diff --git a/src/usr/isteps/istep14/call_mss_power_cleanup.C b/src/usr/isteps/istep14/call_mss_power_cleanup.C index daa6cff0621..f28ea50823f 100644 --- a/src/usr/isteps/istep14/call_mss_power_cleanup.C +++ b/src/usr/isteps/istep14/call_mss_power_cleanup.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,6 +38,7 @@ #include #include #include +#include using namespace ISTEP; using namespace ISTEP_ERROR; @@ -94,8 +95,6 @@ void* call_mss_power_cleanup (void *io_pArgs) } } -//@TODO RTC:144076 L1 HWPs for Centaur+Cumulus -#if 0 // -- Cumulus only // Get a list of all present Centaurs TargetHandleList l_presCentaurs; @@ -144,18 +143,14 @@ void* call_mss_power_cleanup (void *io_pArgs) l_currMBA0Huid, l_currMBA1Huid); // Create FAPI Targets. - // @TODO RTC:155020 - /*const fapi::Target l_fapiCentaurTarget(TARGET_TYPE_MEMBUF_CHIP, - (const_cast(l_pCentaur))); - const fapi::Target l_fapiMba0Target(TARGET_TYPE_MBA_CHIPLET, - (const_cast(l_presMbas[0]))); - const fapi::Target l_fapiMba1Target(TARGET_TYPE_MBA_CHIPLET, - (const_cast(l_presMbas[1]))); + fapi2::Target l_fapiCentaurTarget( l_pCentaur ); + fapi2::Target l_fapiMba0Target( l_presMbas[0] ); + fapi2::Target l_fapiMba1Target( l_presMbas[1] ); // Call the HWP with each fapi::Target - FAPI_INVOKE_HWP(l_err, mss_power_cleanup, l_fapiCentaurTarget, + FAPI_INVOKE_HWP(l_err, p9c_mss_power_cleanup, l_fapiCentaurTarget, l_fapiMba0Target, l_fapiMba1Target); - */ + if (l_err) { TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, @@ -179,7 +174,6 @@ void* call_mss_power_cleanup (void *io_pArgs) l_currMBA0Huid, l_currMBA1Huid); } } -#endif TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_power_cleanup exit" ); diff --git a/src/usr/isteps/istep14/call_mss_thermal_init.C b/src/usr/isteps/istep14/call_mss_thermal_init.C index 892f57c2b40..2460e290ff8 100644 --- a/src/usr/isteps/istep14/call_mss_thermal_init.C +++ b/src/usr/isteps/istep14/call_mss_thermal_init.C @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include @@ -52,67 +52,62 @@ void* call_mss_thermal_init (void *io_pArgs) { IStepError l_StepError; errlHndl_t l_errl = nullptr; -//@TODO RTC:144076 L1 HWPs for Centaur+Cumulus -#if 0 + // -- Cumulus only --- - // Get all Centaur targets - TARGETING::TargetHandleList l_memBufTargetList; - getAllChiplets(l_memBufTargetList, TYPE_MCBIST ); - - // -------------------------------------------------------------------- - // run mss_thermal_init on all Centaurs - // -------------------------------------------------------------------- - for (TargetHandleList::const_iterator - l_iter = l_memBufTargetList.begin(); - l_iter != l_memBufTargetList.end(); - ++l_iter) - { - // make a local copy of the target for ease of use - TARGETING::Target* l_pCentaur = *l_iter; + // Get all Centaur targets + TARGETING::TargetHandleList l_memBufTargetList; + getAllChiplets(l_memBufTargetList, TYPE_MEMBUF ); + + // -------------------------------------------------------------------- + // run mss_thermal_init on all Centaurs + // -------------------------------------------------------------------- + for (TargetHandleList::const_iterator + l_iter = l_memBufTargetList.begin(); + l_iter != l_memBufTargetList.end(); + ++l_iter) + { + // make a local copy of the target for ease of use + TARGETING::Target* l_pCentaur = *l_iter; - // write HUID of target - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "target HUID %.8X", TARGETING::get_huid(l_pCentaur)); + // write HUID of target + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + "target HUID %.8X", TARGETING::get_huid(l_pCentaur)); - fapi2::Target l_fapi_pCentaur - (l_pCentaur); + fapi2::Target l_fapi_pCentaur + (l_pCentaur); - // Current run on target - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "Running call_mss_thermal_init HWP on " - "target HUID %.8X", TARGETING::get_huid(l_pCentaur)); + // Current run on target + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "Running call_mss_thermal_init HWP on " + "target HUID %.8X", TARGETING::get_huid(l_pCentaur)); - FAPI_INVOKE_HWP( l_errl, p9_mss_thermal_init, l_fapi_pCentaur ); + FAPI_INVOKE_HWP( l_errl, p9c_mss_thermal_init, l_fapi_pCentaur ); - if ( l_errl ) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X: mss_thermal_init HWP returns error", - l_errl->reasonCode()); + if ( l_errl ) + { + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + "ERROR 0x%.8X: mss_thermal_init HWP returns error", + l_errl->reasonCode()); - // capture the target data in the elog - ErrlUserDetailsTarget(l_pCentaur).addToLog( l_errl ); + // capture the target data in the elog + ErrlUserDetailsTarget(l_pCentaur).addToLog( l_errl ); - // Create IStep error log and cross reference - // to error that occurred - l_StepError.addErrorDetails( l_errl ); + // Create IStep error log and cross reference + // to error that occurred + l_StepError.addErrorDetails( l_errl ); - // Commit Error - errlCommit( l_errl, HWPF_COMP_ID ); + // Commit Error + errlCommit( l_errl, HWPF_COMP_ID ); - break; - } - else - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "SUCCESS : mss_thermal_init HWP( )" ); - } + break; } - if (l_errl) + else { - break; + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "SUCCESS : mss_thermal_init HWP( )" ); } - #endif + } + do { // Run proc throttle sync @@ -128,8 +123,8 @@ void* call_mss_thermal_init (void *io_pArgs) fapi2::Targetl_fapi2CpuTarget((l_procChip)); TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "Running p9_throttle_sync HWP on " - "target HUID %.8X", TARGETING::get_huid(l_procChip)); + "Running p9_throttle_sync HWP on " + "target HUID %.8X", TARGETING::get_huid(l_procChip)); // Call p9_throttle_sync FAPI_INVOKE_HWP( l_errl, p9_throttle_sync, l_fapi2CpuTarget ); diff --git a/src/usr/isteps/istep14/makefile b/src/usr/isteps/istep14/makefile index 17e3faedfc7..77db145b79e 100644 --- a/src/usr/isteps/istep14/makefile +++ b/src/usr/isteps/istep14/makefile @@ -26,6 +26,7 @@ ROOTPATH = ../../../.. MODULE = istep14 PROCEDURE_PATH = ${ROOTPATH}/src/import/chips/p9/procedures +CEN_PROC_PATH = ${ROOTPATH}/src/import/chips/centaur/procedures #Add all the extra include paths EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/ @@ -41,6 +42,9 @@ EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/memory/lib/eff_config/ EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/memory/lib/ EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/memory/lib/mcbist/ EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/memory/lib/dimm/ +EXTRAINCDIR += ${CEN_PROC_PATH}/hwp/memory +EXTRAINCDIR += ${CEN_PROC_PATH}/hwp/memory/lib/shared/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/centaur/common/include/ OBJS += call_mss_memdiag.o OBJS += call_mss_thermal_init.o @@ -68,6 +72,11 @@ OBJS += p9_setup_bars.o OBJS += p9_fbc_utils.o OBJS += p9_fbc_smp_utils.o OBJS += p9_mpipl_chip_cleanup.o +OBJS += p9c_mss_thermal_init.o +OBJS += p9c_mss_unmask_errors.o +OBJS += p9c_mss_power_cleanup.o +OBJS += p9c_cen_stopclocks.o +OBJS += p9c_mss_maint_cmds.o #include ${PROCEDURE_PATH}/hwp/nest/p9_htm_setup.mk #include ${PROCEDURE_PATH}/hwp/nest/p9_pcie_config.mk @@ -76,6 +85,8 @@ OBJS += p9_mpipl_chip_cleanup.o # include ${PROCEDURE_PATH}/hwp/memory/p9_mss_memdiag.mk # include ${PROCEDURE_PATH}/hwp/memory/p9_mss_thermal_init.mk +# include ${CEN_PROC_PATH}/hwp/memory/p9c_mss_thermal_init.mk +# include ${CEN_PROC_PATH}/hwp/memory/p9c_mss_unmask_errors.mk include ${PROCEDURE_PATH}/hwp/nest/p9_throttle_sync.mk include ${PROCEDURE_PATH}/hwp/memory/p9_mss_power_cleanup.mk include ${ROOTPATH}/config.mk @@ -85,3 +96,4 @@ VPATH += ${PROCEDURE_PATH}/hwp/memory/lib/eff_config/ VPATH += ${PROCEDURE_PATH}/hwp/memory/lib/utils/ VPATH += ${PROCEDURE_PATH}/hwp/memory/lib/mcbist/ VPATH += ${PROCEDURE_PATH}/hwp/memory/lib/dimm/ +VPATH += ${CEN_PROC_PATH}/hwp/memory/