lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ipmi: watchdog/NMI interaction fixes

Browse Source 
There are some interactions between IPMI NMI timeouts and the other operations
of the IPMI driver.  This make sure those interactions are handled properly.

Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Corey Minyard
2005-09-06 15:18:39 -07:00
committed by Linus Torvalds
parent 75b0768a39
commit 8f05ee9a63
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/char/ipmi/ipmi_watchdog.c
View File

@@ -259,7 +259,7 @@ static int i_ipmi_set_timeout(struct ipmi_smi_msg *smi_msg,
data[1] = 0; data[1] = 0;
WDOG_SET_TIMEOUT_ACT(data[1], ipmi_watchdog_state); WDOG_SET_TIMEOUT_ACT(data[1], ipmi_watchdog_state);
if (pretimeout > 0) { if ((pretimeout > 0) && (ipmi_watchdog_state != WDOG_TIMEOUT_NONE)) {
WDOG_SET_PRETIMEOUT_ACT(data[1], preaction_val); WDOG_SET_PRETIMEOUT_ACT(data[1], preaction_val);
data[2] = pretimeout; data[2] = pretimeout;
} else { } else {
@@ -817,15 +817,19 @@ static void ipmi_register_watchdog(int ipmi_intf)
static int static int
ipmi_nmi(void *dev_id, struct pt_regs *regs, int cpu, int handled) ipmi_nmi(void *dev_id, struct pt_regs *regs, int cpu, int handled)
{ {
/* If we are not expecting a timeout, ignore it. */
if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE)
return NOTIFY_DONE;
/* If no one else handled the NMI, we assume it was the IPMI /* If no one else handled the NMI, we assume it was the IPMI
watchdog. */ watchdog. */
if ((!handled) && (preop_val == WDOG_PREOP_PANIC)) if ((!handled) && (preop_val == WDOG_PREOP_PANIC)) {
panic(PFX "pre-timeout");
/* On some machines, the heartbeat will give /* On some machines, the heartbeat will give
an error and not work unless we re-enable an error and not work unless we re-enable
the timer. So do so. */ the timer. So do so. */
pretimeout_since_last_heartbeat = 1; pretimeout_since_last_heartbeat = 1;
panic(PFX "pre-timeout");
}
return NOTIFY_DONE; return NOTIFY_DONE;
} }