diff options
| author | William A. Kennington III <wak@google.com> | 2018-05-23 17:13:30 -0700 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-06-01 02:07:26 -0500 |
| commit | 84995f90049782e04981ff74cd373677f45f8eba (patch) | |
| tree | f8d2ee5c337890e5225208e484d5f7e7135dbf96 /hw/ipmi | |
| parent | af7c59027d7b5f5662a8cc62d8ebef2257be9ddf (diff) | |
| download | skiboot-84995f90049782e04981ff74cd373677f45f8eba.zip skiboot-84995f90049782e04981ff74cd373677f45f8eba.tar.gz skiboot-84995f90049782e04981ff74cd373677f45f8eba.tar.bz2 | |
ipmi-watchdog: Don't disable at shutdown
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>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'hw/ipmi')
| -rw-r--r-- | hw/ipmi/ipmi-watchdog.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/ipmi/ipmi-watchdog.c b/hw/ipmi/ipmi-watchdog.c index e8efba2..b5cb5fe 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); } |