diff mbox series

[1/9] ipmi-watchdog: WD_POWER_CYCLE_ACTION -> WD_RESET_ACTION

Message ID 20180524001335.15457-2-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 IPMI specification denotes that action 0x1 is Host Reset and 0x3 is
Host Power Cycle. Use the correct name for Reset in our watchdog code.

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

Patch

diff --git a/hw/ipmi/ipmi-watchdog.c b/hw/ipmi/ipmi-watchdog.c
index 55c3bf555..966d10de4 100644
--- a/hw/ipmi/ipmi-watchdog.c
+++ b/hw/ipmi/ipmi-watchdog.c
@@ -31,7 +31,7 @@ 
 
 /* WDT expiration actions */
 #define WDT_PRETIMEOUT_SMI	0x10
-#define WDT_POWER_CYCLE_ACTION 	0x01
+#define WDT_RESET_ACTION 	0x01
 #define WDT_NO_ACTION		0x00
 
 /* How long to set the overall watchdog timeout for. In units of
@@ -122,7 +122,7 @@  void ipmi_wdt_final_reset(void)
 	/* todo: this is disabled while we're waiting on fixed watchdog
 	 * behaviour */
 #if 0
-	set_wdt(WDT_POWER_CYCLE_ACTION | WDT_PRETIMEOUT_SMI, WDT_TIMEOUT,
+	set_wdt(WDT_RESET_ACTION | WDT_PRETIMEOUT_SMI, WDT_TIMEOUT,
 		WDT_MARGIN/10);
 	reset_wdt(NULL, (void *) 1);
 #endif
@@ -134,7 +134,7 @@  void ipmi_wdt_final_reset(void)
 void ipmi_wdt_init(void)
 {
 	init_timer(&wdt_timer, reset_wdt, NULL);
-	set_wdt(WDT_POWER_CYCLE_ACTION, WDT_TIMEOUT, 0);
+	set_wdt(WDT_RESET_ACTION, WDT_TIMEOUT, 0);
 
 	/* Start the WDT. We do it synchronously to make sure it has
 	 * started before skiboot continues booting. Otherwise we