Risk level 3/4/5 support: Step 1 - backward compatibility and v6 image

- Introducing RV_RL3/4/5 ring variant (RV) support for EC/EQ chiplets.
- Dropping RV support for all chiplet's instance rings which saves 456
  Quad bytes and 58 Nest bytes in Seeprom's TOR slots (compared to
  master).
- Each additional risk level adds 144 bytes in Seeprom TOR slots.
- Various changes to data names associated with ring variants to
  clarify that the notion of ring variants is now specific only to
  Common rings while Instance rings only have the BASE variant.
- Also, removed backwards compatibility to TOR v5, i.e. from before
  we introduced RL2 in february. Assumption is that all images/drivers
  used in fips910/920 and OP920 are TOR v6.
- This commit produces a TOR v6 image to ensure EKB FSP CI success.

Key_Cronus_Test=XIP_REGRESS

Change-Id: Icfcb1e68fd74a10ffc48ee7a5da528a8042ef3b1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56973
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Kahn C. Evans <kahnevan@us.ibm.com>
Reviewed-by: James N. Klazynski <jklazyns@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/import/chips/centaur/utils/imageProcs/cen_ringId.C b/import/chips/centaur/utils/imageProcs/cen_ringId.C
index 79eda445..b7cd2d02 100644
--- a/import/chips/centaur/utils/imageProcs/cen_ringId.C
+++ b/import/chips/centaur/utils/imageProcs/cen_ringId.C
@@ -145,7 +145,7 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
     {"tp_pll_bndy_bucket_8", 0x6a, 0x01, 0x01, CEN_RING, 0x01030088},
 };
 
-const RingVariantOrder RING_VARIANT_ORDER[] = { RV_BASE, RV_RL, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT };
+const RingVariantOrder RING_VARIANT_ORDER[] = { RV_BASE, RV_RL, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT };
 
 }; // namespace CEN
 
@@ -165,7 +165,7 @@ void CEN_RID::ringid_get_chiplet_properties(
     GenRingIdList**    o_ringComm,
     GenRingIdList**    o_ringInst,
     RingVariantOrder** o_varOrder,
-    uint8_t*           o_varNumb)
+    uint8_t*           o_numVariants)
 {
     switch (i_chipletType)
     {
@@ -174,7 +174,7 @@ void CEN_RID::ringid_get_chiplet_properties(
             *o_ringComm = (GenRingIdList*)    CEN::RING_ID_LIST_COMMON;
             *o_ringInst = NULL;
             *o_varOrder = (RingVariantOrder*) CEN::RING_VARIANT_ORDER;
-            *o_varNumb  = (*(*o_cpltData)).iv_num_ring_variants;
+            *o_numVariants = (*(*o_cpltData)).iv_num_common_ring_variants;
             break;
 
         default :
@@ -182,7 +182,7 @@ void CEN_RID::ringid_get_chiplet_properties(
             *o_ringComm = NULL;
             *o_ringInst = NULL;
             *o_varOrder = NULL;
-            *o_varNumb = 0;
+            *o_numVariants = 0;
             break;
     }
 }
@@ -192,12 +192,12 @@ GenRingIdList* CEN_RID::_ringid_get_ring_list(RingId_t i_ringId)
     ChipletData_t*    l_cpltData;
     GenRingIdList*    l_ringList[2];    // 0: common, 1: instance
     RingVariantOrder* l_varOrder;
-    uint8_t           l_varNumb;
+    uint8_t           l_numVariants;;
     int               i, j, n;
 
     CEN_RID::ringid_get_chiplet_properties(
         CEN_RID::ringid_get_chiplet(i_ringId),
-        &l_cpltData, &l_ringList[0], &l_ringList[1], &l_varOrder, &l_varNumb);
+        &l_cpltData, &l_ringList[0], &l_ringList[1], &l_varOrder, &l_numVariants);
 
     if (!l_ringList[0])
     {
diff --git a/import/chips/centaur/utils/imageProcs/cen_ringId.H b/import/chips/centaur/utils/imageProcs/cen_ringId.H
index dc3b3fac..703e3774 100644
--- a/import/chips/centaur/utils/imageProcs/cen_ringId.H
+++ b/import/chips/centaur/utils/imageProcs/cen_ringId.H
@@ -411,7 +411,7 @@ ringid_get_chiplet_properties(
     GenRingIdList**    o_ringComm,
     GenRingIdList**    o_ringInst,
     RingVariantOrder** o_varOrder,
-    uint8_t*           o_varNumb);
+    uint8_t*           o_numVariants);
 
 // returns properties of a ring as determined by ringId
 GenRingIdList*