diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-10-25 10:07:40 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-11-06 13:06:35 -0500 |
| commit | 94b12d2ea05031aecf05601575608f781bf9e526 (patch) | |
| tree | dbccb6dacfa2a63f9bc9d16601262aa997df1687 /src/usr/runtime | |
| parent | 97f6525326d7ad9fa099be2b503a971c9325f503 (diff) | |
| download | talos-hostboot-94b12d2ea05031aecf05601575608f781bf9e526.tar.gz talos-hostboot-94b12d2ea05031aecf05601575608f781bf9e526.zip | |
Enable preverified lid loading from pnor and Master Container Lid
Change-Id: Ic6bc381148796c49c928eb1d3586039203eea822
RTC:125304
RTC:178163
CMVC-Prereq: 1036742
CMVC-Prereq: 1037898
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48825
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@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: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/runtime')
| -rw-r--r-- | src/usr/runtime/populate_hbruntime.C | 4 | ||||
| -rw-r--r-- | src/usr/runtime/preverifiedlidmgr.C | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C index 12a6fba9f..38e1236ab 100644 --- a/src/usr/runtime/populate_hbruntime.C +++ b/src/usr/runtime/populate_hbruntime.C @@ -1092,9 +1092,6 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId) break; } - // @TODO RTC:125304 enable when PHYP changes necessary for pre-verified - // lids are in a fips release -/* // Load lids from Master Container Lid Container provided by FSP if (INITSERVICE::spBaseServicesEnabled()) { @@ -1105,7 +1102,6 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId) break; } } -*/ } while(0); // If lock obtained, always unlock Pre verified lid manager diff --git a/src/usr/runtime/preverifiedlidmgr.C b/src/usr/runtime/preverifiedlidmgr.C index 4e5d9a2dc..4e869711f 100644 --- a/src/usr/runtime/preverifiedlidmgr.C +++ b/src/usr/runtime/preverifiedlidmgr.C @@ -180,12 +180,9 @@ errlHndl_t PreVerifiedLidMgr::_loadFromPnor(const PNOR::SectionId i_sec, bool l_loadImage = false; if(cv_payloadKind == TARGETING::PAYLOAD_KIND_PHYP) { - // @TODO RTC:178163 enable when PHYP changes necessary for pre-verified - // lids are in a fips release -/* l_loadImage = true; // Verified Lid - Header Only - if ( (l_lids.containerLid != INVALID_LIDID) && + if ( (l_lids.containerLid != Util::INVALID_LIDID) && !isLidLoaded(l_lids.containerLid)) { char l_containerLidStr [Util::lidIdStrLength] {}; @@ -204,7 +201,7 @@ errlHndl_t PreVerifiedLidMgr::_loadFromPnor(const PNOR::SectionId i_sec, } // Verified Lid - Content Only - if ( (l_lids.lid != INVALID_LIDID) && + if ( (l_lids.lid != Util::INVALID_LIDID) && !isLidLoaded(l_lids.lid)) { char l_lidStr[Util::lidIdStrLength] {}; @@ -220,7 +217,6 @@ errlHndl_t PreVerifiedLidMgr::_loadFromPnor(const PNOR::SectionId i_sec, break; } } -*/ } else if(cv_payloadKind == TARGETING::PAYLOAD_KIND_SAPPHIRE) { |
