diff options
author | Prachi Gupta <pragupta@us.ibm.com> | 2018-05-04 08:53:05 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-05-07 11:51:15 -0400 |
commit | 3c73a7c369ce2eebdd53c7672aceddd48d436b3f (patch) | |
tree | 624964774103c524d35f43e843c1d5c2cc275ec4 /src/usr/hwas/common | |
parent | 1af47d2a9aef6d4cb5144cc4c219e58f15eedce3 (diff) | |
download | talos-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>
Diffstat (limited to 'src/usr/hwas/common')
-rw-r--r-- | src/usr/hwas/common/hwas.C | 31 |
1 files changed, 16 insertions, 15 deletions
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) |