diff options
| author | Chris Cain <cjcain@us.ibm.com> | 2019-04-22 15:22:44 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-04-30 13:27:01 -0500 |
| commit | cbf60d385958cca0ad6c35926284cf35e62da65b (patch) | |
| tree | 53c629e9aeaadbed16bc74ca5b2f1358fe8ac1a6 /src/usr | |
| parent | 6c39a01069eceea95e0637d5d943aa80f8b3e0a0 (diff) | |
| download | talos-hostboot-cbf60d385958cca0ad6c35926284cf35e62da65b.tar.gz talos-hostboot-cbf60d385958cca0ad6c35926284cf35e62da65b.zip | |
Add SMF mode flag to HOMER for use by OCC
Change-Id: I03daab724811f09aa83c4e0d7929f0a013a2b731
RTC: 164116
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76398
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: Sheldon Bailey <baileysh@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/initservice/extinitsvc/extinitsvctasks.H | 12 | ||||
| -rw-r--r-- | src/usr/isteps/pm/occCheckstop.C | 13 | ||||
| -rw-r--r-- | src/usr/isteps/pm/pm_common.C | 10 | ||||
| -rw-r--r-- | src/usr/isteps/pm/pm_common.H | 6 |
4 files changed, 39 insertions, 2 deletions
diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H index ef8fb76f0..b57469430 100644 --- a/src/usr/initservice/extinitsvc/extinitsvctasks.H +++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H @@ -430,6 +430,18 @@ const TaskInfo g_exttaskinfolist[] = { }, #endif + /** + * @brief SMF module + */ + { + "libsmf.so", // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + } + }, + // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // NOTE: libistepdisp.so needs to always be last in this list!! // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/src/usr/isteps/pm/occCheckstop.C b/src/usr/isteps/pm/occCheckstop.C index 44b7296f0..a9154e2c6 100644 --- a/src/usr/isteps/pm/occCheckstop.C +++ b/src/usr/isteps/pm/occCheckstop.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2018 */ +/* Contributors Listed Below - COPYRIGHT 2013,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -59,6 +59,7 @@ #include <pnorif.H> #include <pnor_const.H> #include <utillidmgr.H> +#include <secureboot/smf_utils.H> #ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS #include <diag/prdf/prdfWriteHomerFirData.H> @@ -476,6 +477,16 @@ namespace HBOCC l_errl = PRDF::writeHomerFirData( config_data->firdataConfig, sizeof(config_data->firdataConfig), i_curHw); + + if (SECUREBOOT::SMF::isSmfEnabled()) + { + config_data->smfMode = SMF_MODE_ENABLED; + } + else + { + config_data->smfMode = SMF_MODE_DISABLED; + } + if (l_errl) { TRACFCOMP( g_fapiImpTd, diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C index 376ec0278..ea8f16118 100644 --- a/src/usr/isteps/pm/pm_common.C +++ b/src/usr/isteps/pm/pm_common.C @@ -82,6 +82,7 @@ #include <p9_stop_api.H> #include <scom/scomif.H> #include <p9_quad_scom_addresses.H> +#include <secureboot/smf_utils.H> #ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS @@ -242,6 +243,15 @@ namespace HBPM l_config_data->firMaster = 0; #endif + if (SECUREBOOT::SMF::isSmfEnabled()) + { + l_config_data->smfMode = SMF_MODE_ENABLED; + } + else + { + l_config_data->smfMode = SMF_MODE_DISABLED; + } + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, EXIT_MRK"loadHostDataToHomer: RC=0x%X, PLID=0x%lX", ERRL_GETRC_SAFE(l_errl), ERRL_GETPLID_SAFE(l_errl) ); diff --git a/src/usr/isteps/pm/pm_common.H b/src/usr/isteps/pm/pm_common.H index 6d167dbda..c8354e5d0 100644 --- a/src/usr/isteps/pm/pm_common.H +++ b/src/usr/isteps/pm/pm_common.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2018 */ +/* Contributors Listed Below - COPYRIGHT 2016,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -48,6 +48,10 @@ namespace HBPM NOT_FIR_MASTER = 0x00000000, IS_FIR_MASTER = 0x00000001, + // SMF Mode + SMF_MODE_DISABLED = 0x00000000, + SMF_MODE_ENABLED = 0x00000001, + // Mask off bit zero PHYSICAL_ADDR_MASK = 0x7FFFFFFFFFFFFFFF, VER_EYECATCH = 0x56455253494F4E00, //'VERSION\0' |
