[Skiboot] [PATCH 6/9] ipmi-watchdog: The stop action should disable reset

[William A. Kennington III]

Otherwise it is possible for the reset timer to elapse and trigger the
watchdog to wake back up. This doesn't affect the behavior of the
system since we are providing a NONE action to the BMC. However we would
like to avoid the action from taking place if possible.

Signed-off-by: William A. Kennington III <wak at google.com>
---
 hw/ipmi/ipmi-watchdog.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hw/ipmi/ipmi-watchdog.c b/hw/ipmi/ipmi-watchdog.c
index fc559c6da..6f2ac4abf 100644
--- a/hw/ipmi/ipmi-watchdog.c
+++ b/hw/ipmi/ipmi-watchdog.c
@@ -115,6 +115,15 @@ static void reset_wdt(struct timer *t __unused, void *data __unused,
 void ipmi_wdt_stop(void)
 {
 	if (!wdt_stopped) {
+		/* Make sure the background reset timer is disabled before
+		 * stopping the watchdog. If we issue a reset after disabling
+		 * the timer, it will be re-enabled. */
+		wdt_ticking = false;
+		cancel_timer(&wdt_timer);
+
+		/* Configure the watchdog to be disabled and do no action
+		 * in case the underlying implementation is buggy and times
+		 * out anyway. */
 		wdt_stopped = true;
 		set_wdt(WDT_NO_ACTION, 100, 0, false);
 	}
-- 
2.17.0.441.gb46fe60e1d-goog