Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Richard A Lary and committed by
Benjamin Herrenschmidt
ecb73902 308fc4f8

+14 -5
+14 -5
arch/powerpc/platforms/pseries/eeh.c
··· 728 728 if (pdn->eeh_pe_config_addr) 729 729 config_addr = pdn->eeh_pe_config_addr; 730 730 731 - rc = rtas_call(ibm_set_slot_reset,4,1, NULL, 731 + rc = rtas_call(ibm_set_slot_reset, 4, 1, NULL, 732 732 config_addr, 733 733 BUID_HI(pdn->phb->buid), 734 734 BUID_LO(pdn->phb->buid), 735 735 state); 736 - if (rc) 737 - printk (KERN_WARNING "EEH: Unable to reset the failed slot," 738 - " (%d) #RST=%d dn=%s\n", 739 - rc, state, pdn->node->full_name); 736 + 737 + /* Fundamental-reset not supported on this PE, try hot-reset */ 738 + if (rc == -8 && state == 3) { 739 + rc = rtas_call(ibm_set_slot_reset, 4, 1, NULL, 740 + config_addr, 741 + BUID_HI(pdn->phb->buid), 742 + BUID_LO(pdn->phb->buid), 1); 743 + if (rc) 744 + printk(KERN_WARNING 745 + "EEH: Unable to reset the failed slot," 746 + " #RST=%d dn=%s\n", 747 + rc, pdn->node->full_name); 748 + } 740 749 } 741 750 742 751 /**