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>
open-power · Jan 29, 2020 · cbb2bd7 · cbb2bd7
1 parent 1f4ac83
commit cbb2bd7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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;