Skip to content

Commit

Permalink
Fix RTC number in TODO and limit trace from MclMgr and PreVerifiedLidMgr
Browse files Browse the repository at this point in the history 
Change-Id: Ia96d2993fb209a7a8f4ca4d16532f316b27c706c
CMVC-Prereq: 1036742
CMVC-Prereq: 1037898
RTC: 125304
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49294
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-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>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
  • Loading branch information
@wghoffa
Stephen Cprek authored and wghoffa committed Nov 13, 2017
1 parent d2f72e8 commit bf8e8d4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
23 changes: 11 additions & 12 deletions src/usr/runtime/preverifiedlidmgr.C
View file
Expand Up @@ -162,14 +162,14 @@ errlHndl_t PreVerifiedLidMgr::_loadFromPnor(const PNOR::SectionId i_sec,

// Translate Pnor Section Id to Lid
auto l_lids = Util::getPnorSecLidIds(i_sec);
TRACFCOMP( g_trac_runtime, "PreVerifiedLidMgr::loadFromPnor - getPnorSecLidIds lid = 0x%X, containerLid = 0x%X",
l_lids.lid, l_lids.containerLid);
TRACDCOMP( g_trac_runtime, "PreVerifiedLidMgr::_loadFromPnor - getPnorSecLidIds lid = 0x%X, containerLid = 0x%X",
l_lids.lid, l_lids.containerLid);
assert(l_lids.lid != Util::INVALID_LIDID,"Pnor Section = %s not associated with any Lids", PNOR::SectionIdToString(i_sec));

// Only load if not previously done.
if( isLidLoaded(l_lids.containerLid) && isLidLoaded(l_lids.lid) )
{
TRACFCOMP( g_trac_runtime, "PreVerifiedLidMgr::loadFromPnor - sec %s already loaded",
TRACFCOMP( g_trac_runtime, "PreVerifiedLidMgr::_loadFromPnor - sec %s already loaded",
PNOR::SectionIdToString(i_sec));
break;
}
Expand All @@ -195,7 +195,7 @@ errlHndl_t PreVerifiedLidMgr::_loadFromPnor(const PNOR::SectionId i_sec,
l_containerLidStr);
if(l_errl)
{
TRACFCOMP( g_trac_runtime, ERR_MRK"PreVerifiedLidMgr::loadFromPnor - setNextHbRsvMemEntry Lid header failed");
TRACFCOMP( g_trac_runtime, ERR_MRK"PreVerifiedLidMgr::_loadFromPnor - setNextHbRsvMemEntry Lid header failed");
break;
}
}
Expand All @@ -213,7 +213,7 @@ errlHndl_t PreVerifiedLidMgr::_loadFromPnor(const PNOR::SectionId i_sec,
l_lidStr);
if(l_errl)
{
TRACFCOMP( g_trac_runtime, ERR_MRK"PreVerifiedLidMgr::loadFromPnor - setNextHbRsvMemEntry Lid content failed");
TRACFCOMP( g_trac_runtime, ERR_MRK"PreVerifiedLidMgr::_loadFromPnor - setNextHbRsvMemEntry Lid content failed");
break;
}
}
Expand All @@ -230,7 +230,7 @@ errlHndl_t PreVerifiedLidMgr::_loadFromPnor(const PNOR::SectionId i_sec,
HDAT::RHB_READ_ONLY);
if(l_errl)
{
TRACFCOMP( g_trac_runtime, ERR_MRK"PreVerifiedLidMgr::loadFromPnor - setNextHbRsvMemEntry PNOR content failed");
TRACFCOMP( g_trac_runtime, ERR_MRK"PreVerifiedLidMgr::_loadFromPnor - setNextHbRsvMemEntry PNOR content failed");
break;
}
}
Expand All @@ -241,7 +241,7 @@ errlHndl_t PreVerifiedLidMgr::_loadFromPnor(const PNOR::SectionId i_sec,
l_errl = loadImage(i_addr, i_size);
if(l_errl)
{
TRACFCOMP( g_trac_runtime, ERR_MRK"PreVerifiedLidMgr::loadFromPnor - setNextHbRsvMemEntry PNOR content failed");
TRACFCOMP( g_trac_runtime, ERR_MRK"PreVerifiedLidMgr::_loadFromPnor - setNextHbRsvMemEntry PNOR content failed");
break;
}
}
Expand Down Expand Up @@ -329,8 +329,7 @@ errlHndl_t PreVerifiedLidMgr::_loadFromMCL(const uint32_t i_lidId,
// Force switch back to default reserved memory info
cv_pResvMemInfo = &cv_resvMemInfo;

TRACFCOMP(g_trac_runtime, EXIT_MRK"PreVerifiedLidMgr::_loadFromMCL lid = 0x%X",
i_lidId);
TRACFCOMP(g_trac_runtime, EXIT_MRK"PreVerifiedLidMgr::_loadFromMCL");

mutex_unlock(&cv_loadImageMutex);

Expand Down Expand Up @@ -376,7 +375,7 @@ bool PreVerifiedLidMgr::isLidLoaded(uint32_t i_lidId)
errlHndl_t PreVerifiedLidMgr::loadImage(const uint64_t i_imgAddr,
const size_t i_imgSize)
{
TRACFCOMP( g_trac_runtime, ENTER_MRK"PreVerifiedLidMgr::loadImage addr = 0x%X, size = 0x%X",
TRACDCOMP( g_trac_runtime, ENTER_MRK"PreVerifiedLidMgr::loadImage addr = 0x%X, size = 0x%X",
i_imgAddr, i_imgSize);

errlHndl_t l_errl = nullptr;
Expand All @@ -394,7 +393,7 @@ errlHndl_t PreVerifiedLidMgr::loadImage(const uint64_t i_imgAddr,
break;
}

TRACFCOMP(g_trac_runtime, "PreVerifiedLidMgr::loadImage - curAddr 0x%X, size 0x%X, vaddr 0x%X",
TRACDCOMP(g_trac_runtime, "PreVerifiedLidMgr::loadImage - curAddr 0x%X, size 0x%X, vaddr 0x%X",
cv_pResvMemInfo->curAddr, i_imgSize, l_tmpVaddr);

// Include Header page from pnor image.
Expand Down Expand Up @@ -425,7 +424,7 @@ errlHndl_t PreVerifiedLidMgr::loadImage(const uint64_t i_imgAddr,

} while(0);

TRACFCOMP( g_trac_runtime, EXIT_MRK"PreVerifiedLidMgr::loadImage");
TRACDCOMP( g_trac_runtime, EXIT_MRK"PreVerifiedLidMgr::loadImage");

return l_errl;
}
29 changes: 15 additions & 14 deletions src/usr/util/utilmclmgr.C
View file
Expand Up @@ -109,7 +109,7 @@ MasterContainerLidMgr::~MasterContainerLidMgr()

void MasterContainerLidMgr::initMcl(const void* i_pMcl, const size_t i_mclSize)
{
UTIL_FT(ENTER_MRK"MasterContainerLidMgr::initMcl");
UTIL_DT(ENTER_MRK"MasterContainerLidMgr::initMcl");

errlHndl_t l_errl = nullptr;

Expand Down Expand Up @@ -159,13 +159,13 @@ void MasterContainerLidMgr::initMcl(const void* i_pMcl, const size_t i_mclSize)
iv_pVaddr = iv_pTempVaddr;
iv_maxSize = iv_tmpSize;

UTIL_FT(EXIT_MRK"MasterContainerLidMgr::initMcl");
UTIL_DT(EXIT_MRK"MasterContainerLidMgr::initMcl");
}

void MasterContainerLidMgr::releaseMem(const uint64_t i_physAddr,
void *&io_pVaddr)
{
UTIL_FT(ENTER_MRK"MasterContainerLidMgr::releaseMem");
UTIL_DT(ENTER_MRK"MasterContainerLidMgr::releaseMem");

errlHndl_t l_errl = nullptr;
assert(i_physAddr != 0, "MasterContainerLidMgr physical address to release cannot be 0");
Expand Down Expand Up @@ -210,14 +210,14 @@ void MasterContainerLidMgr::releaseMem(const uint64_t i_physAddr,
INITSERVICE::doShutdown(l_reasonCode);
}

UTIL_FT(EXIT_MRK"MasterContainerLidMgr::releaseMem");
UTIL_DT(EXIT_MRK"MasterContainerLidMgr::releaseMem");
}

void MasterContainerLidMgr::initMem(const uint64_t i_physAddr,
const size_t i_size,
void *&io_pVaddr)
{
UTIL_FT(ENTER_MRK"MasterContainerLidMgr::initMem");
UTIL_DT(ENTER_MRK"MasterContainerLidMgr::initMem");

errlHndl_t l_errl = nullptr;
assert(i_physAddr != 0, "MasterContainerLidMgr physical address cannot be 0");
Expand Down Expand Up @@ -263,7 +263,7 @@ void MasterContainerLidMgr::initMem(const uint64_t i_physAddr,
INITSERVICE::doShutdown(l_reasonCode);
}

UTIL_FT(EXIT_MRK"MasterContainerLidMgr::initMem");
UTIL_DT(EXIT_MRK"MasterContainerLidMgr::initMem");
}

void MasterContainerLidMgr::parseMcl()
Expand Down Expand Up @@ -348,6 +348,8 @@ errlHndl_t MasterContainerLidMgr::processComponents()
break;
}
// Print Comp Info after loading lid and verifying
UTIL_FT("MasterContainerLidMgr::processComponents %s Info",
iv_curCompIdStr);
iv_compInfoCache.at(compInfoPair.first).print();
}

Expand All @@ -368,7 +370,6 @@ errlHndl_t MasterContainerLidMgr::processComponent(const ComponentID& i_compId,
// Check if Component is POWERVM (aka PHYP)
bool isPhypComp = (i_compId == g_PowervmCompId) ? true : false;

// @TODO RTC:125304 Provide support for a preloaded PHYP
// Check if Component is POWERVM (PHYP) and still skip if (!isTCEmode)
if ( isPhypComp )
{
Expand Down Expand Up @@ -531,7 +532,7 @@ errlHndl_t MasterContainerLidMgr::processComponent(const ComponentID& i_compId,
errlHndl_t MasterContainerLidMgr::loadLids(CompInfo& io_compInfo,
size_t& o_totalSize)
{
UTIL_FT(ENTER_MRK"MasterContainerLidMgr::loadLids");
UTIL_DT(ENTER_MRK"MasterContainerLidMgr::loadLids");
errlHndl_t l_errl = nullptr;

// Force total size to zero
Expand Down Expand Up @@ -587,15 +588,15 @@ errlHndl_t MasterContainerLidMgr::loadLids(CompInfo& io_compInfo,
o_totalSize += l_lidSize;
}

UTIL_FT(EXIT_MRK"MasterContainerLidMgr::loadLids");
UTIL_DT(EXIT_MRK"MasterContainerLidMgr::loadLids");

return l_errl;
}

errlHndl_t MasterContainerLidMgr::verifyExtend(const ComponentID& i_compId,
CompInfo& io_compInfo)
{
UTIL_FT(ENTER_MRK"MasterContainerLidMgr::verifyExtend");
UTIL_DT(ENTER_MRK"MasterContainerLidMgr::verifyExtend");

errlHndl_t l_errl = nullptr;

Expand Down Expand Up @@ -626,7 +627,7 @@ errlHndl_t MasterContainerLidMgr::verifyExtend(const ComponentID& i_compId,
io_compInfo.unprotectedSize = l_conHdr.totalContainerSize() -
l_conHdr.payloadTextSize();

// @TODO RTC:125304 re-enable when component id is supported in lids
// @TODO RTC:181848 re-enable when component id is supported in lids
if (0)// memcmp(l_conHdr.componentId(), i_compId.data(),
// SW_HDR_COMP_ID_SIZE_BYTES) != 0 )
{
Expand Down Expand Up @@ -661,15 +662,15 @@ errlHndl_t MasterContainerLidMgr::verifyExtend(const ComponentID& i_compId,
}
} while(0);

UTIL_FT(EXIT_MRK"MasterContainerLidMgr::verifyExtend");
UTIL_DT(EXIT_MRK"MasterContainerLidMgr::verifyExtend");

return l_errl;
}

errlHndl_t MasterContainerLidMgr::tpmExtend(const ComponentID& i_compId,
const SECUREBOOT::ContainerHeader& i_conHdr) const
{
UTIL_FT(ENTER_MRK"MasterContainerLidMgr::tpmExtend");
UTIL_DT(ENTER_MRK"MasterContainerLidMgr::tpmExtend");

errlHndl_t l_errl = nullptr;

Expand Down Expand Up @@ -714,7 +715,7 @@ errlHndl_t MasterContainerLidMgr::tpmExtend(const ComponentID& i_compId,

} while(0);

UTIL_FT(EXIT_MRK"MasterContainerLidMgr::tpmExtend");
UTIL_DT(EXIT_MRK"MasterContainerLidMgr::tpmExtend");

return l_errl;
}
Expand Down

0 comments on commit bf8e8d4

Please sign in to comment.