Enable rest of istep8 HWPs

Procedures being enabled:
8.8 proc_chiplet_scominit
8.9 proc_xbus_scominit
8.11 proc_obus_scominit

Depends-on:I929f23f0fc628f3e21df622dc56f4a6ad5859a8a
Change-Id: I70f6892b9771570b895252b1e5d43af8c59f3adc
RTC:149687
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26131
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 57 insertions, 41 deletions

diff --git a/src/usr/isteps/istep08/call_proc_chiplet_scominit.C b/src/usr/isteps/istep08/call_proc_chiplet_scominit.C
index b678d9c1d..483c25f98 100644
--- a/src/usr/isteps/istep08/call_proc_chiplet_scominit.C
+++ b/src/usr/isteps/istep08/call_proc_chiplet_scominit.C
@@ -59,7 +59,8 @@
 
 #include <config.h>
 
-//#include <p9_chiplet_scominit.H> //TODO-RTC:149687
+// HWP
+#include <p9_chiplet_scominit.H>
 #include <p9_psi_scominit.H>
 
 namespace   ISTEP_08
@@ -97,8 +98,7 @@ void*    call_proc_chiplet_scominit( void    *io_pArgs )
             "Running p9_chiplet_scominit HWP on "
             "target HUID %.8X", TARGETING::get_huid(l_cpu_target));
 
-        //TODO-RTC:149687
-        //FAPI_INVOKE_HWP(l_err, p9_chiplet_scominit, l_fapi2_proc_target);
+        FAPI_INVOKE_HWP(l_err, p9_chiplet_scominit, l_fapi2_proc_target);
         if (l_err)
         {
             TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "ERROR 0x%.8X : "
@@ -109,6 +109,7 @@ void*    call_proc_chiplet_scominit( void    *io_pArgs )
 
             // Create IStep error log and cross ref to error that occurred
             l_StepError.addErrorDetails( l_err );
+
             // We want to continue to the next target instead of exiting,
             // Commit the error log and move on
             // Note: Error log should already be deleted and set to NULL
@@ -124,7 +125,7 @@ void*    call_proc_chiplet_scominit( void    *io_pArgs )
         if (l_err)
         {
             TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "ERROR 0x%.8X : "
-             "proc_psi_scominit HWP returns error.  target HUID %.8X",
+             "p9_psi_scominit HWP returns error.  target HUID %.8X",
                     l_err->reasonCode(), TARGETING::get_huid(l_cpu_target));
 
             ErrlUserDetailsTarget(l_cpu_target).addToLog( l_err );
diff --git a/src/usr/isteps/istep08/call_proc_obus_scominit.C b/src/usr/isteps/istep08/call_proc_obus_scominit.C
index 61d9127b6..389d5e299 100644
--- a/src/usr/isteps/istep08/call_proc_obus_scominit.C
+++ b/src/usr/isteps/istep08/call_proc_obus_scominit.C
@@ -60,7 +60,7 @@
 #include <vpd/mvpdenums.H>
 
 #include <config.h>
-//#include <p9_io_obus_scominit.H> // TODO-RTC:149687
+#include <p9_io_obus_scominit.H>
 
 namespace   ISTEP_08
 {
@@ -129,9 +129,8 @@ void* call_proc_obus_scominit( void *io_pArgs )
                      TARGETING::get_huid(l_thisObusTarget),
                      TARGETING::get_huid(l_connectedObusTarget) );
 
-            //TODO-RTC:149687
-            //FAPI_INVOKE_HWP(l_err, p9_io_obus_scominit,
-            //      l_thisObusFapi2Target, l_connectedObusFapi2Target);
+            FAPI_INVOKE_HWP(l_err, p9_io_obus_scominit,
+                  l_thisObusFapi2Target, l_connectedObusFapi2Target);
 
             if(l_err)
             {
diff --git a/src/usr/isteps/istep08/call_proc_xbus_scominit.C b/src/usr/isteps/istep08/call_proc_xbus_scominit.C
index efc9f05c2..faa203d4a 100644
--- a/src/usr/isteps/istep08/call_proc_xbus_scominit.C
+++ b/src/usr/isteps/istep08/call_proc_xbus_scominit.C
@@ -60,7 +60,7 @@
 #include <vpd/mvpdenums.H>
 
 #include <config.h>
-//#include <p9_io_xbus_scominit.H> // TODO-RTC:149687 - enable when ready
+#include <p9_io_xbus_scominit.H>
 
 namespace   ISTEP_08
 {
@@ -70,6 +70,11 @@ using   namespace   ISTEP_ERROR;
 using   namespace   ERRORLOG;
 using   namespace   TARGETING;
 
+// Defines
+// The HWP currently supports XBUS0 and XBUS1 groups
+// -- see ENUM_ATTR_XBUS_GROUP_0,1 in p9_io_xbus_scominit.C
+#define XBUS_GROUP_COUNT 2
+
 //******************************************************************************
 // wrapper function to call proc_xbus_scominit
 //******************************************************************************
@@ -122,35 +127,44 @@ void* call_proc_xbus_scominit( void *io_pArgs )
                 l_connectedXbusFapi2Target(
                 (const_cast<TARGETING::Target*>(l_connectedXbusTarget)));
 
-            TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                     "Running p9_io_xbus_scominit HWP on "
-                     "This XBUS target %.8X - Connected XBUS target %.8X",
-                     TARGETING::get_huid(l_thisXbusTarget),
-                     TARGETING::get_huid(l_connectedXbusTarget) );
-
-            // TODO-RTC:149687
-            //FAPI_INVOKE_HWP(l_err, p9_io_xbus_scominit,
-            //               l_thisXbusFapi2Target, l_connectedXbusFapi2Target);
-            if (l_err)
+            for (uint8_t group = 0; group < XBUS_GROUP_COUNT; group++)
             {
                 TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                         "Running p9_io_xbus_scominit HWP on "
+                         "This XBUS target %.8X - Connected XBUS target %.8X, "
+                         "group %d",
+                         TARGETING::get_huid(l_thisXbusTarget),
+                         TARGETING::get_huid(l_connectedXbusTarget), group );
+
+                FAPI_INVOKE_HWP(l_err, p9_io_xbus_scominit,
+                    l_thisXbusFapi2Target, l_connectedXbusFapi2Target, group);
+
+                if (l_err)
+                {
+                    TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                         "ERROR 0x%.8X : proc_xbus_scominit HWP returned error. "
-                        "This XBUS target %.8X - Connected XBUS target  %.8X",
+                        "This XBUS target %.8X - Connected XBUS target  %.8X "
+                        " group %d",
                         l_err->reasonCode(),
                         TARGETING::get_huid(l_thisXbusTarget),
-                        TARGETING::get_huid(l_connectedXbusTarget) );
-
-                // capture the target data in the elog
-                ErrlUserDetailsTarget(l_thisXbusTarget).addToLog( l_err );
-                ErrlUserDetailsTarget(l_connectedXbusTarget).addToLog( l_err );
-
-                // Create IStep error log and cross ref to error that occurred
-                l_StepError.addErrorDetails( l_err );
-                // We want to continue to the next target instead of exiting,
-                // Commit the error log and move on
-                // Note: Error log should already be deleted and set to NULL
-                // after committing
-                errlCommit(l_err, HWPF_COMP_ID);
+                        TARGETING::get_huid(l_connectedXbusTarget),
+                        group );
+
+                    // capture the target data in the elog
+                    ErrlUserDetailsTarget(l_thisXbusTarget).addToLog(l_err);
+                    ErrlUserDetailsTarget(l_connectedXbusTarget).
+                                                            addToLog(l_err);
+
+                    // Create IStep error log and cross ref to error
+                    // that occurred
+                    l_StepError.addErrorDetails( l_err );
+                    // We want to continue to the next target
+                    // instead of exiting,
+                    // Commit the error log and move on
+                    // Note: Error log should already be deleted and set to NULL
+                    // after committing
+                    errlCommit(l_err, HWPF_COMP_ID);
+                }
             }
         } // end of going through pairs
 
diff --git a/src/usr/isteps/istep08/makefile b/src/usr/isteps/istep08/makefile
index 9f797a793..9c6d7a051 100644
--- a/src/usr/isteps/istep08/makefile
+++ b/src/usr/isteps/istep08/makefile
@@ -94,23 +94,25 @@ include ${PROCEDURES_PATH}/hwp/nest/p9_attr_update.mk
 # Cummulus only -- p9_enable_osclite.mk not defined yet
 
 # proc_chiplet_scominit : Scom inits to all chiplets (sans Quad)
-#TODO-RTC:149687 - HWP requires p9_fbc_scom.H
-#include ${PROCEDURES_PATH}/hwp/nest/p9_chiplet_scominit.mk
+include ${PROCEDURES_PATH}/hwp/nest/p9_chiplet_scominit.mk
 include ${PROCEDURES_PATH}/hwp/nest/p9_psi_scominit.mk
-#include ${PROCEDURES_PATH}/hwp/initfiles/p9_fbc_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9_psi_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_fbc_ioe_dl_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_fbc_ioo_tl_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_fbc_ioo_dl_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_fbc_no_hp_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_fbc_ioe_tl_scom.mk
 
 # proc_xbus_scominit : Apply scom inits to Xbus
-# TODO-RTC:149687
-# Now missing p9_io_regs.H, p9_xbus_g0_scom.H and p9_xbus_g1_scom.H
-#include ${PROCEDURES_PATH}/hwp/io/p9_io_xbus_scominit.mk
+include ${PROCEDURES_PATH}/hwp/io/p9_io_xbus_scominit.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_xbus_g0_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_xbus_g1_scom.mk
 
 # proc_abus_scominit : Apply scom inits to Abus
 # HWP not found - p9_abus_scominit.mk not defined
 
 # proc_obus_scominit : Apply scom inits to Obus
-# TODO-RTC:149687 - Missing p9_io_regs.H
-#include ${PROCEDURES_PATH}/hwp/io/p9_io_obus_scominit.mk
+include ${PROCEDURES_PATH}/hwp/io/p9_io_obus_scominit.mk
 
 # proc_npu_scominit : Apply scom inits to NPU bus
 include ${PROCEDURES_PATH}/hwp/nest/p9_npu_scominit.mk