Skip to content

Commit

Permalink
PRD: fix Explorer FSI address workaround in FIRDATA code
Browse files Browse the repository at this point in the history
There was a previous workaround to stub out filling in the FSI address
for Explorer in the FIRDATA code for checkstop analysis. That workaround
would fill in the FSI address for processor chips before initializing
the structure that contains the FSI address. Therefore, the FSI address
for processors would always get initialized to 0xffffffff. The fix is to
simply put the code in the correct order.

Change-Id: Id76ec015ffec1565236481fcc14be6c1a3145d28
CQ: SW474413
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84369
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
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: Zane C Shelley <zshelle@us.ibm.com>
  • Loading branch information
zane131 committed Sep 27, 2019
1 parent b99004f commit f3f0a8f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C
Expand Up @@ -737,6 +737,11 @@ void __initChipInfo( TargetHandle_t i_chip, HOMER_ChipType_t i_chipModel,
uint32_t chipPos = getTargetPosition( i_chip );
PRDF_ASSERT( chipPos < i_maxChipsPerNode );

// Fill in the HOMER chip info.
o_chipInfo.hChipType = HOMER_getChip( i_chipModel );
o_chipInfo.hChipType.chipPos = chipPos;
o_chipInfo.hChipType.chipEcLevel = i_chip->getAttr<ATTR_EC>();

if( HOMER_CHIP_EXPLORER == i_chipModel )
{
//@todo - RTC:201781 - Add i2c information
Expand All @@ -748,11 +753,6 @@ void __initChipInfo( TargetHandle_t i_chip, HOMER_ChipType_t i_chipModel,
FSI::getFsiLinkInfo( i_chip, fsiInfo );
o_chipInfo.hChipType.fsiBaseAddr = fsiInfo.baseAddr;
}

// Fill in the HOMER chip info.
o_chipInfo.hChipType = HOMER_getChip( i_chipModel );
o_chipInfo.hChipType.chipPos = chipPos;
o_chipInfo.hChipType.chipEcLevel = i_chip->getAttr<ATTR_EC>();
}

// Returns a right justified config mask of the unit
Expand Down

0 comments on commit f3f0a8f

Please sign in to comment.