Skip to content

Commit

Permalink
powerpc/eeh: Ignore handlers in eeh_pe_reset_and_recover()
Browse files Browse the repository at this point in the history
The function eeh_pe_reset_and_recover() is used to recover EEH
error when the passthrough device are transferred to guest and
backwards, meaning the device's driver is vfio-pci or none. In
both cases, the handlers triggered by eeh_report_reset() and
eeh_report_resume() shouldn't be called.

This ignores the error handlers from eeh_report_reset() and
eeh_report_resume().

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Gavin Shan authored and Michael Ellerman committed May 12, 2016
1 parent 5a0cdbf commit 2efc771
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions arch/powerpc/kernel/eeh_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ static int eeh_clear_pe_frozen_state(struct eeh_pe *pe,

int eeh_pe_reset_and_recover(struct eeh_pe *pe)
{
int result, ret;
int ret;

/* Bail if the PE is being recovered */
if (pe->state & EEH_PE_RECOVERING)
Expand All @@ -601,15 +601,9 @@ int eeh_pe_reset_and_recover(struct eeh_pe *pe)
return ret;
}

/* Notify completion of reset */
eeh_pe_dev_traverse(pe, eeh_report_reset, &result);

/* Restore device state */
eeh_pe_dev_traverse(pe, eeh_dev_restore_state, NULL);

/* Resume */
eeh_pe_dev_traverse(pe, eeh_report_resume, NULL);

/* Clear recovery mode */
eeh_pe_state_clear(pe, EEH_PE_RECOVERING);

Expand Down

0 comments on commit 2efc771

Please sign in to comment.