diff options
| author | Elizabeth Liner <eliner@us.ibm.com> | 2017-06-06 12:28:19 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-14 17:05:06 -0400 |
| commit | 3608c1ff8cc3df658c095280e0dab8705a6be036 (patch) | |
| tree | 1c5ef2f8cfb9406f794a991c7a85e282bcd0aafb /src/usr/runtime/customize_attrs_for_payload.C | |
| parent | 16bd650cb92cae9b9794eb031db2c8d702ead11b (diff) | |
| download | talos-hostboot-3608c1ff8cc3df658c095280e0dab8705a6be036.tar.gz talos-hostboot-3608c1ff8cc3df658c095280e0dab8705a6be036.zip | |
Changing PHYP HBRT to work on normal-core mode instead of fused.
Change-Id: Icbbdc529ed88cd19a408729e5573423b19a1eb1e
RTC:154667
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41436
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/runtime/customize_attrs_for_payload.C')
| -rw-r--r-- | src/usr/runtime/customize_attrs_for_payload.C | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/usr/runtime/customize_attrs_for_payload.C b/src/usr/runtime/customize_attrs_for_payload.C index 909517a68..e5901b179 100644 --- a/src/usr/runtime/customize_attrs_for_payload.C +++ b/src/usr/runtime/customize_attrs_for_payload.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -374,20 +374,25 @@ errlHndl_t configureHbrtHypIds(const bool i_configForPhyp) break; } - // PHyp only operates on fused cores, so all core IDs - // must match that of the parent EX if( (*pIt)->getAttr<TARGETING::ATTR_TYPE>() == TARGETING::TYPE_CORE) { - auto type = TARGETING::TYPE_EX; - const TARGETING::Target* pEx = - TARGETING::getParent(*pIt,type); - - // If this fails, everything is already hosed - assert(pEx != NULL); - - hbrtHypId = - pEx->getAttr<TARGETING::ATTR_ORDINAL_ID>(); + if(TARGETING::is_fused_mode()) + { + // If we're in fused core mode, all core ID's must + // match that of the parent EX + auto type = TARGETING::TYPE_EX; + const TARGETING::Target* pEx = + TARGETING::getParent(*pIt,type); + + // If this fails, everything is already hosed + assert(pEx != NULL); + + hbrtHypId = (pEx)->getAttr<TARGETING::ATTR_ORDINAL_ID>(); + }else + { + hbrtHypId = (*pIt)->getAttr<TARGETING::ATTR_ORDINAL_ID>(); + } } else if( (*pIt)->getAttr<TARGETING::ATTR_TYPE>() == TARGETING::TYPE_MEMBUF ) |
