diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2014-08-08 15:52:14 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-08-12 18:40:31 -0500 |
| commit | 0fab01cf0c87843871862448a4809e9cab7c6b2a (patch) | |
| tree | 0b8e1af4b1d9af33a9e607f06d63ac28625e972e /src/usr/hwpf | |
| parent | d163851f247ae3e16c0a338bcb745238c80d7640 (diff) | |
| download | blackbird-hostboot-0fab01cf0c87843871862448a4809e9cab7c6b2a.tar.gz blackbird-hostboot-0fab01cf0c87843871862448a4809e9cab7c6b2a.zip | |
Only look at present targets rather than possible targets
Found a couple places where the code was trying to access targets
that weren't present. The getChildByAffinityTargets function is
vague in its behavior when false is passed in. Switched to using
a more explicit interface to get the desired behavior.
Change-Id: Ibb2927b048227ce8c0b4e79ca70c23dc72ce9774
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12724
Tested-by: Jenkins Server
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf')
| -rw-r--r-- | src/usr/hwpf/hwp/slave_sbe/slave_sbe.C | 4 | ||||
| -rw-r--r-- | src/usr/hwpf/plat/fapiPlatSystemConfig.C | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C index eebb12417..939f6d7ff 100644 --- a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C +++ b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C @@ -594,11 +594,11 @@ void fenceAttachedMembufs( TARGETING::Target * i_procTarget ) // Get list of membuf chips downstream from the given proc chip TARGETING::TargetHandleList MembufChipList; - getChildAffinityTargets( MembufChipList, + getChildAffinityTargetsByState( MembufChipList, const_cast<TARGETING::Target*>(i_procTarget ), TARGETING::CLASS_CHIP, TARGETING::TYPE_MEMBUF, - false); + TARGETING::UTIL_FILTER_PRESENT); // loop through the membufs for(TARGETING::TargetHandleList::const_iterator pTargetItr diff --git a/src/usr/hwpf/plat/fapiPlatSystemConfig.C b/src/usr/hwpf/plat/fapiPlatSystemConfig.C index 075bc27ac..22f03e98f 100644 --- a/src/usr/hwpf/plat/fapiPlatSystemConfig.C +++ b/src/usr/hwpf/plat/fapiPlatSystemConfig.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* Contributors Listed Below - COPYRIGHT 2011,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -80,8 +82,8 @@ fapi::ReturnCode fapiGetOtherSideOfMemChannel( else if (i_target.getType() == fapi::TARGET_TYPE_MCS_CHIPLET) { // find the Centaur that is associated with this MCS - getChildAffinityTargets(l_targetList, l_target, - CLASS_CHIP, TYPE_MEMBUF, false); + getChildAffinityTargetsByState(l_targetList, l_target, + CLASS_CHIP, TYPE_MEMBUF, UTIL_FILTER_PRESENT); if(l_targetList.size() != 1) // one and only one expected { |
