diff options
| author | Christian Geddes <crgeddes@us.ibm.com> | 2018-08-21 11:32:02 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-09-20 23:02:25 -0500 |
| commit | 739807847a95530dc42ee9a955b81ced4ffda142 (patch) | |
| tree | e18a30087c72c003f86995c8bb2225120faabce3 /src | |
| parent | 165bb46bac36d2774b7fe36543024710053ec3d0 (diff) | |
| download | talos-hostboot-739807847a95530dc42ee9a955b81ced4ffda142.tar.gz talos-hostboot-739807847a95530dc42ee9a955b81ced4ffda142.zip | |
Set wakeup mode in istep 15 based on SMF setttings
Change-Id: I979d20fb8f38e2aa4e8fc29aebc38a7752aed5ce
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64939
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: Ilya Smirnov <ismirno@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/isteps/istep15/host_build_stop_image.C | 22 | ||||
| -rw-r--r-- | src/usr/isteps/pm/pm.mk | 1 |
2 files changed, 20 insertions, 3 deletions
diff --git a/src/usr/isteps/istep15/host_build_stop_image.C b/src/usr/isteps/istep15/host_build_stop_image.C index cbd699e08..e417fe71d 100644 --- a/src/usr/isteps/istep15/host_build_stop_image.C +++ b/src/usr/isteps/istep15/host_build_stop_image.C @@ -59,6 +59,7 @@ //Import directory (from EKB repository) #include <p9_hcode_image_build.H> #include <p9_stop_api.H> +#include <p9_setup_runtime_wakeup_mode.H> #include <p9_xip_image.h> #include <p9_infrastruct_help.H> #include <p9_hcode_image_defines.H> @@ -500,7 +501,7 @@ void* host_build_stop_image (void *io_pArgs) //Cast OUR type of target to a FAPI2 type of target. const fapi2::Target<TARGET_TYPE_PROC_CHIP> - l_fapiCpuTarget( const_cast<TARGETING::Target*>(l_procChip)); + l_fapiProcTarget( const_cast<TARGETING::Target*>(l_procChip)); //Default constructor sets the appropriate settings ImageType_t img_type; @@ -520,7 +521,7 @@ void* host_build_stop_image (void *io_pArgs) //Call p9_hcode_image_build.C HWP FAPI_INVOKE_HWP( l_errl, p9_hcode_image_build, - l_fapiCpuTarget, + l_fapiProcTarget, reinterpret_cast<void*>(l_pHcodeImage), l_pImageOut, //homer image buffer l_ringOverrides, @@ -538,7 +539,7 @@ void* host_build_stop_image (void *io_pArgs) if ( l_errl ) { TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "host_build_stop_image ERROR : errorlog PLID=0x%x", + "host_build_stop_image ERROR occured during p9_hcode_image_build : errorlog PLID=0x%x", l_errl->plid() ); // drop out of block with errorlog. @@ -563,6 +564,21 @@ void* host_build_stop_image (void *io_pArgs) "applyHcodeGenCpuRegs SUCCESS " ); } + // Set wakeup mode for processor based on SMF enablement + FAPI_INVOKE_HWP(l_errl, + p9_setup_runtime_wakeup_mode, + l_fapiProcTarget); + + if ( l_errl ) + { + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + "host_build_stop_image ERROR occured during p9_setup_runtime_wakeup_mode : errorlog PLID=0x%x", + l_errl->plid() ); + + // drop out of block with errorlog. + break; + } + } while (0) ; // broke out due to an error, store all the details away, store diff --git a/src/usr/isteps/pm/pm.mk b/src/usr/isteps/pm/pm.mk index e8e725a35..0234f0e96 100644 --- a/src/usr/isteps/pm/pm.mk +++ b/src/usr/isteps/pm/pm.mk @@ -116,4 +116,5 @@ include ${HWP_PM_PATH}/p9_pm_recovery_ffdc_qppm.mk include ${HWP_PM_PATH}/p9_pm_recovery_ffdc_occ.mk include ${HWP_PM_PATH}/p9_cme_sram_access.mk include ${HWP_PM_PATH}/p9_pm_callout.mk +include ${HWP_PM_PATH}/p9_setup_runtime_wakeup_mode.mk include ${ROOTPATH}/src/import/chips/p9/procedures/hwp/perv/p9_core_checkstop_handler.mk |
