From cbb2bd75670ed71b36ba41dd0638c9b8dc3e3a36 Mon Sep 17 00:00:00 2001 From: Caleb Palmer Date: Mon, 27 Jan 2020 15:17:29 -0600 Subject: PRD: Fix checkEccFirs template problem Change-Id: I04a9c10d7e96c618297b691273705e2e0c874a83 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90399 Reviewed-by: Benjamen G Tyner Reviewed-by: Brian J Stegmiller Reviewed-by: Zane C Shelley Tested-by: Jenkins Server Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90490 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins --- src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C | 6 +++--- src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C index a6061dfc6..bececfa21 100644 --- a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C +++ b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2019 */ +/* Contributors Listed Below - COPYRIGHT 2016,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -379,14 +379,14 @@ template<> uint32_t checkEccFirs( ExtensibleChip * i_chip, uint32_t & o_eccAttns ) { - #define PRDF_FUNC "[checkEccFirs] " + #define PRDF_FUNC "[checkEccFirs] " uint32_t o_rc = SUCCESS; o_eccAttns = MAINT_NO_ERROR; PRDF_ASSERT( nullptr != i_chip ); - PRDF_ASSERT( TYPE_MEM_PORT == i_chip->getType() ); + PRDF_ASSERT( TYPE_OCMB_CHIP == i_chip->getType() ); SCAN_COMM_REGISTER_CLASS * rdffir = i_chip->getRegister( "RDFFIR" ); SCAN_COMM_REGISTER_CLASS * mcbistfir = i_chip->getRegister( "MCBISTFIR" ); diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C index 564dafdf4..5d310c51b 100644 --- a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C +++ b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2019 */ +/* Contributors Listed Below - COPYRIGHT 2016,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -315,12 +315,11 @@ uint32_t __analyzeCmdComplete( ExtensibleChip * i_chip, { PRDF_ERR( PRDF_FUNC "__checkEcc(0x%08x) failed", i_chip->getHuid() ); - o_rc |= o_rc; break; } if ( errorsFound ) o_errorsFound = true; - if ( SUCCESS != o_rc ) break; + } while (0); return o_rc; -- cgit v1.2.1