From bcb3d79c3389ce0119accf0925a21c8b64c7ea2c Mon Sep 17 00:00:00 2001 From: crgeddes Date: Mon, 22 Aug 2016 14:55:22 -0500 Subject: Update attribute xml to match with fapi2 There were a lot of attributes whose type did not match what was in the EKB. This commit fixes a lot of those issues RTC: 158587 Change-Id: Ie74f84c7874d7285a9091c8c975027399ef89ddf Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28634 Tested-by: Jenkins Server Reviewed-by: Martin Gloff Tested-by: FSP CI Jenkins Reviewed-by: Matt Derksen Reviewed-by: William G. Hoffa --- src/usr/fapi2/attribute_service.C | 4 +- src/usr/targeting/attrsync.C | 2 +- .../targeting/common/xmltohb/attribute_types.xml | 225 +++++++++++++++++---- 3 files changed, 188 insertions(+), 43 deletions(-) diff --git a/src/usr/fapi2/attribute_service.C b/src/usr/fapi2/attribute_service.C index 9896db0f3..6f999b978 100644 --- a/src/usr/fapi2/attribute_service.C +++ b/src/usr/fapi2/attribute_service.C @@ -38,13 +38,13 @@ #include #include +#include +#include #include #include #include #include -#include #include -#include #include #include #include diff --git a/src/usr/targeting/attrsync.C b/src/usr/targeting/attrsync.C index 6b39cbe32..9a443e917 100644 --- a/src/usr/targeting/attrsync.C +++ b/src/usr/targeting/attrsync.C @@ -678,7 +678,7 @@ namespace TARGETING for(TargetHandleList::const_iterator mca = l_mcaList.begin(); mca != l_mcaList.end(); ++mca) { - uint8_t effDimmSize[][2] = {{0x4,0x0},{0x4,0x0}}; + uint32_t effDimmSize[][2] = {{0x4,0x0},{0x4,0x0}}; (*mca)->setAttr(effDimmSize); } diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 33916fe69..66495791a 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -774,7 +774,7 @@ - 2, 3, 4 + 2, 3, 2 volatile-zeroed @@ -808,7 +808,7 @@ - 2, 3, 4 + 2, 3, 2 volatile-zeroed @@ -8360,8 +8360,8 @@ DEPRECATED!!!! DIMM Size, in GB Used in various locations and is computed in mss_eff_cnfg. - - + + 2,2 volatile-zeroed @@ -9504,6 +9504,8 @@ DEPRECATED!!!! + MSS_MEM_WATT_TARGET @@ -9516,8 +9518,27 @@ DEPRECATED!!!! - - + + volatile-zeroed + + + + + + + MSS_MEM_WATT_TARGET_TEMPORARY + + Total memory power limit in cW for the dimms on the memory channel pair. + Used to compute the throttles on the channel and/or dimms. + creator: unknown. + consumer: mss_eff_config. + firmware notes: none. + + + + + 2 volatile-zeroed @@ -9881,6 +9902,7 @@ DEPRECATED!!!! + 2 volatile-zeroed @@ -10194,7 +10216,7 @@ Measured in GB - 16,16 + 16,18 volatile-zeroed @@ -12338,8 +12360,8 @@ Measured in GB firmware notes: Platforms should initialize this attribute to AUTO (0) - - + + volatile-zeroed @@ -13301,6 +13323,7 @@ Measured in GB + 2 volatile-zeroed @@ -15330,7 +15353,7 @@ Measured in GB - 2,2 + 2 volatile-zeroed @@ -19387,8 +19410,8 @@ DEPRECATED!!!! Provided by the Machine Readable Workbook after system characterization. - - + + ATTR_EXTERNAL_VRM_STEPSIZE @@ -21481,8 +21504,8 @@ DEPRECATED!!!! PROC_FABRIC_SYSTEM_ID Logical fabric system ID associated with this chip. Provided by the MRW. - - + + volatile-zeroed @@ -21761,9 +21784,7 @@ DEPRECATED!!!! - 0,0,0,0 - 4 non-volatile @@ -23390,7 +23411,7 @@ DEPRECATED!!!! - 4 + 7 volatile-zeroed @@ -23851,8 +23872,8 @@ DEPRECATED!!!! firmware notes: none - - + + 2 volatile-zeroed @@ -24065,8 +24086,8 @@ DEPRECATED!!!! firmware notes: none - - + + 2 volatile-zeroed @@ -27532,7 +27553,7 @@ DEPRECATED!!!! Place holder description - 2,2,2 + 2,2,4 volatile-zeroed @@ -27548,7 +27569,7 @@ DEPRECATED!!!! Place holder description - 2,2,2 + 2,2,4 volatile-zeroed @@ -27565,7 +27586,7 @@ DEPRECATED!!!! Place holder description - 2,2,2 + 2,2,4 volatile-zeroed @@ -27581,7 +27602,7 @@ DEPRECATED!!!! Place holder description - 2,2,2 + 2,2,4 volatile-zeroed @@ -27664,7 +27685,7 @@ DEPRECATED!!!! Place holder description - 2 + 2,5 volatile-zeroed @@ -27680,7 +27701,7 @@ DEPRECATED!!!! Place holder description - 2 + 2, 5 volatile-zeroed @@ -27794,7 +27815,7 @@ DEPRECATED!!!! Place holder description - 2,2,2 + 2,2,4 volatile-zeroed @@ -27810,7 +27831,7 @@ DEPRECATED!!!! Place holder description - 2,2,2 + 2,2,4 volatile-zeroed @@ -27889,7 +27910,7 @@ DEPRECATED!!!! MSS_VPD_MT_VREF_MC_RD Place holder description - + 2 volatile-zeroed @@ -29734,8 +29755,8 @@ DEPRECATED!!!! 0x06 = b00000110 (2 branches selected) - - 2, 2 + + 2 volatile-zeroed @@ -29754,8 +29775,8 @@ DEPRECATED!!!! 0x06 = b00000110 (2 branches selected) - - 2, 2 + + 2 volatile-zeroed @@ -29774,8 +29795,8 @@ DEPRECATED!!!! 0x06 = b00000110 (2 branches selected) - - 2, 2 + + 2 volatile-zeroed @@ -29795,8 +29816,8 @@ DEPRECATED!!!! 0x03 = maximum capacitors selected) - - 2, 5 + + 2 volatile-zeroed @@ -29816,8 +29837,8 @@ DEPRECATED!!!! 0x07 = min resistance) - - 2, 5 + + 2 volatile-zeroed @@ -29935,5 +29956,129 @@ DEPRECATED!!!! + + VDM_ENABLE + + Controls the enablement of Voltage Droop Monitors (VDM) in the system. + + Producer: Machine Readable Workbook + + Consumers: + p9_pstate_parameter_block to set flag for CME QuadManager Hcode + reaction + p9_hcd_cache procedures to power on VDMs before CME booting + + + + + + + volatile-zeroed + + ATTR_VDM_ENABLE + DIRECT + + + + + DPLL_DYNAMIC_FMAX_ENABLE + + Allow increased dynamic frequency in response to excess voltage margin + Controlled by VDM_OVERVOLT threshold value in VDM Configuration Register. + + Producer: MRWB. + + + + + + + volatile-zeroed + + ATTR_DPLL_DYNAMIC_FMAX_ENABLE + DIRECT + + + + + DPLL_DYNAMIC_FMIN_ENABLE + + Allow increased dynamic frequency in response to excess voltage margin + Controlled by VDM_OVERVOLT threshold value in VDM Configuration Register. + + Producer: MRWB. + + + + + + + volatile-zeroed + + ATTR_DPLL_DYNAMIC_FMIN_ENABLE + DIRECT + + + + + DPLL_DROOP_PROTECT_ENABLE + + Enable instantaneous frequency reduction in response to droop events + Controlled by VDM_DROOP_SMALL, _LARGE and _XTREME threshold values in VDM + Configuration Register. The amount of reduction is controlled by chip + initialization values + + Producer: MRWB. + + + + + + + volatile-zeroed + + ATTR_DPLL_DROOP_PROTECT_ENABLE + DIRECT + + + + + DPLL_VDM_RESPONSE + + Indicates the response of the DPLL frequency upon VDM events. This + control will only apply if ATTR_DPLL_VDM_JUMP_ENABLE is ON; + Hardware WOF = DROOP_PROTECT_OVERVOLT (slew to Fmax if margin exists) + + Producer: MRWB. + + + + + + + volatile-zeroed + + ATTR_DPLL_VDM_RESPONSE + DIRECT + + + + + MSS_MRW_DRAM_2N_MODE + + Allows user to manually turn on and off 2N Mode. + AUTO indicates to use Signal Integrity generated setting (from VPD). + + + + + + + volatile-zeroed + + ATTR_MSS_MRW_DRAM_2N_MODE + DIRECT + + -- cgit v1.2.3