summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLouis Stermole <stermole@us.ibm.com>2020-01-17 14:44:00 -0500
committerChristian R Geddes <crgeddes@us.ibm.com>2020-02-03 17:25:00 -0600
commita9b71d90c5c83af0a309c152a1e7956f5823fdfe (patch)
tree1bfea46827b47ad24ce83cf10ad5402418644176 /src
parentdc407ba49e012ff1bb466c2153551b69a3f8823a (diff)
downloadtalos-hostboot-a9b71d90c5c83af0a309c152a1e7956f5823fdfe.tar.gz
talos-hostboot-a9b71d90c5c83af0a309c152a1e7956f5823fdfe.zip
Don't assert from ddimm_get_efd for unsupported freq if ffdc_enabled not set
This will remove DDIMM_UNSUPPORTED_FREQUENCY errors from passing mss_freq trace Change-Id: I384282d61bc426cb903c560ea1eb242a47349b9c Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89881 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com> Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com> Dev-Ready: Louis Stermole <stermole@us.ibm.com> Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com> Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89903 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C42
1 files changed, 30 insertions, 12 deletions
diff --git a/src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C b/src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C
index ca161ed46..9480b341f 100755
--- a/src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C
+++ b/src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2016,2019 */
+/* Contributors Listed Below - COPYRIGHT 2016,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -713,6 +713,8 @@ extern "C"
{
// If no value for freq, then mapping of frequency was unsuccessful
+ // Note we don't want to produce FFDC if the ffdc_enabled flag is not set
+ // i.e. if we're just probing the EFD for its supported frequencies
FAPI_ASSERT( ( !io_vpdInfo.iv_is_config_ffdc_enabled ),
fapi2::DDIMM_GET_EFD_UNSUPPORTED_FREQUENCY().
set_UNSUPPORTED_FREQ(static_cast<uint32_t>
@@ -753,6 +755,8 @@ extern "C"
if ( !l_rankMask)
{
// If no value for MR, then mapping of MR was unsuccessful
+ // Note we don't want to produce FFDC if the ffdc_enabled flag is not set
+ // i.e. if we're just probing the EFD for its supported frequencies
FAPI_ASSERT( ( !io_vpdInfo.iv_is_config_ffdc_enabled ),
fapi2::DDIMM_GET_EFD_UNSUPPORTED_RANK().
set_UNSUPPORTED_RANK(static_cast<uint32_t>
@@ -794,18 +798,30 @@ extern "C"
l_supportedSpeeds = *reinterpret_cast<const uint16_t*>
(i_spdBuffer + SPD_SUPPORTED_HOST_SPEEDS_ADDR);
l_supportedSpeeds = le16toh(l_supportedSpeeds);
- FAPI_ASSERT( l_freqMask & l_supportedSpeeds,
- fapi2::DDIMM_UNSUPPORTED_FREQUENCY().
- set_UNSUPPORTED_FREQ(static_cast<uint32_t>
- (io_vpdInfo.iv_omi_freq_mhz)).
- set_SUPPORTED_FREQS(l_supportedSpeeds).
- set_OCMB_CHIP_TARGET(i_ocmbFapi2Target).
- set_VPD_TYPE(io_vpdInfo.iv_vpd_type).
- set_DDR_TYPE(static_cast<uint32_t>
- (i_spdBuffer[SPD_MEM_TYPE_ADDR])),
- "Invalid frequency for this DIMM - request=%d, supported mask=%.4X",
- io_vpdInfo.iv_omi_freq_mhz, l_supportedSpeeds );
+ if (!(l_freqMask & l_supportedSpeeds))
+ {
+ // Note we don't want to produce FFDC if the ffdc_enabled flag is not set
+ // i.e. if we're just probing the EFD for its supported frequencies
+ FAPI_ASSERT( !io_vpdInfo.iv_is_config_ffdc_enabled,
+ fapi2::DDIMM_UNSUPPORTED_FREQUENCY().
+ set_UNSUPPORTED_FREQ(static_cast<uint32_t>
+ (io_vpdInfo.iv_omi_freq_mhz)).
+ set_SUPPORTED_FREQS(l_supportedSpeeds).
+ set_OCMB_CHIP_TARGET(i_ocmbFapi2Target).
+ set_VPD_TYPE(io_vpdInfo.iv_vpd_type).
+ set_DDR_TYPE(static_cast<uint32_t>
+ (i_spdBuffer[SPD_MEM_TYPE_ADDR])),
+ "Invalid frequency for this DIMM - request=%d, supported mask=%.4X",
+ io_vpdInfo.iv_omi_freq_mhz, l_supportedSpeeds );
+
+ // If unable to collect FFDC and assert, at least trace out and exit with false
+ FAPI_INF ("ddr4_get_efd: Unsupported frequency %d (frequency bit mask = 0x%.4X, "
+ "supported mask = 0x%.4X)",
+ io_vpdInfo.iv_omi_freq_mhz, l_freqMask, l_supportedSpeeds);
+
+ FAPI_TRY(fapi2::FAPI2_RC_FALSE);
+ }
// Point to the beginning of the EFD meta data, AKA EFD[0] meta data.
l_efdMetaDataPtr = i_spdBuffer + SPD_EFD_META_DATA_ADDR;
@@ -927,6 +943,8 @@ extern "C"
{
// Did not find an EFD to match frequency and master rank criteria
// Collect FFDC and assert if iv_is_config_ffdc_enabled is true
+ // Note we don't want to produce FFDC if the ffdc_enabled flag is not set
+ // i.e. if we're just probing the EFD for its supported frequencies
FAPI_ASSERT( ( !io_vpdInfo.iv_is_config_ffdc_enabled ),
fapi2::DDIMM_GET_EFD_EFD_NOT_FOUND().
set_FREQUENCY(io_vpdInfo.iv_omi_freq_mhz).
OpenPOWER on IntegriCloud