Skip to content

Commit

Permalink
PRD: Adjust core checkstop handling for EX rt deconfig
Browse files Browse the repository at this point in the history
Change-Id: Iaf035e51a08f7cef6d691338c696ca00986eaf07
CQ: SW439014
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64435
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64437
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>
  • Loading branch information
bweisenb authored and zane131 committed Aug 16, 2018
1 parent c818c28 commit 04712b9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
3 changes: 1 addition & 2 deletions src/usr/diag/prdf/common/plat/p9/prdfP9Ec.C
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,12 @@ int32_t PostAnalysis( ExtensibleChip * i_chip,
#ifdef __HOSTBOOT_RUNTIME
if ( io_sc.service_data->isProcCoreCS() )
{
ExtensibleChip * n_chip = getNeighborCore(i_chip);
maskIfCoreCs(i_chip);
rtDcnfgCore(i_chip);
ExtensibleChip * n_chip = getNeighborCore(i_chip);
if (n_chip != nullptr)
{
maskIfCoreCs(n_chip);
rtDcnfgCore(n_chip);
}
}
else
Expand Down
12 changes: 9 additions & 3 deletions src/usr/diag/prdf/common/plat/prdfTargetServices.C
Original file line number Diff line number Diff line change
Expand Up @@ -947,11 +947,17 @@ ExtensibleChip * getNeighborCore( ExtensibleChip * i_core )
PRDF_ASSERT( nullptr != i_core );

TargetHandle_t thisCore = i_core->getTrgt();
TargetHandleList parentEx = getConnected( thisCore, TYPE_EX );

// Check that there is still a functional parent EX
if (parentEx.size() == 0)
return nullptr;

ExtensibleChip * neighborCore = nullptr;
TargetHandleList list =
getConnected(getConnectedParent(thisCore, TYPE_EX), TYPE_CORE);

for ( auto & trgt : list)
TargetHandleList coreList = getConnected( parentEx[0], TYPE_CORE);

for ( auto & trgt : coreList)
{
if ( trgt != thisCore )
{
Expand Down

0 comments on commit 04712b9

Please sign in to comment.