powerpc/eeh: Add support for ibm,configure-pe RTAS call

Added support for ibm,configure-pe RTAS call introduced with
PAPR 2.2.

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

diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 89649173d3a339bcd70a4a70ef13b13644827535..2293730538645805420f5348eac757d82c6d443b 100644 (file)
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -93,6 +93,7 @@ static int ibm_slot_error_detail;
 static int ibm_get_config_addr_info;
 static int ibm_get_config_addr_info2;
 static int ibm_configure_bridge;
+static int ibm_configure_pe;
 
 int eeh_subsystem_enabled;
 EXPORT_SYMBOL(eeh_subsystem_enabled);
@@ -261,6 +262,8 @@ void eeh_slot_error_detail(struct pci_dn *pdn, int severity)
        pci_regs_buf[0] = 0;
 
        rtas_pci_enable(pdn, EEH_THAW_MMIO);
+       rtas_configure_bridge(pdn);
+       eeh_restore_bars(pdn);
        loglen = gather_pci_data(pdn, pci_regs_buf, EEH_PCI_REGS_LOG_LEN);
 
        rtas_slot_error_detail(pdn, severity, pci_regs_buf, loglen);
@@ -895,13 +898,20 @@ rtas_configure_bridge(struct pci_dn *pdn)
 {
        int config_addr;
        int rc;
+       int token;
 
        /* Use PE configuration address, if present */
        config_addr = pdn->eeh_config_addr;
        if (pdn->eeh_pe_config_addr)
                config_addr = pdn->eeh_pe_config_addr;
 
-       rc = rtas_call(ibm_configure_bridge,3,1, NULL,
+       /* Use new configure-pe function, if supported */
+       if (ibm_configure_pe != RTAS_UNKNOWN_SERVICE)
+               token = ibm_configure_pe;
+       else
+               token = ibm_configure_bridge;
+
+       rc = rtas_call(token, 3, 1, NULL,
                       config_addr,
                       BUID_HI(pdn->phb->buid),
                       BUID_LO(pdn->phb->buid));
@@ -1077,6 +1087,7 @@ void __init eeh_init(void)
        ibm_get_config_addr_info = rtas_token("ibm,get-config-addr-info");
        ibm_get_config_addr_info2 = rtas_token("ibm,get-config-addr-info2");
        ibm_configure_bridge = rtas_token ("ibm,configure-bridge");
+       ibm_configure_pe = rtas_token("ibm,configure-pe");
 
        if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE)
                return;