ana_bndy RS4v2 algorithm support in ring_apply to accommodate proper

 FSM control (i.e., set and reset latches) during scanning.

Change-Id: Ic0f323ae08d0d9c31d5cee37a61fb476eaf3f2d9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35178
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: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35186
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

3 files changed, 223 insertions, 218 deletions

diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
index 6e96281b..5bcbe432 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C
+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
@@ -23,33 +23,33 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
+#include <string.h>
 #include "p9_ringId.H"
-#include "p9_ring_identification.H"
 
 namespace PERV
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"perv_fure"             , 0x00, 0x01, 0x01, NON_VPD_RING    , 0, 0x0103400F},
-    {"perv_gptr"             , 0x01, 0x01, 0x01, NON_VPD_RING    , 0, 0x01034002},
-    {"perv_time"             , 0x02, 0x01, 0x01, NON_VPD_RING    , 0, 0x01034007},
-    {"occ_fure"              , 0x03, 0x01, 0x01, NON_VPD_RING    , 0, 0x0103080F},
-    {"occ_gptr"              , 0x04, 0x01, 0x01, NON_VPD_RING    , 0, 0x01030802},
-    {"occ_time"              , 0x05, 0x01, 0x01, NON_VPD_RING    , 0, 0x01030807},
-    {"perv_ana_func"         , 0x06, 0x01, 0x01, NON_VPD_RING    , 0, 0x01030400},
-    {"perv_ana_gptr"         , 0x07, 0x01, 0x01, NON_VPD_RING    , 0, 0x01030402},
-    {"perv_pll_gptr"         , 0x08, 0x01, 0x01, NON_VPD_RING    , 0, 0x01030012},
-    {"perv_pll_bndy_bucket_1", 0x09, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x01030018},
-    {"perv_pll_bndy_bucket_2", 0x0a, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x01030018},
-    {"perv_pll_bndy_bucket_3", 0x0b, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x01030018},
-    {"perv_pll_bndy_bucket_4", 0x0c, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x01030018},
-    {"perv_pll_bndy_bucket_5", 0x0d, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x01030018},
-    {"perv_pll_func"         , 0x0e, 0x01, 0x01, NON_VPD_RING    , 0, 0x01030010},
+    {"perv_fure"             , 0x00, 0x01, 0x01, EKB_RING    , 0x0103400F},
+    {"perv_gptr"             , 0x01, 0x01, 0x01, EKB_RING    , 0x01034002},
+    {"perv_time"             , 0x02, 0x01, 0x01, VPD_RING    , 0x01034007},
+    {"occ_fure"              , 0x03, 0x01, 0x01, EKB_RING    , 0x0103080F},
+    {"occ_gptr"              , 0x04, 0x01, 0x01, EKB_RING    , 0x01030802},
+    {"occ_time"              , 0x05, 0x01, 0x01, VPD_RING    , 0x01030807},
+    {"perv_ana_func"         , 0x06, 0x01, 0x01, EKB_RING    , 0x01030400},
+    {"perv_ana_gptr"         , 0x07, 0x01, 0x01, EKB_RING    , 0x01030402},
+    {"perv_pll_gptr"         , 0x08, 0x01, 0x01, EKB_RING    , 0x01030012},
+    {"perv_pll_bndy_bucket_1", 0x09, 0x01, 0x01, EKB_RING    , 0x01030018},
+    {"perv_pll_bndy_bucket_2", 0x0a, 0x01, 0x01, EKB_RING    , 0x01030018},
+    {"perv_pll_bndy_bucket_3", 0x0b, 0x01, 0x01, EKB_RING    , 0x01030018},
+    {"perv_pll_bndy_bucket_4", 0x0c, 0x01, 0x01, EKB_RING    , 0x01030018},
+    {"perv_pll_bndy_bucket_5", 0x0d, 0x01, 0x01, EKB_RING    , 0x01030018},
+    {"perv_pll_func"         , 0x0e, 0x01, 0x01, EKB_RING    , 0x01030010},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"perv_repr"           , 0x0f, 0x01, 0x01, NON_VPD_RING    , 0, 0x01034006},
-    {"occ_repr"            , 0x10, 0x01, 0x01, NON_VPD_RING    , 0, 0x01030806},
+    {"perv_repr"             , 0x0f, 0x01, 0x01, VPD_RING    , 0x01034006},
+    {"occ_repr"              , 0x10, 0x01, 0x01, VPD_RING    , 0x01030806},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -59,21 +59,21 @@ namespace N0
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"n0_fure"             , 0x00, 0x02, 0x02, NON_VPD_RING    , 0, 0x02034E0F},
-    {"n0_gptr"             , 0x01, 0x02, 0x02, NON_VPD_RING    , 0, 0x02034E02},
-    {"n0_time"             , 0x02, 0x02, 0x02, NON_VPD_RING    , 0, 0x02034E07},
-    {"n0_nx_fure"          , 0x03, 0x02, 0x02, NON_VPD_RING    , 0, 0x0203200F},
-    {"n0_nx_gptr"          , 0x04, 0x02, 0x02, NON_VPD_RING    , 0, 0x02032002},
-    {"n0_nx_time"          , 0x05, 0x02, 0x02, NON_VPD_RING    , 0, 0x02032007},
-    {"n0_cxa0_fure"        , 0x06, 0x02, 0x02, NON_VPD_RING    , 0, 0x0203100F},
-    {"n0_cxa0_gptr"        , 0x07, 0x02, 0x02, NON_VPD_RING    , 0, 0x02031002},
-    {"n0_cxa0_time"        , 0x08, 0x02, 0x02, NON_VPD_RING    , 0, 0x02031007},
+    {"n0_fure"             , 0x00, 0x02, 0x02, EKB_RING    , 0x02034E0F},
+    {"n0_gptr"             , 0x01, 0x02, 0x02, EKB_RING    , 0x02034E02},
+    {"n0_time"             , 0x02, 0x02, 0x02, VPD_RING    , 0x02034E07},
+    {"n0_nx_fure"          , 0x03, 0x02, 0x02, EKB_RING    , 0x0203200F},
+    {"n0_nx_gptr"          , 0x04, 0x02, 0x02, EKB_RING    , 0x02032002},
+    {"n0_nx_time"          , 0x05, 0x02, 0x02, VPD_RING    , 0x02032007},
+    {"n0_cxa0_fure"        , 0x06, 0x02, 0x02, EKB_RING    , 0x0203100F},
+    {"n0_cxa0_gptr"        , 0x07, 0x02, 0x02, EKB_RING    , 0x02031002},
+    {"n0_cxa0_time"        , 0x08, 0x02, 0x02, VPD_RING    , 0x02031007},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"n0_repr"             , 0x09, 0x02, 0x02, NON_VPD_RING    , 0, 0x02034E06},
-    {"n0_nx_repr"          , 0x0a, 0x02, 0x02, NON_VPD_RING    , 0, 0x02032006},
-    {"n0_cxa0_repr"        , 0x0b, 0x02, 0x02, NON_VPD_RING    , 0, 0x02031006},
+    {"n0_repr"             , 0x09, 0x02, 0x02, VPD_RING    , 0x02034E06},
+    {"n0_nx_repr"          , 0x0a, 0x02, 0x02, VPD_RING    , 0x02032006},
+    {"n0_cxa0_repr"        , 0x0b, 0x02, 0x02, VPD_RING    , 0x02031006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -83,25 +83,25 @@ namespace N1
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"n1_fure"             , 0x00, 0x03, 0x03, NON_VPD_RING    , 0, 0x0303700F},
-    {"n1_gptr"             , 0x01, 0x03, 0x03, NON_VPD_RING    , 0, 0x03037002},
-    {"n1_time"             , 0x02, 0x03, 0x03, NON_VPD_RING    , 0, 0x03037007},
-    {"n1_ioo0_fure"        , 0x03, 0x03, 0x03, NON_VPD_RING    , 0, 0x0303080F},
-    {"n1_ioo0_gptr"        , 0x04, 0x03, 0x03, NON_VPD_RING    , 0, 0x03030802},
-    {"n1_ioo0_time"        , 0x05, 0x03, 0x03, NON_VPD_RING    , 0, 0x03030807},
-    {"n1_ioo1_fure"        , 0x06, 0x03, 0x03, NON_VPD_RING    , 0, 0x0303040F},
-    {"n1_ioo1_gptr"        , 0x07, 0x03, 0x03, NON_VPD_RING    , 0, 0x03030402},
-    {"n1_ioo1_time"        , 0x08, 0x03, 0x03, NON_VPD_RING    , 0, 0x03030407},
-    {"n1_mcs23_fure"       , 0x09, 0x03, 0x03, NON_VPD_RING    , 0, 0x0303020F},
-    {"n1_mcs23_gptr"       , 0x0a, 0x03, 0x03, NON_VPD_RING    , 0, 0x03030202},
-    {"n1_mcs23_time"       , 0x0b, 0x03, 0x03, NON_VPD_RING    , 0, 0x03030207},
+    {"n1_fure"             , 0x00, 0x03, 0x03, EKB_RING    , 0x0303700F},
+    {"n1_gptr"             , 0x01, 0x03, 0x03, EKB_RING    , 0x03037002},
+    {"n1_time"             , 0x02, 0x03, 0x03, VPD_RING    , 0x03037007},
+    {"n1_ioo0_fure"        , 0x03, 0x03, 0x03, EKB_RING    , 0x0303080F},
+    {"n1_ioo0_gptr"        , 0x04, 0x03, 0x03, EKB_RING    , 0x03030802},
+    {"n1_ioo0_time"        , 0x05, 0x03, 0x03, VPD_RING    , 0x03030807},
+    {"n1_ioo1_fure"        , 0x06, 0x03, 0x03, EKB_RING    , 0x0303040F},
+    {"n1_ioo1_gptr"        , 0x07, 0x03, 0x03, EKB_RING    , 0x03030402},
+    {"n1_ioo1_time"        , 0x08, 0x03, 0x03, VPD_RING    , 0x03030407},
+    {"n1_mcs23_fure"       , 0x09, 0x03, 0x03, EKB_RING    , 0x0303020F},
+    {"n1_mcs23_gptr"       , 0x0a, 0x03, 0x03, EKB_RING    , 0x03030202},
+    {"n1_mcs23_time"       , 0x0b, 0x03, 0x03, VPD_RING    , 0x03030207},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"n1_repr"             , 0x0c, 0x03, 0x03, NON_VPD_RING    , 0, 0x03037006},
-    {"n1_ioo0_repr"        , 0x0d, 0x03, 0x03, NON_VPD_RING    , 0, 0x03030806},
-    {"n1_ioo1_repr"        , 0x0e, 0x03, 0x03, NON_VPD_RING    , 0, 0x03030406},
-    {"n1_mcs23_repr"       , 0x0f, 0x03, 0x03, NON_VPD_RING    , 0, 0x03030206},
+    {"n1_repr"             , 0x0c, 0x03, 0x03, VPD_RING    , 0x03037006},
+    {"n1_ioo0_repr"        , 0x0d, 0x03, 0x03, VPD_RING    , 0x03030806},
+    {"n1_ioo1_repr"        , 0x0e, 0x03, 0x03, VPD_RING    , 0x03030406},
+    {"n1_mcs23_repr"       , 0x0f, 0x03, 0x03, VPD_RING    , 0x03030206},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
@@ -111,21 +111,21 @@ namespace N2
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"n2_fure"             , 0x00, 0x04, 0x04, NON_VPD_RING    , 0, 0x04035C0F},
-    {"n2_gptr"             , 0x01, 0x04, 0x04, NON_VPD_RING    , 0, 0x04035C02},
-    {"n2_time"             , 0x02, 0x04, 0x04, NON_VPD_RING    , 0, 0x04035C07},
-    {"n2_cxa1_fure"        , 0x03, 0x04, 0x04, NON_VPD_RING    , 0, 0x0403200F},
-    {"n2_cxa1_gptr"        , 0x04, 0x04, 0x04, NON_VPD_RING    , 0, 0x04032002},
-    {"n2_cxa1_time"        , 0x05, 0x04, 0x04, NON_VPD_RING    , 0, 0x04032007},
-    {"n2_psi_fure"         , 0x06, 0x04, 0x04, NON_VPD_RING    , 0, 0x0403020F},
-    {"n2_psi_gptr"         , 0x07, 0x04, 0x04, NON_VPD_RING    , 0, 0x04030202},
-    {"n2_psi_time"         , 0x08, 0x04, 0x04, NON_VPD_RING    , 0, 0x04030207},
+    {"n2_fure"             , 0x00, 0x04, 0x04, EKB_RING    , 0x04035C0F},
+    {"n2_gptr"             , 0x01, 0x04, 0x04, EKB_RING    , 0x04035C02},
+    {"n2_time"             , 0x02, 0x04, 0x04, VPD_RING    , 0x04035C07},
+    {"n2_cxa1_fure"        , 0x03, 0x04, 0x04, EKB_RING    , 0x0403200F},
+    {"n2_cxa1_gptr"        , 0x04, 0x04, 0x04, EKB_RING    , 0x04032002},
+    {"n2_cxa1_time"        , 0x05, 0x04, 0x04, VPD_RING    , 0x04032007},
+    {"n2_psi_fure"         , 0x06, 0x04, 0x04, EKB_RING    , 0x0403020F},
+    {"n2_psi_gptr"         , 0x07, 0x04, 0x04, EKB_RING    , 0x04030202},
+    {"n2_psi_time"         , 0x08, 0x04, 0x04, VPD_RING    , 0x04030207},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"n2_repr"             , 0x09, 0x04, 0x04, NON_VPD_RING    , 0, 0x04035C06},
-    {"n2_cxa1_repr"        , 0x0a, 0x04, 0x04, NON_VPD_RING    , 0, 0x04032006},
-    {"n2_psi_repr"         , 0x0b, 0x04, 0x04, NON_VPD_RING    , 0, 0x04030206},
+    {"n2_repr"             , 0x09, 0x04, 0x04, VPD_RING    , 0x04035C06},
+    {"n2_cxa1_repr"        , 0x0a, 0x04, 0x04, VPD_RING    , 0x04032006},
+    {"n2_psi_repr"         , 0x0b, 0x04, 0x04, VPD_RING    , 0x04030206},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -135,21 +135,21 @@ namespace N3
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"n3_fure"             , 0x00, 0x05, 0x05, NON_VPD_RING    , 0, 0x0503660F},
-    {"n3_gptr"             , 0x01, 0x05, 0x05, NON_VPD_RING    , 0, 0x05037602},
-    {"n3_time"             , 0x02, 0x05, 0x05, NON_VPD_RING    , 0, 0x05037607},
-    {"n3_mcs01_fure"       , 0x03, 0x05, 0x05, NON_VPD_RING    , 0, 0x0503010F},
-    {"n3_mcs01_gptr"       , 0x04, 0x05, 0x05, NON_VPD_RING    , 0, 0x05030102},
-    {"n3_mcs01_time"       , 0x05, 0x05, 0x05, NON_VPD_RING    , 0, 0x05030107},
-    {"n3_np_fure"          , 0x06, 0x05, 0x05, NON_VPD_RING    , 0, 0x0503080F},
-    {"n3_np_gptr"          , 0x07, 0x05, 0x05, NON_VPD_RING    , 0, 0x05030802},
-    {"n3_np_time"          , 0x08, 0x05, 0x05, NON_VPD_RING    , 0, 0x05030807},
+    {"n3_fure"             , 0x00, 0x05, 0x05, EKB_RING    , 0x0503660F},
+    {"n3_gptr"             , 0x01, 0x05, 0x05, EKB_RING    , 0x05037602},
+    {"n3_time"             , 0x02, 0x05, 0x05, VPD_RING    , 0x05037607},
+    {"n3_mcs01_fure"       , 0x03, 0x05, 0x05, EKB_RING    , 0x0503010F},
+    {"n3_mcs01_gptr"       , 0x04, 0x05, 0x05, EKB_RING    , 0x05030102},
+    {"n3_mcs01_time"       , 0x05, 0x05, 0x05, VPD_RING    , 0x05030107},
+    {"n3_np_fure"          , 0x06, 0x05, 0x05, EKB_RING    , 0x0503080F},
+    {"n3_np_gptr"          , 0x07, 0x05, 0x05, EKB_RING    , 0x05030802},
+    {"n3_np_time"          , 0x08, 0x05, 0x05, VPD_RING    , 0x05030807},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"n3_repr"             , 0x09, 0x05, 0x05, NON_VPD_RING    , 0, 0x05037606},
-    {"n3_mcs01_repr"       , 0x0a, 0x05, 0x05, NON_VPD_RING    , 0, 0x05030106},
-    {"n3_np_repr"          , 0x0b, 0x05, 0x05, NON_VPD_RING    , 0, 0x05030806},
+    {"n3_repr"             , 0x09, 0x05, 0x05, VPD_RING    , 0x05037606},
+    {"n3_mcs01_repr"       , 0x0a, 0x05, 0x05, VPD_RING    , 0x05030106},
+    {"n3_np_repr"          , 0x0b, 0x05, 0x05, VPD_RING    , 0x05030806},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -159,28 +159,28 @@ namespace XB
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"xb_fure"             , 0x00, 0x06, 0x06, NON_VPD_RING    , 0, 0x0603440F},
-    {"xb_gptr"             , 0x01, 0x06, 0x06, NON_VPD_RING    , 0, 0x06034402},
-    {"xb_time"             , 0x02, 0x06, 0x06, NON_VPD_RING    , 0, 0x06034407},
-    {"xb_io0_fure"         , 0x03, 0x06, 0x06, NON_VPD_RING    , 0, 0x0603220F},
-    {"xb_io0_gptr"         , 0x04, 0x06, 0x06, NON_VPD_RING    , 0, 0x06032202},
-    {"xb_io0_time"         , 0x05, 0x06, 0x06, NON_VPD_RING    , 0, 0x06032207},
-    {"xb_io1_fure"         , 0x06, 0x06, 0x06, NON_VPD_RING    , 0, 0x0603110F},
-    {"xb_io1_gptr"         , 0x07, 0x06, 0x06, NON_VPD_RING    , 0, 0x06031102},
-    {"xb_io1_time"         , 0x08, 0x06, 0x06, NON_VPD_RING    , 0, 0x06031107},
-    {"xb_io2_fure"         , 0x09, 0x06, 0x06, NON_VPD_RING    , 0, 0x0603088F},
-    {"xb_io2_gptr"         , 0x0a, 0x06, 0x06, NON_VPD_RING    , 0, 0x06030882},
-    {"xb_io2_time"         , 0x0b, 0x06, 0x06, NON_VPD_RING    , 0, 0x06030887},
-    {"xb_pll_gptr"         , 0x0c, 0x06, 0x06, NON_VPD_RING    , 0, 0x06030012},
-    {"xb_pll_bndy"         , 0x0d, 0x06, 0x06, NON_VPD_RING    , 0, 0x06030018},
-    {"xb_pll_func"         , 0x0e, 0x06, 0x06, NON_VPD_RING    , 0, 0x06030010},
+    {"xb_fure"             , 0x00, 0x06, 0x06, EKB_RING    , 0x0603440F},
+    {"xb_gptr"             , 0x01, 0x06, 0x06, EKB_RING    , 0x06034402},
+    {"xb_time"             , 0x02, 0x06, 0x06, VPD_RING    , 0x06034407},
+    {"xb_io0_fure"         , 0x03, 0x06, 0x06, EKB_RING    , 0x0603220F},
+    {"xb_io0_gptr"         , 0x04, 0x06, 0x06, EKB_RING    , 0x06032202},
+    {"xb_io0_time"         , 0x05, 0x06, 0x06, VPD_RING    , 0x06032207},
+    {"xb_io1_fure"         , 0x06, 0x06, 0x06, EKB_RING    , 0x0603110F},
+    {"xb_io1_gptr"         , 0x07, 0x06, 0x06, EKB_RING    , 0x06031102},
+    {"xb_io1_time"         , 0x08, 0x06, 0x06, VPD_RING    , 0x06031107},
+    {"xb_io2_fure"         , 0x09, 0x06, 0x06, EKB_RING    , 0x0603088F},
+    {"xb_io2_gptr"         , 0x0a, 0x06, 0x06, EKB_RING    , 0x06030882},
+    {"xb_io2_time"         , 0x0b, 0x06, 0x06, VPD_RING    , 0x06030887},
+    {"xb_pll_gptr"         , 0x0c, 0x06, 0x06, EKB_RING    , 0x06030012},
+    {"xb_pll_bndy"         , 0x0d, 0x06, 0x06, EKB_RING    , 0x06030018},
+    {"xb_pll_func"         , 0x0e, 0x06, 0x06, EKB_RING    , 0x06030010},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"xb_repr"             , 0x13, 0x06, 0x06, NON_VPD_RING    , 0, 0x06034406},
-    {"xb_io0_repr"         , 0x14, 0x06, 0x06, NON_VPD_RING    , 0, 0x06032206},
-    {"xb_io1_repr"         , 0x15, 0x06, 0x06, NON_VPD_RING    , 0, 0x06031106},
-    {"xb_io2_repr"         , 0x16, 0x06, 0x06, NON_VPD_RING    , 0, 0x06030886},
+    {"xb_repr"             , 0x13, 0x06, 0x06, VPD_RING    , 0x06034406},
+    {"xb_io0_repr"         , 0x14, 0x06, 0x06, VPD_RING    , 0x06032206},
+    {"xb_io1_repr"         , 0x15, 0x06, 0x06, VPD_RING    , 0x06031106},
+    {"xb_io2_repr"         , 0x16, 0x06, 0x06, VPD_RING    , 0x06030886},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -190,28 +190,28 @@ namespace MC
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"mc_fure"             , 0x00, 0x07, 0x07, NON_VPD_RING,     0, 0x0703600F},
-    {"mc_gptr"             , 0x01, 0x07, 0x07, NON_VPD_RING,     0, 0x07036002},
-    {"mc_time"             , 0x02, 0x07, 0x07, NON_VPD_RING,     0, 0x07036007},
-    {"mc_iom01_fure"       , 0x03, 0x07, 0x07, NON_VPD_RING,     0, 0x0703100F},
-    {"mc_iom01_gptr"       , 0x04, 0x07, 0x07, NON_VPD_RING,     0, 0x07031002},
-    {"mc_iom01_time"       , 0x05, 0x07, 0x07, NON_VPD_RING,     0, 0x07031007},
-    {"mc_iom23_fure"       , 0x06, 0x07, 0x07, NON_VPD_RING,     0, 0x0703080F},
-    {"mc_iom23_gptr"       , 0x07, 0x07, 0x07, NON_VPD_RING,     0, 0x07030802},
-    {"mc_iom23_time"       , 0x08, 0x07, 0x07, NON_VPD_RING,     0, 0x07030807},
-    {"mc_pll_gptr"         , 0x09, 0x07, 0x07, NON_VPD_RING,     0, 0x07030012},
-    {"mc_pll_bndy_bucket_1", 0x0a, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x07030018},
-    {"mc_pll_bndy_bucket_2", 0x0b, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x07030018},
-    {"mc_pll_bndy_bucket_3", 0x0c, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x07030018},
-    {"mc_pll_bndy_bucket_4", 0x0d, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x07030018},
-    {"mc_pll_bndy_bucket_5", 0x0e, 0x07, 0x07, NON_VPD_PLL_RING, 0, 0x07030018},
-    {"mc_pll_func"         , 0x0f, 0x07, 0x07, NON_VPD_RING,     0, 0x07030010},
+    {"mc_fure"             , 0x00, 0x07, 0x07, EKB_RING    , 0x0703600F},
+    {"mc_gptr"             , 0x01, 0x07, 0x07, EKB_RING    , 0x07036002},
+    {"mc_time"             , 0x02, 0x07, 0x07, VPD_RING    , 0x07036007},
+    {"mc_iom01_fure"       , 0x03, 0x07, 0x07, EKB_RING    , 0x0703100F},
+    {"mc_iom01_gptr"       , 0x04, 0x07, 0x07, EKB_RING    , 0x07031002},
+    {"mc_iom01_time"       , 0x05, 0x07, 0x07, VPD_RING    , 0x07031007},
+    {"mc_iom23_fure"       , 0x06, 0x07, 0x07, EKB_RING    , 0x0703080F},
+    {"mc_iom23_gptr"       , 0x07, 0x07, 0x07, EKB_RING    , 0x07030802},
+    {"mc_iom23_time"       , 0x08, 0x07, 0x07, VPD_RING    , 0x07030807},
+    {"mc_pll_gptr"         , 0x09, 0x07, 0x07, EKB_RING    , 0x07030012},
+    {"mc_pll_bndy_bucket_1", 0x0a, 0x07, 0x07, EKB_RING    , 0x07030018},
+    {"mc_pll_bndy_bucket_2", 0x0b, 0x07, 0x07, EKB_RING    , 0x07030018},
+    {"mc_pll_bndy_bucket_3", 0x0c, 0x07, 0x07, EKB_RING    , 0x07030018},
+    {"mc_pll_bndy_bucket_4", 0x0d, 0x07, 0x07, EKB_RING    , 0x07030018},
+    {"mc_pll_bndy_bucket_5", 0x0e, 0x07, 0x07, EKB_RING    , 0x07030018},
+    {"mc_pll_func"         , 0x0f, 0x07, 0x07, EKB_RING    , 0x07030010},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"mc_repr"             , 0x10, 0x07, 0x08, NON_VPD_RING    , 0, 0x07036006},
-    {"mc_iom01_repr"       , 0x11, 0x07, 0x08, NON_VPD_RING    , 0, 0x07031006},
-    {"mc_iom23_repr"       , 0x12, 0x07, 0x08, NON_VPD_RING    , 0, 0x07030806},
+    {"mc_repr"             , 0x10, 0x07, 0x08, VPD_RING    , 0x07036006},
+    {"mc_iom01_repr"       , 0x11, 0x07, 0x08, VPD_RING    , 0x07031006},
+    {"mc_iom23_repr"       , 0x12, 0x07, 0x08, VPD_RING    , 0x07030806},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -221,16 +221,16 @@ namespace OB0
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"ob0_fure"            , 0x00, 0x09, 0x09, NON_VPD_RING    , 0, 0x0903700F},
-    {"ob0_gptr"            , 0x01, 0x09, 0x09, NON_VPD_RING    , 0, 0x09037002},
-    {"ob0_time"            , 0x02, 0x09, 0x09, NON_VPD_RING    , 0, 0x09037007},
-    {"ob0_pll_gptr"        , 0x03, 0x09, 0x09, NON_VPD_RING    , 0, 0x09030012},
-    {"ob0_pll_bndy"        , 0x04, 0x09, 0x09, NON_VPD_RING    , 0, 0x09030018},
-    {"ob0_pll_func"        , 0x05, 0x09, 0x09, NON_VPD_RING    , 0, 0x09030010},
+    {"ob0_fure"            , 0x00, 0x09, 0x09, EKB_RING    , 0x0903700F},
+    {"ob0_gptr"            , 0x01, 0x09, 0x09, EKB_RING    , 0x09037002},
+    {"ob0_time"            , 0x02, 0x09, 0x09, VPD_RING    , 0x09037007},
+    {"ob0_pll_gptr"        , 0x03, 0x09, 0x09, EKB_RING    , 0x09030012},
+    {"ob0_pll_bndy"        , 0x04, 0x09, 0x09, EKB_RING    , 0x09030018},
+    {"ob0_pll_func"        , 0x05, 0x09, 0x09, EKB_RING    , 0x09030010},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob0_repr"            , 0x0a, 0x09, 0x09, NON_VPD_RING    , 0, 0x09037006},
+    {"ob0_repr"            , 0x0a, 0x09, 0x09, VPD_RING    , 0x09037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -240,16 +240,16 @@ namespace OB1
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"ob1_fure"            , 0x00, 0x0a, 0x0a, NON_VPD_RING    , 0, 0x0A03700F},
-    {"ob1_gptr"            , 0x01, 0x0a, 0x0a, NON_VPD_RING    , 0, 0x0A037002},
-    {"ob1_time"            , 0x02, 0x0a, 0x0a, NON_VPD_RING    , 0, 0x0A037007},
-    {"ob1_pll_gptr"        , 0x03, 0x0a, 0x0a, NON_VPD_RING    , 0, 0x0A030012},
-    {"ob1_pll_bndy"        , 0x04, 0x0a, 0x0a, NON_VPD_RING    , 0, 0x0A030018},
-    {"ob1_pll_func"        , 0x05, 0x0a, 0x0a, NON_VPD_RING    , 0, 0x0A030010},
+    {"ob1_fure"            , 0x00, 0x0a, 0x0a, EKB_RING    , 0x0A03700F},
+    {"ob1_gptr"            , 0x01, 0x0a, 0x0a, EKB_RING    , 0x0A037002},
+    {"ob1_time"            , 0x02, 0x0a, 0x0a, VPD_RING    , 0x0A037007},
+    {"ob1_pll_gptr"        , 0x03, 0x0a, 0x0a, EKB_RING    , 0x0A030012},
+    {"ob1_pll_bndy"        , 0x04, 0x0a, 0x0a, EKB_RING    , 0x0A030018},
+    {"ob1_pll_func"        , 0x05, 0x0a, 0x0a, EKB_RING    , 0x0A030010},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob1_repr"            , 0x0a, 0x0a, 0x0a, NON_VPD_RING    , 0, 0x0A037006},
+    {"ob1_repr"            , 0x0a, 0x0a, 0x0a, VPD_RING    , 0x0A037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -259,16 +259,16 @@ namespace OB2
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"ob2_fure"            , 0x00, 0x0b, 0x0b, NON_VPD_RING    , 0, 0x0B03700F},
-    {"ob2_gptr"            , 0x01, 0x0b, 0x0b, NON_VPD_RING    , 0, 0x0B037002},
-    {"ob2_time"            , 0x02, 0x0b, 0x0b, NON_VPD_RING    , 0, 0x0B037007},
-    {"ob2_pll_gptr"        , 0x03, 0x0b, 0x0b, NON_VPD_RING    , 0, 0x0B030012},
-    {"ob2_pll_bndy"        , 0x04, 0x0b, 0x0b, NON_VPD_RING    , 0, 0x0B030018},
-    {"ob2_pll_func"        , 0x05, 0x0b, 0x0b, NON_VPD_RING    , 0, 0x0B030010},
+    {"ob2_fure"            , 0x00, 0x0b, 0x0b, EKB_RING    , 0x0B03700F},
+    {"ob2_gptr"            , 0x01, 0x0b, 0x0b, EKB_RING    , 0x0B037002},
+    {"ob2_time"            , 0x02, 0x0b, 0x0b, VPD_RING    , 0x0B037007},
+    {"ob2_pll_gptr"        , 0x03, 0x0b, 0x0b, EKB_RING    , 0x0B030012},
+    {"ob2_pll_bndy"        , 0x04, 0x0b, 0x0b, EKB_RING    , 0x0B030018},
+    {"ob2_pll_func"        , 0x05, 0x0b, 0x0b, EKB_RING    , 0x0B030010},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob2_repr"            , 0x0a, 0x0b, 0x0b, NON_VPD_RING    , 0, 0x0B037006},
+    {"ob2_repr"            , 0x0a, 0x0b, 0x0b, VPD_RING    , 0x0B037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -278,16 +278,16 @@ namespace OB3
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"ob3_fure"            , 0x00, 0x0c, 0x0c, NON_VPD_RING    , 0, 0x0C03700F},
-    {"ob3_gptr"            , 0x01, 0x0c, 0x0c, NON_VPD_RING    , 0, 0x0C037002},
-    {"ob3_time"            , 0x02, 0x0c, 0x0c, NON_VPD_RING    , 0, 0x0C037007},
-    {"ob3_pll_gptr"        , 0x03, 0x0c, 0x0c, NON_VPD_RING    , 0, 0x0C030012},
-    {"ob3_pll_bndy"        , 0x04, 0x0c, 0x0c, NON_VPD_RING    , 0, 0x0C030018},
-    {"ob3_pll_func"        , 0x05, 0x0c, 0x0c, NON_VPD_RING    , 0, 0x0C030010},
+    {"ob3_fure"            , 0x00, 0x0c, 0x0c, EKB_RING    , 0x0C03700F},
+    {"ob3_gptr"            , 0x01, 0x0c, 0x0c, EKB_RING    , 0x0C037002},
+    {"ob3_time"            , 0x02, 0x0c, 0x0c, VPD_RING    , 0x0C037007},
+    {"ob3_pll_gptr"        , 0x03, 0x0c, 0x0c, EKB_RING    , 0x0C030012},
+    {"ob3_pll_bndy"        , 0x04, 0x0c, 0x0c, EKB_RING    , 0x0C030018},
+    {"ob3_pll_func"        , 0x05, 0x0c, 0x0c, EKB_RING    , 0x0C030010},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob3_repr"            , 0x0a, 0x0c, 0x0c, NON_VPD_RING    , 0, 0x0C037006},
+    {"ob3_repr"            , 0x0a, 0x0c, 0x0c, VPD_RING    , 0x0C037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -297,15 +297,15 @@ namespace PCI0
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"pci0_fure"           , 0x00, 0x0d, 0x0d, NON_VPD_RING    , 0, 0x0D03700F},
-    {"pci0_gptr"           , 0x01, 0x0d, 0x0d, NON_VPD_RING    , 0, 0x0D037002},
-    {"pci0_time"           , 0x02, 0x0d, 0x0d, NON_VPD_RING    , 0, 0x0D037007},
-    {"pci0_pll_bndy"       , 0x03, 0x0d, 0x0d, NON_VPD_RING    , 0, 0x0D030018},
-    {"pci0_pll_gptr"       , 0x04, 0x0d, 0x0d, NON_VPD_RING    , 0, 0x0D030012},
+    {"pci0_fure"           , 0x00, 0x0d, 0x0d, EKB_RING    , 0x0D03700F},
+    {"pci0_gptr"           , 0x01, 0x0d, 0x0d, EKB_RING    , 0x0D037002},
+    {"pci0_time"           , 0x02, 0x0d, 0x0d, VPD_RING    , 0x0D037007},
+    {"pci0_pll_bndy"       , 0x03, 0x0d, 0x0d, EKB_RING    , 0x0D030018},
+    {"pci0_pll_gptr"       , 0x04, 0x0d, 0x0d, EKB_RING    , 0x0D030012},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"pci0_repr"           , 0x05, 0x0d, 0x0d, NON_VPD_RING    , 0, 0x0D037006},
+    {"pci0_repr"           , 0x05, 0x0d, 0x0d, VPD_RING    , 0x0D037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -315,15 +315,15 @@ namespace PCI1
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"pci1_fure"           , 0x00, 0x0e, 0x0e, NON_VPD_RING    , 0, 0x0E03780F},
-    {"pci1_gptr"           , 0x01, 0x0e, 0x0e, NON_VPD_RING    , 0, 0x0E037802},
-    {"pci1_time"           , 0x02, 0x0e, 0x0e, NON_VPD_RING    , 0, 0x0E037807},
-    {"pci1_pll_bndy"       , 0x03, 0x0e, 0x0e, NON_VPD_RING    , 0, 0x0E030018},
-    {"pci1_pll_gptr"       , 0x04, 0x0e, 0x0e, NON_VPD_RING    , 0, 0x0E030012},
+    {"pci1_fure"           , 0x00, 0x0e, 0x0e, EKB_RING    , 0x0E03780F},
+    {"pci1_gptr"           , 0x01, 0x0e, 0x0e, EKB_RING    , 0x0E037802},
+    {"pci1_time"           , 0x02, 0x0e, 0x0e, VPD_RING    , 0x0E037807},
+    {"pci1_pll_bndy"       , 0x03, 0x0e, 0x0e, EKB_RING    , 0x0E030018},
+    {"pci1_pll_gptr"       , 0x04, 0x0e, 0x0e, EKB_RING    , 0x0E030012},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"pci1_repr"           , 0x05, 0x0e, 0x0e, NON_VPD_RING    , 0, 0x0E037806},
+    {"pci1_repr"           , 0x05, 0x0e, 0x0e, VPD_RING    , 0x0E037806},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -333,15 +333,15 @@ namespace PCI2
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"pci2_fure"           , 0x00, 0x0f, 0x0f, NON_VPD_RING    , 0, 0x0F037C0F},
-    {"pci2_gptr"           , 0x01, 0x0f, 0x0f, NON_VPD_RING    , 0, 0x0F037C02},
-    {"pci2_time"           , 0x02, 0x0f, 0x0f, NON_VPD_RING    , 0, 0x0F037C07},
-    {"pci2_pll_bndy"       , 0x03, 0x0f, 0x0f, NON_VPD_RING    , 0, 0x0F030018},
-    {"pci2_pll_gptr"       , 0x04, 0x0f, 0x0f, NON_VPD_RING    , 0, 0x0F030012},
+    {"pci2_fure"           , 0x00, 0x0f, 0x0f, EKB_RING    , 0x0F037C0F},
+    {"pci2_gptr"           , 0x01, 0x0f, 0x0f, EKB_RING    , 0x0F037C02},
+    {"pci2_time"           , 0x02, 0x0f, 0x0f, VPD_RING    , 0x0F037C07},
+    {"pci2_pll_bndy"       , 0x03, 0x0f, 0x0f, EKB_RING    , 0x0F030018},
+    {"pci2_pll_gptr"       , 0x04, 0x0f, 0x0f, EKB_RING    , 0x0F030012},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"pci2_repr"           , 0x05, 0x0F, 0x0F, NON_VPD_RING    , 0, 0x0F037C06},
+    {"pci2_repr"           , 0x05, 0x0F, 0x0F, VPD_RING    , 0x0F037C06},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -351,62 +351,62 @@ namespace EQ
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"eq_fure"                    , 0x00, 0x10, 0x10, NON_VPD_RING, 0, 0x1003608F},
-    {"eq_gptr"                    , 0x01, 0x10, 0x10, NON_VPD_RING, 0, 0x10036082},
-    {"eq_time"                    , 0x02, 0x10, 0x10, NON_VPD_RING, 0, 0x10036087},
-    {"eq_mode"                    , 0x03, 0x10, 0x10, NON_VPD_RING, 0, 0x10036081},
-    {"ex_l3_fure"                 , 0x04, 0x10, 0x10, NON_VPD_RING, 0, 0x1003100F},
-    {"ex_l3_gptr"                 , 0x05, 0x10, 0x10, NON_VPD_RING, 0, 0x10031002},
-    {"ex_l3_time"                 , 0x06, 0x10, 0x10, NON_VPD_RING, 0, 0x10031007},
-    {"ex_l2_mode"                 , 0x07, 0x10, 0x10, NON_VPD_RING, 0, 0x10030401},
-    {"ex_l2_fure"                 , 0x08, 0x10, 0x10, NON_VPD_RING, 0, 0x1003040F},
-    {"ex_l2_gptr"                 , 0x09, 0x10, 0x10, NON_VPD_RING, 0, 0x10030402},
-    {"ex_l2_time"                 , 0x0a, 0x10, 0x10, NON_VPD_RING, 0, 0x10030407},
-    {"ex_l3_refr_fure"            , 0x0b, 0x10, 0x10, NON_VPD_RING, 0, 0x1003004F},
-    {"ex_l3_refr_gptr"            , 0x0c, 0x10, 0x10, NON_VPD_RING, 0, 0x10030042},
-    {"eq_ana_func"                , 0x0d, 0x10, 0x10, NON_VPD_RING, 0, 0x10030100},
-    {"eq_ana_gptr"                , 0x0e, 0x10, 0x10, NON_VPD_RING, 0, 0x10030102},
-    {"eq_dpll_func"               , 0x0f, 0x10, 0x10, NON_VPD_RING, 0, 0x10030010},
-    {"eq_dpll_gptr"               , 0x10, 0x10, 0x10, NON_VPD_RING, 0, 0x10030012},
-    {"eq_dpll_mode"               , 0x11, 0x10, 0x10, NON_VPD_RING, 0, 0x10030011},
-    {"eq_ana_bndy_bucket_0"       , 0x12, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_1"       , 0x13, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_2"       , 0x14, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_3"       , 0x15, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_4"       , 0x16, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_5"       , 0x17, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_6"       , 0x18, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_7"       , 0x19, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_8"       , 0x1a, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_9"       , 0x1b, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_10"      , 0x1c, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_11"      , 0x1d, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_12"      , 0x1e, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_13"      , 0x1f, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_14"      , 0x20, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_15"      , 0x21, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_16"      , 0x22, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_17"      , 0x23, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_18"      , 0x24, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_19"      , 0x25, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_20"      , 0x26, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_21"      , 0x27, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_22"      , 0x28, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_23"      , 0x29, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_24"      , 0x2a, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_bucket_25"      , 0x2b, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_bndy_l3dcc_bucket_26", 0x2c, 0x10, 0x10, NON_VPD_RING, 0, 0x10030108},
-    {"eq_ana_mode"                , 0x2d, 0x10, 0x10, NON_VPD_RING, 0, 0x10030101},
-    {"ex_l2_fure_1"               , 0x2e, 0x10, 0x10, NON_VPD_RING, 0, 0x1003040F},
-    {"ex_l3_fure_1"               , 0x2f, 0x10, 0x10, NON_VPD_RING, 0, 0x1003100F},
+    {"eq_fure"                    , 0x00, 0x10, 0x10, EKB_RING    , 0x1003608F},
+    {"eq_gptr"                    , 0x01, 0x10, 0x10, EKB_RING    , 0x10036082},
+    {"eq_time"                    , 0x02, 0x10, 0x10, VPD_RING    , 0x10036087},
+    {"eq_mode"                    , 0x03, 0x10, 0x10, EKB_RING    , 0x10036081},
+    {"ex_l3_fure"                 , 0x04, 0x10, 0x10, EKB_RING    , 0x1003100F},
+    {"ex_l3_gptr"                 , 0x05, 0x10, 0x10, EKB_RING    , 0x10031002},
+    {"ex_l3_time"                 , 0x06, 0x10, 0x10, VPD_RING    , 0x10031007},
+    {"ex_l2_mode"                 , 0x07, 0x10, 0x10, EKB_RING    , 0x10030401},
+    {"ex_l2_fure"                 , 0x08, 0x10, 0x10, EKB_RING    , 0x1003040F},
+    {"ex_l2_gptr"                 , 0x09, 0x10, 0x10, EKB_RING    , 0x10030402},
+    {"ex_l2_time"                 , 0x0a, 0x10, 0x10, VPD_RING    , 0x10030407},
+    {"ex_l3_refr_fure"            , 0x0b, 0x10, 0x10, EKB_RING    , 0x1003004F},
+    {"ex_l3_refr_gptr"            , 0x0c, 0x10, 0x10, EKB_RING    , 0x10030042},
+    {"eq_ana_func"                , 0x0d, 0x10, 0x10, EKB_RING    , 0x10030100},
+    {"eq_ana_gptr"                , 0x0e, 0x10, 0x10, EKB_RING    , 0x10030102},
+    {"eq_dpll_func"               , 0x0f, 0x10, 0x10, EKB_RING    , 0x10030010},
+    {"eq_dpll_gptr"               , 0x10, 0x10, 0x10, EKB_RING    , 0x10030012},
+    {"eq_dpll_mode"               , 0x11, 0x10, 0x10, EKB_RING    , 0x10030011},
+    {"eq_ana_bndy_bucket_0"       , 0x12, 0x10, 0x10, EKB_RING    , 0x10030108},
+    {"eq_ana_bndy_bucket_1"       , 0x13, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_2"       , 0x14, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_3"       , 0x15, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_4"       , 0x16, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_5"       , 0x17, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_6"       , 0x18, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_7"       , 0x19, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_8"       , 0x1a, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_9"       , 0x1b, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_10"      , 0x1c, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_11"      , 0x1d, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_12"      , 0x1e, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_13"      , 0x1f, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_14"      , 0x20, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_15"      , 0x21, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_16"      , 0x22, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_17"      , 0x23, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_18"      , 0x24, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_19"      , 0x25, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_20"      , 0x26, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_21"      , 0x27, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_22"      , 0x28, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_23"      , 0x29, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_24"      , 0x2a, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_bucket_25"      , 0x2b, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_bndy_l3dcc_bucket_26", 0x2c, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+    {"eq_ana_mode"                , 0x2d, 0x10, 0x10, EKB_RING    , 0x10030101},
+    {"ex_l2_fure_1"               , 0x2e, 0x10, 0x10, EKB_RING    , 0x1003040F},
+    {"ex_l3_fure_1"               , 0x2f, 0x10, 0x10, EKB_RING    , 0x1003100F},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"eq_repr"             , 0x30, 0x10, 0x1b, NON_VPD_RING    , 0, 0x10036086},
-    {"ex_l3_repr"          , 0x31, 0x10, 0x1b, NON_VPD_RING    , 0, 0x10031006},
-    {"ex_l2_repr"          , 0x32, 0x10, 0x1b, NON_VPD_RING    , 0, 0x10030406},
-    {"ex_l3_refr_repr"     , 0x33, 0x10, 0x1b, NON_VPD_RING    , 0, 0x10030046},
-    {"ex_l3_refr_time"     , 0x34, 0x10, 0x1b, NON_VPD_RING    , 0, 0x10030047},
+    {"eq_repr"                    , 0x30, 0x10, 0x1b, VPD_RING    , 0x10036086},
+    {"ex_l3_repr"                 , 0x31, 0x10, 0x1b, VPD_RING    , 0x10031006},
+    {"ex_l2_repr"                 , 0x32, 0x10, 0x1b, VPD_RING    , 0x10030406},
+    {"ex_l3_refr_repr"            , 0x33, 0x10, 0x1b, VPD_RING    , 0x10030046},
+    {"ex_l3_refr_time"            , 0x34, 0x10, 0x1b, VPD_RING    , 0x10030047},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, CC, RL };
 };
@@ -416,14 +416,14 @@ namespace EC
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    { "ec_func"            , 0x00, 0x20, 0x20, NON_VPD_RING    , 0, 0x2003700F},
-    { "ec_gptr"            , 0x01, 0x20, 0x20, NON_VPD_RING    , 0, 0x20037002},
-    { "ec_time"            , 0x02, 0x20, 0x20, NON_VPD_RING    , 0, 0x20037007},
-    { "ec_mode"            , 0x03, 0x20, 0x20, NON_VPD_RING    , 0, 0x20037001},
+    { "ec_func"            , 0x00, 0x20, 0x20, EKB_RING    , 0x2003700F},
+    { "ec_gptr"            , 0x01, 0x20, 0x20, EKB_RING    , 0x20037002},
+    { "ec_time"            , 0x02, 0x20, 0x20, VPD_RING    , 0x20037007},
+    { "ec_mode"            , 0x03, 0x20, 0x20, EKB_RING    , 0x20037001},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    { "ec_repr"            , 0x04, 0x20, 0x37, NON_VPD_RING    , 0,  0x20037006},
+    { "ec_repr"            , 0x04, 0x20, 0x37, VPD_RING    , 0x20037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, CC, RL };
 };
diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.H b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
index 1b0d1d89..60db3fc4 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H
+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
@@ -36,15 +36,22 @@
     #include <p9_ring_id.h>
 #endif
 
+enum RingClass
+{
+    EKB_RING,
+    EKB_FSM_RING,
+    VPD_RING,
+    NUM_RING_CLASSES
+};
+
 // General Ring ID list structure
 typedef struct
 {
     const char*  ringName;
     uint8_t      ringId;
-    uint8_t      instanceIdMin;    // the min instanceId
-    uint8_t      instanceIdMax;    // the max instanceId
-    uint8_t      vpdKeyword;
-    uint8_t      pllCopy;     // 0,1,2,3,4,5 -- No of PLL copies required
+    uint8_t      instanceIdMin;
+    uint8_t      instanceIdMax;
+    RingClass    ringClass;
     uint32_t     scanScomAddress;
 } GenRingIdList;
 
diff --git a/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H b/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H
index 5782e33d..f1268765 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H
+++ b/src/import/chips/p9/utils/imageProcs/p9_ring_identification.H
@@ -77,8 +77,6 @@ enum VpdKeyword
     VPD_KEYWORD_PDG = 0,
     VPD_KEYWORD_PDR = 1,
     NUM_OF_VPD_TYPES = 2,
-    NON_VPD_RING = 3,
-    NON_VPD_PLL_RING = 4,
 };