From 12b6b45da2328eed329d94c8bb678580e1ef97ca Mon Sep 17 00:00:00 2001 From: Santosh Puranik Date: Tue, 17 Jan 2017 10:39:05 -0600 Subject: Make plat init attributes non-writable Change-Id: I382948a4083293e4ecc42a9759559a060444f5f0 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34997 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: HWSV CI Tested-by: Hostboot CI Tested-by: PPE CI Reviewed-by: Sachin Gupta Reviewed-by: SRINIVAS V. POLISETTY Reviewed-by: Matt K. Light Reviewed-by: Daniel M. Crowell Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35044 Reviewed-by: Hostboot Team Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW --- .../xml/attribute_info/nest_attributes.xml | 23 +--------- .../xml/attribute_info/pervasive_attributes.xml | 52 ---------------------- src/include/usr/fapi2/attribute_service.H | 4 -- .../targeting/common/xmltohb/attribute_types.xml | 52 +++++++++++++--------- .../common/xmltohb/hb_customized_attrs.xml | 43 +++++++++++++++--- 5 files changed, 71 insertions(+), 103 deletions(-) (limited to 'src') diff --git a/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml index a67e37b94..4d5483b8a 100644 --- a/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml +++ b/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml @@ -193,7 +193,6 @@ SLOW = 0x01 - @@ -291,7 +290,6 @@ CHIP_IS_GROUP = 0x02 - @@ -421,10 +419,6 @@ uint8 - - @@ -438,10 +432,6 @@ uint8 - - @@ -454,10 +444,6 @@ uint8 - - @@ -781,11 +767,8 @@ uint8 HB_IPL = 0x1,HB_RUNTIME = 0x2,CACHE_CONTAINED = 0x4,CHIP_CONTAINED = 0x8,NONHB_IPL = 0x10 - - + @@ -800,10 +783,6 @@ TRUE = 0x1 - - diff --git a/src/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml index d0444806d..e543d94bc 100755 --- a/src/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml +++ b/src/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml @@ -34,10 +34,6 @@ setup clock mux settings uint32 - - @@ -55,7 +51,6 @@ uint16 - @@ -65,7 +60,6 @@ uint8 - @@ -75,7 +69,6 @@ uint32 - @@ -106,7 +99,6 @@ FSP_LESS = 0x0,FSP = 0x1 - @@ -137,7 +129,6 @@ uint8 - @@ -147,7 +138,6 @@ uint8 - @@ -157,7 +147,6 @@ uint8 - @@ -167,7 +156,6 @@ uint8 - @@ -177,7 +165,6 @@ uint8 - @@ -196,7 +183,6 @@ uint16 - @@ -208,7 +194,6 @@ FALSE = 0x0,TRUE = 0x1 - @@ -220,7 +205,6 @@ FALSE = 0x0,TRUE = 0x1 - @@ -239,7 +223,6 @@ uint32 - @@ -384,7 +367,6 @@ FALSE = 0x0,TRUE = 0x1 - @@ -464,7 +446,6 @@ uint8 - @@ -474,7 +455,6 @@ uint8 - @@ -486,7 +466,6 @@ uint8 - @@ -496,7 +475,6 @@ Holds the state of Security Access Bit (SAB) uint8 - @@ -512,7 +490,6 @@ uint8 - @@ -525,9 +502,6 @@ - ATTR_OBUS_RATIO_VALUE TARGET_TYPE_PROC_CHIP @@ -538,7 +512,6 @@ uint8 - @@ -547,7 +520,6 @@ Pibmem repair attribute 0 uint64 - @@ -557,7 +529,6 @@ Pibmem repair attribute 1 uint64 - @@ -567,7 +538,6 @@ Pibmem repair attribute 2 uint64 - @@ -585,10 +555,6 @@ To skip the locking sequence and check for lock of CP filter PLL uint8 - - @@ -597,10 +563,6 @@ To skip the locking sequence and check for lock of SS filter PLL uint8 - - @@ -609,10 +571,6 @@ To skip the locking sequence and check for lock of IO filter PLL uint8 - - @@ -621,10 +579,6 @@ Skip locking sequence and check for lock of DPLL uint8 - - @@ -633,10 +587,6 @@ Skip the locking sequence and check for lock of NEST/MEM/XBUS/OBUS/PCI PLLs uint8 - - @@ -675,7 +625,6 @@ System Configurtion information - 1 indicates a chip present uint64 - @@ -784,7 +733,6 @@ uint8 - diff --git a/src/include/usr/fapi2/attribute_service.H b/src/include/usr/fapi2/attribute_service.H index f21020610..110e0b4c8 100644 --- a/src/include/usr/fapi2/attribute_service.H +++ b/src/include/usr/fapi2/attribute_service.H @@ -407,9 +407,5 @@ fapiToTargeting::ID, sizeof(VAL), &(VAL)) AttrOverrideSync::getAttrOverrideFunc(ID, TARGET, &VAL)\ ? fapi2::ReturnCode() : \ fapi2::platAttrSvc::platGetSecurityMode(VAL) -#define ATTR_SECURITY_MODE_SETMACRO(ID, TARGET, VAL) \ - AttrOverrideSync::getAttrOverrideFunc(ID, TARGET, &VAL)\ - ? fapi2::ReturnCode() : \ - fapi2::platAttrSvc::platSetSecurityMode() #endif // ATTRIBUTESERVICE_H_ diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 31098656f..fd2ff7946 100755 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -75,25 +75,6 @@ - - SYSTEM_IPL_PHASE - Define context for current phase of system IPL. - Provided by the platform. - HB_IPL = 0x1,HB_RUNTIME = 0x2,CACHE_CONTAINED = 0x4 - - - 0x01 - - - - ATTR_SYSTEM_IPL_PHASE - DIRECT - - non-volatile - - - - Dummy attribute with read/write permissions @@ -582,7 +563,6 @@ 0 - @@ -7003,6 +6983,38 @@ Selects which voltage level to place the Core and ECO domain PFETs upon Winkle e + + A_EREPAIR_THRESHOLD_FIELD + + This attribute represents the eRepair threshold value of A-Bus used + in the field. + creator: platform (generated based on MRW data) + See defintion in erepair_thresholds.xml for more information. + + + + + + non-volatile + + + + + A_EREPAIR_THRESHOLD_MNFG + + This attribute represents the eRepair threshold value of A-Bus used + by Manufacturing. + creator: platform (generated based on MRW data) + See defintion in erepair_thresholds.xml for more information. + + + + + + non-volatile + + + MSS_MBA_ADDR_INTERLEAVE_BIT sets the Centaur address bits used to interleave addresses between MBA01 and MBA23. valid values are 23 through 32. diff --git a/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml b/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml index 10df84541..830512147 100644 --- a/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml +++ b/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml @@ -55,7 +55,7 @@ - + ATTR_DUMMY_SCRATCH_PLAT_INIT_UINT8 5 @@ -297,6 +297,7 @@ ATTR_NEST_PLL_BUCKET 0x05 + @@ -316,7 +317,7 @@ ATTR_SYSTEM_IPL_PHASE - 0x01 + HB_IPL @@ -527,6 +528,12 @@ 0x40000 + + ATTR_SYSTEM_RESCLK_DISABLE + 0x00 + + + ATTR_BACKUP_SEEPROM_SELECT @@ -545,11 +552,13 @@ ATTR_PROC_EFF_FABRIC_GROUP_ID + ATTR_PROC_EFF_FABRIC_CHIP_ID + @@ -563,6 +572,11 @@ + + ATTR_DMI_REFCLOCK_SWIZZLE + + + ATTR_MRW_MEM_SENSOR_CACHE_ADDR_MAP @@ -584,10 +598,29 @@ - ATTR_EI_BUS_TX_MSBSWAP - + ATTR_PROC_SBE_MASTER_CHIP + + + + + ATTR_RISK_LEVEL + + + + + ATTR_BOOT_FLAGS + + + ATTR_EC_GARD + + + + + ATTR_EQ_GARD + + ATTR_CEN_MSS_ALLOW_SINGLE_PORTFALSE ATTR_CEN_VPD_DIMM_RCD_OUTPUT_TIMING0x01,0x00,0x01,0x00 @@ -608,7 +641,7 @@ ATTR_CEN_MRW_CDIMM_SPARE_I2C_TEMP_SENSOR_ENABLE0x01 ATTR_CEN_MRW_SAFEMODE_MEM_THROTTLE_NUMERATOR_PER_MBA0x00000060 ATTR_CEN_MRW_SAFEMODE_MEM_THROTTLE_NUMERATOR_PER_CHIP0x00000020 - + ATTR_CEN_VPD_DRV_IMP_DQ_DQSOHM34_FFE0,OHM34_FFE0 ATTR_CEN_VPD_SLEW_RATE_DQ_DQS0x03,0x03 ATTR_CEN_EFF_CEN_DRV_IMP_DQ_DQSOHM34_FFE0,OHM34_FFE0 -- cgit v1.2.1