summaryrefslogtreecommitdiffstats
path: root/src/usr/diag/prdf
diff options
context:
space:
mode:
authorCaleb Palmer <cnpalmer@us.ibm.com>2020-01-27 15:17:29 -0600
committerZane C Shelley <zshelle@us.ibm.com>2020-01-29 10:00:17 -0600
commitcbb2bd75670ed71b36ba41dd0638c9b8dc3e3a36 (patch)
tree4d0c3dc0ec3170907910d9f273036e6ac9f1f142 /src/usr/diag/prdf
parent1f4ac83bb5accada77f240c360e9028fb13dd6aa (diff)
downloadtalos-hostboot-cbb2bd75670ed71b36ba41dd0638c9b8dc3e3a36.tar.gz
talos-hostboot-cbb2bd75670ed71b36ba41dd0638c9b8dc3e3a36.zip
PRD: Fix checkEccFirs template problem
Change-Id: I04a9c10d7e96c618297b691273705e2e0c874a83 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90399 Reviewed-by: Benjamen G Tyner <ben.tyner@ibm.com> Reviewed-by: Brian J Stegmiller <bjs@us.ibm.com> Reviewed-by: Zane C Shelley <zshelle@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90490 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/usr/diag/prdf')
-rw-r--r--src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C6
-rw-r--r--src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C5
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<TYPE_OCMB_CHIP>( ExtensibleChip * i_chip,
uint32_t & o_eccAttns )
{
- #define PRDF_FUNC "[checkEccFirs<TYPE_MEM_PORT>] "
+ #define PRDF_FUNC "[checkEccFirs<TYPE_OCMB_CHIP>] "
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<TYPE_OCMB_CHIP>( ExtensibleChip * i_chip,
{
PRDF_ERR( PRDF_FUNC "__checkEcc<TYPE_OCMB_CHIP>(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;
OpenPOWER on IntegriCloud