diff options
Diffstat (limited to 'src/import/chips/p9/utils/imageProcs')
| -rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ringId.C | 4 | ||||
| -rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ringId.H | 20 | ||||
| -rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ring_id.h | 7 |
3 files changed, 13 insertions, 18 deletions
diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C index 855a5c7e..f03ca39a 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C @@ -135,7 +135,6 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"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[] = { RV_BASE, RV_RL, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT }; }; @@ -221,8 +220,7 @@ const GenRingIdList RING_ID_LIST_COMMON[] = const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"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}, + {"mc_iom23_repr" , 0x11, 0x07, 0x08, VPD_RING , 0x07030806}, }; const RingVariantOrder RING_VARIANT_ORDER[] = { RV_BASE, RV_RL, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT, UNDEFINED_RING_VARIANT }; }; diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.H b/src/import/chips/p9/utils/imageProcs/p9_ringId.H index fd4a4289..e090acc7 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H @@ -299,15 +299,14 @@ enum RingOffset // Instance Rings n2_repr = (0 | INSTANCE_RING_MARK), n2_cxa1_repr = (1 | INSTANCE_RING_MARK), - n2_psi_repr = (2 | INSTANCE_RING_MARK) }; static const ChipletData_t g_chipletData = { 4, // N2 Chiplet ID is 4. 9, // 9 common rings for N2 Chiplet - 3, // 3 instance specific rings for N2 chiplet - 3, + 2, // 2 instance specific rings for N2 chiplet + 2, 2, // 2 common ring variants: BASE, RL }; }; @@ -404,16 +403,15 @@ enum RingOffset mc_pll_func = 15, // Instance Rings mc_repr = (0 | INSTANCE_RING_MARK), - mc_iom01_repr = (1 | INSTANCE_RING_MARK), - mc_iom23_repr = (2 | INSTANCE_RING_MARK) + mc_iom23_repr = (1 | INSTANCE_RING_MARK), }; static const ChipletData_t g_chipletData = { 7, // MC Chiplet ID range is 7 - 8. The base ID is 7. 16, // 16 common rings for MC Chiplet - 3, // 3 instance specific rings for each MC instance - 3, + 2, // 1 instance specific rings for each MC instance + 2, 2, // 2 common ring variants: BASE, RL }; }; // end of namespace MC @@ -780,7 +778,7 @@ static const RingProperties_t RING_PROPERTIES[NUM_RING_IDS] = { N2::n2_psi_time , "n2_psi_time" , N2_TYPE }, // 57 { N2::n2_repr , "n2_repr" , N2_TYPE }, // 58 { N2::n2_cxa1_repr , "n2_cxa1_repr" , N2_TYPE }, // 59 - { N2::n2_psi_repr , "n2_psi_repr" , N2_TYPE }, // 60 + { INVALID_RING_OFFSET , "invalid" , N2_TYPE }, // 60 { INVALID_RING_OFFSET , "invalid" , N2_TYPE }, // 61 { N3::n3_fure , "n3_fure" , N3_TYPE }, // 62 { N3::n3_gptr , "n3_gptr" , N3_TYPE }, // 63 @@ -834,7 +832,7 @@ static const RingProperties_t RING_PROPERTIES[NUM_RING_IDS] = { MC::mc_pll_bndy_bucket_5 , "mc_pll_bndy_bucket_5" , MC_TYPE }, // 111 { MC::mc_pll_func , "mc_pll_func" , MC_TYPE }, // 112 { MC::mc_repr , "mc_repr" , MC_TYPE }, // 113 - { MC::mc_iom01_repr , "mc_iom01_repr" , MC_TYPE }, // 114 + { INVALID_RING_OFFSET , "invalid" , MC_TYPE }, // 114 { MC::mc_iom23_repr , "mc_iom23_repr" , MC_TYPE }, // 115 { OB0::ob0_pll_bndy , "ob0_pll_bndy" , OB0_TYPE }, // 116 { OB0::ob0_pll_bndy_bucket_1 , "ob0_pll_bndy_bucket_1" , OB0_TYPE }, // 117 @@ -1043,7 +1041,7 @@ static const RingProperties_t RING_PROPERTIES[NUM_RING_IDS] = { N2::n2_psi_time , N2_TYPE }, // 57 { N2::n2_repr , N2_TYPE }, // 58 { N2::n2_cxa1_repr , N2_TYPE }, // 59 - { N2::n2_psi_repr , N2_TYPE }, // 60 + { INVALID_RING_OFFSET , N2_TYPE }, // 60 { INVALID_RING_OFFSET , N2_TYPE }, // 61 { N3::n3_fure , N3_TYPE }, // 62 { N3::n3_gptr , N3_TYPE }, // 63 @@ -1097,7 +1095,7 @@ static const RingProperties_t RING_PROPERTIES[NUM_RING_IDS] = { MC::mc_pll_bndy_bucket_5 , MC_TYPE }, // 111 { MC::mc_pll_func , MC_TYPE }, // 112 { MC::mc_repr , MC_TYPE }, // 113 - { MC::mc_iom01_repr , MC_TYPE }, // 114 + { INVALID_RING_OFFSET , MC_TYPE }, // 114 { MC::mc_iom23_repr , MC_TYPE }, // 115 { OB0::ob0_pll_bndy , OB0_TYPE }, // 116 { OB0::ob0_pll_bndy_bucket_1 , OB0_TYPE }, // 117 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 d4fb93e9..47fe2f5b 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h +++ b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h @@ -110,8 +110,7 @@ enum RingID n2_psi_time = 57, //0x39 n2_repr = 58, //0x3A n2_cxa1_repr = 59, //0x3B - n2_psi_repr = 60, //0x3C - // values 61 unused + // values 60-61 unused // Nest Chiplet Rings - N3 n3_fure = 62, //0x3E @@ -177,8 +176,8 @@ enum RingID // MC Chiplet Rings // MC01 and MC23 instance specific Rings mc_repr = 113, //0x71 - mc_iom01_repr = 114, //0x72 - mc_iom23_repr = 115, //0x73 + // value 114 unused + mc_iom23_repr = 115, //0c73 // OB0 Chiplet Rings ob0_pll_bndy = 116, //0x74 |
