Commit 2efc771f authored by Gavin Shan's avatar Gavin Shan Committed by Michael Ellerman

powerpc/eeh: Ignore handlers in eeh_pe_reset_and_recover()

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: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: default avatarRussell Currey <ruscur@russell.cc>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 5a0cdbfd
...@@ -575,7 +575,7 @@ static int eeh_clear_pe_frozen_state(struct eeh_pe *pe, ...@@ -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 eeh_pe_reset_and_recover(struct eeh_pe *pe)
{ {
int result, ret; int ret;
/* Bail if the PE is being recovered */ /* Bail if the PE is being recovered */
if (pe->state & EEH_PE_RECOVERING) if (pe->state & EEH_PE_RECOVERING)
...@@ -601,15 +601,9 @@ int eeh_pe_reset_and_recover(struct eeh_pe *pe) ...@@ -601,15 +601,9 @@ int eeh_pe_reset_and_recover(struct eeh_pe *pe)
return ret; return ret;
} }
/* Notify completion of reset */
eeh_pe_dev_traverse(pe, eeh_report_reset, &result);
/* Restore device state */ /* Restore device state */
eeh_pe_dev_traverse(pe, eeh_dev_restore_state, NULL); eeh_pe_dev_traverse(pe, eeh_dev_restore_state, NULL);
/* Resume */
eeh_pe_dev_traverse(pe, eeh_report_resume, NULL);
/* Clear recovery mode */ /* Clear recovery mode */
eeh_pe_state_clear(pe, EEH_PE_RECOVERING); eeh_pe_state_clear(pe, EEH_PE_RECOVERING);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment