Skip to content

Commit

Permalink
Cleanup: Updated Mvpd access function and removal of unused rings
Browse files Browse the repository at this point in the history 
- Removed the function that converts the outdated RS4v2 header format
  to the current RS4v3 header format in the Mvpd accessor functions,
  mvpdRingFundFind(). This can be done since all Mvpd in existance on
  any of our supported P9 systems (i.e., >=P9N DD20) use RS4v3.
- Removed two #R rings which are no longer supported since P9n DD10.
  Because these rings happen to be located at the end of the TOR
  instance ring sections, it will alter the image, but will not
  interfere with the traversing of the ringSection image due to the
  way chiplet and common/instance sub-sections are partitioned.

Key_Cronus_Test=XIP_REGRESS

Change-Id: I39740a099b224bfade8a97a057453b85498e5880
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61100
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Michael C. Sgro <mcs793@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61288
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
  • Loading branch information
@cmolsen @sgupta2m
cmolsen authored and sgupta2m committed Jul 14, 2018
1 parent 6fca309 commit b899067
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 18 deletions.
4 changes: 1 addition & 3 deletions src/import/chips/p9/utils/imageProcs/p9_ringId.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
};
Expand Down Expand Up @@ -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 };
};
Expand Down
20 changes: 9 additions & 11 deletions src/import/chips/p9/utils/imageProcs/p9_ringId.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
};
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions src/import/chips/p9/utils/imageProcs/p9_ring_id.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b899067

Please sign in to comment.