git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
eeh_event.c
diff --git
a/arch/powerpc/platforms/pseries/eeh_event.c
b/arch/powerpc/platforms/pseries/eeh_event.c
index
40020c6
..
49037ed
100644
(file)
--- 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>
*/
* 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/list.h>
#include <linux/mutex.h>
#include <linux/pci.h>
@@
-34,10
+35,10
@@
*/
/* EEH event workqueue setup. */
*/
/* EEH event workqueue setup. */
-static
spinlock_t eeh_eventlist_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(eeh_eventlist_lock)
;
LIST_HEAD(eeh_eventlist);
LIST_HEAD(eeh_eventlist);
-static void eeh_thread_launcher(
void
*);
-DECLARE_WORK(eeh_event_wq, eeh_thread_launcher
, NULL
);
+static void eeh_thread_launcher(
struct work_struct
*);
+DECLARE_WORK(eeh_event_wq, eeh_thread_launcher);
/* Serialize reset sequences for a given pci device */
DEFINE_MUTEX(eeh_event_mutex);
/* Serialize reset sequences for a given pci device */
DEFINE_MUTEX(eeh_event_mutex);
@@
-56,38
+57,43
@@
static int eeh_event_handler(void * dummy)
{
unsigned long flags;
struct eeh_event *event;
{
unsigned long flags;
struct eeh_event *event;
+ struct pci_dn *pdn;
daemonize ("eehd");
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;
}
return 0;
@@
-97,7
+103,7
@@
static int eeh_event_handler(void * dummy)
* eeh_thread_launcher
* @dummy - unused
*/
* eeh_thread_launcher
* @dummy - unused
*/
-static void eeh_thread_launcher(
void
*dummy)
+static void eeh_thread_launcher(
struct work_struct
*dummy)
{
if (kernel_thread(eeh_event_handler, NULL, CLONE_KERNEL) < 0)
printk(KERN_ERR "Failed to start EEH daemon\n");
{
if (kernel_thread(eeh_event_handler, NULL, CLONE_KERNEL) < 0)
printk(KERN_ERR "Failed to start EEH daemon\n");
@@
-118,11
+124,11
@@
int eeh_send_failure_event (struct device_node *dn,
{
unsigned long flags;
struct eeh_event *event;
{
unsigned long flags;
struct eeh_event *event;
- char *location;
+ c
onst c
har *location;
if (!mem_init_done) {
printk(KERN_ERR "EEH: event during early boot not handled\n");
if (!mem_init_done) {
printk(KERN_ERR "EEH: event during early boot not handled\n");
- location =
(char *)
get_property(dn, "ibm,loc-code", NULL);
+ location = 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;
printk(KERN_ERR "EEH: device node = %s\n", dn->full_name);
printk(KERN_ERR "EEH: PCI location = %s\n", location);
return 1;