wrap test: Use MNFG_FLAGS instead of compile time flag

Change-Id: I347075dd2424ee8b96805456b3d7d9962f428b64
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58347
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
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>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

12 files changed, 83 insertions, 70 deletions

diff --git a/src/usr/isteps/istep08/call_host_set_voltages.C b/src/usr/isteps/istep08/call_host_set_voltages.C
index c940858cd..55e334fa3 100644
--- a/src/usr/isteps/istep08/call_host_set_voltages.C
+++ b/src/usr/isteps/istep08/call_host_set_voltages.C
@@ -137,14 +137,15 @@ void* call_host_set_voltages(void *io_pArgs)
             break;
         }
 
-#ifdef CONFIG_SMP_WRAP_TEST
-        // Make the FAPI call to p9_fbc_eff_config_links
-        // Make the FAPI call to p9_sys_chiplet_scominit, if previous call succeeded
-        fapiHWPCallWrapperHandler(P9_FBC_EFF_CONFIG_LINKS_F_T, l_stepError,
-                                  HWPF_COMP_ID, TYPE_PROC)                  &&
-        fapiHWPCallWrapperHandler(P9_SYS_CHIPLET_SCOMINIT, l_stepError,
-                                       HWPF_COMP_ID, TYPE_PROC);
-#endif
+        if (INITSERVICE::isSMPWrapConfig())
+        {
+            // Make the FAPI call to p9_fbc_eff_config_links
+            // Make the FAPI call to p9_sys_chiplet_scominit, if previous call succeeded
+            fapiHWPCallWrapperHandler(P9_FBC_EFF_CONFIG_LINKS_F_T, l_stepError,
+                                      HWPF_COMP_ID, TYPE_PROC)                  &&
+            fapiHWPCallWrapperHandler(P9_SYS_CHIPLET_SCOMINIT, l_stepError,
+                                           HWPF_COMP_ID, TYPE_PROC);
+        }
     }while( 0 );
 
 
diff --git a/src/usr/isteps/istep08/call_proc_xbus_enable_ridi.C b/src/usr/isteps/istep08/call_proc_xbus_enable_ridi.C
index 5002f6642..8a0a651e7 100644
--- a/src/usr/isteps/istep08/call_proc_xbus_enable_ridi.C
+++ b/src/usr/isteps/istep08/call_proc_xbus_enable_ridi.C
@@ -49,6 +49,7 @@
 //  Tracing support
 #include <trace/interface.H>           // TRACFCOMP
 #include <initservice/isteps_trace.H>  // g_trac_isteps_trace
+#include <initservice/initserviceif.H>
 
 //  HWP call support
 #include <nest/nestHwpHelperFuncs.H>   // fapiHWPCallWrapper
@@ -78,23 +79,24 @@ void* call_proc_xbus_enable_ridi( void *io_pArgs )
             break;
         }
 
-#ifdef CONFIG_SMP_WRAP_TEST
-        // Make the FAPI call to p9_chiplet_scominit
-        // Make the FAPI call to p9_psi_scominit, if previous call succeeded
-        // Make the FAPI call to p9_io_obus_scominit, if previous call succeeded
-        // Make the FAPI call to p9_npu_scominit, if previous call succeeded
-        // Make the FAPI call to p9_chiplet_enable_ridi, if previous call succeeded
-        fapiHWPCallWrapperHandler(P9_CHIPLET_SCOMINIT, l_stepError,
-                                  HWPF_COMP_ID, TYPE_PROC)             &&
-        fapiHWPCallWrapperHandler(P9_PSI_SCOMINIT, l_stepError,
-                                  HWPF_COMP_ID, TYPE_PROC)             &&
-        fapiHWPCallWrapperHandler(P9_IO_OBUS_SCOMINIT, l_stepError,
-                                  HWPF_COMP_ID, TYPE_OBUS)             &&
-        fapiHWPCallWrapperHandler(P9_NPU_SCOMINIT, l_stepError,
-                                  HWPF_COMP_ID, TYPE_PROC)             &&
-        fapiHWPCallWrapperHandler(P9_CHIPLET_ENABLE_RIDI, l_stepError,
-                                  HWPF_COMP_ID, TYPE_PROC);
-#endif  // end #ifdef CONFIG_SMP_WRAP_TEST
+        if (INITSERVICE::isSMPWrapConfig())
+        {
+            // Make the FAPI call to p9_chiplet_scominit
+            // Make the FAPI call to p9_psi_scominit, if previous call succeeded
+            // Make the FAPI call to p9_io_obus_scominit, if previous call succeeded
+            // Make the FAPI call to p9_npu_scominit, if previous call succeeded
+            // Make the FAPI call to p9_chiplet_enable_ridi, if previous call succeeded
+            fapiHWPCallWrapperHandler(P9_CHIPLET_SCOMINIT, l_stepError,
+                                      HWPF_COMP_ID, TYPE_PROC)             &&
+            fapiHWPCallWrapperHandler(P9_PSI_SCOMINIT, l_stepError,
+                                      HWPF_COMP_ID, TYPE_PROC)             &&
+            fapiHWPCallWrapperHandler(P9_IO_OBUS_SCOMINIT, l_stepError,
+                                      HWPF_COMP_ID, TYPE_OBUS)             &&
+            fapiHWPCallWrapperHandler(P9_NPU_SCOMINIT, l_stepError,
+                                      HWPF_COMP_ID, TYPE_PROC)             &&
+            fapiHWPCallWrapperHandler(P9_CHIPLET_ENABLE_RIDI, l_stepError,
+                                      HWPF_COMP_ID, TYPE_PROC);
+        }
     } while (0);
     TRACFCOMP(g_trac_isteps_trace, EXIT_MRK"call_proc_xbus_enable_ridi exit");
 
diff --git a/src/usr/isteps/istep09/call_fabric_io_dccal.C b/src/usr/isteps/istep09/call_fabric_io_dccal.C
index 5cb2605cc..84b0b56dd 100644
--- a/src/usr/isteps/istep09/call_fabric_io_dccal.C
+++ b/src/usr/isteps/istep09/call_fabric_io_dccal.C
@@ -52,7 +52,7 @@
 //  Tracing support
 #include <trace/interface.H>            // TRACFCOMP
 #include <initservice/isteps_trace.H>   // g_trac_isteps_trace
-
+#include <initservice/initserviceif.H>  // isSMPWrapConfig
 
 //  Pbus link service support
 #include <pbusLinkSvc.H>                // TargetPairs_t, PbusLinkSvc
@@ -167,8 +167,8 @@ void* call_fabric_io_dccal( void *io_pArgs )
                                          l_pbusConnections,
                                          XbusDccalMode::RxDccalCheckGrp);
         }  // end if (TYPE_XBUS == l_busSet[ii])
-#ifdef CONFIG_SMP_WRAP_TEST
-        else if (TYPE_OBUS == l_busSet[ii])
+        else if (INITSERVICE::isSMPWrapConfig() &&
+                (TYPE_OBUS == l_busSet[ii]))
         {
             // Make the FAPI call to p9_io_obus_dccal
             if (!trainBusHandler(l_busSet[ii],
@@ -180,7 +180,6 @@ void* call_fabric_io_dccal( void *io_pArgs )
                 break;
             }
         }  // end else if (TYPE_OBUS == l_busSet[ii])
-#endif
     } // end  for (uint32_t ii = 0; ii < l_maxBusSet; ii++)
 
     TRACFCOMP(g_trac_isteps_trace, EXIT_MRK"call_fabric_io_dccal exit" );
diff --git a/src/usr/isteps/istep09/call_fabric_io_run_training.C b/src/usr/isteps/istep09/call_fabric_io_run_training.C
index f234ec488..6b3aa5f37 100644
--- a/src/usr/isteps/istep09/call_fabric_io_run_training.C
+++ b/src/usr/isteps/istep09/call_fabric_io_run_training.C
@@ -44,7 +44,7 @@
 //  Tracing support
 #include <trace/interface.H>            // TRACFCOMP
 #include <initservice/isteps_trace.H>   // g_trac_isteps_trace
-
+#include <initservice/initserviceif.H>  // isSMPWrapConfig
 //  Targeting support
 #include <fapi2_target.H>               // fapi2::Target
 #include <target.H>                     // TARGETING::Target
@@ -162,8 +162,8 @@ void* call_fabric_io_run_training( void *io_pArgs )
                 }
             }  // end for (const auto & l_pbusConnection: l_pbusConnections)
         }  // end if (TYPE_XBUS == l_busSet[ii])
-#ifdef CONFIG_SMP_WRAP_TEST
-        else if (TYPE_OBUS == l_busSet[ii])
+        else if (INITSERVICE::isSMPWrapConfig() &&
+                (TYPE_OBUS == l_busSet[ii]))
         {
             // Make the FAPI call to p9_io_obus_linktrain
             if (!trainBusHandler(l_busSet[ii],
@@ -175,7 +175,6 @@ void* call_fabric_io_run_training( void *io_pArgs )
                 break;
             }
         }  // end else if (TYPE_OBUS == l_busSet[ii])
-#endif
     } // end for (uint32_t ii = 0; ii < l_maxBusSet; ++ii)
 
     TRACFCOMP(g_trac_isteps_trace, EXIT_MRK"call_fabric_io_run_training exit" );
diff --git a/src/usr/isteps/istep09/call_fabric_post_trainadv.C b/src/usr/isteps/istep09/call_fabric_post_trainadv.C
index 4f36e8526..2005a03a1 100644
--- a/src/usr/isteps/istep09/call_fabric_post_trainadv.C
+++ b/src/usr/isteps/istep09/call_fabric_post_trainadv.C
@@ -44,6 +44,7 @@
 //  Tracing support
 #include <trace/interface.H>            // TRACFCOMP
 #include <initservice/isteps_trace.H>   // g_trac_isteps_trace
+#include <initservice/initserviceif.H>  // isSMPWrapConfig
 
 //  Error handling support
 #include <errl/errlentry.H>             // errlHndl_t
@@ -107,8 +108,8 @@ void* call_fabric_post_trainadv( void *io_pArgs )
                 break;
             }
         }  // end if (TYPE_XBUS == l_busSet[ii])
-#ifdef CONFIG_SMP_WRAP_TEST
-        else if (TYPE_OBUS == l_busSet[ii])
+        else if (INITSERVICE::isSMPWrapConfig() &&
+                (TYPE_OBUS == l_busSet[ii]))
         {
             // Make the FAPI call to p9_io_obus_post_trainadv
             if (!trainBusHandler(l_busSet[ii],
@@ -120,7 +121,6 @@ void* call_fabric_post_trainadv( void *io_pArgs )
                 break;
             }
         }  // end else if (TYPE_OBUS == l_busSet[ii])
-#endif
     } // end for (uint32_t ii = 0; ii < l_maxBusSet; ++ii)
 
     TRACFCOMP(g_trac_isteps_trace, EXIT_MRK"call_fabric_post_trainadv exit");
diff --git a/src/usr/isteps/istep09/call_fabric_pre_trainadv.C b/src/usr/isteps/istep09/call_fabric_pre_trainadv.C
index bbc152ad4..fc07cbb10 100644
--- a/src/usr/isteps/istep09/call_fabric_pre_trainadv.C
+++ b/src/usr/isteps/istep09/call_fabric_pre_trainadv.C
@@ -43,6 +43,7 @@
 //  Tracing support
 #include <trace/interface.H>            // TRACFCOMP
 #include <initservice/isteps_trace.H>   // g_trac_isteps_trace
+#include <initservice/initserviceif.H>  // isSMPWrapConfig
 
 //  Error handling support
 #include <errl/errlentry.H>             // errlHndl_t
@@ -107,8 +108,8 @@ void* call_fabric_pre_trainadv( void *io_pArgs )
                 break;
             }
         }  // end if (TYPE_XBUS == l_busSet[ii])
-#ifdef CONFIG_SMP_WRAP_TEST
-        else if (TYPE_OBUS == l_busSet[ii])
+        else if (INITSERVICE::isSMPWrapConfig() &&
+                (TYPE_OBUS == l_busSet[ii]))
         {
             // Make the FAPI call to p9_io_obus_pre_trainadv
             if (!trainBusHandler(l_busSet[ii],
@@ -120,7 +121,6 @@ void* call_fabric_pre_trainadv( void *io_pArgs )
                 break;
             }
         }  // end else if (TYPE_OBUS == l_busSet[ii])
-#endif
     } // end for (uint32_t ii = 0; (!l_err) && (ii < l_maxBusSet); ii++)
 
     TRACFCOMP(g_trac_isteps_trace, EXIT_MRK"call_fabric_pre_trainadv exit" );
diff --git a/src/usr/isteps/istep09/call_proc_fab_iovalid.C b/src/usr/isteps/istep09/call_proc_fab_iovalid.C
index 7f530d716..b2d40347a 100644
--- a/src/usr/isteps/istep09/call_proc_fab_iovalid.C
+++ b/src/usr/isteps/istep09/call_proc_fab_iovalid.C
@@ -46,6 +46,7 @@
 #include    <errl/errludtarget.H>
 
 #include    <initservice/isteps_trace.H>
+#include    <initservice/initserviceif.H>
 
 #include    <hwas/common/deconfigGard.H>
 #include    <hwas/common/hwasCommon.H>
@@ -121,8 +122,17 @@ void*    call_proc_fab_iovalid( void    *io_pArgs )
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                  "Running p9_fab_iovalid HWP on processor target %.8X",
                  TARGETING::get_huid(l_cpu_target) );
-        FAPI_INVOKE_HWP(l_errl, p9_fab_iovalid, l_fapi2_proc_target,
+        
+        if (INITSERVICE::isSMPWrapConfig())
+        {
+            FAPI_INVOKE_HWP(l_errl, p9_fab_iovalid, l_fapi2_proc_target,
                         true, true, true);
+        }
+        else
+        {
+            FAPI_INVOKE_HWP(l_errl, p9_fab_iovalid, l_fapi2_proc_target,
+                        true, true, false);
+        }
         if(l_errl)
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
diff --git a/src/usr/isteps/istep09/istep09HelperFuncs.C b/src/usr/isteps/istep09/istep09HelperFuncs.C
index 5927dc08f..30c4c099c 100644
--- a/src/usr/isteps/istep09/istep09HelperFuncs.C
+++ b/src/usr/isteps/istep09/istep09HelperFuncs.C
@@ -340,7 +340,7 @@ bool trainBusHandler(TYPE                     i_busType,
         }
         else if (TYPE_XBUS == i_busType)
         {
-            l_numberOfTrainFailures = trainObus(i_hwpCall,
+            l_numberOfTrainFailures = trainXbus(i_hwpCall,
                                                 o_stepError,
                                                 i_componentId,
                                                 l_pbusConnection.first,
diff --git a/src/usr/isteps/istep10/call_proc_chiplet_enable_ridi.C b/src/usr/isteps/istep10/call_proc_chiplet_enable_ridi.C
index 2c82e7f10..b5a0619b4 100644
--- a/src/usr/isteps/istep10/call_proc_chiplet_enable_ridi.C
+++ b/src/usr/isteps/istep10/call_proc_chiplet_enable_ridi.C
@@ -49,6 +49,7 @@
 //  Tracing support
 #include <trace/interface.H>           // TRACFCOMP
 #include <initservice/isteps_trace.H>  // g_trac_isteps_trace
+#include <initservice/initserviceif.H>  // isSMPWrapConfig
 
 //  HWP call support
 #include <nest/nestHwpHelperFuncs.H>   // fapiHWPCallWrapperForChip
@@ -70,13 +71,12 @@ void* call_proc_chiplet_enable_ridi( void *io_pArgs )
     TRACFCOMP(g_trac_isteps_trace,
               ENTER_MRK"call_proc_chiplet_enable_ridi entry");
 
-
-#ifndef CONFIG_SMP_WRAP_TEST
-    // Make the FAPI call to p9_chiplet_enable_ridi
-    fapiHWPCallWrapperHandler(P9_CHIPLET_ENABLE_RIDI, l_stepError,
-                              HWPF_COMP_ID, TYPE_PROC);
-#endif
-
+    if (!INITSERVICE::isSMPWrapConfig())
+    {
+        // Make the FAPI call to p9_chiplet_enable_ridi
+        fapiHWPCallWrapperHandler(P9_CHIPLET_ENABLE_RIDI, l_stepError,
+                                  HWPF_COMP_ID, TYPE_PROC);
+    }
     TRACFCOMP(g_trac_isteps_trace,
               EXIT_MRK"call_proc_chiplet_enable_ridi exit");
 
diff --git a/src/usr/isteps/istep10/call_proc_chiplet_scominit.C b/src/usr/isteps/istep10/call_proc_chiplet_scominit.C
index 51fd78fa0..6493aa7d1 100644
--- a/src/usr/isteps/istep10/call_proc_chiplet_scominit.C
+++ b/src/usr/isteps/istep10/call_proc_chiplet_scominit.C
@@ -50,7 +50,7 @@
 //  Tracing support
 #include <trace/interface.H>           // TRACFCOMP
 #include <initservice/isteps_trace.H>  // g_trac_isteps_trace
-
+#include <initservice/initserviceif.H>  // isSMPWrapConfig
 //  HWP call support
 #include <nest/nestHwpHelperFuncs.H>   // fapiHWPCallWrapperForChip
 
@@ -74,14 +74,15 @@ void* call_proc_chiplet_scominit( void *io_pArgs )
 
     TRACFCOMP(g_trac_isteps_trace, ENTER_MRK"call_proc_chiplet_scominit entry" );
 
-#ifndef CONFIG_SMP_WRAP_TEST
-    // Make the FAPI call to p9_chiplet_scominit
-    // Make the FAPI call to p9_psi_scominit, if previous call succeeded
-    fapiHWPCallWrapperHandler(P9_CHIPLET_SCOMINIT, l_stepError,
-                              HWPF_COMP_ID, TYPE_PROC)                &&
-    fapiHWPCallWrapperHandler(P9_PSI_SCOMINIT, l_stepError,
-                              HWPF_COMP_ID, TYPE_PROC);
-#endif
+    if (!INITSERVICE::isSMPWrapConfig())
+    {
+        // Make the FAPI call to p9_chiplet_scominit
+        // Make the FAPI call to p9_psi_scominit, if previous call succeeded
+        fapiHWPCallWrapperHandler(P9_CHIPLET_SCOMINIT, l_stepError,
+                                  HWPF_COMP_ID, TYPE_PROC)                &&
+        fapiHWPCallWrapperHandler(P9_PSI_SCOMINIT, l_stepError,
+                                  HWPF_COMP_ID, TYPE_PROC);
+    }
 
     // Enable TCEs with an empty TCE Table, if necessary
     // This will prevent the FSP from DMAing to system memory without
diff --git a/src/usr/isteps/istep10/call_proc_npu_scominit.C b/src/usr/isteps/istep10/call_proc_npu_scominit.C
index 35f29d30a..623ca6088 100644
--- a/src/usr/isteps/istep10/call_proc_npu_scominit.C
+++ b/src/usr/isteps/istep10/call_proc_npu_scominit.C
@@ -48,6 +48,7 @@
 //  Tracing support
 #include <trace/interface.H>           // TRACFCOMP
 #include <initservice/isteps_trace.H>  // g_trac_isteps_trace
+#include <initservice/initserviceif.H>  // isSMPWrapConfig
 
 //  HWP call support
 #include <nest/nestHwpHelperFuncs.H>   // fapiHWPCallWrapperForChip
@@ -67,13 +68,12 @@ void* call_proc_npu_scominit( void *io_pArgs )
     IStepError l_stepError;
 
     TRACFCOMP(g_trac_isteps_trace, ENTER_MRK"call_proc_npu_scominit entry");
-
-#ifndef CONFIG_SMP_WRAP_TEST
-    // Make the FAPI call to p9_npu_scominit
-    fapiHWPCallWrapperHandler(P9_NPU_SCOMINIT, l_stepError,
-                              HWPF_COMP_ID, TYPE_PROC);
-#endif
-
+    if (!INITSERVICE::isSMPWrapConfig())
+    {
+        // Make the FAPI call to p9_npu_scominit
+        fapiHWPCallWrapperHandler(P9_NPU_SCOMINIT, l_stepError,
+                                  HWPF_COMP_ID, TYPE_PROC);
+    }
     TRACFCOMP(g_trac_isteps_trace, EXIT_MRK"call_proc_npu_scominit exit");
 
     return l_stepError.getErrorHandle();
diff --git a/src/usr/isteps/istep10/call_proc_obus_scominit.C b/src/usr/isteps/istep10/call_proc_obus_scominit.C
index b9be6a74d..4133f4fce 100644
--- a/src/usr/isteps/istep10/call_proc_obus_scominit.C
+++ b/src/usr/isteps/istep10/call_proc_obus_scominit.C
@@ -49,6 +49,7 @@
 //  Tracing support
 #include <trace/interface.H>           // TRACFCOMP
 #include <initservice/isteps_trace.H>  // g_trac_isteps_trace
+#include <initservice/initserviceif.H>  // isSMPWrapConfig
 
 //  HWP call support
 #include <nest/nestHwpHelperFuncs.H>   // fapiHWPCallWrapperForChip
@@ -69,12 +70,12 @@ void* call_proc_obus_scominit( void *io_pArgs )
 
     TRACFCOMP(g_trac_isteps_trace, ENTER_MRK"call_proc_obus_scominit entry");
 
-#ifndef CONFIG_SMP_WRAP_TEST
-    // Make the FAPI call to p9_io_obus_scominit
-    fapiHWPCallWrapperHandler(P9_IO_OBUS_SCOMINIT, l_stepError,
-                              HWPF_COMP_ID, TYPE_OBUS);
-#endif
-
+    if (!INITSERVICE::isSMPWrapConfig())
+    {
+        // Make the FAPI call to p9_io_obus_scominit
+        fapiHWPCallWrapperHandler(P9_IO_OBUS_SCOMINIT, l_stepError,
+                                  HWPF_COMP_ID, TYPE_OBUS);
+    }
     TRACFCOMP(g_trac_isteps_trace, EXIT_MRK"call_proc_obus_scominit exit");
 
     return l_stepError.getErrorHandle();