Iterate on all Targets regardless of error in dram_training

Change-Id: Ifc984da6454d95bcf1ea4cfda5c1057b4ffaffbb
CQ: FW621340
Backport: release-fips810
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10028
Tested-by: Jenkins Server
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 13 insertions, 36 deletions

diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.C b/src/usr/hwpf/hwp/dram_training/dram_training.C
index d635268e2..5ce469dd1 100644
--- a/src/usr/hwpf/hwp/dram_training/dram_training.C
+++ b/src/usr/hwpf/hwp/dram_training/dram_training.C
@@ -183,7 +183,11 @@ void*    call_mem_pll_initf( void *io_pArgs )
             // capture the target data in the elog
             ErrlUserDetailsTarget(l_pCentaur).addToLog(l_err );
 
-            break;
+            // Create IStep error log and cross reference to error that occurred
+            l_StepError.addErrorDetails(l_err);
+
+            // Commit Error
+            errlCommit(l_err, HWPF_COMP_ID);
         }
         else
         {
@@ -192,15 +196,6 @@ void*    call_mem_pll_initf( void *io_pArgs )
         }
     }
 
-    if( l_err )
-    {
-        // Create IStep error log and cross reference to error that occurred
-        l_StepError.addErrorDetails( l_err );
-
-        // Commit Error
-        errlCommit( l_err, HWPF_COMP_ID );
-    }
-
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_initf exit" );
 
     return l_StepError.getErrorHandle();
@@ -250,7 +245,11 @@ void*    call_mem_pll_setup( void *io_pArgs )
             // capture the target data in the elog
             ErrlUserDetailsTarget(l_pCentaur).addToLog(l_err);
 
-            break;
+            // Create IStep error log and cross reference to error that occurred
+            l_StepError.addErrorDetails(l_err);
+
+            // Commit Error
+            errlCommit(l_err, HWPF_COMP_ID);
         }
         else
         {
@@ -259,15 +258,6 @@ void*    call_mem_pll_setup( void *io_pArgs )
         }
     }
 
-    if( l_err )
-    {
-        // Create IStep error log and cross reference to error that occurred
-        l_StepError.addErrorDetails( l_err );
-
-        // Commit Error
-        errlCommit( l_err, HWPF_COMP_ID );
-    }
-
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_setup exit" );
 
     return l_StepError.getErrorHandle();
@@ -440,13 +430,12 @@ void*    call_mss_scominit( void *io_pArgs )
                 // capture the target data in the elog
                 ErrlUserDetailsTarget(l_pCentaur).addToLog(l_err);
 
-                // Create IStep error log and cross reference to error that occurred
+                // Create IStep error log and cross reference to error that
+                // occurred
                 l_stepError.addErrorDetails( l_err );
 
                 // Commit Error
                 errlCommit( l_err, HWPF_COMP_ID );
-
-                break;
             }
             else
             {
@@ -454,7 +443,7 @@ void*    call_mss_scominit( void *io_pArgs )
                            "SUCCESS :  mss_scominit HWP( )" );
             }
         }
-        if (l_err)
+        if (l_stepError.getErrorHandle())
         {
             break;
         }
@@ -494,8 +483,6 @@ void*    call_mss_scominit( void *io_pArgs )
 
                 // Commit Error
                 errlCommit( l_err, HWPF_COMP_ID );
-
-                break;
             }
             else
             {
@@ -565,8 +552,6 @@ void*  call_mss_ddr_phy_reset( void *io_pArgs )
 
             // Commit Error
             errlCommit( l_err, HWPF_COMP_ID );
-
-            break; // break out of mba loop
         }
         else
         {
@@ -635,8 +620,6 @@ void*    call_mss_draminit( void *io_pArgs )
 
             // Commit Error
             errlCommit( l_err, HWPF_COMP_ID );
-
-            break; // Break out of mba loop
         }
         else
         {
@@ -707,8 +690,6 @@ void*    call_mss_draminit_training( void *io_pArgs )
 
             // Commit Error
             errlCommit( l_err, HWPF_COMP_ID );
-
-            break; // break out of mba loop
         }
         else
         {
@@ -842,8 +823,6 @@ void*    call_mss_draminit_mc( void *io_pArgs )
 
             // Commit Error
             errlCommit( l_err, HWPF_COMP_ID );
-
-            break; // break out of memBuf loop
         }
         else
         {
@@ -938,6 +917,4 @@ void*    call_mss_dimm_power_test( void *io_pArgs )
     return l_stepError.getErrorHandle();
 }
 
-
-
 };   // end namespace