Commit 2c1175c2 authored by Robert Lippert's avatar Robert Lippert Committed by Corey Minyard

ipmi/watchdog: fix wdog hang on panic waiting for ipmi response

Commit c49c0976 ("ipmi: Don't call receive handler in the
panic context") means that the panic_recv_free is not called during a
panic and the atomic count does not drop to 0.

Fix this by only expecting one decrement of the atomic variable
which comes from panic_smi_free.
Signed-off-by: default avatarRobert Lippert <rlippert@google.com>
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent 3f724c40
...@@ -516,7 +516,7 @@ static void panic_halt_ipmi_heartbeat(void) ...@@ -516,7 +516,7 @@ static void panic_halt_ipmi_heartbeat(void)
msg.cmd = IPMI_WDOG_RESET_TIMER; msg.cmd = IPMI_WDOG_RESET_TIMER;
msg.data = NULL; msg.data = NULL;
msg.data_len = 0; msg.data_len = 0;
atomic_add(2, &panic_done_count); atomic_add(1, &panic_done_count);
rv = ipmi_request_supply_msgs(watchdog_user, rv = ipmi_request_supply_msgs(watchdog_user,
(struct ipmi_addr *) &addr, (struct ipmi_addr *) &addr,
0, 0,
...@@ -526,7 +526,7 @@ static void panic_halt_ipmi_heartbeat(void) ...@@ -526,7 +526,7 @@ static void panic_halt_ipmi_heartbeat(void)
&panic_halt_heartbeat_recv_msg, &panic_halt_heartbeat_recv_msg,
1); 1);
if (rv) if (rv)
atomic_sub(2, &panic_done_count); atomic_sub(1, &panic_done_count);
} }
static struct ipmi_smi_msg panic_halt_smi_msg = { static struct ipmi_smi_msg panic_halt_smi_msg = {
...@@ -550,12 +550,12 @@ static void panic_halt_ipmi_set_timeout(void) ...@@ -550,12 +550,12 @@ static void panic_halt_ipmi_set_timeout(void)
/* Wait for the messages to be free. */ /* Wait for the messages to be free. */
while (atomic_read(&panic_done_count) != 0) while (atomic_read(&panic_done_count) != 0)
ipmi_poll_interface(watchdog_user); ipmi_poll_interface(watchdog_user);
atomic_add(2, &panic_done_count); atomic_add(1, &panic_done_count);
rv = i_ipmi_set_timeout(&panic_halt_smi_msg, rv = i_ipmi_set_timeout(&panic_halt_smi_msg,
&panic_halt_recv_msg, &panic_halt_recv_msg,
&send_heartbeat_now); &send_heartbeat_now);
if (rv) { if (rv) {
atomic_sub(2, &panic_done_count); atomic_sub(1, &panic_done_count);
printk(KERN_WARNING PFX printk(KERN_WARNING PFX
"Unable to extend the watchdog timeout."); "Unable to extend the watchdog timeout.");
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment