diff options
author | Dan Crowell <dcrowell@us.ibm.com> | 2017-09-07 10:08:03 -0500 |
---|---|---|
committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-09-11 09:36:34 -0400 |
commit | 29cb1f68e34c3b6f1a4167f4ff49f021f587b8af (patch) | |
tree | af6fde04494625c1a36d2bf0e310c275eaf93fb8 /src/usr/initservice | |
parent | de726d0ea25bfe1f01d810080f82ab0650c39646 (diff) | |
download | talos-hostboot-29cb1f68e34c3b6f1a4167f4ff49f021f587b8af.tar.gz talos-hostboot-29cb1f68e34c3b6f1a4167f4ff49f021f587b8af.zip |
Add terminate option for mfg stop on error case
Adding a new config option HANG_ON_MFG_SRC_TERM that will affect
how we handle the MFG_SRC_TERM flag. The default (and current)
behavior is for Hostboot to put itself into a hang state in order
to prevent a reboot from the BMC. The new option will allow us
to terminate normally (with a TI) instead.
Change-Id: I82a0062cf50e4161d0da811a823dd7664dc2a5de
CQ: SW401335
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45793
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/initservice')
-rw-r--r-- | src/usr/initservice/istepdispatcher/HBconfig | 11 | ||||
-rw-r--r-- | src/usr/initservice/istepdispatcher/istepdispatcher.C | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/usr/initservice/istepdispatcher/HBconfig b/src/usr/initservice/istepdispatcher/HBconfig index 2b0a07fd0..7987f8ef3 100644 --- a/src/usr/initservice/istepdispatcher/HBconfig +++ b/src/usr/initservice/istepdispatcher/HBconfig @@ -3,17 +3,28 @@ config CONSOLE_OUTPUT_PROGRESS depends on CONSOLE help Display boot progress to console. + config RECONFIG_LOOP_TESTS_ENABLE default y help Include functions for enabling reconfig loop testing. + config SIO_ISTEP_CONTROL default n depends on BMC_AST2400 help Allows istep control via SIO scratch registers. Typical usage is via mailbox (scom) scratch registers. + config ISTEP_LPC_PORT80_DEBUG default n help Writes ISTEP progress to LPC port 80h. + +config HANG_ON_MFG_SRC_TERM + default y + help + Controls the behavior when terminating due to a fail when + manufacturing stop-on-error mode is set. + y: Hostboot will put itself into an infinite loop + n: Hostboot will terminate (TI), relies on BMC to not reboot diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index dec077b82..e12e762f6 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -668,8 +668,14 @@ errlHndl_t IStepDispatcher::executeAllISteps() // Quiesce new isteps, including external requests (void)setStopIpl(); +#ifdef CONFIG_HANG_ON_MFG_SRC_TERM // Stop the IPL stop(); +#else + // Shutdown with a TI + doShutdown( SHUTDOWN_MFG_TERM ); +#endif + } #endif |