diff options
| author | Christian Geddes <crgeddes@us.ibm.com> | 2019-03-01 12:04:28 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-03-06 08:31:00 -0600 |
| commit | e70d216f8e2b9dea8c8f89e13a4ac9d8f56caa3b (patch) | |
| tree | 5e023f6dcbaea355df5ea6ecf63a7dcaed108d7e /src/usr/isteps/istep13 | |
| parent | efda71702697a1f3d748b9e5f3c77039ef6e61ac (diff) | |
| download | talos-hostboot-e70d216f8e2b9dea8c8f89e13a4ac9d8f56caa3b.tar.gz talos-hostboot-e70d216f8e2b9dea8c8f89e13a4ac9d8f56caa3b.zip | |
Compile and add calls to exp_scominit in istep 13.8
Since this code is ready and seemingly passing in axone simics okay
we will pull it in to cross another item off the list.
Change-Id: Id02b1fae825d5e601312251f75af21120f9fa2ba
RTC: 195556
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72723
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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/isteps/istep13')
| -rw-r--r-- | src/usr/isteps/istep13/call_mss_scominit.C | 47 | ||||
| -rw-r--r-- | src/usr/isteps/istep13/makefile | 12 |
2 files changed, 57 insertions, 2 deletions
diff --git a/src/usr/isteps/istep13/call_mss_scominit.C b/src/usr/isteps/istep13/call_mss_scominit.C index 966bde9fa..994e17443 100644 --- a/src/usr/isteps/istep13/call_mss_scominit.C +++ b/src/usr/isteps/istep13/call_mss_scominit.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -44,6 +44,7 @@ #include <p9_mss_scominit.H> #include <p9_throttle_sync.H> #include <p9c_mss_scominit.H> +#include <exp_scominit.H> using namespace ERRORLOG; using namespace ISTEP; @@ -155,6 +156,50 @@ void* call_mss_scominit (void *io_pArgs) } } + // Get all OCMB targets + TARGETING::TargetHandleList l_ocmbTargetList; + getAllChips(l_ocmbTargetList, TYPE_OCMB_CHIP); + + for (const auto & l_ocmb_target : l_ocmbTargetList) + { + // Dump current run on target + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "Running exp_scominit HWP on " + "target HUID %.8X", + TARGETING::get_huid(l_ocmb_target)); + + fapi2::Target <fapi2::TARGET_TYPE_OCMB_CHIP> l_fapi_ocmb_target + (l_ocmb_target); + + // call the HWP with each fapi2::Target + FAPI_INVOKE_HWP(l_err, exp_scominit, l_fapi_ocmb_target); + + if (l_err) + { + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + "ERROR 0x%.8X: exp_scominit HWP returns error", + l_err->reasonCode()); + + // capture the target data in the elog + ErrlUserDetailsTarget(l_fapi_ocmb_target).addToLog(l_err); + + // Create IStep error log and cross reference to error that + // occurred + l_stepError.addErrorDetails( l_err ); + + // Commit Error + errlCommit( l_err, HWPF_COMP_ID ); + + break; + } + else + { + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "SUCCESS running exp_scominit HWP on " + "target HUID %.8X", TARGETING::get_huid(l_ocmb_target)); + } + } + if (!l_stepError.isNull()) { break; diff --git a/src/usr/isteps/istep13/makefile b/src/usr/isteps/istep13/makefile index 9cf054dd3..9c6580e60 100644 --- a/src/usr/isteps/istep13/makefile +++ b/src/usr/isteps/istep13/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2018 +# Contributors Listed Below - COPYRIGHT 2015,2019 # [+] International Business Machines Corp. # # @@ -27,6 +27,9 @@ MODULE = istep13 PROCEDURES_PATH = ${ROOTPATH}/src/import/chips/p9/procedures CEN_PROCEDURES_PATH = ${ROOTPATH}/src/import/chips/centaur/procedures +OCMB_PROCEDURES_PATH = ${ROOTPATH}/src/import/chips/ocmb/procedures +EXP_PROCEDURES_PATH = ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures + #Add all the extra include paths EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2 @@ -55,6 +58,8 @@ EXTRAINCDIR += ${CEN_PROCEDURES_PATH}/hwp/memory/lib/ EXTRAINCDIR += ${CEN_PROCEDURES_PATH}/hwp/memory/lib/shared/ EXTRAINCDIR += ${CEN_PROCEDURES_PATH}/hwp/memory/lib/utils/ EXTRAINCDIR += ${CEN_PROCEDURES_PATH}/hwp/initfiles +EXTRAINCDIR += ${EXP_PROCEDURES_PATH}/hwp/memory/ +EXTRAINCDIR += ${OCMB_PROCEDURES_PATH}/hwp/initfiles/ # from src/usr/isteps/istep13 @@ -92,6 +97,9 @@ include ${PROCEDURES_PATH}/hwp/initfiles/p9n_ddrphy_scom.mk include ${PROCEDURES_PATH}/hwp/initfiles/p9n_mca_scom.mk include ${PROCEDURES_PATH}/hwp/initfiles/p9n_mcbist_scom.mk +include ${EXP_PROCEDURES_PATH}/hwp/memory/exp_scominit.mk +include ${OCMB_PROCEDURES_PATH}/hwp/initfiles/explorer_scom.mk + #Dram init include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit.mk include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_training.mk @@ -135,3 +143,5 @@ VPATH += ${CEN_PROCEDURES_PATH}/hwp/memory/lib/ VPATH += ${CEN_PROCEDURES_PATH}/hwp/memory/lib/shared/ VPATH += ${CEN_PROCEDURES_PATH}/hwp/memory/lib/utils/ VPATH += ${CEN_PROCEDURES_PATH}/hwp/initfiles +VPATH += ${EXP_PROCEDURES_PATH}/hwp/memory +VPATH += ${OCMB_PROCEDURES_PATH}/hwp/initfiles/ |
