diff mbox series

[4/9] ipmi-watchdog: Don't disable at shutdown

Message ID 20180524001335.15457-5-wak@google.com
State Accepted
Headers show
Series ipmi-watchdog: Fixes for error handling and general cleanups | expand

Commit Message

William Kennington May 24, 2018, 12:13 a.m. UTC 
The op-build linux kernel has been configured to support the ipmi
watchdog. This driver will always handle the watchdog by either leaving
it enabled if configured, or by disabling it during module load if no
configuration is provided. This increases the coverage of the watchdog
during the boot process. The watchdog should no longer be disabled at
any point during skiboot execution.

Signed-off-by: William A. Kennington III <wak@google.com>
---
 hw/ipmi/ipmi-watchdog.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/hw/ipmi/ipmi-watchdog.c b/hw/ipmi/ipmi-watchdog.c
index e8efba2b4..b5cb5fee4 100644
--- a/hw/ipmi/ipmi-watchdog.c
+++ b/hw/ipmi/ipmi-watchdog.c
@@ -121,14 +121,9 @@  void ipmi_wdt_stop(void)
 
 void ipmi_wdt_final_reset(void)
 {
-	/* todo: this is disabled while we're waiting on fixed watchdog
-	 * behaviour */
-#if 0
 	set_wdt(WDT_RESET_ACTION | WDT_PRETIMEOUT_SMI, WDT_TIMEOUT,
 		WDT_MARGIN/10, true);
-	reset_wdt(NULL, (void *) 1);
-#endif
-	set_wdt(WDT_NO_ACTION, 100, 0, false);
+	sync_reset_wdt();
 	ipmi_set_boot_count();
 	cancel_timer(&wdt_timer);
 }