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>
open-power · Sep 11, 2017 · 29cb1f6 · 29cb1f6
1 parent de726d0
commit 29cb1f6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/include/usr/initservice/initsvcreasoncodes.H b/src/include/usr/initservice/initsvcreasoncodes.H
@@ -80,6 +80,8 @@ enum    InitServiceReasonCode
     ISTEP_PROCESSING_DISABLED    =   INITSVC_COMP_ID | 0x12,
     //termination_rc
     SHUTDOWN_DO_RECONFIG_LOOP    =   INITSVC_COMP_ID | 0x13,
+    //termination_rc
+    SHUTDOWN_MFG_TERM            =   INITSVC_COMP_ID | 0x14,
 };
 
 enum InitServiceUserDetailDataSubSection

diff --git 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
@@ -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