Revert Only call lpc init procedure on slave procs in mnfg mode

Change-Id: I6ced32fc07c8908b6150bd2cf1176a6f3f9f96d9 CQ: SW448041 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67381 Reviewed-by: RAJA DAS <rajadas2@in.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com> (cherry picked from commit 052f2ffb890eb8dec7d548226437a915f5baeed7) Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67405
open-power · Oct 12, 2018 · 50f3938 · 50f3938
1 parent ca16ce9
commit 50f3938
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/src/sbefw/app/power/ipl_table.C b/src/sbefw/app/power/ipl_table.C
@@ -189,7 +189,6 @@ ReturnCode istepWithCoreConditional( voidfuncptr_t i_hwp);
 ReturnCode istepWithEqConditional( voidfuncptr_t i_hwp);
 ReturnCode istepNestFreq( voidfuncptr_t i_hwp);
 ReturnCode istepCacheInitf( voidfuncptr_t i_hwp );
-ReturnCode istepLpcInit( voidfuncptr_t i_hwp );
 
 //MPIPL Specific
 ReturnCode istepWithCoreSetBlock( voidfuncptr_t i_hwp );
@@ -302,7 +301,7 @@ static istepMap_t g_istep3PtrTbl[] =
              ISTEP_MAP( istepWithProc, p9_sbe_io_initf ),
              ISTEP_MAP( istepWithProc, p9_sbe_startclock_chiplets ),
              ISTEP_MAP( istepWithProc, p9_sbe_scominit ),
-             ISTEP_MAP( istepLpcInit, p9_sbe_lpc_init ),
+             ISTEP_MAP( istepWithProc, p9_sbe_lpc_init ),
              ISTEP_MAP( istepWithProc, p9_sbe_fabricinit ),
              ISTEP_MAP( istepCheckSbeMaster, NULL ),
              ISTEP_MAP( istepWithProc, p9_sbe_mcs_setup ),
@@ -641,21 +640,6 @@ ReturnCode istepLoadBootLoader( voidfuncptr_t i_hwp)
 
 //----------------------------------------------------------------------------
 
-ReturnCode istepLpcInit( voidfuncptr_t i_hwp)
-{
-    ReturnCode rc = FAPI2_RC_SUCCESS;
-    // Only call lpc init if we are on master proc or
-    // are in mnfg mode.
-    if( !(SbeRegAccess::theSbeRegAccess().isSbeSlave()) ||
-        (SbeRegAccess::theSbeRegAccess().isMnfgMode()))
-    {
-        rc = istepWithProc(i_hwp);
-    }
-    return rc;
-}
-
-//----------------------------------------------------------------------------
-
 ReturnCode istepStartInstruction( voidfuncptr_t i_hwp)
 {
     ReturnCode rc = FAPI2_RC_SUCCESS;

diff --git a/src/sbefw/core/sberegaccess.H b/src/sbefw/core/sberegaccess.H
@@ -145,17 +145,6 @@ class SbeRegAccess
             return iv_istepMode;
         }
 
-        /**
-         * @brief Check if we are in mnfg mode
-         *
-         * @return true if in mnfg mode, false otherwise
-         *
-         */
-        inline bool isMnfgMode() const
-        {
-            return iv_mnfgMode;
-        }
-
         /**
          * @brief Check if SBE should directly go to runtime state
          *
@@ -307,8 +296,7 @@ class SbeRegAccess
                 uint64_t iv_mbx3DontCare1 : 5;
                 uint64_t iv_disableScomFiltering : 1;
                 uint64_t iv_disableInvalidScomAddrCheck : 1;
-                uint64_t iv_mnfgMode : 1;
-                uint64_t iv_mbx3DontCare2 : 18;
+                uint64_t iv_mbx3DontCare2 : 19;
                 uint64_t iv_mbx3Unused : 32;
             };
             uint64_t iv_mbx3;