powerpc/pseries/eeh: Handle functional reset on non-PCIe device

  Fundamental reset is an optional reset type supported only by PCIe adapters.
  Handle the unexpected case where a non-PCIe device has requested a
  fundamental reset. Try hot-reset as a fallback to handle this case.

Signed-off-by: Richard A Lary <rlary@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 14 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 6cb3e7bd175d..46b55cf563e3 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -728,15 +728,24 @@ rtas_pci_slot_reset(struct pci_dn *pdn, int state)
         if (pdn->eeh_pe_config_addr)
                 config_addr = pdn->eeh_pe_config_addr;
 
-        rc = rtas_call(ibm_set_slot_reset,4,1, NULL,
+        rc = rtas_call(ibm_set_slot_reset, 4, 1, NULL,
                        config_addr,
                        BUID_HI(pdn->phb->buid),
                        BUID_LO(pdn->phb->buid),
                        state);
-        if (rc)
-                printk (KERN_WARNING "EEH: Unable to reset the failed slot,"
-                        " (%d) #RST=%d dn=%s\n",
-                        rc, state, pdn->node->full_name);
+
+        /* Fundamental-reset not supported on this PE, try hot-reset */
+        if (rc == -8 && state == 3) {
+                rc = rtas_call(ibm_set_slot_reset, 4, 1, NULL,
+                               config_addr,
+                               BUID_HI(pdn->phb->buid),
+                               BUID_LO(pdn->phb->buid), 1);
+                if (rc)
+                        printk(KERN_WARNING
+                                "EEH: Unable to reset the failed slot,"
+                                " #RST=%d dn=%s\n",
+                                rc, pdn->node->full_name);
+        }
 }
 
 /**