[POWERPC] pseries: Print PCI slot location code on failure

The PCI error recovery code will printk diagnostic info when
a PCI error event occurs. Change the messages to include the slot
location code, which is how most sysadmins will know the device.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 22 insertions, 13 deletions

diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 4d45347afabc..0ec9a5445b95 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -261,16 +261,22 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
         struct pci_bus *frozen_bus;
         int rc = 0;
         enum pci_ers_result result = PCI_ERS_RESULT_NONE;
-        const char *pci_str, *drv_str;
+        const char *location, *pci_str, *drv_str;
 
         frozen_dn = find_device_pe(event->dn);
         frozen_bus = pcibios_find_pci_bus(frozen_dn);
 
         if (!frozen_dn) {
-                printk(KERN_ERR "EEH: Error: Cannot find partition endpoint for %s\n",
-                        pci_name(event->dev));
+
+                location = (char *) get_property(event->dn, "ibm,loc-code", NULL);
+                location = location ? location : "unknown";
+                printk(KERN_ERR "EEH: Error: Cannot find partition endpoint "
+                                "for location=%s pci addr=%s\n",
+                        location, pci_name(event->dev));
                 return NULL;
         }
+        location = (char *) get_property(frozen_dn, "ibm,loc-code", NULL);
+        location = location ? location : "unknown";
 
         /* There are two different styles for coming up with the PE.
          * In the old style, it was the highest EEH-capable device
@@ -282,8 +288,9 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
                 frozen_bus = pcibios_find_pci_bus (frozen_dn->parent);
 
         if (!frozen_bus) {
-                printk(KERN_ERR "EEH: Cannot find PCI bus for %s\n",
-                        frozen_dn->full_name);
+                printk(KERN_ERR "EEH: Cannot find PCI bus "
+                        "for location=%s dn=%s\n",
+                        location, frozen_dn->full_name);
                 return NULL;
         }
 
@@ -318,8 +325,9 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
 
         eeh_slot_error_detail(frozen_pdn, 1 /* Temporary Error */);
         printk(KERN_WARNING
-           "EEH: This PCI device has failed %d times since last reboot: %s - %s\n",
-                frozen_pdn->eeh_freeze_count, drv_str, pci_str);
+           "EEH: This PCI device has failed %d times since last reboot: "
+                "location=%s driver=%s pci addr=%s\n",
+                frozen_pdn->eeh_freeze_count, location, drv_str, pci_str);
 
         /* Walk the various device drivers attached to this slot through
          * a reset sequence, giving each an opportunity to do what it needs
@@ -368,17 +376,18 @@ excess_failures:
          * due to actual, failed cards.
          */
         printk(KERN_ERR
-           "EEH: PCI device %s - %s has failed %d times \n"
-           "and has been permanently disabled.  Please try reseating\n"
-           "this device or replacing it.\n",
-                drv_str, pci_str, frozen_pdn->eeh_freeze_count);
+           "EEH: PCI device at location=%s driver=%s pci addr=%s \n"
+                "has failed %d times and has been permanently disabled. \n"
+                "Please try reseating this device or replacing it.\n",
+                location, drv_str, pci_str, frozen_pdn->eeh_freeze_count);
         goto perm_error;
 
 hard_fail:
         printk(KERN_ERR
-           "EEH: Unable to recover from failure of PCI device %s - %s\n"
+           "EEH: Unable to recover from failure of PCI device "
+           "at location=%s driver=%s pci addr=%s \n"
            "Please try reseating this device or replacing it.\n",
-                drv_str, pci_str);
+                location, drv_str, pci_str);
 
 perm_error:
         eeh_slot_error_detail(frozen_pdn, 2 /* Permanent Error */);