P10 prep: Infrastructure (IS) ring Id metadata and API changes

Gerrit intent:
- Applicable for P9 merge (co-req NOT required)
- Co-req not req'd for any tests

Includes the following changes:
- Accommodates initCompiler's needs for additional ring Id APIs to
  retrieve IS's key ring identifiers, ringId and ringClass, and to
  align with our enumerated chipId
- Elimination of redundancy in and reorg of IS's ring Id lists:
  RingProperties, GenRingIdList (gone) and ChipletData.
  - GenRingIdList has been removed.
- Expand RingProperties to also include scanScomAddr and ringClass.
- Member of ring and chiplet properties structs have been renamed in
  consistent camel style (no longer using "iv_" anywhere).
- Note that with "infrastructure (IS)" we here mean the core infrastructure
  codes that directly interact with and affect the image.

Key_Cronus_Test=XIP_REGRESS

Change-Id: I7e92af04edd10c0994718e476f6e7b77c5d124d6
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/59087
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: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 5 insertions, 7 deletions

diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C
index ee1fde715..93956fde1 100644
--- a/src/usr/fapi2/plat_utils.C
+++ b/src/usr/fapi2/plat_utils.C
@@ -342,10 +342,9 @@ 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 Generic ring id list
-                GenRingIdList* l_idList;
-
-                rc = ringid_get_ring_list(CT_CEN, l_ringId, &l_idList);
+                // 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);
 
                 if (rc != INFRASTRUCT_RC_SUCCESS)
                 {
@@ -377,8 +376,7 @@ ReturnCode  get_ring(Target<TARGET_TYPE_MEMBUF_CHIP>i_target,
                     break;
                 }
 
-                o_ringAddress = l_idList->scanScomAddress;
-
+                o_ringAddress = l_ringAddress;
             }
             else
             {
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
index cfa3372ec..14193b1f9 100644
--- a/src/usr/sbe/sbe_update.C
+++ b/src/usr/sbe/sbe_update.C
@@ -1137,7 +1137,7 @@ namespace SBE
                                  (void*)RING_SEC_VADDR,
                                  l_ringSectionBufSize,
                                  SYSPHASE_HB_SBE,
-                                 MODEBUILD_IPL,
+                                 0, //Was MODEBUILD_IPL=0 but not used in P9
                                  (void*)RING_BUF1_VADDR,
                                  (uint32_t)MAX_RING_BUF_SIZE,
                                  (void*)RING_BUF2_VADDR,