From bc4bd5e18cffeefe2db00f59098bb1dc6b1a0879 Mon Sep 17 00:00:00 2001 From: Louis Stermole Date: Wed, 8 Feb 2017 10:27:10 -0600 Subject: [PATCH] Add workaround for DDRPHY ODT config register erratum (ODT2, ODT3 bits swapped) Change-Id: If02e5e31c768c62bbdf37c15b5146bacaaf38d80 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36173 Dev-Ready: Louis Stermole Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Brent Wieman Reviewed-by: STEPHEN GLANCY Reviewed-by: ANDRE A. MARIN Reviewed-by: Joseph J. McGill Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36196 Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- .../lib/mss_attribute_accessors_manual.H | 25 +++++- .../procedures/hwp/memory/lib/phy/ddr_phy.C | 2 + .../memory/lib/workarounds/seq_workarounds.C | 87 +++++++++++++++++++ .../memory/lib/workarounds/seq_workarounds.H | 44 ++++++++++ .../xml/attribute_info/chip_ec_attributes.xml | 20 +++++ 5 files changed, 177 insertions(+), 1 deletion(-) diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors_manual.H b/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors_manual.H index 078e7682deb..54b594bbbae 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors_manual.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors_manual.H @@ -278,7 +278,30 @@ inline bool chip_ec_feature_blue_waterfall_adjust(const fapi2::Target& i_targ return (l_value != 0) && (l_do_value == fapi2::ENUM_ATTR_DO_BLUE_WATERFALL_ADJUST_YES); fapi_try_exit: - FAPI_ERR("failed accessing ATTR_CHIP_EC_FEATURE_MSS_WR_VREF or ATTR_DO_MSS_WR_VREF: 0x%lx (target: %s)", + FAPI_ERR("failed accessing ATTR_CHIP_EC_FEATURE_MSS_BLUE_WATERFALL_ADJUST or ATTR_DO_BLUE_WATERFALL_ADJUST: 0x%lx (target: %s)", + uint64_t(fapi2::current_err), mss::c_str(i_target)); + fapi2::Assert(false); + return false; +} + +/// +/// @brief ATTR_CHIP_EC_FEATURE_MSS_ODT_CONFIG getter +/// @tparam T the fapi2 target type of the target +/// @param[in] const ref to the target +/// @return bool true iff feature is enabled +/// +template< fapi2::TargetType T > +inline bool chip_ec_feature_mss_odt_config(const fapi2::Target& i_target) +{ + const auto l_chip = mss::find_target(i_target); + uint8_t l_value = 0; + + FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_MSS_ODT_CONFIG, l_chip, l_value) ); + + return l_value != 0; + +fapi_try_exit: + FAPI_ERR("failed accessing ATTR_CHIP_EC_FEATURE_MSS_ODT_CONFIG: 0x%lx (target: %s)", uint64_t(fapi2::current_err), mss::c_str(i_target)); fapi2::Assert(false); return false; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C index 75d85d16576..d34b7242f7d 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -766,6 +767,7 @@ fapi2::ReturnCode phy_scominit(const fapi2::Target& i_target FAPI_TRY( mss::workarounds::dp16::dqs_polarity(p) ); FAPI_TRY( mss::workarounds::dp16::rd_dia_config5(p) ); FAPI_TRY( mss::workarounds::dp16::dqsclk_offset(p) ); + FAPI_TRY( mss::workarounds::seq::odt_config(p) ); } fapi_try_exit: diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C index 2aa8be03958..53c212f9136 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.C @@ -22,3 +22,90 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ + +/// +/// @file workarounds/seq_workarounds.C +/// @brief Workarounds for the SEQ logic blocks +/// Workarounds are very deivce specific, so there is no attempt to generalize +/// this code in any way. +/// +// *HWP HWP Owner: Louis Stermole +// *HWP HWP Backup: Stephen Glancy +// *HWP Team: Memory +// *HWP Level: 2 +// *HWP Consumed by: FSP:HB + +#include +#include + +#include +#include + +namespace mss +{ + +namespace workarounds +{ + +namespace seq +{ + +/// +/// @brief ODT Config workaround +/// For Nimbus DD1, ODT2 and ODT3 bits are swapped in each of the PHY config registers +/// @param[in] i_target the fapi2 target of the port +/// @return fapi2::ReturnCode FAPI2_RC_SUCCESS if ok +/// @note This function is called during the phy scom init procedure, after the initfile is +/// processed. +/// +fapi2::ReturnCode odt_config( const fapi2::Target& i_target ) +{ + // skip the workaroud if attribute is not set + if (! mss::chip_ec_feature_mss_odt_config(i_target) ) + { + return fapi2::FAPI2_RC_SUCCESS; + } + + FAPI_INF("Running ODT Config workaround on %s", mss::c_str(i_target)); + + std::vector> l_read; + + static const std::vector ODT_REGS = + { + MCA_DDRPHY_SEQ_ODT_RD_CONFIG0_P0, MCA_DDRPHY_SEQ_ODT_RD_CONFIG1_P0, + MCA_DDRPHY_SEQ_ODT_WR_CONFIG0_P0, MCA_DDRPHY_SEQ_ODT_WR_CONFIG1_P0 + }; + + FAPI_TRY(mss::scom_suckah(i_target, ODT_REGS, l_read)); + + for (auto& l_data : l_read) + { + // Note these bit positions are the same in RD_CONFIG* and WR_CONFIG* + constexpr uint64_t EVEN_RANK_ODT2 = 50; + constexpr uint64_t EVEN_RANK_ODT3 = 51; + constexpr uint64_t ODD_RANK_ODT2 = 58; + constexpr uint64_t ODD_RANK_ODT3 = 59; + + bool l_odt2 = 0; + bool l_odt3 = 0; + + // swap even rank ODT2 and ODT3 + l_odt2 = l_data.getBit(); + l_odt3 = l_data.getBit(); + l_data.writeBit(l_odt3).writeBit(l_odt2); + // swap odd rank ODT2 and ODT3 + l_odt2 = l_data.getBit(); + l_odt3 = l_data.getBit(); + l_data.writeBit(l_odt3).writeBit(l_odt2); + } + + FAPI_TRY(mss::scom_blastah(i_target, ODT_REGS, l_read)); + +fapi_try_exit: + return fapi2::current_err; +} + + +} // close namespace seq +} // close namespace workarounds +} // close namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.H b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.H index 7bc2ac898b4..0c72fbeb2cb 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/seq_workarounds.H @@ -22,3 +22,47 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ + +/// +/// @file workarounds/seq_workarounds.H +/// @brief Workarounds for the SEQ logic blocks +/// Workarounds are very deivce specific, so there is no attempt to generalize +/// this code in any way. +/// +// *HWP HWP Owner: Louis Stermole +// *HWP HWP Backup: Stephen Glancy +// *HWP Team: Memory +// *HWP Level: 2 +// *HWP Consumed by: FSP:HB + +#ifndef _MSS_WORKAROUNDS_SEQ_H_ +#define _MSS_WORKAROUNDS_SEQ_H_ + +#include +#include +#include + +namespace mss +{ + +namespace workarounds +{ + +namespace seq +{ + +/// +/// @brief ODT Config workaround +/// For Nimbus DD1, ODT2 and ODT3 bits are swapped in each of the PHY config registers +/// @param[in] i_target the fapi2 target of the port +/// @return fapi2::ReturnCode FAPI2_RC_SUCCESS if ok +/// @note This function is called during the phy scom init procedure, after the initfile is +/// processed. +/// +fapi2::ReturnCode odt_config( const fapi2::Target& i_target ); + +} // close namespace seq +} // close namespace workarounds +} // close namespace mss + +#endif diff --git a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml index 15b2ea91b8b..43bb3183041 100644 --- a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml +++ b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml @@ -2303,6 +2303,25 @@ + + ATTR_CHIP_EC_FEATURE_MSS_ODT_CONFIG + TARGET_TYPE_PROC_CHIP + + For Nimbus pre DD2.** we need to swap ODT2 and ODT3 values in the + DDRPHY_SEQ_ODT_RD/WR_CONFIG registers due to a PHY erratum. + Post DD2.** will have a hardware enabled fix for this (HW389360). + + + + ENUM_ATTR_NAME_NIMBUS + + 0x20 + LESS_THAN + + + + + ATTR_CHIP_EC_FEATURE_MSS_BLUE_WATERFALL_ADJUST TARGET_TYPE_PROC_CHIP @@ -2354,6 +2373,7 @@ +