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

PATCH In review Richard A Lary 2 participants 3 messages Apr 6, 2011 – Apr 8, 2011

Subsystems (2)

PowerPC PCI enhanced error handling (eeh) for PowerPC

lore

Share & tools

lore

Richard A Lary

author

2011-04-06 22:50 UTC #0 lore raw

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

From: Richard A. Lary <[email protected]>

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

Signed-off-by Richard A. Lary <[email protected]>

---
arch/powerpc/platforms/pseries/eeh.c | 13 12 + 1 - 0 !

 1 file changed, 12 insertions(+), 1 deletion(-)

arch/powerpc/platforms/pseries/eeh.c +12 -1

Index: b/arch/powerpc/platforms/pseries/eeh.c
===================================================================
@@ -95,6 +95,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);

@@ -263,6 +264,8 @@ void eeh_slot_error_detail(struct pci_dn
 	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);

@@ -896,6 +899,7 @@ void
 rtas_configure_bridge(struct pci_dn *pdn)
 {
 	int config_addr;
+	int token;
 	int rc;
 
 	/* Use PE configuration address, if present */

@@ -903,7 +907,13 @@ rtas_configure_bridge(struct pci_dn *pdn
 	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));

@@ -1079,6 +1089,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;

Benjamin Herrenschmidt

2011-04-07 03:35 UTC #1 lore raw

Quoted 4 lines · Richard A Lary

From: Richard A. Lary <[email protected]>
Added support for ibm,configure-pe RTAS call introduced with PAPR 2.2.

Care to tell us a bit about the difference ? :-) There's nothing obvious in the code.... Also you added calls to rtas_configure_bridge() and eeh_restore_bars() to eeh_slot_error_Detail(), that might want some explanation as well.

Cheers,
Ben.

Quoted 62 lines

Signed-off-by Richard A. Lary <[email protected]>

---
arch/powerpc/platforms/pseries/eeh.c | 13 12 + 1 - 0 !

  1 file changed, 12 insertions(+), 1 deletion(-)

Index: b/arch/powerpc/platforms/pseries/eeh.c
===================================================================

arch/powerpc/platforms/pseries/eeh.c +12 -1

@@ -95,6 +95,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);

@@ -263,6 +264,8 @@ void eeh_slot_error_detail(struct pci_dn
  	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);

@@ -896,6 +899,7 @@ void
  rtas_configure_bridge(struct pci_dn *pdn)
  {
  	int config_addr;
+	int token;
  	int rc;
 
  	/* Use PE configuration address, if present */

@@ -903,7 +907,13 @@ rtas_configure_bridge(struct pci_dn *pdn
  	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));

@@ -1079,6 +1089,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;

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev

Richard A Lary

author

2011-04-08 14:38 UTC #2 lore raw

Quoted 10 lines · Benjamin Herrenschmidt

Quoted 4 lines · Richard A Lary
From: Richard A. Lary<[email protected]>
Added support for ibm,configure-pe RTAS call introduced with PAPR 2.2.
Care to tell us a bit about the difference ? :-) There's nothing obvious in the code.... Also you added calls to rtas_configure_bridge() and eeh_restore_bars() to eeh_slot_error_Detail(), that might want some explanation as well.

I was directed by Platform Firmware team to use the new configure-pe call on platforms which support it. Other than that, all I can tell you is what PAPR+ 2.5 has to say:

---
Section 7.3.12.2 ibm,configure-pe
This call has about the same semantics as the ibm,configure-bridge RTAS call, except that it:
1. Has the additional semantics of bypassing the configuration process if the PE has previously not been reset by the platform as a result of entering the EEH Stopped State.
2. Configures all the configurations spaces within the PE, including those of the endpoint devices within the PE (see Requirement R1–7.3.12.2–3).

Thus, this RTAS call can be made at the beginning of any EEH processing.

---

The addition of calls to rtas_configure_bridge() and eeh_restore_bars() were also added as directed by Platform Firmware team. Platform Firmware advised these calls were required to allow access to all devices under the Partitionable Endpoint by gather_pci_data() on PCIe adapters which contain PCIe Switches/Bridges.

I have verified in testing that the addition of rtas_configure_bridge() and eeh_restore_bars() do indeed allow gather_pci_data() to read config space on every device under the PE, which returned all FF's prior to addition of those calls.

Quoted 67 lines

Cheers,
Ben.

Quoted 62 lines

Signed-off-by Richard A. Lary<[email protected]>

---
arch/powerpc/platforms/pseries/eeh.c | 13 12 + 1 - 0 !

   1 file changed, 12 insertions(+), 1 deletion(-)

Index: b/arch/powerpc/platforms/pseries/eeh.c
===================================================================

arch/powerpc/platforms/pseries/eeh.c +12 -1

@@ -95,6 +95,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);

@@ -263,6 +264,8 @@ void eeh_slot_error_detail(struct pci_dn
   	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);

@@ -896,6 +899,7 @@ void
   rtas_configure_bridge(struct pci_dn *pdn)
   {
   	int config_addr;
+	int token;
   	int rc;
 
   	/* Use PE configuration address, if present */

@@ -903,7 +907,13 @@ rtas_configure_bridge(struct pci_dn *pdn
   	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));

@@ -1079,6 +1089,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;

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev