summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrachi Gupta <pragupta@us.ibm.com>2018-05-04 08:53:05 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-05-07 11:51:15 -0400
commit3c73a7c369ce2eebdd53c7672aceddd48d436b3f (patch)
tree624964774103c524d35f43e843c1d5c2cc275ec4
parent1af47d2a9aef6d4cb5144cc4c219e58f15eedce3 (diff)
downloadtalos-hostboot-3c73a7c369ce2eebdd53c7672aceddd48d436b3f.tar.gz
talos-hostboot-3c73a7c369ce2eebdd53c7672aceddd48d436b3f.zip
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>
-rw-r--r--src/HBconfig5
-rwxr-xr-xsrc/build/mkrules/hbfw/img/makefile4
-rw-r--r--src/include/usr/initservice/initserviceif.H18
-rw-r--r--src/usr/hwas/common/hwas.C31
-rw-r--r--src/usr/isteps/istep08/call_host_set_voltages.C17
-rw-r--r--src/usr/isteps/istep08/call_proc_xbus_enable_ridi.C36
-rw-r--r--src/usr/isteps/istep09/call_fabric_io_dccal.C7
-rw-r--r--src/usr/isteps/istep09/call_fabric_io_run_training.C7
-rw-r--r--src/usr/isteps/istep09/call_fabric_post_trainadv.C6
-rw-r--r--src/usr/isteps/istep09/call_fabric_pre_trainadv.C6
-rw-r--r--src/usr/isteps/istep09/call_proc_fab_iovalid.C12
-rw-r--r--src/usr/isteps/istep09/istep09HelperFuncs.C2
-rw-r--r--src/usr/isteps/istep10/call_proc_chiplet_enable_ridi.C14
-rw-r--r--src/usr/isteps/istep10/call_proc_chiplet_scominit.C19
-rw-r--r--src/usr/isteps/istep10/call_proc_npu_scominit.C14
-rw-r--r--src/usr/isteps/istep10/call_proc_obus_scominit.C13
16 files changed, 119 insertions, 92 deletions
diff --git a/src/HBconfig b/src/HBconfig
index 7011b1b5d..249f9cf34 100644
--- a/src/HBconfig
+++ b/src/HBconfig
@@ -53,8 +53,3 @@ config SUPPORT_PARTIAL_CACHE
help
Support chips that do not have full cache --
intended for early bringup of hardware
-
-config SMP_WRAP_TEST
- defaults y
- help
- Enables SMP Wrap configuration for manufacturing testing
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index 4cd27d676..27e395cf2 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -353,7 +353,7 @@ ZZ2U_HBD_IMG = ${HBFW_TARGPATH:FZZ-2U_hb_targeting.bin}
ZEPPELIN_HBD_IMG = ${HBFW_TARGPATH:FZEPPELIN_hb_targeting.bin}
# Create list of images for each node (in node order)
# genPnorImages will handle multiple HBD=binfile pairs
-FLEETWOOD_HBD_IMGS = HBD=${${HBFW_TARGPATH:FFLEETWOOD_node_0_hb_targeting.bin}:P},HBD=${${HBFW_TARGPATH:FFLEETWOOD_node_1_hb_targeting.bin}:P},HBD=${${HBFW_TARGPATH:FFLEETWOOD_node_2_hb_targeting.bin}:P},HBD=${${HBFW_TARGPATH:FFLEETWOOD_node_3_hb_targeting.bin}:P}
+FLEETWOOD_HBD_IMGS = HBD=${${HBFW_TARGPATH:FFLEETWOOD_node_0_hb_targeting.bin}:P},HBD=${${HBFW_TARGPATH:FFLEETWOOD_node_1_hb_targeting.bin}:P},HBD=${${HBFW_TARGPATH:FFLEETWOOD_node_2_hb_targeting.bin}:P},HBD=${${HBFW_TARGPATH:FFLEETWOOD_node_3_hb_targeting.bin}:P},HBD=${${HBFW_TARGPATH:FFLEETWOOD_MST_node_0_hb_targeting.bin}:P}
# Input fake images
NIMBUS_VPO_HBD_IMG = vbu_NIMBUS_targeting.bin
@@ -382,7 +382,7 @@ FLEETWOOD_MEMD_FINAL_IMG = FLEETWOOD.MEMD.bin
# defined in fipsfs.db.
ZZ_HBD_FINAL_IMG = ZZ.HBD.bin
ZEPPELIN_HBD_FINAL_IMG = ZEPPELIN.HBD.bin
-FLEETWOOD_HBD_FINAL_IMGS = FLEETWOOD.HBD_NODE_0.bin,FLEETWOOD.HBD_NODE_1.bin,FLEETWOOD.HBD_NODE_2.bin,FLEETWOOD.HBD_NODE_3.bin
+FLEETWOOD_HBD_FINAL_IMGS = FLEETWOOD.HBD_NODE_0.bin,FLEETWOOD.HBD_NODE_1.bin,FLEETWOOD.HBD_NODE_2.bin,FLEETWOOD.HBD_NODE_3.bin,FLEETWOOD_MST.HBD_NODE_0.bin
ZZ2U_HBD_FINAL_IMG = ZZ-2U.HBD.bin
diff --git a/src/include/usr/initservice/initserviceif.H b/src/include/usr/initservice/initserviceif.H
index d2d61c4bd..c30570324 100644
--- a/src/include/usr/initservice/initserviceif.H
+++ b/src/include/usr/initservice/initserviceif.H
@@ -176,6 +176,24 @@ inline bool spBaseServicesEnabled()
return spBaseServicesEnabled;
}
+/**
+ * @brief Returns if we are in smp wrap config
+ *
+ * If true then we are running in wrap config
+ *
+ * @return bool - true if wrap config, else false
+ */
+inline bool isSMPWrapConfig()
+{
+ TARGETING::Target * sys {nullptr};
+ TARGETING::targetService().getTopLevelTarget( sys );
+ TARGETING::ATTR_MNFG_FLAGS_type mnfg_flags;
+ return
+ ( sys &&
+ sys->tryGetAttr<TARGETING::ATTR_MNFG_FLAGS>(mnfg_flags) &&
+ (mnfg_flags & TARGETING::MNFG_FLAG_BRAZOS_WRAP_CONFIG)) ;
+
+}
/**
* @brief Save Istep Step and Substep for use by error logging
diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C
index 9bac35eb3..62beadae5 100644
--- a/src/usr/hwas/common/hwas.C
+++ b/src/usr/hwas/common/hwas.C
@@ -39,6 +39,7 @@
#include <algorithm>
#ifdef __HOSTBOOT_MODULE
#include <config.h>
+#include <initservice/initserviceif.H>
#endif
#include <targeting/common/commontargeting.H>
@@ -193,7 +194,6 @@ bool allCoresBad(const uint8_t & i_firstCore,
return coresBad;
}
-#ifdef CONFIG_SMP_WRAP_TEST
/**
* @brief disable obuses in wrap config.
* Due to fabric limitations, we can only have 2 parallel OBUS
@@ -289,7 +289,6 @@ errlHndl_t disableOBUSes()
} while (0);
return l_err;
}
-#endif
errlHndl_t discoverTargets()
{
@@ -582,21 +581,23 @@ errlHndl_t discoverTargets()
// targets that need to be deconfigured
invokePresentByAssoc();
-#ifdef CONFIG_SMP_WRAP_TEST
- //Due to fabric limitations, we can only have 2 parallel OBUS
- //connections at a time in wrap config. So, deconfigure appropriate
- //OBUSes using the following rule. If the value of
- //MFG_WRAP_TEST_ABUS_LINKS_SET_ENABLE (on the system target) does
- //not match with the value of MFG_WRAP_TEST_ABUS_LINKS_SET (on the
- //OBUS target), then deconfigure the OBUSes.
- errl = disableOBUSes();
- if (errl)
- {
- HWAS_ERR ("discoverTargets:: disableOBUSes failed");
- break;
+#ifdef __HOSTBOOT_MODULE
+ if (INITSERVICE::isSMPWrapConfig())
+ {
+ //Due to fabric limitations, we can only have 2 parallel OBUS
+ //connections at a time in wrap config. So, deconfigure appropriate
+ //OBUSes using the following rule. If the value of
+ //MFG_WRAP_TEST_ABUS_LINKS_SET_ENABLE (on the system target) does
+ //not match with the value of MFG_WRAP_TEST_ABUS_LINKS_SET (on the
+ //OBUS target), then deconfigure the OBUSes.
+ errl = disableOBUSes();
+ if (errl)
+ {
+ HWAS_ERR ("discoverTargets:: disableOBUSes failed");
+ break;
+ }
}
#endif
-
} while (0);
if (errl)
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();
OpenPOWER on IntegriCloud