From fad80fcf1cf0ae7923cab267777f2c3974f7cc93 Mon Sep 17 00:00:00 2001 From: Sumit Kumar Date: Tue, 25 Apr 2017 05:10:56 -0500 Subject: Enablement of n3_br_fure ring for Nimbus DD2 Change-Id: I913dce08862c05aedd21ea1e00bc02a147786536 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39634 Reviewed-by: Joseph J. McGill Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Claus M. Olsen Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39642 Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/import/chips/p9/utils/imageProcs/p9_ringId.C | 7 ++++--- src/import/chips/p9/utils/imageProcs/p9_ringId.H | 7 ++++--- src/import/chips/p9/utils/imageProcs/p9_ring_id.h | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'src/import/chips/p9/utils') diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C index 85e7bbe8e..74abdc45d 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C @@ -144,12 +144,13 @@ const GenRingIdList RING_ID_LIST_COMMON[] = {"n3_np_fure" , 0x06, 0x05, 0x05, EKB_RING , 0x0503080F}, {"n3_np_gptr" , 0x07, 0x05, 0x05, EKB_RING , 0x05030802}, {"n3_np_time" , 0x08, 0x05, 0x05, VPD_RING , 0x05030807}, + {"n3_br_fure" , 0x09, 0x05, 0x05, EKB_RING , 0x0503100F}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"n3_repr" , 0x09, 0x05, 0x05, VPD_RING , 0x05037606}, - {"n3_mcs01_repr" , 0x0a, 0x05, 0x05, VPD_RING , 0x05030106}, - {"n3_np_repr" , 0x0b, 0x05, 0x05, VPD_RING , 0x05030806}, + {"n3_repr" , 0x0a, 0x05, 0x05, VPD_RING , 0x05037606}, + {"n3_mcs01_repr" , 0x0b, 0x05, 0x05, VPD_RING , 0x05030106}, + {"n3_np_repr" , 0x0c, 0x05, 0x05, VPD_RING , 0x05030806}, }; 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 1b1eaf29d..8b501bf1e 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H @@ -414,6 +414,7 @@ enum RingOffset n3_np_fure = 6, n3_np_gptr = 7, n3_np_time = 8, + n3_br_fure = 9, // Instance Rings n3_repr = (0 | INSTANCE_RING_MARK), n3_mcs01_repr = (1 | INSTANCE_RING_MARK), @@ -423,7 +424,7 @@ enum RingOffset static const CHIPLET_DATA g_n3Data = { 5, // N3 Chiplet ID is 5 - 9, // 9 common rings for N3 Chiplet + 10,// 10 common rings for N3 Chiplet 3, // 3 instance specific rings for N3 chiplet 3 }; @@ -946,7 +947,7 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] = { N3::n3_repr , "n3_repr" , N3_TYPE }, // 71 { N3::n3_mcs01_repr , "n3_mcs01_repr" , N3_TYPE }, // 72 { N3::n3_np_repr , "n3_np_repr" , N3_TYPE }, // 73 - { INVALID_RING , "invalid" , N3_TYPE }, // 74 + { N3::n3_br_fure , "n3_br_fure" , N3_TYPE }, // 74 { XB::xb_fure , "xb_fure" , XB_TYPE }, // 75 { XB::xb_gptr , "xb_gptr" , XB_TYPE }, // 76 { XB::xb_time , "xb_time" , XB_TYPE }, // 77 @@ -1203,7 +1204,7 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] = { N3::n3_repr , N3_TYPE }, // 71 { N3::n3_mcs01_repr , N3_TYPE }, // 72 { N3::n3_np_repr , N3_TYPE }, // 73 - { INVALID_RING , N3_TYPE }, // 74 + { N3::n3_br_fure , N3_TYPE }, // 74 { XB::xb_fure , XB_TYPE }, // 75 { XB::xb_gptr , XB_TYPE }, // 76 { XB::xb_time , XB_TYPE }, // 77 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 34c920d72..98b9d58f3 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h +++ b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h @@ -118,7 +118,7 @@ enum RingID n3_repr = 71, n3_mcs01_repr = 72, n3_np_repr = 73, - // values 74 unused + n3_br_fure = 74, // X-Bus Chiplet Rings // Common - apply to all instances of X-Bus -- cgit v1.2.1