X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fpowerpc%2Fplatforms%2Fpseries%2Feeh_event.c;fp=arch%2Fpowerpc%2Fplatforms%2Fpseries%2Feeh_event.c;h=9a9961f27480d5736981c5982716ee17fc7c307e;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=45ccc687e57cbedc3395f0c113b7117a5c6c1b53;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c
index 45ccc687e..9a9961f27 100644
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@ -18,11 +18,8 @@
  * Copyright (c) 2005 Linas Vepstas <linas@linas.org>
  */
 
-#include <linux/delay.h>
 #include <linux/list.h>
-#include <linux/mutex.h>
 #include <linux/pci.h>
-#include <linux/workqueue.h>
 #include <asm/eeh_event.h>
 #include <asm/ppc-pci.h>
 
@@ -35,65 +32,55 @@
  */
 
 /* EEH event workqueue setup. */
-static DEFINE_SPINLOCK(eeh_eventlist_lock);
+static spinlock_t eeh_eventlist_lock = SPIN_LOCK_UNLOCKED;
 LIST_HEAD(eeh_eventlist);
 static void eeh_thread_launcher(void *);
 DECLARE_WORK(eeh_event_wq, eeh_thread_launcher, NULL);
 
-/* Serialize reset sequences for a given pci device */
-DEFINE_MUTEX(eeh_event_mutex);
-
 /**
- * eeh_event_handler - dispatch EEH events.
- * @dummy - unused
+ * eeh_event_handler - dispatch EEH events.  The detection of a frozen
+ * slot can occur inside an interrupt, where it can be hard to do
+ * anything about it.  The goal of this routine is to pull these
+ * detection events out of the context of the interrupt handler, and
+ * re-dispatch them for processing at a later time in a normal context.
  *
- * The detection of a frozen slot can occur inside an interrupt,
- * where it can be hard to do anything about it.  The goal of this
- * routine is to pull these detection events out of the context
- * of the interrupt handler, and re-dispatch them for processing
- * at a later time in a normal context.
+ * @dummy - unused
  */
 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);
 
-	spin_lock_irqsave(&eeh_eventlist_lock, flags);
-	event = NULL;
+	while (1) {
+		set_current_state(TASK_INTERRUPTIBLE);
 
-	/* 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);
+		spin_lock_irqsave(&eeh_eventlist_lock, flags);
+		event = NULL;
 
-	if (event == NULL)
-		return 0;
+		/* 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);
+		}
+		
+		if (event)
+			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);
+		spin_unlock_irqrestore(&eeh_eventlist_lock, flags);
+		if (event == NULL)
+			break;
 
-	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);
 
-	/* 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--;
+		pci_dev_put(event->dev);
+		kfree(event);
 	}
 
 	return 0;
@@ -101,6 +88,7 @@ static int eeh_event_handler(void * dummy)
 
 /**
  * eeh_thread_launcher
+ *
  * @dummy - unused
  */
 static void eeh_thread_launcher(void *dummy)
@@ -124,15 +112,7 @@ int eeh_send_failure_event (struct device_node *dn,
 {
 	unsigned long flags;
 	struct eeh_event *event;
-	char *location;
 
-	if (!mem_init_done) {
-		printk(KERN_ERR "EEH: event during early boot not handled\n");
-		location = (char *) get_property(dn, "ibm,loc-code", NULL);
-		printk(KERN_ERR "EEH: device node = %s\n", dn->full_name);
-		printk(KERN_ERR "EEH: PCI location = %s\n", location);
-		return 1;
-	}
 	event = kmalloc(sizeof(*event), GFP_ATOMIC);
 	if (event == NULL) {
 		printk (KERN_ERR "EEH: out of memory, event not handled\n");