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>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
index def3c096b..81ad2ad05 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
@@ -271,7 +271,7 @@ RingBucket::RingBucket( PlatId i_plat, uint8_t* i_pRingStart, RingDebugMode_t i_
             iv_cmnRingMap[ringIndex] = l_quadCmnRings[ringIndex];
         }
 
-        for( ringIndex = 0; ringIndex < ( EQ::g_chipletData.iv_num_instance_rings_scan_addrs * MAX_QUADS_PER_CHIP );
+        for( ringIndex = 0; ringIndex < ( EQ::g_chipletData.numInstanceRingsScanAddr * MAX_QUADS_PER_CHIP );
              ringIndex++ )
         {
             iv_instRingMap[ringIndex] = l_quadSpecRings[ringIndex];
@@ -643,12 +643,12 @@ void RingBucket::dumpRings( )
         if( iv_plat == PLAT_CME )
         {
             FAPI_INF("---------------------------------CME Rings---------------------------------------");
-            chipletNo = EC::g_chipletData.iv_num_instance_rings_scan_addrs;
+            chipletNo = EC::g_chipletData.numInstanceRingsScanAddr;
         }
         else if( iv_plat == PLAT_SGPE )
         {
             FAPI_INF("---------------------------------SGPE Rings--------------------------------------");
-            chipletNo = EQ::g_chipletData.iv_num_instance_rings_scan_addrs;
+            chipletNo = EQ::g_chipletData.numInstanceRingsScanAddr;
         }
         else
         {