add support for OBUS PLL buckets

p9_frequency_buckets.H
p9.obus.pll.scan.initfile
  document and support base frequencies
    1611 MHz - 25.78G, 156.25 MHz ref
    1250 MHz - 25G, 156.25 MHz ref
    1200 MHz - 19.2G, 133.33 MHz ref

pervasive_attributes.xml
  define ATTR_OB[0123]_PLL_BUCKET to hold encoded ring bucket select value

nest_attributes.xml
  define ATTR_FREQ_O_MHZ array to hold per chiplet OBUS frequency
  retain ATTR_FREQ_A_MHZ to serve as FBC A link frequency indicator

p9_setup_sbe_config.C
p9_sbe_attr_setup.C
  transmit bucket selection through FSP/BMC->SBE mailbox
  encode OBUS bucket selects in Scratch Reg2 bits 24:31

p9_sbe_chiplet_pll_initf.C
p9_sbe_chiplet_pll_initf_errors.xml
  scan correct ring image based on bucket selector attributes

p9_ringId.C
p9_ringId.H
p9_ring_id.h
  accomodate three copies of obX_pll_bndy (use ID previously reserved for
  obX_pll_func, which should not be necessary to scan init)

scan_procedures.mk
generateWrapper.pl
  initCompiler infrastructure changes to support build of bucket data

p9.fbc.ab_hp.scom.initfile
p9.fbc.ioo_tl.scom.initfile
p9_tod_setup.C
  updates to handle A,O frequency attribute changes

Change-Id: I42f9bb4037a587f7e3ec8dd9848bdb853ac3d7a0
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40159
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt K. Light <mklight@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: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40165
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 97 insertions, 81 deletions

diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
index ccf7281af..1f4537cef 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C
+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
@@ -222,16 +222,17 @@ namespace OB0
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"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},
+    {"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_bucket_1" , 0x04, 0x09, 0x09, EKB_RING    , 0x09030018},
+    {"ob0_pll_bndy_bucket_2" , 0x05, 0x09, 0x09, EKB_RING    , 0x09030018},
+    {"ob0_pll_bndy_bucket_3" , 0x06, 0x09, 0x09, EKB_RING    , 0x09030018},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob0_repr"            , 0x0a, 0x09, 0x09, VPD_RING    , 0x09037006},
+    {"ob0_repr"              , 0x0a, 0x09, 0x09, VPD_RING    , 0x09037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -241,16 +242,17 @@ namespace OB1
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"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},
+    {"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_bucket_1" , 0x04, 0x0a, 0x0a, EKB_RING    , 0x0A030018},
+    {"ob1_pll_bndy_bucket_2" , 0x05, 0x0a, 0x0a, EKB_RING    , 0x0A030018},
+    {"ob1_pll_bndy_bucket_3" , 0x06, 0x0a, 0x0a, EKB_RING    , 0x0A030018},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob1_repr"            , 0x0a, 0x0a, 0x0a, VPD_RING    , 0x0A037006},
+    {"ob1_repr"              , 0x0a, 0x0a, 0x0a, VPD_RING    , 0x0A037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -260,16 +262,17 @@ namespace OB2
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"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},
+    {"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_bucket_1" , 0x04, 0x0b, 0x0b, EKB_RING    , 0x0B030018},
+    {"ob2_pll_bndy_bucket_2" , 0x05, 0x0b, 0x0b, EKB_RING    , 0x0B030018},
+    {"ob2_pll_bndy_bucket_3" , 0x06, 0x0b, 0x0b, EKB_RING    , 0x0B030018},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob2_repr"            , 0x0a, 0x0b, 0x0b, VPD_RING    , 0x0B037006},
+    {"ob2_repr"              , 0x0a, 0x0b, 0x0b, VPD_RING    , 0x0B037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
@@ -279,16 +282,17 @@ namespace OB3
 {
 const GenRingIdList RING_ID_LIST_COMMON[] =
 {
-    {"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},
+    {"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_bucket_1" , 0x04, 0x0c, 0x0c, EKB_RING    , 0x0C030018},
+    {"ob3_pll_bndy_bucket_2" , 0x05, 0x0c, 0x0c, EKB_RING    , 0x0C030018},
+    {"ob3_pll_bndy_bucket_3" , 0x06, 0x0c, 0x0c, EKB_RING    , 0x0C030018},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
-    {"ob3_repr"            , 0x0a, 0x0c, 0x0c, VPD_RING    , 0x0C037006},
+    {"ob3_repr"              , 0x0a, 0x0c, 0x0c, VPD_RING    , 0x0C037006},
 };
 const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID };
 };
diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.H b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
index 93927e483..d3a1ddeaa 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H
+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
@@ -533,7 +533,9 @@ enum RingOffset
     ob0_time      = 2,
     ob0_pll_gptr  = 3,
     ob0_pll_bndy  = 4,
-    ob0_pll_func  = 5,
+    ob0_pll_bndy_bucket_1  = 4,
+    ob0_pll_bndy_bucket_2  = 5,
+    ob0_pll_bndy_bucket_3  = 6,
     // Instance Rings
     ob0_repr      = (0 | INSTANCE_RING_MARK)
 };
@@ -541,7 +543,7 @@ enum RingOffset
 static const CHIPLET_DATA g_ob0Data =
 {
     9,  // O-Bus Chiplet ID range is 9 - 12. The base ID is 9.
-    6,  // 6 common rings for OB Chiplet
+    7,  // 7 common rings for OB Chiplet
     1,  // 1 instance specific rings for each OB chiplet
     1
 };
@@ -563,7 +565,9 @@ enum RingOffset
     ob1_time      = 2,
     ob1_pll_gptr  = 3,
     ob1_pll_bndy  = 4,
-    ob1_pll_func  = 5,
+    ob1_pll_bndy_bucket_1  = 4,
+    ob1_pll_bndy_bucket_2  = 5,
+    ob1_pll_bndy_bucket_3  = 6,
     // Instance Rings
     ob1_repr      = (0 | INSTANCE_RING_MARK)
 };
@@ -571,7 +575,7 @@ enum RingOffset
 static const CHIPLET_DATA g_ob1Data =
 {
     10, // O-Bus Chiplet ID range is 9 - 12. The base ID is 9.
-    6,  // 6 common rings for OB Chiplet
+    7,  // 7 common rings for OB Chiplet
     1,  // 1 instance specific rings for each OB chiplet
     1
 };
@@ -594,7 +598,9 @@ enum RingOffset
     ob2_time      = 2,
     ob2_pll_gptr  = 3,
     ob2_pll_bndy  = 4,
-    ob2_pll_func  = 5,
+    ob2_pll_bndy_bucket_1  = 4,
+    ob2_pll_bndy_bucket_2  = 5,
+    ob2_pll_bndy_bucket_3  = 6,
     // Instance Rings
     ob2_repr      = (0 | INSTANCE_RING_MARK)
 };
@@ -602,7 +608,7 @@ enum RingOffset
 static const CHIPLET_DATA g_ob2Data =
 {
     11, // O-Bus Chiplet ID range is 9 - 12. The base ID is 9.
-    6,  // 6 common rings for OB Chiplet
+    7,  // 7 common rings for OB Chiplet
     1,  // 1 instance specific rings for each OB chiplet
     1
 };
@@ -624,7 +630,9 @@ enum RingOffset
     ob3_time      = 2,
     ob3_pll_gptr  = 3,
     ob3_pll_bndy  = 4,
-    ob3_pll_func  = 5,
+    ob3_pll_bndy_bucket_1  = 4,
+    ob3_pll_bndy_bucket_2  = 5,
+    ob3_pll_bndy_bucket_3  = 6,
     // Instance Rings
     ob3_repr      = (0 | INSTANCE_RING_MARK)
 };
@@ -632,7 +640,7 @@ enum RingOffset
 static const CHIPLET_DATA g_ob3Data =
 {
     12, // O-Bus Chiplet ID range is 9 - 12. The base ID is 9.
-    6,  // 10 common rings for OB Chiplet
+    7,  // 7 common rings for OB Chiplet
     1,  // 1 instance specific rings for each OB chiplet
     1
 };
@@ -999,37 +1007,37 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
     { OB0::ob0_time                      , "ob0_time"                    , OB0_TYPE   }, // 120
     { OB0::ob0_pll_gptr                  , "ob0_pll_gptr"                , OB0_TYPE   }, // 121
     { OB0::ob0_pll_bndy                  , "ob0_pll_bndy"                , OB0_TYPE   }, // 122
-    { OB0::ob0_pll_func                  , "ob0_pll_func"                , OB0_TYPE   }, // 123
-    { OB0::ob0_repr                      , "ob0_repr"                    , OB0_TYPE   }, // 124
-    { INVALID_RING                       , "invalid"                     , OB0_TYPE   }, // 125
-    { INVALID_RING                       , "invalid"                     , OB0_TYPE   }, // 126
+    { OB0::ob0_pll_bndy_bucket_1         , "ob0_pll_bndy_bucket_1"       , OB0_TYPE   }, // 123
+    { OB0::ob0_pll_bndy_bucket_2         , "ob0_pll_bndy_bucket_2"       , OB0_TYPE   }, // 124
+    { OB0::ob0_pll_bndy_bucket_3         , "ob0_pll_bndy_bucket_3"       , OB0_TYPE   }, // 125
+    { OB0::ob0_repr                      , "ob0_repr"                    , OB0_TYPE   }, // 126
     { OB1::ob1_fure                      , "ob1_fure"                    , OB1_TYPE   }, // 127
     { OB1::ob1_gptr                      , "ob1_gptr"                    , OB1_TYPE   }, // 128
     { OB1::ob1_time                      , "ob1_time"                    , OB1_TYPE   }, // 129
     { OB1::ob1_pll_gptr                  , "ob1_pll_gptr"                , OB1_TYPE   }, // 130
     { OB1::ob1_pll_bndy                  , "ob1_pll_bndy"                , OB1_TYPE   }, // 131
-    { OB1::ob1_pll_func                  , "ob1_pll_func"                , OB1_TYPE   }, // 132
-    { OB1::ob1_repr                      , "ob1_repr"                    , OB1_TYPE   }, // 133
-    { INVALID_RING                       , "invalid"                     , OB1_TYPE   }, // 134
-    { INVALID_RING                       , "invalid"                     , OB1_TYPE   }, // 135
+    { OB1::ob1_pll_bndy_bucket_1         , "ob1_pll_bndy_bucket_1"       , OB1_TYPE   }, // 132
+    { OB1::ob1_pll_bndy_bucket_2         , "ob1_pll_bndy_bucket_2"       , OB1_TYPE   }, // 133
+    { OB1::ob1_pll_bndy_bucket_3         , "ob1_pll_bndy_bucket_3"       , OB1_TYPE   }, // 134
+    { OB1::ob1_repr                      , "ob1_repr"                    , OB1_TYPE   }, // 135
     { OB2::ob2_fure                      , "ob2_fure"                    , OB2_TYPE   }, // 136
     { OB2::ob2_gptr                      , "ob2_gptr"                    , OB2_TYPE   }, // 137
     { OB2::ob2_time                      , "ob2_time"                    , OB2_TYPE   }, // 138
     { OB2::ob2_pll_gptr                  , "ob2_pll_gptr"                , OB2_TYPE   }, // 139
     { OB2::ob2_pll_bndy                  , "ob2_pll_bndy"                , OB2_TYPE   }, // 140
-    { OB2::ob2_pll_func                  , "ob2_pll_func"                , OB2_TYPE   }, // 141
-    { OB2::ob2_repr                      , "ob2_repr"                    , OB2_TYPE   }, // 142
-    { INVALID_RING                       , "invalid"                     , OB2_TYPE   }, // 143
-    { INVALID_RING                       , "invalid"                     , OB2_TYPE   }, // 144
+    { OB2::ob2_pll_bndy_bucket_1         , "ob2_pll_bndy_bucket_1"       , OB2_TYPE   }, // 141
+    { OB2::ob2_pll_bndy_bucket_2         , "ob2_pll_bndy_bucket_2"       , OB2_TYPE   }, // 142
+    { OB2::ob2_pll_bndy_bucket_3         , "ob2_pll_bndy_bucket_3"       , OB2_TYPE   }, // 143
+    { OB2::ob2_repr                      , "ob2_repr"                    , OB2_TYPE   }, // 144
     { OB3::ob3_fure                      , "ob3_fure"                    , OB3_TYPE   }, // 145
     { OB3::ob3_gptr                      , "ob3_gptr"                    , OB3_TYPE   }, // 146
     { OB3::ob3_time                      , "ob3_time"                    , OB3_TYPE   }, // 147
     { OB3::ob3_pll_gptr                  , "ob3_pll_gptr"                , OB3_TYPE   }, // 148
     { OB3::ob3_pll_bndy                  , "ob3_pll_bndy"                , OB3_TYPE   }, // 149
-    { OB3::ob3_pll_func                  , "ob3_pll_func"                , OB3_TYPE   }, // 150
-    { OB3::ob3_repr                      , "ob3_repr"                    , OB3_TYPE   }, // 151
-    { INVALID_RING                       , "invalid"                     , OB3_TYPE   }, // 152
-    { INVALID_RING                       , "invalid"                     , OB3_TYPE   }, // 153
+    { OB3::ob3_pll_bndy_bucket_1         , "ob3_pll_bndy_bucket_1"       , OB3_TYPE   }, // 150
+    { OB3::ob3_pll_bndy_bucket_2         , "ob3_pll_bndy_bucket_2"       , OB3_TYPE   }, // 151
+    { OB3::ob3_pll_bndy_bucket_3         , "ob3_pll_bndy_bucket_3"       , OB3_TYPE   }, // 152
+    { OB3::ob3_repr                      , "ob3_repr"                    , OB3_TYPE   }, // 153
     { PCI0::pci0_fure                    , "pci0_fure"                   , PCI0_TYPE  }, // 154
     { PCI0::pci0_gptr                    , "pci0_gptr"                   , PCI0_TYPE  }, // 155
     { PCI0::pci0_time                    , "pci0_time"                   , PCI0_TYPE  }, // 156
@@ -1257,37 +1265,37 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
     { OB0::ob0_time                      , OB0_TYPE   }, // 120
     { OB0::ob0_pll_gptr                  , OB0_TYPE   }, // 121
     { OB0::ob0_pll_bndy                  , OB0_TYPE   }, // 122
-    { OB0::ob0_pll_func                  , OB0_TYPE   }, // 123
-    { OB0::ob0_repr                      , OB0_TYPE   }, // 124
-    { INVALID_RING                       , OB0_TYPE   }, // 125
-    { INVALID_RING                       , OB0_TYPE   }, // 126
+    { OB0::ob0_pll_bndy_bucket_1         , OB0_TYPE   }, // 123
+    { OB0::ob0_pll_bndy_bucket_2         , OB0_TYPE   }, // 124
+    { OB0::ob0_pll_bndy_bucket_3         , OB0_TYPE   }, // 125
+    { OB0::ob0_repr                      , OB0_TYPE   }, // 126
     { OB1::ob1_fure                      , OB1_TYPE   }, // 127
     { OB1::ob1_gptr                      , OB1_TYPE   }, // 128
     { OB1::ob1_time                      , OB1_TYPE   }, // 129
     { OB1::ob1_pll_gptr                  , OB1_TYPE   }, // 130
     { OB1::ob1_pll_bndy                  , OB1_TYPE   }, // 131
-    { OB1::ob1_pll_func                  , OB1_TYPE   }, // 132
-    { OB1::ob1_repr                      , OB1_TYPE   }, // 133
-    { INVALID_RING                       , OB1_TYPE   }, // 134
-    { INVALID_RING                       , OB1_TYPE   }, // 135
+    { OB1::ob1_pll_bndy_bucket_1         , OB1_TYPE   }, // 132
+    { OB1::ob1_pll_bndy_bucket_2         , OB1_TYPE   }, // 133
+    { OB1::ob1_pll_bndy_bucket_3         , OB1_TYPE   }, // 134
+    { OB1::ob1_repr                      , OB1_TYPE   }, // 135
     { OB2::ob2_fure                      , OB2_TYPE   }, // 136
     { OB2::ob2_gptr                      , OB2_TYPE   }, // 137
     { OB2::ob2_time                      , OB2_TYPE   }, // 138
     { OB2::ob2_pll_gptr                  , OB2_TYPE   }, // 139
     { OB2::ob2_pll_bndy                  , OB2_TYPE   }, // 140
-    { OB2::ob2_pll_func                  , OB2_TYPE   }, // 141
-    { OB2::ob2_repr                      , OB2_TYPE   }, // 142
-    { INVALID_RING                       , OB2_TYPE   }, // 143
-    { INVALID_RING                       , OB2_TYPE   }, // 144
+    { OB2::ob2_pll_bndy_bucket_1         , OB2_TYPE   }, // 141
+    { OB2::ob2_pll_bndy_bucket_2         , OB2_TYPE   }, // 142
+    { OB2::ob2_pll_bndy_bucket_3         , OB2_TYPE   }, // 143
+    { OB2::ob2_repr                      , OB2_TYPE   }, // 144
     { OB3::ob3_fure                      , OB3_TYPE   }, // 145
     { OB3::ob3_gptr                      , OB3_TYPE   }, // 146
     { OB3::ob3_time                      , OB3_TYPE   }, // 147
     { OB3::ob3_pll_gptr                  , OB3_TYPE   }, // 148
     { OB3::ob3_pll_bndy                  , OB3_TYPE   }, // 149
-    { OB3::ob3_pll_func                  , OB3_TYPE   }, // 150
-    { OB3::ob3_repr                      , OB3_TYPE   }, // 151
-    { INVALID_RING                       , OB3_TYPE   }, // 152
-    { INVALID_RING                       , OB3_TYPE   }, // 153
+    { OB3::ob3_pll_bndy_bucket_1         , OB3_TYPE   }, // 150
+    { OB3::ob3_pll_bndy_bucket_2         , OB3_TYPE   }, // 151
+    { OB3::ob3_pll_bndy_bucket_3         , OB3_TYPE   }, // 152
+    { OB3::ob3_repr                      , OB3_TYPE   }, // 153
     { PCI0::pci0_fure                    , PCI0_TYPE  }, // 154
     { PCI0::pci0_gptr                    , PCI0_TYPE  }, // 155
     { PCI0::pci0_time                    , PCI0_TYPE  }, // 156
diff --git a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
index bcd0b7c59..efd63394e 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
+++ b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
@@ -179,49 +179,53 @@ enum RingID
     ob0_gptr = 119,
     ob0_time = 120,
     ob0_pll_gptr = 121,
-    ob0_pll_bndy  = 122,
-    ob0_pll_func = 123,
+    ob0_pll_bndy = 122,
+    ob0_pll_bndy_bucket_1 = 123,
+    ob0_pll_bndy_bucket_2 = 124,
+    ob0_pll_bndy_bucket_3 = 125,
 
     // OB Chiplet Rings
     // OB0, OB1, OB2 and OB3 instance specific Ring
-    ob0_repr = 124,
-    // values 125-126 unused
+    ob0_repr = 126,
 
     ob1_fure = 127,
     ob1_gptr = 128,
     ob1_time = 129,
     ob1_pll_gptr = 130,
     ob1_pll_bndy  = 131,
-    ob1_pll_func = 132,
+    ob1_pll_bndy_bucket_1 = 132,
+    ob1_pll_bndy_bucket_2 = 133,
+    ob1_pll_bndy_bucket_3 = 134,
 
     // OB Chiplet Rings
     // OB0, OB1, OB2 and OB3 instance specific Ring
-    ob1_repr = 133,
-    // values 134-135 unused
+    ob1_repr = 135,
 
     ob2_fure = 136,
     ob2_gptr = 137,
     ob2_time = 138,
     ob2_pll_gptr = 139,
     ob2_pll_bndy  = 140,
-    ob2_pll_func = 141,
+    ob2_pll_bndy_bucket_1 = 141,
+    ob2_pll_bndy_bucket_2 = 142,
+    ob2_pll_bndy_bucket_3 = 143,
 
     // OB Chiplet Rings
     // OB0, OB1, OB2 and OB3 instance specific Ring
-    ob2_repr = 142,
-    // values 143-144 unused
+    ob2_repr = 144,
 
     ob3_fure = 145,
     ob3_gptr = 146,
     ob3_time = 147,
     ob3_pll_gptr = 148,
     ob3_pll_bndy  = 149,
-    ob3_pll_func = 150,
+    ob3_pll_bndy_bucket_1 = 150,
+    ob3_pll_bndy_bucket_2 = 151,
+    ob3_pll_bndy_bucket_3 = 152,
 
     // OB Chiplet Rings
     // OB0, OB1, OB2 and OB3 instance specific Ring
-    ob3_repr = 151,
-    // values 152-153 unused
+    ob3_repr = 153,
 
     // PCI Chiplet Rings
     // PCI0 Common Rings