diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2018-03-27 14:01:50 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2018-03-28 09:56:20 -0400 |
| commit | 94408620cf26c11a1f26571d8f457b1e8d6df883 (patch) | |
| tree | 95c50b59e80dfe82cda8f7180fa0cd3463b6dbb1 | |
| parent | 08b8dd518da9c48a2e0cf64106210902a34a8008 (diff) | |
| download | talos-hostboot-94408620cf26c11a1f26571d8f457b1e8d6df883.tar.gz talos-hostboot-94408620cf26c11a1f26571d8f457b1e8d6df883.zip | |
attrrp_rt.C: translateAddr returns input address by default
After a HBRT reset, PEER_TARGET attribute had its value
preserved from prior to the reset. This attribute is a
target pointer, so its address value needs to be
translated for HBRT. When the translation is attempted
again after the reset, we have a valid address already.
The second translation fails and returns NULL. This fix
was to return the original address instead of NULL
when the translation isn't possible.
CQ:SW422523
Change-Id: I75de8d1e780140ca1979dd6fdf237c6c0526f08b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56332
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@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>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
| -rw-r--r-- | src/usr/targeting/runtime/attrrp_rt.C | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/targeting/runtime/attrrp_rt.C b/src/usr/targeting/runtime/attrrp_rt.C index 487f168d1..e97fae738 100644 --- a/src/usr/targeting/runtime/attrrp_rt.C +++ b/src/usr/targeting/runtime/attrrp_rt.C @@ -532,7 +532,7 @@ namespace TARGETING void* AttrRP::translateAddr(void* i_pAddress, const Target* i_pTarget) { - void* o_pTransAddr = nullptr; + void* o_pTransAddr = i_pAddress; if(i_pTarget != NULL) { NODE_ID l_nodeId = NODE0; @@ -545,7 +545,7 @@ namespace TARGETING void* AttrRP::translateAddr(void* i_pAddress, const TARGETING::NODE_ID i_nodeId) { - void* l_address = nullptr; + void* l_address = i_pAddress; do { if (i_nodeId >= AttrRP::INVALID_NODE_ID) |
