From 99761f93896da24de7ad18561ecd3519645d4f1e Mon Sep 17 00:00:00 2001 From: "Daniel M. Crowell" Date: Sun, 14 Oct 2018 13:07:08 -0500 Subject: 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 Tested-by: Daniel M. Crowell --- src/usr/fapi2/plat_utils.C | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/usr/fapi2') 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(Targeti_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(Targeti_target, break; } - o_ringAddress = l_ringAddress; + o_ringAddress = l_idList->scanScomAddress; + } else { -- cgit v1.2.1