diff options
author | Stephen Glancy <sglancy@us.ibm.com> | 2019-03-17 14:38:46 -0400 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2019-04-16 12:58:58 -0500 |
commit | 98267572c8c143aa73388239954331b0e1422871 (patch) | |
tree | edf220db7340fe2576c004fda54ddbbc9164137e /src/import/chips/p9/procedures | |
parent | ffe6b03116231ad51ef13016c2211913b7fb9bf6 (diff) | |
download | talos-hostboot-98267572c8c143aa73388239954331b0e1422871.tar.gz talos-hostboot-98267572c8c143aa73388239954331b0e1422871.zip |
Fixes LRDIM dual-drop 4R frequency/plug rules bugs
Change-Id: Ibe1fd639b5812ffb1b7baa418dccb07f869a800b
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/73512
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Dev-Ready: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/73520
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/procedures')
-rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/lib/eff_config/plug_rules.C | 2 | ||||
-rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/lib/freq/nimbus_mss_freq.C | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/plug_rules.C b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/plug_rules.C index 2d9882a15..5a8f25ab3 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/plug_rules.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/plug_rules.C @@ -702,7 +702,7 @@ fapi2::ReturnCode check_rank_config(const fapi2::Target<TARGET_TYPE_MCA>& i_targ l_dimm1_kind = &k; } - l_rank_count += k.iv_master_ranks; + l_rank_count += k.iv_dimm_type == fapi2::ENUM_ATTR_EFF_DIMM_TYPE_LRDIMM ? 1 : k.iv_master_ranks; } // If we get here and we see there's no DIMM in slot 0, we did something very wrong. We shouldn't have diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/freq/nimbus_mss_freq.C b/src/import/chips/p9/procedures/hwp/memory/lib/freq/nimbus_mss_freq.C index 37a13275b..52b140e6e 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/freq/nimbus_mss_freq.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/freq/nimbus_mss_freq.C @@ -331,6 +331,19 @@ fapi2::ReturnCode num_master_ranks_per_dimm<mss::proc_type::NIMBUS>(const fapi2: } /// +/// @brief Gets the DIMM type for a specific DIMM - specialization for the NIMBUS processor type +/// @param[in] i_target DIMM target +/// @param[out] o_dimm_type DIMM type on the DIMM target +/// @return FAPI2_RC_SUCCESS iff ok +/// +template<> +fapi2::ReturnCode get_dimm_type<mss::proc_type::NIMBUS>(const fapi2::Target<fapi2::TARGET_TYPE_DIMM>& i_target, + uint8_t& o_dimm_type) +{ + return mss::eff_dimm_type(i_target, o_dimm_type); +} + +/// /// @brief Calls out the target if no DIMM frequencies are supported - specialization for NIMBUS and MCBIST /// @param[in] i_target target on which to operate /// @param[in] i_supported_freq true if any FREQ's are supported |