3 files changed, 40 insertions, 33 deletions

diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 1fba695e32e8..2a9eb2630730 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -23,9 +23,8 @@
  *
  */
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
-#include <linux/notifier.h>
+#include <linux/irq.h>
 #include <linux/pci.h>
 #include <asm/eeh.h>
 #include <asm/eeh_event.h>
@@ -250,7 +249,7 @@ static int eeh_reset_device (struct pci_dn *pe_dn, struct pci_bus *bus)
  */
 #define MAX_WAIT_FOR_RECOVERY 15
 
-void handle_eeh_events (struct eeh_event *event)
+struct pci_dn * handle_eeh_events (struct eeh_event *event)
 {
         struct device_node *frozen_dn;
         struct pci_dn *frozen_pdn;
@@ -265,7 +264,7 @@ void handle_eeh_events (struct eeh_event *event)
         if (!frozen_dn) {
                 printk(KERN_ERR "EEH: Error: Cannot find partition endpoint for %s\n",
                         pci_name(event->dev));
-                return;
+                return NULL;
         }
 
         /* There are two different styles for coming up with the PE.
@@ -280,7 +279,7 @@ void handle_eeh_events (struct eeh_event *event)
         if (!frozen_bus) {
                 printk(KERN_ERR "EEH: Cannot find PCI bus for %s\n",
                         frozen_dn->full_name);
-                return;
+                return NULL;
         }
 
 #if 0
@@ -355,7 +354,7 @@ void handle_eeh_events (struct eeh_event *event)
         /* Tell all device drivers that they can resume operations */
         pci_walk_bus(frozen_bus, eeh_report_resume, NULL);
 
-        return;
+        return frozen_pdn;
         
 excess_failures:
         /*
@@ -384,6 +383,8 @@ perm_error:
 
         /* Shut down the device drivers for good. */
         pcibios_remove_pci_devices(frozen_bus);
+
+        return NULL;
 }
 
 /* ---------- end of file ---------- */
diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c
index a1bda6f96fd1..a0b39640a00f 100644
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@ -18,6 +18,7 @@
  * Copyright (c) 2005 Linas Vepstas <linas@linas.org>
  */
 
+#include <linux/delay.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/pci.h>
@@ -56,38 +57,43 @@ static int eeh_event_handler(void * dummy)
 {
         unsigned long flags;
         struct eeh_event        *event;
+        struct pci_dn *pdn;
 
         daemonize ("eehd");
+        set_current_state(TASK_INTERRUPTIBLE);
 
-        while (1) {
-                set_current_state(TASK_INTERRUPTIBLE);
+        spin_lock_irqsave(&eeh_eventlist_lock, flags);
+        event = NULL;
 
-                spin_lock_irqsave(&eeh_eventlist_lock, flags);
-                event = NULL;
+        /* Unqueue the event, get ready to process. */
+        if (!list_empty(&eeh_eventlist)) {
+                event = list_entry(eeh_eventlist.next, struct eeh_event, list);
+                list_del(&event->list);
+        }
+        spin_unlock_irqrestore(&eeh_eventlist_lock, flags);
 
-                /* Unqueue the event, get ready to process. */
-                if (!list_empty(&eeh_eventlist)) {
-                        event = list_entry(eeh_eventlist.next, struct eeh_event, list);
-                        list_del(&event->list);
-                }
-                spin_unlock_irqrestore(&eeh_eventlist_lock, flags);
+        if (event == NULL)
+                return 0;
 
-                if (event == NULL)
-                        break;
+        /* Serialize processing of EEH events */
+        mutex_lock(&eeh_event_mutex);
+        eeh_mark_slot(event->dn, EEH_MODE_RECOVERING);
 
-                /* Serialize processing of EEH events */
-                mutex_lock(&eeh_event_mutex);
-                eeh_mark_slot(event->dn, EEH_MODE_RECOVERING);
+        printk(KERN_INFO "EEH: Detected PCI bus error on device %s\n",
+               pci_name(event->dev));
 
-                printk(KERN_INFO "EEH: Detected PCI bus error on device %s\n",
-                       pci_name(event->dev));
+        pdn = handle_eeh_events(event);
 
-                handle_eeh_events(event);
+        eeh_clear_slot(event->dn, EEH_MODE_RECOVERING);
+        pci_dev_put(event->dev);
+        kfree(event);
+        mutex_unlock(&eeh_event_mutex);
 
-                eeh_clear_slot(event->dn, EEH_MODE_RECOVERING);
-                pci_dev_put(event->dev);
-                kfree(event);
-                mutex_unlock(&eeh_event_mutex);
+        /* If there are no new errors after an hour, clear the counter. */
+        if (pdn && pdn->eeh_freeze_count>0) {
+                msleep_interruptible (3600*1000);
+                if (pdn->eeh_freeze_count>0)
+                        pdn->eeh_freeze_count--;
         }
 
         return 0;
diff --git a/include/asm-powerpc/eeh_event.h b/include/asm-powerpc/eeh_event.h
index 93d55a2bebfd..dc6bf0ffb796 100644
--- a/include/asm-powerpc/eeh_event.h
+++ b/include/asm-powerpc/eeh_event.h
@@ -18,8 +18,8 @@
  * Copyright (c) 2005 Linas Vepstas <linas@linas.org>
  */
 
-#ifndef ASM_PPC64_EEH_EVENT_H
-#define ASM_PPC64_EEH_EVENT_H
+#ifndef ASM_POWERPC_EEH_EVENT_H
+#define ASM_POWERPC_EEH_EVENT_H
 #ifdef __KERNEL__
 
 /** EEH event -- structure holding pci controller data that describes
@@ -39,7 +39,7 @@ struct eeh_event {
  * @dev pci device
  *
  * This routine builds a PCI error event which will be delivered
- * to all listeners on the peh_notifier_chain.
+ * to all listeners on the eeh_notifier_chain.
  *
  * This routine can be called within an interrupt context;
  * the actual event will be delivered in a normal context
@@ -51,7 +51,7 @@ int eeh_send_failure_event (struct device_node *dn,
                             int time_unavail);
 
 /* Main recovery function */
-void handle_eeh_events (struct eeh_event *);
+struct pci_dn * handle_eeh_events (struct eeh_event *);
 
 #endif /* __KERNEL__ */
-#endif /* ASM_PPC64_EEH_EVENT_H */
+#endif /* ASM_POWERPC_EEH_EVENT_H */