diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2018-06-26 11:34:57 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2018-06-30 12:04:35 -0400 |
| commit | 96aa468a7e6a5013dd8149a2ecab7e618b2b02a9 (patch) | |
| tree | 8ae6d135d6754b6d6625abe3d15dee58b04f229c /src/usr | |
| parent | d875133a8d13b69960eee85b69de8b238c4edf5d (diff) | |
| download | talos-hostboot-96aa468a7e6a5013dd8149a2ecab7e618b2b02a9.tar.gz talos-hostboot-96aa468a7e6a5013dd8149a2ecab7e618b2b02a9.zip | |
Fix for assert in hbrt on two node fleetwood
-A change went in recently to fix the hbrt
attribute resource provider and targeting code
so that it would not depend on node zero being
in the configuration. That change introduced a
bug in two node systems where the targeting
code fails to initalize properly if the single
node in the system is not node zero.
Change-Id: Ibe2529ac3279a2a4346becd6757736f2d8ad5051
CQ:SW435007
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61415
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: Richard Ward <rward15@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61659
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/targeting/runtime/attrrp_rt.C | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/usr/targeting/runtime/attrrp_rt.C b/src/usr/targeting/runtime/attrrp_rt.C index 5227f3f83..33d759ad5 100644 --- a/src/usr/targeting/runtime/attrrp_rt.C +++ b/src/usr/targeting/runtime/attrrp_rt.C @@ -134,17 +134,17 @@ namespace TARGETING ++l_node; } // while } - else // Single-node system + else // Single-node system, hb_images will be zero, but the + // variable, i_instance, will be equal to the node id + // of the only functional node in the system, and will + // not always be node zero { - // Check if current node is the node of interest - if(l_node == i_instance) - { - // Flag that input instance is a valid node - l_validNode = true; - } + // Flag that input instance is a valid node + l_validNode = true; - // Replace maximum node ID - io_maxNodeId = l_node; + // Replace maximum node ID with + // this nodes instance id + io_maxNodeId = i_instance; } // Input instance is not a valid node |
