diff options
| author | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-10-14 13:07:08 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-10-15 08:48:17 -0500 |
| commit | 99761f93896da24de7ad18561ecd3519645d4f1e (patch) | |
| tree | 8021fdbe11a24c5047fcb6ec4813b521c6263419 /src/usr/fapi2 | |
| parent | 78f90ced0fa36c4d682b2c7bf0c1af973b0e7755 (diff) | |
| download | talos-hostboot-99761f93896da24de7ad18561ecd3519645d4f1e.tar.gz talos-hostboot-99761f93896da24de7ad18561ecd3519645d4f1e.zip | |
Revert "P10 prep: Infrastructure (IS) ring Id metadata and API changes"
This reverts commit 52b76be222254e59959db984606c09dae854270b.
Accidental merge before ekb was complete.
Change-Id: I59412ecad661596322aaba5cb5cf83190727d64f
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67455
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/fapi2')
| -rw-r--r-- | src/usr/fapi2/plat_utils.C | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C index 93956fde1..ee1fde715 100644 --- a/src/usr/fapi2/plat_utils.C +++ b/src/usr/fapi2/plat_utils.C @@ -342,9 +342,10 @@ ReturnCode get_ring(Target<TARGET_TYPE_MEMBUF_CHIP>i_target, // return the ring lenght in bits o_ringLength = l_ringSizeInBits; - // grab the address from the main ring id list - uint32_t l_ringAddress = UNDEFINED_SCOM_ADDR; - rc = ringid_get_scanScomAddr(CID_CEN, l_ringId, &l_ringAddress); + // grab the address from the Generic ring id list + GenRingIdList* l_idList; + + rc = ringid_get_ring_list(CT_CEN, l_ringId, &l_idList); if (rc != INFRASTRUCT_RC_SUCCESS) { @@ -376,7 +377,8 @@ ReturnCode get_ring(Target<TARGET_TYPE_MEMBUF_CHIP>i_target, break; } - o_ringAddress = l_ringAddress; + o_ringAddress = l_idList->scanScomAddress; + } else { |
