diff options
| author | Claus Michael Olsen <cmolsen@us.ibm.com> | 2016-10-24 14:12:51 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-11-01 11:38:17 -0400 |
| commit | 5360af86d0568d3a69bbd0e38b32195e640dbd0d (patch) | |
| tree | 493590403ddfa6e472a03b6ff2dda4fe3d6dad13 /src/import/chips/p9/utils | |
| parent | 9d56704c471a0389d471930cd3747554380b6b0c (diff) | |
| download | talos-hostboot-5360af86d0568d3a69bbd0e38b32195e640dbd0d.tar.gz talos-hostboot-5360af86d0568d3a69bbd0e38b32195e640dbd0d.zip | |
Removing three pibnet rings.
Change-Id: I44fdbb857ca1fe578e097ce3871b3d65f608a6d9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31739
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: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31879
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>
Diffstat (limited to 'src/import/chips/p9/utils')
| -rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ringId.C | 7 | ||||
| -rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ringId.H | 29 |
2 files changed, 15 insertions, 21 deletions
diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C index 253301fb4..83e230eaf 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C @@ -45,15 +45,12 @@ const GenRingIdList RING_ID_LIST_COMMON[] = {"perv_pll_bndy_bucket_4" , 0x0c, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x0002000000000080}, {"perv_pll_bndy_bucket_5" , 0x0d, 0x01, 0x01, NON_VPD_PLL_RING, 5, 0x0002000000000080}, {"perv_pll_func" , 0x0e, 0x01, 0x01, NON_VPD_RING, 0, 0x0002000000008000}, - {"perv_pibnet_gptr" , 0x0f, 0x01, 0x01, NON_VPD_RING, 0, 0x0600000000002000}, - {"perv_pibnet_time" , 0x10, 0x01, 0x01, NON_VPD_RING, 0, 0x0600000000000100}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"perv_repr" , 0x11, 0x01, 0x01, NON_VPD_RING, 0, 0x0800000000000200}, - {"occ_repr" , 0x12, 0x01, 0x01, NON_VPD_RING, 0, 0x0100000000000200}, - {"perv_pibnet_repr" , 0x13, 0x01, 0x01, NON_VPD_RING, 0, 0x0600000000000200}, + {"perv_repr" , 0x0f, 0x01, 0x01, NON_VPD_RING, 0, 0x0800000000000200}, + {"occ_repr" , 0x10, 0x01, 0x01, NON_VPD_RING, 0, 0x0100000000000200}, }; 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 816bdaf25..e6997ddf3 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H @@ -252,20 +252,17 @@ enum RingOffset perv_pll_bndy_bucket_4 = 12, perv_pll_bndy_bucket_5 = 13, perv_pll_func = 14, - perv_pibnet_gptr = 15, - perv_pibnet_time = 16, // Instance Rings perv_repr = (0 | INSTANCE_RING_MARK), occ_repr = (1 | INSTANCE_RING_MARK), - perv_pibnet_repr = (2 | INSTANCE_RING_MARK) }; static const CHIPLET_DATA g_pervData = { 1, // Pervasive Chiplet ID is 1 - 17, // 17 common rings for pervasive chiplet - 3, // 3 instance specific rings for pervasive chiplet - 3 + 15, // 15 common rings for pervasive chiplet + 2, // 2 instance specific rings for pervasive chiplet + 2 }; }; // end of namespace PERV @@ -850,11 +847,11 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] = { PERV::perv_pll_bndy_bucket_4 , "perv_pll_bndy_bucket_4" , PERV_TYPE }, // 13 { PERV::perv_pll_bndy_bucket_5 , "perv_pll_bndy_bucket_5" , PERV_TYPE }, // 14 { PERV::perv_pll_func , "perv_pll_func" , PERV_TYPE }, // 15 - { PERV::perv_pibnet_gptr , "perv_pibnet_gptr" , PERV_TYPE }, // 16 - { PERV::perv_pibnet_time , "perv_pibnet_time" , PERV_TYPE }, // 17 - { PERV::perv_repr , "perv_repr" , PERV_TYPE }, // 18 - { PERV::occ_repr , "occ_repr" , PERV_TYPE }, // 19 - { PERV::perv_pibnet_repr , "perv_pibnet_repr" , PERV_TYPE }, // 20 + { PERV::perv_repr , "perv_repr" , PERV_TYPE }, // 16 + { PERV::occ_repr , "occ_repr" , PERV_TYPE }, // 17 + { INVALID_RING , "invalid" , PERV_TYPE }, // 18 + { INVALID_RING , "invalid" , PERV_TYPE }, // 19 + { INVALID_RING , "invalid" , PERV_TYPE }, // 20 { N0::n0_fure , "n0_fure" , N0_TYPE }, // 21 { N0::n0_gptr , "n0_gptr" , N0_TYPE }, // 22 { N0::n0_time , "n0_time" , N0_TYPE }, // 23 @@ -1084,11 +1081,11 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] = { PERV::perv_pll_bndy_bucket_4 , PERV_TYPE }, // 13 { PERV::perv_pll_bndy_bucket_5 , PERV_TYPE }, // 14 { PERV::perv_pll_func , PERV_TYPE }, // 15 - { PERV::perv_pibnet_gptr , PERV_TYPE }, // 16 - { PERV::perv_pibnet_time , PERV_TYPE }, // 17 - { PERV::perv_repr , PERV_TYPE }, // 18 - { PERV::occ_repr , PERV_TYPE }, // 19 - { PERV::perv_pibnet_repr , PERV_TYPE }, // 20 + { PERV::perv_repr , PERV_TYPE }, // 16 + { PERV::occ_repr , PERV_TYPE }, // 17 + { INVALID_RING , PERV_TYPE }, // 18 + { INVALID_RING , PERV_TYPE }, // 19 + { INVALID_RING , PERV_TYPE }, // 20 { N0::n0_fure , N0_TYPE }, // 21 { N0::n0_gptr , N0_TYPE }, // 22 { N0::n0_time , N0_TYPE }, // 23 |
