Merge ../linus

[pandora-kernel.git] / arch / powerpc / platforms / pseries / eeh_driver.c

diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 2a9eb26..0ec9a54 100644 (file)
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -201,7 +201,11 @@ static void eeh_report_failure(struct pci_dev *dev, void *userdata)
 
 static int eeh_reset_device (struct pci_dn *pe_dn, struct pci_bus *bus)
 {
-       int rc;
+       int cnt, rc;
+
+       /* pcibios will clear the counter; save the value */
+       cnt = pe_dn->eeh_freeze_count;
+
        if (bus)
                pcibios_remove_pci_devices(bus);
 
@@ -240,6 +244,7 @@ static int eeh_reset_device (struct pci_dn *pe_dn, struct pci_bus *bus)
                ssleep (5);
                pcibios_add_pci_devices(bus);
        }
+       pe_dn->eeh_freeze_count = cnt;
 
        return 0;
 }
@@ -256,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
@@ -277,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;
        }
 
@@ -313,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
@@ -363,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 */);