From f3f0a8ff446b02ab62c2789cb926257ce00b97e2 Mon Sep 17 00:00:00 2001 From: Zane Shelley Date: Wed, 25 Sep 2019 10:04:42 -0500 Subject: PRD: fix Explorer FSI address workaround in FIRDATA code 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 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Zane C Shelley --- src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C index 41602a80e..f5b5899ae 100644 --- a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C +++ b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C @@ -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(); + if( HOMER_CHIP_EXPLORER == i_chipModel ) { //@todo - RTC:201781 - Add i2c information @@ -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(); } // Returns a right justified config mask of the unit -- cgit v1.2.3