diff options
| author | Claus Michael Olsen <cmolsen@us.ibm.com> | 2017-11-08 14:35:02 -0600 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2017-12-09 02:28:50 -0500 |
| commit | d9ebe234862c9e400494430a5b9ba35991a009f2 (patch) | |
| tree | b1f7e5f5ba957839dadc1475b2382242bfdb2a17 | |
| parent | 2dab7d4053aa119f11d8c98ca7413d5fc50e0339 (diff) | |
| download | talos-sbe-d9ebe234862c9e400494430a5b9ba35991a009f2.tar.gz talos-sbe-d9ebe234862c9e400494430a5b9ba35991a009f2.zip | |
Override filter ring support for perv_pll_bndy_bucket rings.
Change-Id: If1d4649da6da3c0d9e09ef4169d4181a1dc43bde
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49438
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: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Sumit Kumar <sumit_kumar@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49450
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
4 files changed, 27 insertions, 4 deletions
diff --git a/src/import/chips/common/utils/imageProcs/common_ringId.H b/src/import/chips/common/utils/imageProcs/common_ringId.H index 8da6a095..f61cc397 100644 --- a/src/import/chips/common/utils/imageProcs/common_ringId.H +++ b/src/import/chips/common/utils/imageProcs/common_ringId.H @@ -168,6 +168,7 @@ typedef enum RingClass EKB_FSM_RING, EKB_STUMPED_RING, EKB_CMSK_RING, + EKB_NONFLUSH_RING, VPD_RING, CEN_RING, NUM_RING_CLASSES @@ -204,7 +205,7 @@ enum RingVariant CC = 0x01, RL = 0x02, OVERRIDE = 0x03, - OVERLAY = 0x04, //@FIXME Not supported. + OVERLAY = 0x04, NUM_RING_VARIANTS = 0x05, NOT_VALID = 0xff }; diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C index b73b8c71..c0fff7dc 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C @@ -51,11 +51,15 @@ const GenRingIdList RING_ID_LIST_COMMON[] = {"perv_pll_bndy_bucket_4", 0x0c, 0x01, 0x01, EKB_RING , 0x01030018}, {"perv_pll_bndy_bucket_5", 0x0d, 0x01, 0x01, EKB_RING , 0x01030018}, {"perv_pll_func" , 0x0e, 0x01, 0x01, EKB_RING , 0x01030010}, + {"perv_pll_bndy_flt_1" , 0x0f, 0x01, 0x01, EKB_NONFLUSH_RING, 0x01030018}, + {"perv_pll_bndy_flt_2" , 0x10, 0x01, 0x01, EKB_NONFLUSH_RING, 0x01030018}, + {"perv_pll_bndy_flt_3" , 0x11, 0x01, 0x01, EKB_NONFLUSH_RING, 0x01030018}, + {"perv_pll_bndy_flt_4" , 0x12, 0x01, 0x01, EKB_NONFLUSH_RING, 0x01030018}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"perv_repr" , 0x0f, 0x01, 0x01, VPD_RING , 0x01034006}, - {"occ_repr" , 0x10, 0x01, 0x01, VPD_RING , 0x01030806}, + {"perv_repr" , 0x13, 0x01, 0x01, VPD_RING , 0x01034006}, + {"occ_repr" , 0x14, 0x01, 0x01, VPD_RING , 0x01030806}, }; 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 8f0a2588..5811830a 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H @@ -199,6 +199,10 @@ enum RingOffset perv_pll_bndy_bucket_4 = 12, perv_pll_bndy_bucket_5 = 13, perv_pll_func = 14, + perv_pll_bndy_flt_1 = 15, + perv_pll_bndy_flt_2 = 16, + perv_pll_bndy_flt_3 = 17, + perv_pll_bndy_flt_4 = 18, // Instance Rings perv_repr = (0 | INSTANCE_RING_MARK), occ_repr = (1 | INSTANCE_RING_MARK), @@ -207,7 +211,7 @@ enum RingOffset static const ChipletData_t g_chipletData = { 1, // Pervasive Chiplet ID is 1 - 15, // 15 common rings for pervasive chiplet + 19, // 19 common rings for pervasive chiplet 2, // 2 instance specific rings for pervasive chiplet 2, 2, // 2 ring variants: BASE, RL @@ -969,6 +973,10 @@ static const RingProperties_t RING_PROPERTIES[NUM_RING_IDS] = { EQ::eq_inex_bucket_3 , "eq_inex_bucket_3" , EQ_TYPE }, // 250 { EQ::eq_inex_bucket_4 , "eq_inex_bucket_4" , EQ_TYPE }, // 251 { EC::ec_cmsk , "ec_cmsk" , EC_TYPE }, // 252 + { PERV::perv_pll_bndy_flt_1 , "perv_pll_bndy_flt_1" , PERV_TYPE }, // 253 + { PERV::perv_pll_bndy_flt_2 , "perv_pll_bndy_flt_2" , PERV_TYPE }, // 254 + { PERV::perv_pll_bndy_flt_3 , "perv_pll_bndy_flt_3" , PERV_TYPE }, // 255 + { PERV::perv_pll_bndy_flt_4 , "perv_pll_bndy_flt_4" , PERV_TYPE }, // 256 }; #endif @@ -1228,6 +1236,10 @@ static const RingProperties_t RING_PROPERTIES[NUM_RING_IDS] = { EQ::eq_inex_bucket_3 , EQ_TYPE }, // 250 { EQ::eq_inex_bucket_4 , EQ_TYPE }, // 251 { EC::ec_cmsk , EC_TYPE }, // 252 + { PERV::perv_pll_bndy_flt_1 , PERV_TYPE }, // 253 + { PERV::perv_pll_bndy_flt_2 , PERV_TYPE }, // 254 + { PERV::perv_pll_bndy_flt_3 , PERV_TYPE }, // 255 + { PERV::perv_pll_bndy_flt_4 , PERV_TYPE }, // 256 }; #endif 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 ab0824a6..338c48c9 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h +++ b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h @@ -356,6 +356,12 @@ enum RingID // CMSK ring ec_cmsk = 252, //0xFC + // Perv PLL filter override rings + perv_pll_bndy_flt_1 = 253, //0xFD + perv_pll_bndy_flt_2 = 254, //0xFE + perv_pll_bndy_flt_3 = 255, //0xFF + perv_pll_bndy_flt_4 = 256, //0x100 + //*************************** // Rings needed for SBE - End //*************************** |
