diff options
| author | Sachin Gupta <sgupta2m@in.ibm.com> | 2018-10-11 21:39:04 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2018-10-12 08:58:21 -0500 |
| commit | 50f39386956ea1c82aaf2745be7f14631740f824 (patch) | |
| tree | fd75e0a3a05a1c04f94427622a2e2c130a915745 /src | |
| parent | ca16ce92cfebcc11b9d5b3b9bddd4028a28a5fa1 (diff) | |
| download | talos-sbe-50f39386956ea1c82aaf2745be7f14631740f824.tar.gz talos-sbe-50f39386956ea1c82aaf2745be7f14631740f824.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/sbefw/app/power/ipl_table.C | 18 | ||||
| -rw-r--r-- | src/sbefw/core/sberegaccess.H | 14 |
2 files changed, 2 insertions, 30 deletions
diff --git a/src/sbefw/app/power/ipl_table.C b/src/sbefw/app/power/ipl_table.C index 21b70a58..ca3298bf 100644 --- 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 index 56f4775f..b2d7e1d7 100644 --- a/src/sbefw/core/sberegaccess.H +++ b/src/sbefw/core/sberegaccess.H @@ -146,17 +146,6 @@ class SbeRegAccess } /** - * @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 * * @return true if SBE should go directly 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; |
