L2 Istep 6 - Enable host_revert_sbe_mcs_setup

Change-Id: I0d6342be2517cc515405b14cdbf8d67ef1e4b819
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24817
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 23 insertions, 22 deletions

diff --git a/src/usr/isteps/istep06/call_proc_revert_sbe_mcs_setup.C b/src/usr/isteps/istep06/call_proc_revert_sbe_mcs_setup.C
index d61a038e3..5c95fb2f6 100644
--- a/src/usr/isteps/istep06/call_proc_revert_sbe_mcs_setup.C
+++ b/src/usr/isteps/istep06/call_proc_revert_sbe_mcs_setup.C
@@ -52,33 +52,32 @@ void* call_proc_revert_sbe_mcs_setup( void *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
             "call p9_revert_sbe_mcs_setup entry" );
 
-    TARGETING::TargetHandleList l_cpuTargetList;
-    TARGETING::getAllChips(l_cpuTargetList, TARGETING::TYPE_PROC);
+    TARGETING::Target * l_masterProc;
+    TARGETING::targetService().masterProcChipTargetHandle( l_masterProc );
 
-    for (const auto & l_target : l_cpuTargetList)
+    TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
+              "Running p9_revert_sbe_mcs_setup on "
+              "target HUID %.8X",
+              TARGETING::get_huid(l_masterProc));
+
+    // cast the target to a fapi2 target
+    fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> l_fapi_master_proc( l_masterProc );
+
+    //Invode p9_revert_sbe_mcs_setup
+    FAPI_INVOKE_HWP( l_err, p9_revert_sbe_mcs_setup, l_fapi_master_proc );
+
+    if (l_err)
     {
         TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                  "Running p9_revert_sbe_mcs_setup on "
-                  "target HUID %.8X",
-                  TARGETING::get_huid(l_target));
-
-        //TODO RTC 133836 call p9_revert_sbe_mcs_setup
-        //fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> l_fapi_target(l_target);
-        //FAPI_INVOKE_HWP(l_err, p9_revert_sbe_mcs_setup,l_fapi_target);
-
-        if (l_err)
-        {
-            TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                      "ERROR 0x%.8X: p9_revert_sbe_mcs_setup",
-                      l_err->reasonCode());
-            // Create IStep error log and cross reference error
-            l_stepError.addErrorDetails(l_err);
-            // Commit error
-            errlCommit(l_err,SBE_COMP_ID);
-        }
-
+                  "ERROR 0x%.8X: p9_revert_sbe_mcs_setup",
+                  l_err->reasonCode());
+        // Create IStep error log and cross reference error
+        l_stepError.addErrorDetails(l_err);
+        // Commit error
+        errlCommit(l_err,SBE_COMP_ID);
     }
 
+
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
             "call p9_revert_sbe_mcs_setup exit" );
 
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 9d6b0ac3a..43bc91919 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -2228,6 +2228,8 @@
     <attribute><id>BOOT_FREQ_MULT</id></attribute>
     <attribute><id>PFET_OFF_CONTROLS</id></attribute>
     <attribute><id>MC_SYNC_MODE</id></attribute>
+    <attribute><id>NHTM_TRACE_TYPE</id></attribute>
+    <attribute><id>CHTM_TRACE_TYPE</id></attribute>
 </targetType>
 
 <!-- chip-processor-nimbus -->