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 <gws...@linux.vnet.ibm.com>
Reviewed-by: Russell Currey <rus...@russell.cc>
---
v3: Split from PATCH[v2 1/3] according to David's comment
---
 arch/powerpc/kernel/eeh_driver.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 31e4c7e..a16212d 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -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)
@@ -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);
 
-- 
2.1.0

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Reply via email to