diff options
author | Matt Derksen <mderkse1@us.ibm.com> | 2018-08-14 17:21:18 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-08-18 13:11:44 -0500 |
commit | 14340c147361cc0616582b090f7abcf1901072f6 (patch) | |
tree | 73fc20ecd635da755d6fbf7dece44a28e7792471 | |
parent | b2ff2dd0c8e5ced78c84cb5f58adf3c3248369fc (diff) | |
download | blackbird-hostboot-14340c147361cc0616582b090f7abcf1901072f6.tar.gz blackbird-hostboot-14340c147361cc0616582b090f7abcf1901072f6.zip |
Use ATTR_MAX_COMPUTE_NODES_PER_SYSTEM instead of hardcoding
hwsvd crash observed during handling hbrt message to get
tod topology data because allocated size was based on a
hardcoded value for max_compute_nodes_per_system
Change-Id: I587dac32fab9dd67fe96e213c5ef72626e4e2ea1
CQ:SW434860
CMVC-Coreq: 1059506
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64459
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
6 files changed, 36 insertions, 11 deletions
diff --git a/src/usr/isteps/tod/TodUtils.C b/src/usr/isteps/tod/TodUtils.C index a1a1ede63..493787861 100644 --- a/src/usr/isteps/tod/TodUtils.C +++ b/src/usr/isteps/tod/TodUtils.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -161,14 +161,8 @@ errlHndl_t getMaxConfigParams( o_maxConfigParams.max_mcs_per_sys = l_pTopLevel->getAttr < TARGETING::ATTR_MAX_MCS_PER_SYSTEM > (); - // TODO RTC 181481: attribute ATTR_MAX_COMPUTE_NODES_PER_SYSTEM is - // currently not implemented as needed to do this assignment. I was - // assured (10/2017) that HB only supports one node, so I am defaulting - // this to 1. In the future HB will need to be multi-node aware and - // TARGETING::ATTR_MAX_COMPUTE_NODES_PER_SYSTEM implemented. - o_maxConfigParams.max_compute_nodes_per_sys = 1; -// o_maxConfigParams.max_compute_nodes_per_sys = l_pTopLevel->getAttr -// < TARGETING::ATTR_MAX_COMPUTE_NODES_PER_SYSTEM > (); + o_maxConfigParams.max_compute_nodes_per_sys = l_pTopLevel->getAttr + < TARGETING::ATTR_MAX_COMPUTE_NODES_PER_SYSTEM > (); } while(0); diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 0158ac626..7606491a5 100755 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -8081,4 +8081,19 @@ Selects which voltage level to place the Core and ECO domain PFETs upon Winkle e <no_export/> </attribute> +<attribute> + <id>MAX_COMPUTE_NODES_PER_SYSTEM</id> + <description> + The max compute nodes available in the system. + Computed value based on CEC enclosures. + </description> + <simpleType> + <uint8_t> + </uint8_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> + <no_export/> +</attribute> + </attributes> diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml index 65f27bebc..cc7147c48 100644 --- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml @@ -611,9 +611,13 @@ <id>X_EREPAIR_THRESHOLD_MNFG</id> <default>0</default> </attribute> - + <attribute> + <id>MAX_COMPUTE_NODES_PER_SYSTEM</id> + <default>4</default> + </attribute> </targetInstance> + <targetInstance> <id>sys0node0</id> <type>enc-node-power9</type> diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml index 0420087c1..287ab72e1 100644 --- a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml @@ -629,9 +629,13 @@ <id>X_EREPAIR_THRESHOLD_MNFG</id> <default>0</default> </attribute> - + <attribute> + <id>MAX_COMPUTE_NODES_PER_SYSTEM</id> + <default>4</default> + </attribute> </targetInstance> + <targetInstance> <id>sys0node0</id> <type>enc-node-power9</type> diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml index 1ef322818..d5ff50f0d 100644 --- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml @@ -180,6 +180,11 @@ <id>MSS_INTERLEAVE_ENABLE</id> <default>0xAF</default> </attribute> + <attribute> + <id>MAX_COMPUTE_NODES_PER_SYSTEM</id> + <default>1</default> + </attribute> + </targetInstance> <!-- System node 0 --> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 9bc1a3fc7..0b6468e96 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -1033,6 +1033,9 @@ <attribute> <id>BOOT_FREQ_MHZ</id> </attribute> + <attribute> + <id>MAX_COMPUTE_NODES_PER_SYSTEM</id> + </attribute> </targetType> <targetType> |