From 31aec74cbca784f43d166fb9571df8280b1c898c Mon Sep 17 00:00:00 2001 From: Zane Shelley Date: Wed, 15 May 2019 12:20:11 -0500 Subject: PRD: debug trace output update for OCMB models Change-Id: I6da40fd2f4833dde2e2275b04fa390838a6e3f27 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77406 Reviewed-by: Michael Baiocchi Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Zane C. Shelley --- src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C | 4 ++-- src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/usr') diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C index 48a198155..664e4b35b 100755 --- a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C +++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C @@ -286,7 +286,7 @@ errlHndl_t PlatConfigurator::addDomainChips( TARGETING::TYPE i_type, { TYPE_MCC, axone_mcc }, { TYPE_OMIC, axone_omic }, } }, #ifdef __HOSTBOOT_MODULE - { POWER_CHIPID::EXPLORER, { { TYPE_OCMB_CHIP, explorer_ocmb }, } }, + { POWER_CHIPID::EXPLORER_16, { { TYPE_OCMB_CHIP, explorer_ocmb }, } }, #endif }; @@ -314,7 +314,7 @@ errlHndl_t PlatConfigurator::addDomainChips( TARGETING::TYPE i_type, model = getChipId( trgt ); // Skip Gemini OCMBs. They can exist, but PRD won't support them. - if ( POWER_CHIPID::GEMINI == model ) continue; + if ( POWER_CHIPID::GEMINI_16 == model ) continue; } #endif diff --git a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C index 061ef03b7..d3de91189 100644 --- a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C +++ b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C @@ -950,15 +950,15 @@ errlHndl_t getHwConfig( std::vector & o_chipInfVector, HOMER_ChipType_t ocmbType = HOMER_CHIP_INVALID; switch ( getChipId(ocmb) ) { - case POWER_CHIPID::GEMINI: + case POWER_CHIPID::GEMINI_16: // Skip Gemini OCMBs. They can exist, but PRD won't support // them (set invalid). ocmbType = HOMER_CHIP_INVALID; break; - case POWER_CHIPID::EXPLORER: + case POWER_CHIPID::EXPLORER_16: ocmbType = HOMER_CHIP_EXPLORER; break; default: - PRDF_ERR( FUNC "Unsupported chip model %d on 0x%08x", - ocmbType, getHuid(ocmb) ); + PRDF_ERR( FUNC "Unsupported chip ID 0x%08x on 0x%08x", + getChipId(ocmb), getHuid(ocmb) ); PRDF_ASSERT( false ); } if ( HOMER_CHIP_INVALID == ocmbType ) continue; -- cgit v1.2.1