diff options
| author | Chris Cain <cjcain@us.ibm.com> | 2017-11-20 13:51:39 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-11-22 10:25:12 -0500 |
| commit | 4e72331566db512e82f4d320d627ed9866967a5e (patch) | |
| tree | 2731eb03b1bddf6021affd072f170043c5f66bae /src/usr | |
| parent | a420f6c23b46b1e582825035999e6f48f1059cb1 (diff) | |
| download | talos-hostboot-4e72331566db512e82f4d320d627ed9866967a5e.tar.gz talos-hostboot-4e72331566db512e82f4d320d627ed9866967a5e.zip | |
HTMGT: Do not validate throttles based on oversubscription
Change-Id: I20520c38ce791a63a1f8a43e9e1afdeb8596b63f
CQ: SW408496
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49921
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sheldon R. Bailey <baileysh@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/htmgt/htmgt_memthrottles.C | 16 | ||||
| -rw-r--r-- | src/usr/htmgt/test/htmgtcfgtest.H | 8 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types_openpower.xml | 51 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/target_types_openpower.xml | 3 |
4 files changed, 4 insertions, 74 deletions
diff --git a/src/usr/htmgt/htmgt_memthrottles.C b/src/usr/htmgt/htmgt_memthrottles.C index e4c5593f1..0a1fafa13 100644 --- a/src/usr/htmgt/htmgt_memthrottles.C +++ b/src/usr/htmgt/htmgt_memthrottles.C @@ -361,25 +361,9 @@ errlHndl_t memPowerThrottlePowercap( mcs_target->tryGetAttr<ATTR_N_PLUS_ONE_N_PER_MBA>(l_slot_redun); mcs_target->tryGetAttr<ATTR_N_PLUS_ONE_N_PER_CHIP>(l_port_redun); mcs_target->tryGetAttr<ATTR_N_PLUS_ONE_MEM_POWER>(l_power_redun); - ATTR_OVERSUB_N_PER_MBA_type l_slot_oversub = {0}; - ATTR_OVERSUB_N_PER_CHIP_type l_port_oversub = {0}; - ATTR_OVERSUB_MEM_POWER_type l_power_oversub = {0}; - mcs_target->tryGetAttr<ATTR_OVERSUB_N_PER_MBA>(l_slot_oversub); - mcs_target->tryGetAttr<ATTR_OVERSUB_N_PER_CHIP>(l_port_oversub); - mcs_target->tryGetAttr<ATTR_OVERSUB_MEM_POWER>(l_power_oversub); unsigned int mca_index; for (mca_index = 0; mca_index < TMGT_MAX_MCA_PER_MCS; ++mca_index) { - if (l_slot[mca_index] > l_slot_oversub[mca_index]) - { - TMGT_INF("memPowerThrottlePowercap: MCS%d/MCA%d" - " oversub throttle (%d) < pcap throttle (%d)", - mcs_unit, mca_index, - l_slot_oversub[mca_index], l_slot[mca_index]); - l_slot[mca_index] = l_slot_oversub[mca_index]; - l_port[mca_index] = l_port_oversub[mca_index]; - l_power[mca_index] = l_power_oversub[mca_index]; - } if (l_slot[mca_index] > l_slot_redun[mca_index]) { TMGT_INF("memPowerThrottlePowercap: MCS%d/MCA%d - " diff --git a/src/usr/htmgt/test/htmgtcfgtest.H b/src/usr/htmgt/test/htmgtcfgtest.H index ab71ec034..3ac3f82fc 100644 --- a/src/usr/htmgt/test/htmgtcfgtest.H +++ b/src/usr/htmgt/test/htmgtcfgtest.H @@ -149,17 +149,17 @@ public: (*mba)->getAttr<ATTR_HUID>()); } - (*mba)->tryGetAttr<ATTR_OVERSUB_N_PER_MBA>(n); + (*mba)->tryGetAttr<ATTR_POWERCAP_N_PER_MBA>(n); if ((0 == n[0]) && (0 == n[1])) { - TS_FAIL("MBA 0x%X has value of zero for OVERSUB_N_PER_MBA", + TS_FAIL("MBA 0x%X has value of zero for POWERCAP_N_PER_MBA", (*mba)->getAttr<ATTR_HUID>()); } - (*mba)->tryGetAttr<ATTR_OVERSUB_N_PER_CHIP>(n); + (*mba)->tryGetAttr<ATTR_POWERCAP_N_PER_CHIP>(n); if ((0 == n[0]) && (0 == n[1])) { - TS_FAIL("MBA 0x%X has value of zero for OVERSUB_N_PER_CHIP", + TS_FAIL("MBA 0x%X has value of zero for POWERCAP_N_PER_CHIP", (*mba)->getAttr<ATTR_HUID>()); } } diff --git a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml index 6f7bc56bd..f9ddff7a4 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml @@ -1123,57 +1123,6 @@ ID for the sensor number returned with the elog. --> </attribute> <attribute> - <id>OVERSUB_N_PER_MBA</id> - <description> - Static per MBA numerator setting when in oversubscription. - Calculated based on MRW oversubscription memory power. - </description> - <simpleType> - <uint16_t> - <default>0,0</default> - </uint16_t> - <array>2</array> - </simpleType> - <persistency>volatile-zeroed</persistency> - <readable/> - <writeable/> -</attribute> - -<attribute> - <id>OVERSUB_N_PER_CHIP</id> - <description> - Static per chip numerator setting when in oversubscription. - </description> - <simpleType> - <uint16_t> - <default>0,0</default> - </uint16_t> - <array>2</array> - </simpleType> - <persistency>volatile-zeroed</persistency> - <readable/> - <writeable/> -</attribute> - -<attribute> - <id>OVERSUB_MEM_POWER</id> - <description> - Maximum memory power in centiWatts with throttle - set to oversubscription. - </description> - <simpleType> - <uint32_t> - <default>0,0</default> - </uint32_t> - <array>2</array> - </simpleType> - <persistency>volatile-zeroed</persistency> - <readable/> - <writeable/> -</attribute> - - -<attribute> <id>POWERCAP_N_PER_MBA</id> <description> Static per slot numerator setting when power is being capped. diff --git a/src/usr/targeting/common/xmltohb/target_types_openpower.xml b/src/usr/targeting/common/xmltohb/target_types_openpower.xml index 602eb2cc3..bcbb11674 100644 --- a/src/usr/targeting/common/xmltohb/target_types_openpower.xml +++ b/src/usr/targeting/common/xmltohb/target_types_openpower.xml @@ -169,9 +169,6 @@ <attribute><id>N_PLUS_ONE_N_PER_MBA</id></attribute> <attribute><id>N_PLUS_ONE_N_PER_CHIP</id></attribute> <attribute><id>N_PLUS_ONE_MEM_POWER</id></attribute> - <attribute><id>OVERSUB_N_PER_MBA</id></attribute> - <attribute><id>OVERSUB_N_PER_CHIP</id></attribute> - <attribute><id>OVERSUB_MEM_POWER</id></attribute> <attribute><id>POWERCAP_N_PER_MBA</id></attribute> <attribute><id>POWERCAP_N_PER_CHIP</id></attribute> <attribute><id>POWERCAP_MEM_POWER</id></attribute> |
