diff options
| -rw-r--r-- | src/include/usr/ipmi/ipmiwatchdog.H | 12 | ||||
| -rw-r--r-- | src/usr/trace/HBconfig | 5 | ||||
| -rw-r--r-- | src/usr/trace/service.C | 14 |
3 files changed, 27 insertions, 4 deletions
diff --git a/src/include/usr/ipmi/ipmiwatchdog.H b/src/include/usr/ipmi/ipmiwatchdog.H index 7d40de7b9..56ba1300c 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,2015 */ +/* Contributors Listed Below - COPYRIGHT 2014,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -48,7 +48,17 @@ namespace IPMIWATCHDOG * @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. +#ifdef CONFIG_BMC_IPMI_LONG_WATCHDOG +const uint16_t DEFAULT_WATCHDOG_COUNTDOWN = 2400; +#else const uint16_t DEFAULT_WATCHDOG_COUNTDOWN = 120; +#endif /** * @brief the default watchdog countdown for transition between hostboot diff --git a/src/usr/trace/HBconfig b/src/usr/trace/HBconfig index 9d523d3f1..ce166b04f 100644 --- a/src/usr/trace/HBconfig +++ b/src/usr/trace/HBconfig @@ -18,3 +18,8 @@ config CONSOLE_OUTPUT_TRACE_COMP_NAME Limits console output trace to a specific component by name. User needs to add to the config file: set CONSOLE_OUTPUT_TRACE_COMP_NAME "<component_string_name>" + +config NO_FAPI_IN_TRACE_LITE_OUTPUT + default y + help + Do not output FAPI traces when CONSOLE_TRACE_LITE is enabled. diff --git a/src/usr/trace/service.C b/src/usr/trace/service.C index aeafc929d..d8039d9be 100644 --- a/src/usr/trace/service.C +++ b/src/usr/trace/service.C @@ -322,13 +322,21 @@ namespace TRACE } #ifdef CONFIG_CONSOLE_TRACE_LITE - CONSOLE::vdisplayf(i_td->iv_compName, *l_cb, l_tl_args); + + #ifdef CONFIG_NO_FAPI_IN_TRACE_LITE_OUTPUT + if (strcmp( i_td->iv_compName, "FAPI" )) + #endif + { CONSOLE::vdisplayf(i_td->iv_compName, *l_cb, l_tl_args); } #else if (iv_traceLite) { - CONSOLE::vdisplayf(i_td->iv_compName, *l_cb, l_tl_args); + #ifdef CONFIG_NO_FAPI_IN_TRACE_LITE_OUTPUT + if (strcmp( i_td->iv_compName, "FAPI" )) + #endif + { CONSOLE::vdisplayf(i_td->iv_compName, *l_cb, l_tl_args); } } -#endif + +#endif //CONFIG_CONSOLE_TRACE_LITE // "Commit" entry to buffer. l_buffer->commitEntry(l_entry); |
