cumulus: changes to boot simics all the way to test cases

Change-Id: Ibc62f59635db28e50197139276b9b4c6b59ccc3e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44768
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 47 insertions, 44 deletions

diff --git a/src/usr/isteps/istep07/call_mss_eff_config.C b/src/usr/isteps/istep07/call_mss_eff_config.C
index 53780cb8d..5c55e2663 100644
--- a/src/usr/isteps/istep07/call_mss_eff_config.C
+++ b/src/usr/isteps/istep07/call_mss_eff_config.C
@@ -136,6 +136,7 @@ errlHndl_t call_mss_eff_mb_interleave()
                       "ERROR 0x%.8X: p9c_mss_eff_mb_interleave HWP returns error",
                       l_err->reasonCode());
             ErrlUserDetailsTarget(l_membuf_target).addToLog(l_err);
+            break;
         }
         else
         {
@@ -193,21 +194,17 @@ void*    call_mss_eff_config( void *io_pArgs )
     {
         //  make a local copy of the target for ease of use
         TARGETING::Target* l_pCentaur = *l_membuf_iter;
-
         TARGETING::TargetHandleList l_mbaTargetList;
-
         getChildChiplets(l_mbaTargetList,
                         l_pCentaur,
                         TYPE_MBA);
-
         for (TargetHandleList::const_iterator
              l_mba_iter = l_mbaTargetList.begin();
              l_mba_iter != l_mbaTargetList.end();
              ++l_mba_iter)
          {
-            //  Make a local copy of the target for ease of use
-            TARGETING::Target*  l_mbaTarget = *l_mba_iter;
-
+           //  Make a local copy of the target for ease of use
+           TARGETING::Target*  l_mbaTarget = *l_mba_iter;
            TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                       "p9c_mss_eff_config HWP target HUID %.8x",
                       TARGETING::get_huid(l_mbaTarget));
@@ -325,7 +322,6 @@ void*    call_mss_eff_config( void *io_pArgs )
                 {
                     //  Make a local copy of the target for ease of use
                     TARGETING::Target*  l_mbaTarget = *l_mba_iter;
-
                     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                     "p9c_mss_eff_config_thermal HWP target HUID %.8x",
                     TARGETING::get_huid(l_mbaTarget));
diff --git a/src/usr/isteps/istep07/call_mss_freq.C b/src/usr/isteps/istep07/call_mss_freq.C
index e1e503c72..024afea9b 100644
--- a/src/usr/isteps/istep07/call_mss_freq.C
+++ b/src/usr/isteps/istep07/call_mss_freq.C
@@ -78,7 +78,10 @@ void*    call_mss_freq( void *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_freq entry" );
 
     TARGETING::TargetHandleList l_membufTargetList;
-    getAllChiplets(l_membufTargetList, TYPE_MEMBUF);
+    getAllChips(l_membufTargetList, TYPE_MEMBUF);
+
+    TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_freq: %d membufs found",
+            l_membufTargetList.size());
 
     for (const auto & l_membuf_target : l_membufTargetList)
     {
@@ -118,30 +121,30 @@ void*    call_mss_freq( void *io_pArgs )
 
     if(l_StepError.getErrorHandle() == NULL)
     {
-        TARGETING::TargetHandleList l_membufTargetList;
-        getAllChiplets(l_membufTargetList, TYPE_MCS);
+        TARGETING::TargetHandleList l_mcsTargetList;
+        getAllChiplets(l_mcsTargetList, TYPE_MCS);
 
-        for (const auto & l_membuf_target : l_membufTargetList)
+        for (const auto & l_mcs_target : l_mcsTargetList)
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                 "p9_mss_freq HWP target HUID %.8x",
-                TARGETING::get_huid(l_membuf_target));
+                TARGETING::get_huid(l_mcs_target));
 
             //  call the HWP with each target   ( if parallel, spin off a task )
-            fapi2::Target <fapi2::TARGET_TYPE_MCS> l_fapi_membuf_target
-            (l_membuf_target);
+            fapi2::Target <fapi2::TARGET_TYPE_MCS> l_fapi_mcs_target
+                (l_mcs_target);
 
-            FAPI_INVOKE_HWP(l_err, p9_mss_freq, l_fapi_membuf_target);
+            FAPI_INVOKE_HWP(l_err, p9_mss_freq, l_fapi_mcs_target);
 
             //  process return code.
             if ( l_err )
             {
                 TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                 "ERROR 0x%.8X:  p9_mss_freq HWP on target HUID %.8x",
-                l_err->reasonCode(), TARGETING::get_huid(l_membuf_target) );
+                l_err->reasonCode(), TARGETING::get_huid(l_mcs_target) );
 
                 // capture the target data in the elog
-                ErrlUserDetailsTarget(l_membuf_target).addToLog( l_err );
+                ErrlUserDetailsTarget(l_mcs_target).addToLog( l_err );
 
                 // Create IStep error log and cross reference to error that occurred
                 l_StepError.addErrorDetails( l_err );
diff --git a/src/usr/isteps/istep07/call_mss_volt.C b/src/usr/isteps/istep07/call_mss_volt.C
index 3f992a87f..7e0540257 100644
--- a/src/usr/isteps/istep07/call_mss_volt.C
+++ b/src/usr/isteps/istep07/call_mss_volt.C
@@ -85,43 +85,48 @@ void* call_mss_volt( void *io_pArgs )
     TARGETING::TargetHandleList l_membufTargetList;
     getAllChips(l_membufTargetList, TYPE_MEMBUF);
 
-    std::vector< fapi2::Target<fapi2::TARGET_TYPE_MEMBUF_CHIP> > l_membufFapiTargetsList;
+    TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                "call_mss_volt: %d membuf targets", l_membufTargetList.size());
 
-    for(auto & l_membuf_target : l_membufTargetList)
+    if (l_membufTargetList.size() > 0)
     {
-        fapi2::Target <fapi2::TARGET_TYPE_MEMBUF_CHIP>
-                    l_membuf_fapi_target (l_membuf_target);
-
-        l_membufFapiTargetsList.push_back( l_membuf_fapi_target );
-    }
+        std::vector< fapi2::Target<fapi2::TARGET_TYPE_MEMBUF_CHIP> > l_membufFapiTargetsList;
 
-    TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                "Calling p9c_mss_volt on list of membuf targets");
+        for(auto & l_membuf_target : l_membufTargetList)
+        {
+            fapi2::Target <fapi2::TARGET_TYPE_MEMBUF_CHIP>
+                        l_membuf_fapi_target (l_membuf_target);
 
-    // p9c_mss_volt.C (vector of centaurs)
-    FAPI_INVOKE_HWP(l_err, p9c_mss_volt, l_membufFapiTargetsList);
+            l_membufFapiTargetsList.push_back( l_membuf_fapi_target );
+        }
 
-    // process return code
-    if ( l_err )
-    {
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                "ERROR 0x%.8X:  p9c_mss_volt HWP() failed",
-                l_err->reasonCode());
+                    "Calling p9c_mss_volt on list of membuf targets");
+
+        // p9c_mss_volt.C (vector of centaurs)
+        FAPI_INVOKE_HWP(l_err, p9c_mss_volt, l_membufFapiTargetsList);
+
+        // process return code
+        if ( l_err )
+        {
+            TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                    "ERROR 0x%.8X:  p9c_mss_volt HWP() failed",
+                    l_err->reasonCode());
 
-        // Create IStep error log and cross reference to error that occurred
-        l_StepError.addErrorDetails(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 );
+            // Commit Error
+            errlCommit( l_err, HWPF_COMP_ID );
+        }
+        else
+        {
+            TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                "SUCCESS :  p9c_mss_volt HWP");
+        }
     }
     else
     {
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-            "SUCCESS :  p9c_mss_volt HWP");
-    }
-
-    if(l_StepError.getErrorHandle() == NULL)
-    {
         TARGETING::TargetHandleList l_mcsTargetList;
         getAllChiplets(l_mcsTargetList, TYPE_MCS);
 
diff --git a/src/usr/isteps/istep07/makefile b/src/usr/isteps/istep07/makefile
index 8fd4c7521..5dd51129b 100644
--- a/src/usr/isteps/istep07/makefile
+++ b/src/usr/isteps/istep07/makefile
@@ -92,5 +92,4 @@ include $(HWP_PATH_2)/p9c_mss_attr_cleanup.mk
 #mss_attr_update : MSS ATTR Overrides
 include $(HWP_PATH_1)/p9_mss_attr_update.mk
 
-
 include ${ROOTPATH}/config.mk