diff options
Diffstat (limited to 'src/import/chips/p9')
| -rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ringId.C | 56 | ||||
| -rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ringId.H | 160 | ||||
| -rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ring_id.h | 71 |
3 files changed, 143 insertions, 144 deletions
diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C index da08274f..3e806059 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C @@ -222,17 +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_bucket_1" , 0x04, 0x09, 0x09, EKB_RING , 0x09030018}, - {"ob0_pll_bndy_bucket_2" , 0x05, 0x09, 0x09, EKB_RING , 0x09030018}, + {"ob0_pll_bndy_bucket_1" , 0x00, 0x09, 0x09, EKB_RING , 0x09030018}, + {"ob0_pll_bndy_bucket_2" , 0x01, 0x09, 0x09, EKB_RING , 0x09030018}, + {"ob0_gptr" , 0x02, 0x09, 0x09, EKB_RING , 0x09037002}, + {"ob0_time" , 0x03, 0x09, 0x09, VPD_RING , 0x09037007}, + {"ob0_pll_gptr" , 0x04, 0x09, 0x09, EKB_RING , 0x09030012}, + {"ob0_fure" , 0x05, 0x09, 0x09, EKB_RING , 0x0903700F}, {"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" , 0x07, 0x09, 0x09, VPD_RING , 0x09037006}, }; const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID }; }; @@ -242,17 +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_bucket_1" , 0x04, 0x0a, 0x0a, EKB_RING , 0x0A030018}, - {"ob1_pll_bndy_bucket_2" , 0x05, 0x0a, 0x0a, EKB_RING , 0x0A030018}, + {"ob1_pll_bndy_bucket_1" , 0x00, 0x0a, 0x0a, EKB_RING , 0x0A030018}, + {"ob1_pll_bndy_bucket_2" , 0x01, 0x0a, 0x0a, EKB_RING , 0x0A030018}, + {"ob1_gptr" , 0x02, 0x0a, 0x0a, EKB_RING , 0x0A037002}, + {"ob1_time" , 0x03, 0x0a, 0x0a, VPD_RING , 0x0A037007}, + {"ob1_pll_gptr" , 0x04, 0x0a, 0x0a, EKB_RING , 0x0A030012}, + {"ob1_fure" , 0x05, 0x0a, 0x0a, EKB_RING , 0x0A03700F}, {"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" , 0x07, 0x0a, 0x0a, VPD_RING , 0x0A037006}, }; const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID }; }; @@ -262,17 +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_bucket_1" , 0x04, 0x0b, 0x0b, EKB_RING , 0x0B030018}, - {"ob2_pll_bndy_bucket_2" , 0x05, 0x0b, 0x0b, EKB_RING , 0x0B030018}, + {"ob2_pll_bndy_bucket_1" , 0x00, 0x0b, 0x0b, EKB_RING , 0x0B030018}, + {"ob2_pll_bndy_bucket_2" , 0x01, 0x0b, 0x0b, EKB_RING , 0x0B030018}, + {"ob2_gptr" , 0x02, 0x0b, 0x0b, EKB_RING , 0x0B037002}, + {"ob2_time" , 0x03, 0x0b, 0x0b, VPD_RING , 0x0B037007}, + {"ob2_pll_gptr" , 0x04, 0x0b, 0x0b, EKB_RING , 0x0B030012}, + {"ob2_fure" , 0x05, 0x0b, 0x0b, EKB_RING , 0x0B03700F}, {"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" , 0x07, 0x0b, 0x0b, VPD_RING , 0x0B037006}, }; const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID }; }; @@ -282,17 +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_bucket_1" , 0x04, 0x0c, 0x0c, EKB_RING , 0x0C030018}, - {"ob3_pll_bndy_bucket_2" , 0x05, 0x0c, 0x0c, EKB_RING , 0x0C030018}, + {"ob3_pll_bndy_bucket_1" , 0x00, 0x0c, 0x0c, EKB_RING , 0x0C030018}, + {"ob3_pll_bndy_bucket_2" , 0x01, 0x0c, 0x0c, EKB_RING , 0x0C030018}, + {"ob3_gptr" , 0x02, 0x0c, 0x0c, EKB_RING , 0x0C037002}, + {"ob3_time" , 0x03, 0x0c, 0x0c, VPD_RING , 0x0C037007}, + {"ob3_pll_gptr" , 0x04, 0x0c, 0x0c, EKB_RING , 0x0C030012}, + {"ob3_fure" , 0x05, 0x0c, 0x0c, EKB_RING , 0x0C03700F}, {"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" , 0x07, 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 26fcd537..7ba216de 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H @@ -528,13 +528,13 @@ struct RingVariants enum RingOffset { // Common Rings - ob0_fure = 0, - ob0_gptr = 1, - ob0_time = 2, - ob0_pll_gptr = 3, - ob0_pll_bndy = 4, - ob0_pll_bndy_bucket_1 = 4, - ob0_pll_bndy_bucket_2 = 5, + ob0_pll_bndy = 0, + ob0_pll_bndy_bucket_1 = 0, + ob0_pll_bndy_bucket_2 = 1, + ob0_gptr = 2, + ob0_time = 3, + ob0_pll_gptr = 4, + ob0_fure = 5, ob0_pll_bndy_bucket_3 = 6, // Instance Rings ob0_repr = (0 | INSTANCE_RING_MARK) @@ -560,13 +560,13 @@ struct RingVariants enum RingOffset { // Common Rings - ob1_fure = 0, - ob1_gptr = 1, - ob1_time = 2, - ob1_pll_gptr = 3, - ob1_pll_bndy = 4, - ob1_pll_bndy_bucket_1 = 4, - ob1_pll_bndy_bucket_2 = 5, + ob1_pll_bndy = 0, + ob1_pll_bndy_bucket_1 = 0, + ob1_pll_bndy_bucket_2 = 1, + ob1_gptr = 2, + ob1_time = 3, + ob1_pll_gptr = 4, + ob1_fure = 5, ob1_pll_bndy_bucket_3 = 6, // Instance Rings ob1_repr = (0 | INSTANCE_RING_MARK) @@ -593,13 +593,13 @@ struct RingVariants enum RingOffset { // Common Rings - ob2_fure = 0, - ob2_gptr = 1, - ob2_time = 2, - ob2_pll_gptr = 3, - ob2_pll_bndy = 4, - ob2_pll_bndy_bucket_1 = 4, - ob2_pll_bndy_bucket_2 = 5, + ob2_pll_bndy = 0, + ob2_pll_bndy_bucket_1 = 0, + ob2_pll_bndy_bucket_2 = 1, + ob2_gptr = 2, + ob2_time = 3, + ob2_pll_gptr = 4, + ob2_fure = 5, ob2_pll_bndy_bucket_3 = 6, // Instance Rings ob2_repr = (0 | INSTANCE_RING_MARK) @@ -625,13 +625,13 @@ struct RingVariants enum RingOffset { // Common Rings - ob3_fure = 0, - ob3_gptr = 1, - ob3_time = 2, - ob3_pll_gptr = 3, - ob3_pll_bndy = 4, - ob3_pll_bndy_bucket_1 = 4, - ob3_pll_bndy_bucket_2 = 5, + ob3_pll_bndy = 0, + ob3_pll_bndy_bucket_1 = 0, + ob3_pll_bndy_bucket_2 = 1, + ob3_gptr = 2, + ob3_time = 3, + ob3_pll_gptr = 4, + ob3_fure = 5, ob3_pll_bndy_bucket_3 = 6, // Instance Rings ob3_repr = (0 | INSTANCE_RING_MARK) @@ -1000,44 +1000,44 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] = { MC::mc_repr , "mc_repr" , MC_TYPE }, // 113 { MC::mc_iom01_repr , "mc_iom01_repr" , MC_TYPE }, // 114 { MC::mc_iom23_repr , "mc_iom23_repr" , MC_TYPE }, // 115 - { INVALID_RING , "invalid" , MC_TYPE }, // 116 - { INVALID_RING , "invalid" , MC_TYPE }, // 117 - { OB0::ob0_fure , "ob0_fure" , OB0_TYPE }, // 118 + { OB0::ob0_pll_bndy , "ob0_pll_bndy" , OB0_TYPE }, // 116 + { OB0::ob0_pll_bndy_bucket_1 , "ob0_pll_bndy_bucket_1" , OB0_TYPE }, // 117 + { OB0::ob0_pll_bndy_bucket_2 , "ob0_pll_bndy_bucket_2" , OB0_TYPE }, // 118 { OB0::ob0_gptr , "ob0_gptr" , OB0_TYPE }, // 119 { 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_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 + { OB0::ob0_fure , "ob0_fure" , OB0_TYPE }, // 122 + { OB0::ob0_pll_bndy_bucket_3 , "ob0_pll_bndy_bucket_3" , OB0_TYPE }, // 123 + { OB0::ob0_repr , "ob0_repr" , OB0_TYPE }, // 124 + { OB1::ob1_pll_bndy , "ob1_pll_bndy" , OB1_TYPE }, // 125 + { OB1::ob1_pll_bndy_bucket_1 , "ob1_pll_bndy_bucket_1" , OB1_TYPE }, // 126 + { OB1::ob1_pll_bndy_bucket_2 , "ob1_pll_bndy_bucket_2" , 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_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 + { OB1::ob1_fure , "ob1_fure" , OB1_TYPE }, // 131 + { OB1::ob1_pll_bndy_bucket_3 , "ob1_pll_bndy_bucket_3" , OB1_TYPE }, // 132 + { OB1::ob1_repr , "ob1_repr" , OB1_TYPE }, // 133 + { OB2::ob2_pll_bndy , "ob2_pll_bndy" , OB2_TYPE }, // 134 + { OB2::ob2_pll_bndy_bucket_1 , "ob2_pll_bndy_bucket_1" , OB2_TYPE }, // 135 + { OB2::ob2_pll_bndy_bucket_2 , "ob2_pll_bndy_bucket_2" , 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_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 + { OB2::ob2_fure , "ob2_fure" , OB2_TYPE }, // 140 + { OB2::ob2_pll_bndy_bucket_3 , "ob2_pll_bndy_bucket_3" , OB2_TYPE }, // 141 + { OB2::ob2_repr , "ob2_repr" , OB2_TYPE }, // 142 + { OB3::ob3_pll_bndy , "ob3_pll_bndy" , OB3_TYPE }, // 143 + { OB3::ob3_pll_bndy_bucket_1 , "ob3_pll_bndy_bucket_1" , OB3_TYPE }, // 144 + { OB3::ob3_pll_bndy_bucket_2 , "ob3_pll_bndy_bucket_2" , 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_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 + { OB3::ob3_fure , "ob3_fure" , OB3_TYPE }, // 149 + { OB3::ob3_pll_bndy_bucket_3 , "ob3_pll_bndy_bucket_3" , OB3_TYPE }, // 150 + { OB3::ob3_repr , "ob3_repr" , OB3_TYPE }, // 151 + { INVALID_RING , "invalid" , OB3_TYPE }, // 152 + { INVALID_RING , "invalid" , 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 @@ -1258,44 +1258,44 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] = { MC::mc_repr , MC_TYPE }, // 113 { MC::mc_iom01_repr , MC_TYPE }, // 114 { MC::mc_iom23_repr , MC_TYPE }, // 115 - { INVALID_RING , MC_TYPE }, // 116 - { INVALID_RING , MC_TYPE }, // 117 - { OB0::ob0_fure , OB0_TYPE }, // 118 + { OB0::ob0_pll_bndy , OB0_TYPE }, // 116 + { OB0::ob0_pll_bndy_bucket_1 , OB0_TYPE }, // 117 + { OB0::ob0_pll_bndy_bucket_2 , OB0_TYPE }, // 118 { OB0::ob0_gptr , OB0_TYPE }, // 119 { OB0::ob0_time , OB0_TYPE }, // 120 { OB0::ob0_pll_gptr , OB0_TYPE }, // 121 - { OB0::ob0_pll_bndy , OB0_TYPE }, // 122 - { 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 + { OB0::ob0_fure , OB0_TYPE }, // 122 + { OB0::ob0_pll_bndy_bucket_3 , OB0_TYPE }, // 123 + { OB0::ob0_repr , OB0_TYPE }, // 124 + { OB1::ob1_pll_bndy , OB1_TYPE }, // 125 + { OB1::ob1_pll_bndy_bucket_1 , OB1_TYPE }, // 126 + { OB1::ob1_pll_bndy_bucket_2 , 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_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 + { OB1::ob1_fure , OB1_TYPE }, // 131 + { OB1::ob1_pll_bndy_bucket_3 , OB1_TYPE }, // 132 + { OB1::ob1_repr , OB1_TYPE }, // 133 + { OB2::ob2_pll_bndy , OB2_TYPE }, // 134 + { OB2::ob2_pll_bndy_bucket_1 , OB2_TYPE }, // 135 + { OB2::ob2_pll_bndy_bucket_2 , 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_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 + { OB2::ob2_fure , OB2_TYPE }, // 140 + { OB2::ob2_pll_bndy_bucket_3 , OB2_TYPE }, // 141 + { OB2::ob2_repr , OB2_TYPE }, // 142 + { OB3::ob3_pll_bndy , OB3_TYPE }, // 143 + { OB3::ob3_pll_bndy_bucket_1 , OB3_TYPE }, // 144 + { OB3::ob3_pll_bndy_bucket_2 , 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_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 + { OB3::ob3_fure , OB3_TYPE }, // 149 + { OB3::ob3_pll_bndy_bucket_3 , OB3_TYPE }, // 150 + { OB3::ob3_repr , OB3_TYPE }, // 151 + { INVALID_RING , OB3_TYPE }, // 152 + { INVALID_RING , 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 9ba4862a..533a20db 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h +++ b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h @@ -171,61 +171,60 @@ enum RingID mc_repr = 113, mc_iom01_repr = 114, mc_iom23_repr = 115, - // values 116-117 unused - // OB Chiplet Rings - // Common - apply to all instances of O-Bus - ob0_fure = 118, + // OB0 Chiplet Rings + ob0_pll_bndy = 116, + ob0_pll_bndy_bucket_1 = 117, + ob0_pll_bndy_bucket_2 = 118, ob0_gptr = 119, ob0_time = 120, ob0_pll_gptr = 121, - ob0_pll_bndy = 122, - ob0_pll_bndy_bucket_1 = 123, - ob0_pll_bndy_bucket_2 = 124, - ob0_pll_bndy_bucket_3 = 125, + ob0_fure = 122, + ob0_pll_bndy_bucket_3 = 123, - // OB Chiplet Rings - // OB0, OB1, OB2 and OB3 instance specific Ring - ob0_repr = 126, + // OB0 Chiplet instance specific Ring + ob0_repr = 124, - ob1_fure = 127, + // OB1 Chiplet Rings + ob1_pll_bndy = 125, + ob1_pll_bndy_bucket_1 = 126, + ob1_pll_bndy_bucket_2 = 127, ob1_gptr = 128, ob1_time = 129, ob1_pll_gptr = 130, - ob1_pll_bndy = 131, - ob1_pll_bndy_bucket_1 = 132, - ob1_pll_bndy_bucket_2 = 133, - ob1_pll_bndy_bucket_3 = 134, + ob1_fure = 131, + ob1_pll_bndy_bucket_3 = 132, - // OB Chiplet Rings - // OB0, OB1, OB2 and OB3 instance specific Ring - ob1_repr = 135, + // OB1 Chiplet instance specific Ring + ob1_repr = 133, - ob2_fure = 136, + // OB2 Chiplet Rings + ob2_pll_bndy = 134, + ob2_pll_bndy_bucket_1 = 135, + ob2_pll_bndy_bucket_2 = 136, ob2_gptr = 137, ob2_time = 138, ob2_pll_gptr = 139, - ob2_pll_bndy = 140, - ob2_pll_bndy_bucket_1 = 141, - ob2_pll_bndy_bucket_2 = 142, - ob2_pll_bndy_bucket_3 = 143, + ob2_fure = 140, + ob2_pll_bndy_bucket_3 = 141, - // OB Chiplet Rings - // OB0, OB1, OB2 and OB3 instance specific Ring - ob2_repr = 144, + // OB2 Chiplet instance specific Ring + ob2_repr = 142, - ob3_fure = 145, + // OB3 Chiplet Rings + ob3_pll_bndy = 143, + ob3_pll_bndy_bucket_1 = 144, + ob3_pll_bndy_bucket_2 = 145, ob3_gptr = 146, ob3_time = 147, ob3_pll_gptr = 148, - ob3_pll_bndy = 149, - 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 = 153, + ob3_fure = 149, + ob3_pll_bndy_bucket_3 = 150, + + // OB3 Chiplet instance specific Rings + ob3_repr = 151, + + // values 152-153 unused // PCI Chiplet Rings // PCI0 Common Rings |
