diff options
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) { |
