Cleanup: ring_apply and associated routines

Key cleanup items:
- Eliminated ringNameImg in GenRingIdList
- Getting rid of FIXED_RING_BUF_SIZE, but not until accommodation
  on HB side to switch to MAX_RING_BUF_SIZE.

Change-Id: If23bd5f190b9f83f43805fc618ffa1f54ea40d44
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31118
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>

4 files changed, 219 insertions, 222 deletions

diff --git a/import/chips/p9/utils/imageProcs/p9_infrastruct_help.H b/import/chips/p9/utils/imageProcs/p9_infrastruct_help.H
index 46e9b2a5..2cf99f63 100644
--- a/import/chips/p9/utils/imageProcs/p9_infrastruct_help.H
+++ b/import/chips/p9/utils/imageProcs/p9_infrastruct_help.H
@@ -34,11 +34,10 @@
 //
 // Various image/ring buffer sizes. Must be used by all users (VBU, FSP, HB, HBI, Cronus)
 //
-//@FIXME: CMO: get rid of FIXED_RING_BUF_SIZE when ring_apply no longer uses it.
-const uint32_t  FIXED_RING_BUF_SIZE     = 60000; // Fixed ring buf size for _fixed.
 const uint32_t  MAX_SEEPROM_IMAGE_SIZE  = 4 * 56 * 1024 - 256; // Max Seeprom size, excl ECC bits (4 banks).
 const uint32_t  MAX_RT_IMAGE_SIZE       = 1024 * 1024;   // Max Runtime size.
 const uint32_t  MAX_RING_BUF_SIZE       = 60000;         // Max ring buffer size.
+const uint32_t  FIXED_RING_BUF_SIZE     = 60000;         //@TODO: RTC156706
 const uint32_t  MAX_OVERRIDES_SIZE      = 2 * 1024;      // Max overrides section size.
 const uint32_t  MAX_HBBL_SIZE           = 20 * 1024;     // Max hbbl section size.
 
diff --git a/import/chips/p9/utils/imageProcs/p9_ringId.C b/import/chips/p9/utils/imageProcs/p9_ringId.C
index c196fe5f..4a18d6aa 100644
--- a/import/chips/p9/utils/imageProcs/p9_ringId.C
+++ b/import/chips/p9/utils/imageProcs/p9_ringId.C
@@ -30,30 +30,30 @@ namespace PERV
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"perv_fure"                 , 0x00, 0x01, 0x01, "perv_fure_ring"               , NON_VPD_RING, 0,  0x0800000000009000},
-    {"perv_gptr"                 , 0x01, 0x01, 0x01, "perv_gptr_ring"               , NON_VPD_RING, 0,  0x0800000000002000},
-    {"perv_time"                 , 0x02, 0x01, 0x01, "perv_time_ring"               , NON_VPD_RING, 0,  0x0800000000000100},
-    {"occ_fure"                  , 0x03, 0x01, 0x01, "occ_fure_ring"                , NON_VPD_RING, 0,  0x0100000000009000},
-    {"occ_gptr"                  , 0x04, 0x01, 0x01, "occ_gptr_ring"                , NON_VPD_RING, 0,  0x0100000000002000},
-    {"occ_time"                  , 0x05, 0x01, 0x01, "occ_time_ring"                , NON_VPD_RING, 0,  0x0100000000000100},
-    {"perv_ana_func"             , 0x06, 0x01, 0x01, "perv_ana_func_ring"           , NON_VPD_RING, 0,  0x0080000000008000},
-    {"perv_ana_gptr"             , 0x07, 0x01, 0x01, "perv_ana_gptr_ring"           , NON_VPD_RING, 0,  0x0080000000002000},
-    {"perv_pll_gptr"             , 0x08, 0x01, 0x01, "perv_pll_gptr_ring"           , NON_VPD_RING, 0,  0x0002000000002000},
-    {"perv_pll_bndy_bucket_1"    , 0x09, 0x01, 0x01, "perv_pll_bndy_bucket_1_ring"  , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"perv_pll_bndy_bucket_2"    , 0x0a, 0x01, 0x01, "perv_pll_bndy_bucket_2_ring"  , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"perv_pll_bndy_bucket_3"    , 0x0b, 0x01, 0x01, "perv_pll_bndy_bucket_3_ring"  , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"perv_pll_bndy_bucket_4"    , 0x0c, 0x01, 0x01, "perv_pll_bndy_bucket_4_ring"  , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"perv_pll_bndy_bucket_5"    , 0x0d, 0x01, 0x01, "perv_pll_bndy_bucket_5_ring"  , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"perv_pll_func"             , 0x0e, 0x01, 0x01, "perv_pll_func_ring"           , NON_VPD_RING, 0,  0x0002000000008000},
-    {"perv_pibnet_gptr"          , 0x0f, 0x01, 0x01, "perv_pibnet_gptr_ring"        , NON_VPD_RING, 0,  0x0600000000002000},
-    {"perv_pibnet_time"          , 0x10, 0x01, 0x01, "perv_pibnet_time_ring"        , NON_VPD_RING, 0,  0x0600000000000100},
+    {"perv_fure"                 , 0x00, 0x01, 0x01, NON_VPD_RING, 0, 0x0800000000009000},
+    {"perv_gptr"                 , 0x01, 0x01, 0x01, NON_VPD_RING, 0, 0x0800000000002000},
+    {"perv_time"                 , 0x02, 0x01, 0x01, NON_VPD_RING, 0, 0x0800000000000100},
+    {"occ_fure"                  , 0x03, 0x01, 0x01, NON_VPD_RING, 0, 0x0100000000009000},
+    {"occ_gptr"                  , 0x04, 0x01, 0x01, NON_VPD_RING, 0, 0x0100000000002000},
+    {"occ_time"                  , 0x05, 0x01, 0x01, NON_VPD_RING, 0, 0x0100000000000100},
+    {"perv_ana_func"             , 0x06, 0x01, 0x01, NON_VPD_RING, 0, 0x0080000000008000},
+    {"perv_ana_gptr"             , 0x07, 0x01, 0x01, NON_VPD_RING, 0, 0x0080000000002000},
+    {"perv_pll_gptr"             , 0x08, 0x01, 0x01, NON_VPD_RING, 0, 0x0002000000002000},
+    {"perv_pll_bndy_bucket_1"    , 0x09, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x0002000000000080},
+    {"perv_pll_bndy_bucket_2"    , 0x0a, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x0002000000000080},
+    {"perv_pll_bndy_bucket_3"    , 0x0b, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x0002000000000080},
+    {"perv_pll_bndy_bucket_4"    , 0x0c, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x0002000000000080},
+    {"perv_pll_bndy_bucket_5"    , 0x0d, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x0002000000000080},
+    {"perv_pll_func"             , 0x0e, 0x01, 0x01, NON_VPD_RING, 0, 0x0002000000008000},
+    {"perv_pibnet_gptr"          , 0x0f, 0x01, 0x01, NON_VPD_RING, 0, 0x0600000000002000},
+    {"perv_pibnet_time"          , 0x10, 0x01, 0x01, NON_VPD_RING, 0, 0x0600000000000100},
 
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"perv_repr"        , 0x11, 0x01, 0x01, "perv_repr_ring"            , NON_VPD_RING, 0,  0x0800000000000200},
-    {"occ_repr"         , 0x12, 0x01, 0x01, "occ_repr_ring"             , NON_VPD_RING, 0,  0x0100000000000200},
-    {"perv_pibnet_repr" , 0x13, 0x01, 0x01, "perv_pibnet_repr_ring"     , NON_VPD_RING, 0,  0x0600000000000200},
+    {"perv_repr"        , 0x11, 0x01, 0x01, NON_VPD_RING, 0, 0x0800000000000200},
+    {"occ_repr"         , 0x12, 0x01, 0x01, NON_VPD_RING, 0, 0x0100000000000200},
+    {"perv_pibnet_repr" , 0x13, 0x01, 0x01, NON_VPD_RING, 0, 0x0600000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -63,21 +63,21 @@ namespace N0
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"n0_fure"          , 0x00, 0x02, 0x02, "n0_fure_ring"              , NON_VPD_RING, 0,  0x09C0000000009000},
-    {"n0_gptr"          , 0x01, 0x02, 0x02, "n0_gptr_ring"              , NON_VPD_RING, 0,  0x09C0000000002000},
-    {"n0_time"          , 0x02, 0x02, 0x02, "n0_time_ring"              , NON_VPD_RING, 0,  0x09C0000000000100},
-    {"n0_nx_fure"       , 0x03, 0x02, 0x02, "n0_nx_fure_ring"           , NON_VPD_RING, 0,  0x0400000000009000},
-    {"n0_nx_gptr"       , 0x04, 0x02, 0x02, "n0_nx_gptr_ring"           , NON_VPD_RING, 0,  0x0400000000002000},
-    {"n0_nx_time"       , 0x05, 0x02, 0x02, "n0_nx_time_ring"           , NON_VPD_RING, 0,  0x0400000000000100},
-    {"n0_cxa0_fure"     , 0x06, 0x02, 0x02, "n0_cxa0_fure_ring"         , NON_VPD_RING, 0,  0x0200000000009000},
-    {"n0_cxa0_gptr"     , 0x07, 0x02, 0x02, "n0_cxa0_gptr_ring"         , NON_VPD_RING, 0,  0x0200000000002000},
-    {"n0_cxa0_time"     , 0x08, 0x02, 0x02, "n0_cxa0_time_ring"         , NON_VPD_RING, 0,  0x0200000000000100},
+    {"n0_fure"          , 0x00, 0x02, 0x02, NON_VPD_RING, 0, 0x09C0000000009000},
+    {"n0_gptr"          , 0x01, 0x02, 0x02, NON_VPD_RING, 0, 0x09C0000000002000},
+    {"n0_time"          , 0x02, 0x02, 0x02, NON_VPD_RING, 0, 0x09C0000000000100},
+    {"n0_nx_fure"       , 0x03, 0x02, 0x02, NON_VPD_RING, 0, 0x0400000000009000},
+    {"n0_nx_gptr"       , 0x04, 0x02, 0x02, NON_VPD_RING, 0, 0x0400000000002000},
+    {"n0_nx_time"       , 0x05, 0x02, 0x02, NON_VPD_RING, 0, 0x0400000000000100},
+    {"n0_cxa0_fure"     , 0x06, 0x02, 0x02, NON_VPD_RING, 0, 0x0200000000009000},
+    {"n0_cxa0_gptr"     , 0x07, 0x02, 0x02, NON_VPD_RING, 0, 0x0200000000002000},
+    {"n0_cxa0_time"     , 0x08, 0x02, 0x02, NON_VPD_RING, 0, 0x0200000000000100},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"n0_repr"          , 0x09, 0x02, 0x02, "n0_repr_ring"              , NON_VPD_RING, 0,  0x09C0000000000200},
-    {"n0_nx_repr"       , 0x0a, 0x02, 0x02, "n0_nx_repr_ring"           , NON_VPD_RING, 0,  0x0400000000000200},
-    {"n0_cxa0_repr"     , 0x0b, 0x02, 0x02, "n0_cxa0_repr_ring"         , NON_VPD_RING, 0,  0x0200000000000200},
+    {"n0_repr"          , 0x09, 0x02, 0x02, NON_VPD_RING, 0, 0x09C0000000000200},
+    {"n0_nx_repr"       , 0x0a, 0x02, 0x02, NON_VPD_RING, 0, 0x0400000000000200},
+    {"n0_cxa0_repr"     , 0x0b, 0x02, 0x02, NON_VPD_RING, 0, 0x0200000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -87,25 +87,25 @@ namespace N1
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"n1_fure"          , 0x00, 0x03, 0x03, "n1_fure_ring"              , NON_VPD_RING, 0,  0x0E00000000009000},
-    {"n1_gptr"          , 0x01, 0x03, 0x03, "n1_gptr_ring"              , NON_VPD_RING, 0,  0x0E00000000002000},
-    {"n1_time"          , 0x02, 0x03, 0x03, "n1_time_ring"              , NON_VPD_RING, 0,  0x0E00000000000100},
-    {"n1_ioo0_fure"     , 0x03, 0x03, 0x03, "n1_ioo0_fure_ring"         , NON_VPD_RING, 0,  0x0100000000009000},
-    {"n1_ioo0_gptr"     , 0x04, 0x03, 0x03, "n1_ioo0_gptr_ring"         , NON_VPD_RING, 0,  0x0100000000002000},
-    {"n1_ioo0_time"     , 0x05, 0x03, 0x03, "n1_ioo0_time_ring"         , NON_VPD_RING, 0,  0x0100000000000100},
-    {"n1_ioo1_fure"     , 0x06, 0x03, 0x03, "n1_ioo1_fure_ring"         , NON_VPD_RING, 0,  0x0080000000009000},
-    {"n1_ioo1_gptr"     , 0x07, 0x03, 0x03, "n1_ioo1_gptr_ring"         , NON_VPD_RING, 0,  0x0080000000002000},
-    {"n1_ioo1_time"     , 0x08, 0x03, 0x03, "n1_ioo1_time_ring"         , NON_VPD_RING, 0,  0x0080000000000100},
-    {"n1_mcs23_fure"    , 0x09, 0x03, 0x03, "n1_mcs23_fure_ring"        , NON_VPD_RING, 0,  0x0040000000009000},
-    {"n1_mcs23_gptr"    , 0x0a, 0x03, 0x03, "n1_mcs23_gptr_ring"        , NON_VPD_RING, 0,  0x0040000000002000},
-    {"n1_mcs23_time"    , 0x0b, 0x03, 0x03, "n1_mcs23_time_ring"        , NON_VPD_RING, 0,  0x0040000000000100},
+    {"n1_fure"          , 0x00, 0x03, 0x03, NON_VPD_RING, 0, 0x0E00000000009000},
+    {"n1_gptr"          , 0x01, 0x03, 0x03, NON_VPD_RING, 0, 0x0E00000000002000},
+    {"n1_time"          , 0x02, 0x03, 0x03, NON_VPD_RING, 0, 0x0E00000000000100},
+    {"n1_ioo0_fure"     , 0x03, 0x03, 0x03, NON_VPD_RING, 0, 0x0100000000009000},
+    {"n1_ioo0_gptr"     , 0x04, 0x03, 0x03, NON_VPD_RING, 0, 0x0100000000002000},
+    {"n1_ioo0_time"     , 0x05, 0x03, 0x03, NON_VPD_RING, 0, 0x0100000000000100},
+    {"n1_ioo1_fure"     , 0x06, 0x03, 0x03, NON_VPD_RING, 0, 0x0080000000009000},
+    {"n1_ioo1_gptr"     , 0x07, 0x03, 0x03, NON_VPD_RING, 0, 0x0080000000002000},
+    {"n1_ioo1_time"     , 0x08, 0x03, 0x03, NON_VPD_RING, 0, 0x0080000000000100},
+    {"n1_mcs23_fure"    , 0x09, 0x03, 0x03, NON_VPD_RING, 0, 0x0040000000009000},
+    {"n1_mcs23_gptr"    , 0x0a, 0x03, 0x03, NON_VPD_RING, 0, 0x0040000000002000},
+    {"n1_mcs23_time"    , 0x0b, 0x03, 0x03, NON_VPD_RING, 0, 0x0040000000000100},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"n1_repr"          , 0x0c, 0x03, 0x03, "n1_repr_ring"              , NON_VPD_RING, 0,  0x0E00000000000200},
-    {"n1_ioo0_repr"     , 0x0d, 0x03, 0x03, "n1_ioo0_repr_ring"         , NON_VPD_RING, 0,  0x0100000000000200},
-    {"n1_ioo1_repr"     , 0x0e, 0x03, 0x03, "n1_ioo1_repr_ring"         , NON_VPD_RING, 0,  0x0080000000000200},
-    {"n1_mcs23_repr"    , 0x0f, 0x03, 0x03, "n1_mcs23_repr_ring"        , NON_VPD_RING, 0,  0x0040000000000200},
+    {"n1_repr"          , 0x0c, 0x03, 0x03, NON_VPD_RING, 0, 0x0E00000000000200},
+    {"n1_ioo0_repr"     , 0x0d, 0x03, 0x03, NON_VPD_RING, 0, 0x0100000000000200},
+    {"n1_ioo1_repr"     , 0x0e, 0x03, 0x03, NON_VPD_RING, 0, 0x0080000000000200},
+    {"n1_mcs23_repr"    , 0x0f, 0x03, 0x03, NON_VPD_RING, 0, 0x0040000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -115,21 +115,21 @@ namespace N2
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"n2_fure"          , 0x00, 0x04, 0x04, "n2_fure_ring"              , NON_VPD_RING, 0,  0x0B80000000009000},
-    {"n2_gptr"          , 0x01, 0x04, 0x04, "n2_gptr_ring"              , NON_VPD_RING, 0,  0x0B80000000002000},
-    {"n2_time"          , 0x02, 0x04, 0x04, "n2_time_ring"              , NON_VPD_RING, 0,  0x0B80000000000100},
-    {"n2_cxa1_fure"     , 0x03, 0x04, 0x04, "n2_cxa1_fure_ring"         , NON_VPD_RING, 0,  0x0400000000009000},
-    {"n2_cxa1_gptr"     , 0x04, 0x04, 0x04, "n2_cxa1_gptr_ring"         , NON_VPD_RING, 0,  0x0400000000002000},
-    {"n2_cxa1_time"     , 0x05, 0x04, 0x04, "n2_cxa1_time_ring"         , NON_VPD_RING, 0,  0x0400000000000100},
-    {"n2_psi_fure"      , 0x06, 0x04, 0x04, "n2_psi_fure_ring"          , NON_VPD_RING, 0,  0x0040000000009000},
-    {"n2_psi_gptr"      , 0x07, 0x04, 0x04, "n2_psi_gptr_ring"          , NON_VPD_RING, 0,  0x0040000000002000},
-    {"n2_psi_time"      , 0x08, 0x04, 0x04, "n2_psi_time_ring"          , NON_VPD_RING, 0,  0x0040000000000100},
+    {"n2_fure"          , 0x00, 0x04, 0x04, NON_VPD_RING, 0, 0x0B80000000009000},
+    {"n2_gptr"          , 0x01, 0x04, 0x04, NON_VPD_RING, 0, 0x0B80000000002000},
+    {"n2_time"          , 0x02, 0x04, 0x04, NON_VPD_RING, 0, 0x0B80000000000100},
+    {"n2_cxa1_fure"     , 0x03, 0x04, 0x04, NON_VPD_RING, 0, 0x0400000000009000},
+    {"n2_cxa1_gptr"     , 0x04, 0x04, 0x04, NON_VPD_RING, 0, 0x0400000000002000},
+    {"n2_cxa1_time"     , 0x05, 0x04, 0x04, NON_VPD_RING, 0, 0x0400000000000100},
+    {"n2_psi_fure"      , 0x06, 0x04, 0x04, NON_VPD_RING, 0, 0x0040000000009000},
+    {"n2_psi_gptr"      , 0x07, 0x04, 0x04, NON_VPD_RING, 0, 0x0040000000002000},
+    {"n2_psi_time"      , 0x08, 0x04, 0x04, NON_VPD_RING, 0, 0x0040000000000100},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"n2_repr"          , 0x09, 0x04, 0x04, "n2_repr_ring"              , NON_VPD_RING, 0,  0x0B80000000000200},
-    {"n2_cxa1_repr"     , 0x0a, 0x04, 0x04, "n2_cxa1_repr_ring"         , NON_VPD_RING, 0,  0x0400000000000200},
-    {"n2_psi_repr"      , 0x0b, 0x04, 0x04, "n2_cxa1_repr_ring"         , NON_VPD_RING, 0,  0x0040000000000200},
+    {"n2_repr"          , 0x09, 0x04, 0x04, NON_VPD_RING, 0, 0x0B80000000000200},
+    {"n2_cxa1_repr"     , 0x0a, 0x04, 0x04, NON_VPD_RING, 0, 0x0400000000000200},
+    {"n2_psi_repr"      , 0x0b, 0x04, 0x04, NON_VPD_RING, 0, 0x0040000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -139,21 +139,21 @@ namespace N3
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"n3_fure"          , 0x00, 0x05, 0x05, "n3_fure_ring"              , NON_VPD_RING, 0,  0x0CC0000000009000},
-    {"n3_gptr"          , 0x01, 0x05, 0x05, "n3_gptr_ring"              , NON_VPD_RING, 0,  0x0EC0000000002000},
-    {"n3_time"          , 0x02, 0x05, 0x05, "n3_time_ring"              , NON_VPD_RING, 0,  0x0EC0000000000100},
-    {"n3_mcs01_fure"    , 0x03, 0x05, 0x05, "n3_mcs01_fure_ring"        , NON_VPD_RING, 0,  0x0020000000009000},
-    {"n3_mcs01_gptr"    , 0x04, 0x05, 0x05, "n3_mcs01_gptr_ring"        , NON_VPD_RING, 0,  0x0020000000002000},
-    {"n3_mcs01_time"    , 0x05, 0x05, 0x05, "n3_mcs01_time_ring"        , NON_VPD_RING, 0,  0x0020000000000100},
-    {"n3_np_fure"       , 0x06, 0x05, 0x05, "n3_np_fure_ring"           , NON_VPD_RING, 0,  0x0100000000009000},
-    {"n3_np_gptr"       , 0x07, 0x05, 0x05, "n3_np_gptr_ring"           , NON_VPD_RING, 0,  0x0100000000002000},
-    {"n3_np_time"       , 0x08, 0x05, 0x05, "n3_np_time_ring"           , NON_VPD_RING, 0,  0x0100000000000100},
+    {"n3_fure"          , 0x00, 0x05, 0x05, NON_VPD_RING, 0, 0x0CC0000000009000},
+    {"n3_gptr"          , 0x01, 0x05, 0x05, NON_VPD_RING, 0, 0x0EC0000000002000},
+    {"n3_time"          , 0x02, 0x05, 0x05, NON_VPD_RING, 0, 0x0EC0000000000100},
+    {"n3_mcs01_fure"    , 0x03, 0x05, 0x05, NON_VPD_RING, 0, 0x0020000000009000},
+    {"n3_mcs01_gptr"    , 0x04, 0x05, 0x05, NON_VPD_RING, 0, 0x0020000000002000},
+    {"n3_mcs01_time"    , 0x05, 0x05, 0x05, NON_VPD_RING, 0, 0x0020000000000100},
+    {"n3_np_fure"       , 0x06, 0x05, 0x05, NON_VPD_RING, 0, 0x0100000000009000},
+    {"n3_np_gptr"       , 0x07, 0x05, 0x05, NON_VPD_RING, 0, 0x0100000000002000},
+    {"n3_np_time"       , 0x08, 0x05, 0x05, NON_VPD_RING, 0, 0x0100000000000100},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"n3_repr"          , 0x09, 0x05, 0x05, "n3_repr_ring"              , NON_VPD_RING, 0,  0x0EC0000000000200},
-    {"n3_mcs01_repr"    , 0x0a, 0x05, 0x05, "n3_mcs01_repr_ring"        , NON_VPD_RING, 0,  0x0020000000000200},
-    {"n3_np_repr"       , 0x0b, 0x05, 0x05, "n3_np_repr_ring"           , NON_VPD_RING, 0,  0x0100000000000200},
+    {"n3_repr"          , 0x09, 0x05, 0x05, NON_VPD_RING, 0, 0x0EC0000000000200},
+    {"n3_mcs01_repr"    , 0x0a, 0x05, 0x05, NON_VPD_RING, 0, 0x0020000000000200},
+    {"n3_np_repr"       , 0x0b, 0x05, 0x05, NON_VPD_RING, 0, 0x0100000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -163,28 +163,28 @@ namespace XB
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"xb_fure"                   , 0x00, 0x06, 0x06, "xb_fure_ring"              , NON_VPD_RING, 0,  0x0880000000009000},
-    {"xb_gptr"                   , 0x01, 0x06, 0x06, "xb_gptr_ring"              , NON_VPD_RING, 0,  0x0880000000002000},
-    {"xb_time"                   , 0x02, 0x06, 0x06, "xb_time_ring"              , NON_VPD_RING, 0,  0x0880000000000100},
-    {"xb_io0_fure"               , 0x03, 0x06, 0x06, "xb_io0_fure_ring"          , NON_VPD_RING, 0,  0x0440000000009000},
-    {"xb_io0_gptr"               , 0x04, 0x06, 0x06, "xb_io0_gptr_ring"          , NON_VPD_RING, 0,  0x0440000000002000},
-    {"xb_io0_time"               , 0x05, 0x06, 0x06, "xb_io0_time_ring"          , NON_VPD_RING, 0,  0x0440000000000100},
-    {"xb_io1_fure"               , 0x06, 0x06, 0x06, "xb_io1_fure_ring"          , NON_VPD_RING, 0,  0x0220000000009000},
-    {"xb_io1_gptr"               , 0x07, 0x06, 0x06, "xb_io1_gptr_ring"          , NON_VPD_RING, 0,  0x0220000000002000},
-    {"xb_io1_time"               , 0x08, 0x06, 0x06, "xb_io1_time_ring"          , NON_VPD_RING, 0,  0x0220000000000100},
-    {"xb_io2_fure"               , 0x09, 0x06, 0x06, "xb_io2_fure_ring"          , NON_VPD_RING, 0,  0x0110000000009000},
-    {"xb_io2_gptr"               , 0x0a, 0x06, 0x06, "xb_io2_gptr_ring"          , NON_VPD_RING, 0,  0x0110000000002000},
-    {"xb_io2_time"               , 0x0b, 0x06, 0x06, "xb_io2_time_ring"          , NON_VPD_RING, 0,  0x0110000000000100},
-    {"xb_pll_gptr"               , 0x0c, 0x06, 0x06, "xb_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"xb_pll_bndy"               , 0x0d, 0x06, 0x06, "xb_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
-    {"xb_pll_func"               , 0x0e, 0x06, 0x06, "xb_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"xb_fure"                   , 0x00, 0x06, 0x06, NON_VPD_RING, 0, 0x0880000000009000},
+    {"xb_gptr"                   , 0x01, 0x06, 0x06, NON_VPD_RING, 0, 0x0880000000002000},
+    {"xb_time"                   , 0x02, 0x06, 0x06, NON_VPD_RING, 0, 0x0880000000000100},
+    {"xb_io0_fure"               , 0x03, 0x06, 0x06, NON_VPD_RING, 0, 0x0440000000009000},
+    {"xb_io0_gptr"               , 0x04, 0x06, 0x06, NON_VPD_RING, 0, 0x0440000000002000},
+    {"xb_io0_time"               , 0x05, 0x06, 0x06, NON_VPD_RING, 0, 0x0440000000000100},
+    {"xb_io1_fure"               , 0x06, 0x06, 0x06, NON_VPD_RING, 0, 0x0220000000009000},
+    {"xb_io1_gptr"               , 0x07, 0x06, 0x06, NON_VPD_RING, 0, 0x0220000000002000},
+    {"xb_io1_time"               , 0x08, 0x06, 0x06, NON_VPD_RING, 0, 0x0220000000000100},
+    {"xb_io2_fure"               , 0x09, 0x06, 0x06, NON_VPD_RING, 0, 0x0110000000009000},
+    {"xb_io2_gptr"               , 0x0a, 0x06, 0x06, NON_VPD_RING, 0, 0x0110000000002000},
+    {"xb_io2_time"               , 0x0b, 0x06, 0x06, NON_VPD_RING, 0, 0x0110000000000100},
+    {"xb_pll_gptr"               , 0x0c, 0x06, 0x06, NON_VPD_RING, 0, 0x0002000000002000},
+    {"xb_pll_bndy"               , 0x0d, 0x06, 0x06, NON_VPD_RING, 0, 0x0002000000000080},
+    {"xb_pll_func"               , 0x0e, 0x06, 0x06, NON_VPD_RING, 0, 0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"xb_repr"          , 0x13, 0x06, 0x06, "xb_repr_ring"              , NON_VPD_RING, 0,  0x0880000000000200},
-    {"xb_io0_repr"      , 0x14, 0x06, 0x06, "xb_io0_repr_ring"          , NON_VPD_RING, 0,  0x0440000000000200},
-    {"xb_io1_repr"      , 0x15, 0x06, 0x06, "xb_io1_repr_ring"          , NON_VPD_RING, 0,  0x0220000000000200},
-    {"xb_io2_repr"      , 0x16, 0x06, 0x06, "xb_io2_repr_ring"          , NON_VPD_RING, 0,  0x0110000000000200},
+    {"xb_repr"          , 0x13, 0x06, 0x06, NON_VPD_RING, 0, 0x0880000000000200},
+    {"xb_io0_repr"      , 0x14, 0x06, 0x06, NON_VPD_RING, 0, 0x0440000000000200},
+    {"xb_io1_repr"      , 0x15, 0x06, 0x06, NON_VPD_RING, 0, 0x0220000000000200},
+    {"xb_io2_repr"      , 0x16, 0x06, 0x06, NON_VPD_RING, 0, 0x0110000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -194,28 +194,28 @@ namespace MC
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"mc_fure"                   , 0x00, 0x07, 0x07, "mc_fure_ring"              , NON_VPD_RING, 0,  0x0C00000000009000},
-    {"mc_gptr"                   , 0x01, 0x07, 0x07, "mc_gptr_ring"              , NON_VPD_RING, 0,  0x0C00000000002000},
-    {"mc_time"                   , 0x02, 0x07, 0x07, "mc_time_ring"              , NON_VPD_RING, 0,  0x0C00000000000100},
-    {"mc_iom01_fure"             , 0x03, 0x07, 0x07, "mc_iom01_fure_ring"        , NON_VPD_RING, 0,  0x0200000000009000},
-    {"mc_iom01_gptr"             , 0x04, 0x07, 0x07, "mc_iom01_gptr_ring"        , NON_VPD_RING, 0,  0x0200000000002000},
-    {"mc_iom01_time"             , 0x05, 0x07, 0x07, "mc_iom01_time_ring"        , NON_VPD_RING, 0,  0x0200000000000100},
-    {"mc_iom23_fure"             , 0x06, 0x07, 0x07, "mc_iom23_fure_ring"        , NON_VPD_RING, 0,  0x0100000000009000},
-    {"mc_iom23_gptr"             , 0x07, 0x07, 0x07, "mc_iom23_gptr_ring"        , NON_VPD_RING, 0,  0x0100000000002000},
-    {"mc_iom23_time"             , 0x08, 0x07, 0x07, "mc_iom23_time_ring"        , NON_VPD_RING, 0,  0x0100000000000100},
-    {"mc_pll_gptr"               , 0x09, 0x07, 0x07, "mc_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"mc_pll_bndy_bucket_1"      , 0x0a, 0x07, 0x07, "mc_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"mc_pll_bndy_bucket_2"      , 0x0b, 0x07, 0x07, "mc_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"mc_pll_bndy_bucket_3"      , 0x0c, 0x07, 0x07, "mc_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"mc_pll_bndy_bucket_4"      , 0x0d, 0x07, 0x07, "mc_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"mc_pll_bndy_bucket_5"      , 0x0e, 0x07, 0x07, "mc_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"mc_pll_func"               , 0x0f, 0x07, 0x07, "mc_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"mc_fure"                   , 0x00, 0x07, 0x07, NON_VPD_RING, 0, 0x0C00000000009000},
+    {"mc_gptr"                   , 0x01, 0x07, 0x07, NON_VPD_RING, 0, 0x0C00000000002000},
+    {"mc_time"                   , 0x02, 0x07, 0x07, NON_VPD_RING, 0, 0x0C00000000000100},
+    {"mc_iom01_fure"             , 0x03, 0x07, 0x07, NON_VPD_RING, 0, 0x0200000000009000},
+    {"mc_iom01_gptr"             , 0x04, 0x07, 0x07, NON_VPD_RING, 0, 0x0200000000002000},
+    {"mc_iom01_time"             , 0x05, 0x07, 0x07, NON_VPD_RING, 0, 0x0200000000000100},
+    {"mc_iom23_fure"             , 0x06, 0x07, 0x07, NON_VPD_RING, 0, 0x0100000000009000},
+    {"mc_iom23_gptr"             , 0x07, 0x07, 0x07, NON_VPD_RING, 0, 0x0100000000002000},
+    {"mc_iom23_time"             , 0x08, 0x07, 0x07, NON_VPD_RING, 0, 0x0100000000000100},
+    {"mc_pll_gptr"               , 0x09, 0x07, 0x07, NON_VPD_RING, 0, 0x0002000000002000},
+    {"mc_pll_bndy_bucket_1"      , 0x0a, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x0002000000000080},
+    {"mc_pll_bndy_bucket_2"      , 0x0b, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x0002000000000080},
+    {"mc_pll_bndy_bucket_3"      , 0x0c, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x0002000000000080},
+    {"mc_pll_bndy_bucket_4"      , 0x0d, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x0002000000000080},
+    {"mc_pll_bndy_bucket_5"      , 0x0e, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x0002000000000080},
+    {"mc_pll_func"               , 0x0f, 0x07, 0x07, NON_VPD_RING, 0, 0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"mc_repr"          , 0x10, 0x07, 0x08, "mc_repr_ring"              , NON_VPD_RING, 0,  0x0C00000000000200},
-    {"mc_iom01_repr"    , 0x11, 0x07, 0x08, "mc_iom01_repr_ring"        , NON_VPD_RING, 0,  0x0200000000000200},
-    {"mc_iom23_repr"    , 0x12, 0x07, 0x08, "mc_iom23_repr_ring"        , NON_VPD_RING, 0,  0x0100000000000200},
+    {"mc_repr"          , 0x10, 0x07, 0x08, NON_VPD_RING, 0, 0x0C00000000000200},
+    {"mc_iom01_repr"    , 0x11, 0x07, 0x08, NON_VPD_RING, 0, 0x0200000000000200},
+    {"mc_iom23_repr"    , 0x12, 0x07, 0x08, NON_VPD_RING, 0, 0x0100000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -225,16 +225,16 @@ namespace OB0
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"ob0_fure"                   , 0x00, 0x09, 0x09, "ob0_fure_ring"              , NON_VPD_RING, 0,  0x0E00000000009000},
-    {"ob0_gptr"                   , 0x01, 0x09, 0x09, "ob0_gptr_ring"              , NON_VPD_RING, 0,  0x0E00000000002000},
-    {"ob0_time"                   , 0x02, 0x09, 0x09, "ob0_time_ring"              , NON_VPD_RING, 0,  0x0E00000000000100},
-    {"ob0_pll_gptr"               , 0x03, 0x09, 0x09, "ob0_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"ob0_pll_bndy"               , 0x04, 0x09, 0x09, "ob0_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
-    {"ob0_pll_func"               , 0x05, 0x09, 0x09, "ob0_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"ob0_fure"                   , 0x00, 0x09, 0x09, NON_VPD_RING, 0, 0x0E00000000009000},
+    {"ob0_gptr"                   , 0x01, 0x09, 0x09, NON_VPD_RING, 0, 0x0E00000000002000},
+    {"ob0_time"                   , 0x02, 0x09, 0x09, NON_VPD_RING, 0, 0x0E00000000000100},
+    {"ob0_pll_gptr"               , 0x03, 0x09, 0x09, NON_VPD_RING, 0, 0x0002000000002000},
+    {"ob0_pll_bndy"               , 0x04, 0x09, 0x09, NON_VPD_RING, 0, 0x0002000000000080},
+    {"ob0_pll_func"               , 0x05, 0x09, 0x09, NON_VPD_RING, 0, 0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob0_repr"          , 0x0a, 0x09, 0x09, "ob0_repr_ring"              , NON_VPD_RING, 0,  0x0E00000000000200},
+    {"ob0_repr"          , 0x0a, 0x09, 0x09, NON_VPD_RING, 0, 0x0E00000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -244,16 +244,16 @@ namespace OB1
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"ob1_fure"                   , 0x00, 0x0a, 0x0a, "ob1_fure_ring"              , NON_VPD_RING, 0,  0x0E00000000009000},
-    {"ob1_gptr"                   , 0x01, 0x0a, 0x0a, "ob1_gptr_ring"              , NON_VPD_RING, 0,  0x0E00000000002000},
-    {"ob1_time"                   , 0x02, 0x0a, 0x0a, "ob1_time_ring"              , NON_VPD_RING, 0,  0x0E00000000000100},
-    {"ob1_pll_gptr"               , 0x03, 0x0a, 0x0a, "ob1_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"ob1_pll_bndy"               , 0x04, 0x0a, 0x0a, "ob1_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
-    {"ob1_pll_func"               , 0x05, 0x0a, 0x0a, "ob1_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"ob1_fure"                   , 0x00, 0x0a, 0x0a, NON_VPD_RING, 0, 0x0E00000000009000},
+    {"ob1_gptr"                   , 0x01, 0x0a, 0x0a, NON_VPD_RING, 0, 0x0E00000000002000},
+    {"ob1_time"                   , 0x02, 0x0a, 0x0a, NON_VPD_RING, 0, 0x0E00000000000100},
+    {"ob1_pll_gptr"               , 0x03, 0x0a, 0x0a, NON_VPD_RING, 0, 0x0002000000002000},
+    {"ob1_pll_bndy"               , 0x04, 0x0a, 0x0a, NON_VPD_RING, 0, 0x0002000000000080},
+    {"ob1_pll_func"               , 0x05, 0x0a, 0x0a, NON_VPD_RING, 0, 0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob1_repr"          , 0x0a, 0x0a, 0x0a, "ob1_repr_ring"              , NON_VPD_RING, 0,  0x0E00000000000200},
+    {"ob1_repr"          , 0x0a, 0x0a, 0x0a, NON_VPD_RING, 0, 0x0E00000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -263,16 +263,16 @@ namespace OB2
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"ob2_fure"                   , 0x00, 0x0b, 0x0b, "ob2_fure_ring"              , NON_VPD_RING, 0,  0x0E00000000009000},
-    {"ob2_gptr"                   , 0x01, 0x0b, 0x0b, "ob2_gptr_ring"              , NON_VPD_RING, 0,  0x0E00000000002000},
-    {"ob2_time"                   , 0x02, 0x0b, 0x0b, "ob2_time_ring"              , NON_VPD_RING, 0,  0x0E00000000000100},
-    {"ob2_pll_gptr"               , 0x03, 0x0b, 0x0b, "ob2_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"ob2_pll_bndy"               , 0x04, 0x0b, 0x0b, "ob2_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
-    {"ob2_pll_func"               , 0x05, 0x0b, 0x0b, "ob2_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"ob2_fure"                   , 0x00, 0x0b, 0x0b, NON_VPD_RING, 0, 0x0E00000000009000},
+    {"ob2_gptr"                   , 0x01, 0x0b, 0x0b, NON_VPD_RING, 0, 0x0E00000000002000},
+    {"ob2_time"                   , 0x02, 0x0b, 0x0b, NON_VPD_RING, 0, 0x0E00000000000100},
+    {"ob2_pll_gptr"               , 0x03, 0x0b, 0x0b, NON_VPD_RING, 0, 0x0002000000002000},
+    {"ob2_pll_bndy"               , 0x04, 0x0b, 0x0b, NON_VPD_RING, 0, 0x0002000000000080},
+    {"ob2_pll_func"               , 0x05, 0x0b, 0x0b, NON_VPD_RING, 0, 0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob2_repr"          , 0x0a, 0x0b, 0x0b, "ob2_repr_ring"              , NON_VPD_RING, 0,  0x0E00000000000200},
+    {"ob2_repr"          , 0x0a, 0x0b, 0x0b, NON_VPD_RING, 0, 0x0E00000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -282,16 +282,16 @@ namespace OB3
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"ob3_fure"                   , 0x00, 0x0c, 0x0c, "ob3_fure_ring"              , NON_VPD_RING, 0,  0x0E00000000009000},
-    {"ob3_gptr"                   , 0x01, 0x0c, 0x0c, "ob3_gptr_ring"              , NON_VPD_RING, 0,  0x0E00000000002000},
-    {"ob3_time"                   , 0x02, 0x0c, 0x0c, "ob3_time_ring"              , NON_VPD_RING, 0,  0x0E00000000000100},
-    {"ob3_pll_gptr"               , 0x03, 0x0c, 0x0c, "ob3_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"ob3_pll_bndy"               , 0x04, 0x0c, 0x0c, "ob3_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
-    {"ob3_pll_func"               , 0x05, 0x0c, 0x0c, "ob3_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"ob3_fure"                   , 0x00, 0x0c, 0x0c, NON_VPD_RING, 0, 0x0E00000000009000},
+    {"ob3_gptr"                   , 0x01, 0x0c, 0x0c, NON_VPD_RING, 0, 0x0E00000000002000},
+    {"ob3_time"                   , 0x02, 0x0c, 0x0c, NON_VPD_RING, 0, 0x0E00000000000100},
+    {"ob3_pll_gptr"               , 0x03, 0x0c, 0x0c, NON_VPD_RING, 0, 0x0002000000002000},
+    {"ob3_pll_bndy"               , 0x04, 0x0c, 0x0c, NON_VPD_RING, 0, 0x0002000000000080},
+    {"ob3_pll_func"               , 0x05, 0x0c, 0x0c, NON_VPD_RING, 0, 0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob3_repr"          , 0x0a, 0x0c, 0x0c, "ob3_repr_ring"              , NON_VPD_RING, 0,  0x0E00000000000200},
+    {"ob3_repr"          , 0x0a, 0x0c, 0x0c, NON_VPD_RING, 0, 0x0E00000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -301,15 +301,15 @@ namespace PCI0
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"pci0_fure"            , 0x00, 0x0d, 0x0d, "pci0_fure_ring"        , NON_VPD_RING, 0,  0x0E00000000009000},
-    {"pci0_gptr"            , 0x01, 0x0d, 0x0d, "pci0_gptr_ring"        , NON_VPD_RING, 0,  0x0E00000000002000},
-    {"pci0_time"            , 0x02, 0x0d, 0x0d, "pci0_time_ring"        , NON_VPD_RING, 0,  0x0E00000000000100},
-    {"pci0_pll_bndy"        , 0x03, 0x0d, 0x0d, "pci0_pll_bndy_ring"    , NON_VPD_RING, 0,  0x0002000000000080},
-    {"pci0_pll_gptr"        , 0x04, 0x0d, 0x0d, "pci0_pll_gptr_ring"    , NON_VPD_RING, 0,  0x0002000000002000},
+    {"pci0_fure"            , 0x00, 0x0d, 0x0d, NON_VPD_RING, 0, 0x0E00000000009000},
+    {"pci0_gptr"            , 0x01, 0x0d, 0x0d, NON_VPD_RING, 0, 0x0E00000000002000},
+    {"pci0_time"            , 0x02, 0x0d, 0x0d, NON_VPD_RING, 0, 0x0E00000000000100},
+    {"pci0_pll_bndy"        , 0x03, 0x0d, 0x0d, NON_VPD_RING, 0, 0x0002000000000080},
+    {"pci0_pll_gptr"        , 0x04, 0x0d, 0x0d, NON_VPD_RING, 0, 0x0002000000002000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"pci0_repr"            , 0x05, 0x0d, 0x0d, "pci0_repr_ring"        , NON_VPD_RING, 0,  0x0E00000000000200},
+    {"pci0_repr"            , 0x05, 0x0d, 0x0d, NON_VPD_RING, 0, 0x0E00000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -319,15 +319,15 @@ namespace PCI1
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"pci1_fure"            , 0x00, 0x0e, 0x0e, "pci1_fure_ring"        , NON_VPD_RING, 0,  0x0F00000000009000},
-    {"pci1_gptr"            , 0x01, 0x0e, 0x0e, "pci1_gptr_ring"        , NON_VPD_RING, 0,  0x0F00000000002000},
-    {"pci1_time"            , 0x02, 0x0e, 0x0e, "pci1_time_ring"        , NON_VPD_RING, 0,  0x0F00000000000100},
-    {"pci1_pll_bndy"        , 0x03, 0x0e, 0x0e, "pci1_pll_bndy_ring"    , NON_VPD_RING, 0,  0x0002000000000080},
-    {"pci1_pll_gptr"        , 0x04, 0x0e, 0x0e, "pci1_pll_gptr_ring"    , NON_VPD_RING, 0,  0x0002000000002000},
+    {"pci1_fure"            , 0x00, 0x0e, 0x0e, NON_VPD_RING, 0, 0x0F00000000009000},
+    {"pci1_gptr"            , 0x01, 0x0e, 0x0e, NON_VPD_RING, 0, 0x0F00000000002000},
+    {"pci1_time"            , 0x02, 0x0e, 0x0e, NON_VPD_RING, 0, 0x0F00000000000100},
+    {"pci1_pll_bndy"        , 0x03, 0x0e, 0x0e, NON_VPD_RING, 0, 0x0002000000000080},
+    {"pci1_pll_gptr"        , 0x04, 0x0e, 0x0e, NON_VPD_RING, 0, 0x0002000000002000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"pci1_repr"            , 0x05, 0x0e, 0x0e, "pci1_repr_ring"        , NON_VPD_RING, 0,  0x0F00000000000200},
+    {"pci1_repr"            , 0x05, 0x0e, 0x0e, NON_VPD_RING, 0, 0x0F00000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -337,15 +337,15 @@ namespace PCI2
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"pci2_fure"            , 0x00, 0x0f, 0x0f, "pci2_fure_ring"        , NON_VPD_RING, 0,  0x0F80000000009000},
-    {"pci2_gptr"            , 0x01, 0x0f, 0x0f, "pci2_gptr_ring"        , NON_VPD_RING, 0,  0x0F80000000002000},
-    {"pci2_time"            , 0x02, 0x0f, 0x0f, "pci2_time_ring"        , NON_VPD_RING, 0,  0x0F80000000000100},
-    {"pci2_pll_bndy"        , 0x03, 0x0f, 0x0f, "pci2_pll_bndy_ring"    , NON_VPD_RING, 0,  0x0002000000000080},
-    {"pci2_pll_gptr"        , 0x04, 0x0f, 0x0f, "pci2_pll_gptr_ring"    , NON_VPD_RING, 0,  0x0002000000002000},
+    {"pci2_fure"            , 0x00, 0x0f, 0x0f, NON_VPD_RING, 0, 0x0F80000000009000},
+    {"pci2_gptr"            , 0x01, 0x0f, 0x0f, NON_VPD_RING, 0, 0x0F80000000002000},
+    {"pci2_time"            , 0x02, 0x0f, 0x0f, NON_VPD_RING, 0, 0x0F80000000000100},
+    {"pci2_pll_bndy"        , 0x03, 0x0f, 0x0f, NON_VPD_RING, 0, 0x0002000000000080},
+    {"pci2_pll_gptr"        , 0x04, 0x0f, 0x0f, NON_VPD_RING, 0, 0x0002000000002000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"pci2_repr"            , 0x05, 0x0F, 0x0F, "pci2_repr_ring"        , NON_VPD_RING, 0,  0x0F80000000000200},
+    {"pci2_repr"            , 0x05, 0x0F, 0x0F, NON_VPD_RING, 0, 0x0F80000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -355,60 +355,60 @@ namespace EQ
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"eq_fure"                   , 0x00, 0x10, 0x10, "eq_fure_ring"              , NON_VPD_RING, 0,  0x0C10000000009000},
-    {"eq_gptr"                   , 0x01, 0x10, 0x10, "eq_gptr_ring"              , NON_VPD_RING, 0,  0x0C10000000002000},
-    {"eq_time"                   , 0x02, 0x10, 0x10, "eq_time_ring"              , NON_VPD_RING, 0,  0x0C10000000000100},
-    {"eq_mode"                   , 0x03, 0x10, 0x10, "eq_mode_ring"              , NON_VPD_RING, 0,  0x0C10000000004000},
-    {"ex_l3_fure"                , 0x04, 0x10, 0x10, "ex_l3_fure_ring"           , NON_VPD_RING, 0,  0x0200000000009000},
-    {"ex_l3_gptr"                , 0x05, 0x10, 0x10, "ex_l3_gptr_ring"           , NON_VPD_RING, 0,  0x0200000000002000},
-    {"ex_l3_time"                , 0x06, 0x10, 0x10, "ex_l3_time_ring"           , NON_VPD_RING, 0,  0x0200000000000100},
-    {"ex_l2_mode"                , 0x07, 0x10, 0x10, "ex_l2_mode_ring"           , NON_VPD_RING, 0,  0x0080000000004000},
-    {"ex_l2_fure"                , 0x08, 0x10, 0x10, "ex_l2_fure_ring"           , NON_VPD_RING, 0,  0x0080000000009000},
-    {"ex_l2_gptr"                , 0x09, 0x10, 0x10, "ex_l2_gptr_ring"           , NON_VPD_RING, 0,  0x0080000000002000},
-    {"ex_l2_time"                , 0x0a, 0x10, 0x10, "ex_l2_time_ring"           , NON_VPD_RING, 0,  0x0080000000000100},
-    {"ex_l3_refr_fure"           , 0x0b, 0x10, 0x10, "ex_l3_refr_fure_ring"      , NON_VPD_RING, 0,  0x0008000000009000},
-    {"ex_l3_refr_gptr"           , 0x0c, 0x10, 0x10, "ex_l3_refr_gptr_ring"      , NON_VPD_RING, 0,  0x0008000000002000},
-    {"eq_ana_func"               , 0x0d, 0x10, 0x10, "eq_ana_func_ring"          , NON_VPD_RING, 0,  0x0020000000008000},
-    {"eq_ana_gptr"               , 0x0e, 0x10, 0x10, "eq_ana_gptr_ring"          , NON_VPD_RING, 0,  0x0020000000002000},
-    {"eq_dpll_func"              , 0x0f, 0x10, 0x10, "eq_dpll_func_ring"         , NON_VPD_RING, 0,  0x0002000000008000},
-    {"eq_dpll_gptr"              , 0x10, 0x10, 0x10, "eq_dpll_gptr_ring"         , NON_VPD_RING, 0,  0x0002000000002000},
-    {"eq_dpll_mode"              , 0x11, 0x10, 0x10, "eq_dpll_mode_ring"         , NON_VPD_RING, 0,  0x0002000000004000},
-    {"eq_ana_bndy_bucket_0"      , 0x12, 0x10, 0x10, "eq_ana_bndy_bucket_0_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_1"      , 0x13, 0x10, 0x10, "eq_ana_bndy_bucket_1_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_2"      , 0x14, 0x10, 0x10, "eq_ana_bndy_bucket_2_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_3"      , 0x15, 0x10, 0x10, "eq_ana_bndy_bucket_3_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_4"      , 0x16, 0x10, 0x10, "eq_ana_bndy_bucket_4_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_5"      , 0x17, 0x10, 0x10, "eq_ana_bndy_bucket_5_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_6"      , 0x18, 0x10, 0x10, "eq_ana_bndy_bucket_6_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_7"      , 0x19, 0x10, 0x10, "eq_ana_bndy_bucket_7_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_8"      , 0x1a, 0x10, 0x10, "eq_ana_bndy_bucket_8_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_9"      , 0x1b, 0x10, 0x10, "eq_ana_bndy_bucket_9_ring"     , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_10"     , 0x1c, 0x10, 0x10, "eq_ana_bndy_bucket_10_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_11"     , 0x1d, 0x10, 0x10, "eq_ana_bndy_bucket_11_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_12"     , 0x1e, 0x10, 0x10, "eq_ana_bndy_bucket_12_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_13"     , 0x1f, 0x10, 0x10, "eq_ana_bndy_bucket_13_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_14"     , 0x20, 0x10, 0x10, "eq_ana_bndy_bucket_14_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_15"     , 0x21, 0x10, 0x10, "eq_ana_bndy_bucket_15_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_16"     , 0x22, 0x10, 0x10, "eq_ana_bndy_bucket_16_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_17"     , 0x23, 0x10, 0x10, "eq_ana_bndy_bucket_17_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_18"     , 0x24, 0x10, 0x10, "eq_ana_bndy_bucket_18_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_19"     , 0x25, 0x10, 0x10, "eq_ana_bndy_bucket_19_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_20"     , 0x26, 0x10, 0x10, "eq_ana_bndy_bucket_20_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_21"     , 0x27, 0x10, 0x10, "eq_ana_bndy_bucket_21_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_22"     , 0x28, 0x10, 0x10, "eq_ana_bndy_bucket_22_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_23"     , 0x29, 0x10, 0x10, "eq_ana_bndy_bucket_23_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_24"     , 0x2a, 0x10, 0x10, "eq_ana_bndy_bucket_24_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_bucket_25"     , 0x2b, 0x10, 0x10, "eq_ana_bndy_bucket_25_ring"    , NON_VPD_RING, 0,  0x0020000000000080},
-    {"eq_ana_bndy_l3dcc_bucket_26", 0x2c, 0x10, 0x10, "eq_ana_bndy_l3dcc_bucket_26_ring", NON_VPD_RING, 0, 0x0020000000000080},
-    {"eq_ana_mode"               , 0x2d, 0x10, 0x10, "eq_ana_mode_ring"              , NON_VPD_RING, 0,  0x0020000000004000},
+    {"eq_fure"                    , 0x00, 0x10, 0x10, NON_VPD_RING, 0, 0x0C10000000009000},
+    {"eq_gptr"                    , 0x01, 0x10, 0x10, NON_VPD_RING, 0, 0x0C10000000002000},
+    {"eq_time"                    , 0x02, 0x10, 0x10, NON_VPD_RING, 0, 0x0C10000000000100},
+    {"eq_mode"                    , 0x03, 0x10, 0x10, NON_VPD_RING, 0, 0x0C10000000004000},
+    {"ex_l3_fure"                 , 0x04, 0x10, 0x10, NON_VPD_RING, 0, 0x0200000000009000},
+    {"ex_l3_gptr"                 , 0x05, 0x10, 0x10, NON_VPD_RING, 0, 0x0200000000002000},
+    {"ex_l3_time"                 , 0x06, 0x10, 0x10, NON_VPD_RING, 0, 0x0200000000000100},
+    {"ex_l2_mode"                 , 0x07, 0x10, 0x10, NON_VPD_RING, 0, 0x0080000000004000},
+    {"ex_l2_fure"                 , 0x08, 0x10, 0x10, NON_VPD_RING, 0, 0x0080000000009000},
+    {"ex_l2_gptr"                 , 0x09, 0x10, 0x10, NON_VPD_RING, 0, 0x0080000000002000},
+    {"ex_l2_time"                 , 0x0a, 0x10, 0x10, NON_VPD_RING, 0, 0x0080000000000100},
+    {"ex_l3_refr_fure"            , 0x0b, 0x10, 0x10, NON_VPD_RING, 0, 0x0008000000009000},
+    {"ex_l3_refr_gptr"            , 0x0c, 0x10, 0x10, NON_VPD_RING, 0, 0x0008000000002000},
+    {"eq_ana_func"                , 0x0d, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000008000},
+    {"eq_ana_gptr"                , 0x0e, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000002000},
+    {"eq_dpll_func"               , 0x0f, 0x10, 0x10, NON_VPD_RING, 0, 0x0002000000008000},
+    {"eq_dpll_gptr"               , 0x10, 0x10, 0x10, NON_VPD_RING, 0, 0x0002000000002000},
+    {"eq_dpll_mode"               , 0x11, 0x10, 0x10, NON_VPD_RING, 0, 0x0002000000004000},
+    {"eq_ana_bndy_bucket_0"       , 0x12, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_1"       , 0x13, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_2"       , 0x14, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_3"       , 0x15, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_4"       , 0x16, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_5"       , 0x17, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_6"       , 0x18, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_7"       , 0x19, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_8"       , 0x1a, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_9"       , 0x1b, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_10"      , 0x1c, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_11"      , 0x1d, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_12"      , 0x1e, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_13"      , 0x1f, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_14"      , 0x20, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_15"      , 0x21, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_16"      , 0x22, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_17"      , 0x23, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_18"      , 0x24, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_19"      , 0x25, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_20"      , 0x26, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_21"      , 0x27, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_22"      , 0x28, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_23"      , 0x29, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_24"      , 0x2a, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_bucket_25"      , 0x2b, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_bndy_l3dcc_bucket_26", 0x2c, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000000080},
+    {"eq_ana_mode"                , 0x2d, 0x10, 0x10, NON_VPD_RING, 0, 0x0020000000004000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"eq_repr"          , 0x2e, 0x10, 0x1b, "eq_repr_ring"              , NON_VPD_RING, 0,  0x0C10000000000200},
-    {"ex_l3_repr"       , 0x2f, 0x10, 0x1b, "ex_l3_repr_ring"           , NON_VPD_RING, 0,  0x0200000000000200},
-    {"ex_l2_repr"       , 0x30, 0x10, 0x1b, "ex_l2_repr_ring"           , NON_VPD_RING, 0,  0x0080000000000200},
-    {"ex_l3_refr_repr"  , 0x31, 0x10, 0x1b, "ex_l3_refr_repr_ring"      , NON_VPD_RING, 0,  0x0008000000000200},
-    {"ex_l3_refr_time"  , 0x32, 0x10, 0x1b, "ex_l3_refr_time_ring"      , NON_VPD_RING, 0,  0x0008000000000100},
+    {"eq_repr"          , 0x2e, 0x10, 0x1b, NON_VPD_RING, 0, 0x0C10000000000200},
+    {"ex_l3_repr"       , 0x2f, 0x10, 0x1b, NON_VPD_RING, 0, 0x0200000000000200},
+    {"ex_l2_repr"       , 0x30, 0x10, 0x1b, NON_VPD_RING, 0, 0x0080000000000200},
+    {"ex_l3_refr_repr"  , 0x31, 0x10, 0x1b, NON_VPD_RING, 0, 0x0008000000000200},
+    {"ex_l3_refr_time"  , 0x32, 0x10, 0x1b, NON_VPD_RING, 0, 0x0008000000000100},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, CC, RL};
 };
@@ -418,15 +418,14 @@ namespace EC
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    /*   ringName   rinngId chipIdMin chipIdMax  ringNameImg        mvpdKeyword               */
-    { "ec_func"         , 0x00, 0x20, 0x20, "ec_func_ring",              NON_VPD_RING, 0,  0x0E00000000009000},
-    { "ec_gptr"         , 0x01, 0x20, 0x20, "ec_gptr_ring",              NON_VPD_RING, 0,  0x0E00000000002000},
-    { "ec_time"         , 0x02, 0x20, 0x20, "ec_time_ring",              NON_VPD_RING, 0,  0x0E00000000000100},
-    { "ec_mode"         , 0x03, 0x20, 0x20, "ec_mode_ring",              NON_VPD_RING, 0,  0x0E00000000004000},
+    { "ec_func"         , 0x00, 0x20, 0x20, NON_VPD_RING, 0, 0x0E00000000009000},
+    { "ec_gptr"         , 0x01, 0x20, 0x20, NON_VPD_RING, 0, 0x0E00000000002000},
+    { "ec_time"         , 0x02, 0x20, 0x20, NON_VPD_RING, 0, 0x0E00000000000100},
+    { "ec_mode"         , 0x03, 0x20, 0x20, NON_VPD_RING, 0, 0x0E00000000004000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    { "ec_repr"         , 0x04, 0x20, 0x37, "ec_repr_ring",              NON_VPD_RING, 0,  0x0E00000000000200},
+    { "ec_repr"         , 0x04, 0x20, 0x37, NON_VPD_RING, 0, 0x0E00000000000200},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, CC, RL};
 };
diff --git a/import/chips/p9/utils/imageProcs/p9_ringId.H b/import/chips/p9/utils/imageProcs/p9_ringId.H
index 00e47e68..a4c68a53 100644
--- a/import/chips/p9/utils/imageProcs/p9_ringId.H
+++ b/import/chips/p9/utils/imageProcs/p9_ringId.H
@@ -36,7 +36,6 @@ typedef struct
     uint8_t      ringId;
     uint8_t      instanceIdMin;    // the min instanceId
     uint8_t      instanceIdMax;    // the max instanceId
-    const char*  ringNameImg; // Ring name in image: ringName + "_ring"
     uint8_t      vpdKeyword;
     uint8_t      pllCopy;     // 0,1,2,3,4,5 -- No of PLL copies required
     uint64_t     scanRegionType;
diff --git a/import/chips/p9/utils/imageProcs/p9_tor.C b/import/chips/p9/utils/imageProcs/p9_tor.C
index 918d12e7..b3f627f2 100644
--- a/import/chips/p9/utils/imageProcs/p9_tor.C
+++ b/import/chips/p9/utils/imageProcs/p9_tor.C
@@ -270,7 +270,7 @@ int get_ring_from_sbe_image ( void*           i_ringSection, // Image pointer
                 if(i_dbgl > 2)
                 {
                     MY_INF(" Ring name %s Cplt Common ring id %d Variant id %d",
-                           (ring_id_list_common + i)->ringNameImg, i, j);
+                           (ring_id_list_common + i)->ringName, i, j);
                 }
 
                 if((strcmp( (ring_id_list_common + i)->ringName,
@@ -404,7 +404,7 @@ int get_ring_from_sbe_image ( void*           i_ringSection, // Image pointer
                     if(i_dbgl > 2)
                     {
                         MY_INF(" Ring name %s Cplt instance ring id %d Variant id %d Instance id %d\n",
-                               (ring_id_list_instance + j)->ringNameImg, j, k, i);
+                               (ring_id_list_instance + j)->ringName, j, k, i);
                     }
 
                     if  (strcmp( (ring_id_list_instance + j)->ringName,
@@ -595,7 +595,7 @@ int get_ring_from_sgpe_image ( void*           i_ringSection,  // Image pointer
             if(i_dbgl > 2)
             {
                 MY_INF(" Ring name %s Cplt Common ring id %d Variant id %d",
-                       (ring_id_list_common + i)->ringNameImg, i, j);
+                       (ring_id_list_common + i)->ringName, i, j);
             }
 
             if((strcmp( (ring_id_list_common + i)->ringName,
@@ -729,7 +729,7 @@ int get_ring_from_sgpe_image ( void*           i_ringSection,  // Image pointer
                 if(i_dbgl > 2)
                 {
                     MY_INF(" Ring name %s Cplt instance ring id %d Variant id %d",
-                           (ring_id_list_instance + j)->ringNameImg, j, k);
+                           (ring_id_list_instance + j)->ringName, j, k);
                 }
 
                 if  (strcmp( (ring_id_list_instance + j)->ringName,
@@ -920,7 +920,7 @@ int get_ring_from_cme_image ( void*
             if(i_dbgl > 2)
             {
                 MY_INF(" Ring name %s Cplt Common ring id %d Variant id %d",
-                       (ring_id_list_common + i)->ringNameImg, i, j);
+                       (ring_id_list_common + i)->ringName, i, j);
             }
 
             if((strcmp( (ring_id_list_common + i)->ringName,
@@ -1056,7 +1056,7 @@ int get_ring_from_cme_image ( void*
                     if(i_dbgl > 2)
                     {
                         MY_INF(" Ring name %s Cplt instance ring id %d Variant id %d",
-                               (ring_id_list_instance + j)->ringNameImg, j, k);
+                               (ring_id_list_instance + j)->ringName, j, k);
                     }
 
                     if  (strcmp( (ring_id_list_instance + j)->ringName,