From 2c84fc6ab09e3641957290eb8fbfd5b4ced64213 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Fri, 20 Apr 2018 15:05:13 -0500 Subject: Enable super-long watchdog timer when console traces are enabled When console traces are enabled, the boot takes significantly longer than usual. Our standard watchdog timeout of 2 minutes is not sufficient. Made the following changes: - Tied the enablement of the long timeout to the CONFIG flags for console traces - Increased the timeout to 1 hour (from 40 minutes) since this is lab only and false positives are the worst... - Added a couple clarifying traces to make future watchdog debug simpler Change-Id: I92bb0b07cb77a13cb390450999b285f2ad74168d CQ: SW425407 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57580 Reviewed-by: Martin Gloff Reviewed-by: Richard J. Knight Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Christian R. Geddes Tested-by: Jenkins OP HW Reviewed-by: William G. Hoffa --- src/include/usr/ipmi/ipmiwatchdog.H | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/include/usr/ipmi') diff --git a/src/include/usr/ipmi/ipmiwatchdog.H b/src/include/usr/ipmi/ipmiwatchdog.H index 56ba1300c..324aa86ef 100644 --- a/src/include/usr/ipmi/ipmiwatchdog.H +++ b/src/include/usr/ipmi/ipmiwatchdog.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2016 */ +/* Contributors Listed Below - COPYRIGHT 2014,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -45,19 +45,15 @@ namespace IPMIWATCHDOG /** * @brief the default watchdog countdown setting it to 120 seconds. * - * @TODO RTC:124499 revisit after performace improvments - * */ // The config option CONFIG_BMC_IPMI_LONG_WATCHDOG allows a tester to use a // watchdog timer that is several times more than what a customer would desire -// to aid in testing only. This option was initially envisioned for use with -// tracelite enabled, which greatly lengthens IPL time causing the watchdog -// timer to timeout. However this option could have other uses, so its name -// is left generic so as not imply the limited use with tracelite alone. +// to aid in testing only. This option will be automatically set whenever any +// kind of console tracing is enabled. #ifdef CONFIG_BMC_IPMI_LONG_WATCHDOG -const uint16_t DEFAULT_WATCHDOG_COUNTDOWN = 2400; +const uint16_t DEFAULT_WATCHDOG_COUNTDOWN = 3600; //60 minutes #else -const uint16_t DEFAULT_WATCHDOG_COUNTDOWN = 120; +const uint16_t DEFAULT_WATCHDOG_COUNTDOWN = 120; //2 minutes #endif /** -- cgit v1.2.3