diff options
author | Brian Silver <bsilver@us.ibm.com> | 2016-08-30 07:56:06 -0500 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2016-08-31 09:16:31 -0400 |
commit | 67c04a68a0d65981fcb4e9ebfc6bbaaf0e99976e (patch) | |
tree | cdf621259ea343e0822a840950e1427c4ce5da46 /src/import/chips/p9 | |
parent | a6ffbfc855f914589e610d618592f92cc8a7af5e (diff) | |
download | talos-hostboot-67c04a68a0d65981fcb4e9ebfc6bbaaf0e99976e.tar.gz talos-hostboot-67c04a68a0d65981fcb4e9ebfc6bbaaf0e99976e.zip |
Avoid nullptr in vpd decode for ports with no DIMM
Fixup the ms perf test for ports with no DIMM
Change-Id: Iabac55143d1a3b4280dfdb8aa2f07973631a208b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28952
Reviewed-by: JACOB L. HARVEY <jlharvey@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28953
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9')
-rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/lib/eff_config/eff_config.C | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/eff_config.C b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/eff_config.C index dca96e80d..80652de2e 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/eff_config.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/eff_config.C @@ -3267,15 +3267,9 @@ fapi2::ReturnCode eff_config::decode_vpd(const fapi2::Target<TARGET_TYPE_MCS>& i // give us MCA with 0 DIMM, so we'll just use a 0-filled VPD for those MCA. memset(l_mt_blob, 0, mss::VPD_KEYWORD_MAX); - const auto l_dimms = mss::find_targets<TARGET_TYPE_DIMM>(p); - - // If we don't have any DIMM, then just move about our business. - if (l_dimms.size() == 0) - { - continue; - } - - for (const auto& d : l_dimms) + // If we don't have any DIMM, don't worry about it. This will just drop the blob full of 0's into our index. + // This will fill the VPD attributes with 0's which is perfectly ok. + for (const auto& d : mss::find_targets<TARGET_TYPE_DIMM>(p)) { uint8_t l_num_master_ranks = 0; FAPI_TRY( mss::eff_num_master_ranks_per_dimm(d, l_num_master_ranks) ); |