diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2018-06-03 23:52:39 -0500 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-06-04 00:00:50 -0500 |
| commit | 5b70462c73a803d15982fe6f2c6dad89b8a9c962 (patch) | |
| tree | f933050f7f5c27b935bbeca738eaf579715ac9cd /hw | |
| parent | c9f363245238b746660dd6198d4c28c7529dacea (diff) | |
| download | skiboot-5b70462c73a803d15982fe6f2c6dad89b8a9c962.zip skiboot-5b70462c73a803d15982fe6f2c6dad89b8a9c962.tar.gz skiboot-5b70462c73a803d15982fe6f2c6dad89b8a9c962.tar.bz2 | |
ipmi-watchdog: don't run by default yet
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ipmi/ipmi-watchdog.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/hw/ipmi/ipmi-watchdog.c b/hw/ipmi/ipmi-watchdog.c index fc559c6..778e655 100644 --- a/hw/ipmi/ipmi-watchdog.c +++ b/hw/ipmi/ipmi-watchdog.c @@ -1,5 +1,4 @@ - -/* Copyright 2013-2014 IBM Corp. +/* Copyright 2013-2018 IBM Corp. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -128,11 +127,20 @@ void ipmi_wdt_final_reset(void) wdt_ticking = false; cancel_timer(&wdt_timer); + /* + * We're going to wait a little while before requiring + * BOOTKERNEL to have IPMI watchdog support so that people + * can catch up in their development environments. + * If you still read this after 2018, send a patch! + */ +#if 0 /* Configure the watchdog and make sure it is still enabled */ set_wdt(WDT_RESET_ACTION | WDT_PRETIMEOUT_SMI, WDT_TIMEOUT, WDT_MARGIN/10, true); sync_reset_wdt(); - +#else + set_wdt(WDT_NO_ACTION, 100, 0, false); +#endif ipmi_set_boot_count(); } |