diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2018-04-20 13:04:58 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-04-23 20:39:10 -0400 |
| commit | de8b3fef04836d7ca75b9301f8f93b0137753c37 (patch) | |
| tree | 99c6141b93c10e53352cc7753ff98256f81d9567 | |
| parent | 8bfb95cac4198f526b2244a3b9e8511591b55284 (diff) | |
| download | talos-hostboot-de8b3fef04836d7ca75b9301f8f93b0137753c37.tar.gz talos-hostboot-de8b3fef04836d7ca75b9301f8f93b0137753c37.zip | |
Remove Ordinal ID as an Attribute to Match
During the preparation for doing an HBRT concurrent code update, targets in
the current reserved memory data are matched with targets in the new LID
structure. One of the attributes used has been ordinal ID, but this is not
always set in the LID structure, thus preventing matches to be found. It is
being removed as a condition for finding a match.
Change-Id: I6b0bea6a001a9ca085fb5a41da714780543655e6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57583
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: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Brian E. Bakke <bbakke@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/usr/targeting/runtime/rt_targeting.C | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/usr/targeting/runtime/rt_targeting.C b/src/usr/targeting/runtime/rt_targeting.C index 8f1a9b5a1..7a51d05c3 100644 --- a/src/usr/targeting/runtime/rt_targeting.C +++ b/src/usr/targeting/runtime/rt_targeting.C @@ -478,10 +478,6 @@ errlHndl_t saveRestoreAttrs(void *i_rsvdMemPtr, l_targetLid->getAttr<ATTR_TYPE>(l_attrRPLid, l_pAttrIdLid, l_ppAttrAddrLid); - ATTR_ORDINAL_ID_type l_ordinalIdLid = - l_targetLid->getAttr<ATTR_ORDINAL_ID>(l_attrRPLid, - l_pAttrIdLid, - l_ppAttrAddrLid); ATTR_HUID_type l_huidLid = l_targetLid->getAttr<ATTR_HUID>(l_attrRPLid, l_pAttrIdLid, @@ -492,12 +488,11 @@ errlHndl_t saveRestoreAttrs(void *i_rsvdMemPtr, l_ppAttrAddrLid); TRACFCOMP( g_trac_targeting, "Target %3d has %3d attrs, class %0.8x, type %0.8x, " - "ord ID %0.8x, HUID 0x%0.8x, %s", + "HUID 0x%0.8x, %s", l_targetNum, l_attrCountLid, l_classLid, l_typeLid, - l_ordinalIdLid, l_huidLid, l_physPathLid.toString()); @@ -505,7 +500,7 @@ errlHndl_t saveRestoreAttrs(void *i_rsvdMemPtr, bool targetMatched = false; // Create TargetRangeFilter for current Reserved Memory data - TargetRangeFilter l_allTargetsRsvd(l_targSrv.begin(), + TargetRangeFilter l_allTargetsRsvd(l_targSrv.begin(l_nodeId), l_targSrv.end(), NULL); @@ -516,8 +511,6 @@ errlHndl_t saveRestoreAttrs(void *i_rsvdMemPtr, { if((l_classLid == l_allTargetsRsvd->getAttr<ATTR_CLASS>()) && (l_typeLid == l_allTargetsRsvd->getAttr<ATTR_TYPE>()) && - (l_ordinalIdLid == - l_allTargetsRsvd->getAttr<ATTR_ORDINAL_ID>()) && (l_physPathLid == l_allTargetsRsvd->getAttr<ATTR_PHYS_PATH>())) { |
