From c49249c720f42d201c92ef887930fee600fa34b5 Mon Sep 17 00:00:00 2001 From: Louis Stermole Date: Fri, 24 Jan 2020 10:55:11 -0500 Subject: Add Explorer specific MCBIST settings before scrub and maint Change-Id: Ieabf8b23b6670ed23664ce2f80b04012c05a4319 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90287 Tested-by: FSP CI Jenkins Tested-by: HWSV CI Reviewed-by: STEPHEN GLANCY Tested-by: Jenkins Server Tested-by: Hostboot CI Dev-Ready: Louis Stermole Reviewed-by: ANDRE A MARIN Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90317 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M Crowell --- .../hwp/memory/lib/dimm/ddr4/nvdimm_utils.C | 2 +- .../chips/p9/procedures/hwp/memory/lib/mc/port.C | 15 ++++++++++++ .../p9/procedures/hwp/memory/lib/mcbist/memdiags.C | 27 +++++++++++++++++++++- 3 files changed, 42 insertions(+), 2 deletions(-) (limited to 'src/import/chips/p9/procedures/hwp/memory/lib') diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/nvdimm_utils.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/nvdimm_utils.C index 3a87de12c..8c19b99f9 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/nvdimm_utils.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/nvdimm_utils.C @@ -218,7 +218,7 @@ fapi2::ReturnCode self_refresh_exit_helper( const fapi2::Target l_stop_conditions; // Read with targeted scrub - FAPI_TRY ( mss::memdiags::targeted_scrub(l_mcbist, + FAPI_TRY ( mss::memdiags::targeted_scrub(l_mcbist, l_stop_conditions, l_start, l_end, diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C index a07fea3d9..fc3f7b568 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.C @@ -306,6 +306,21 @@ fapi_try_exit: return fapi2::current_err; } +/// +/// @brief Set up memory controller specific settings for ECC registers (at the end of draminit_mc) +/// @param[in] i_target the target +/// @param[in,out] io_data contents of RECR register +/// @return FAPI2_RC_SUCCESS if and only if ok +/// @note mc_type::NIMBUS specialization +/// +template<> +fapi2::ReturnCode ecc_reg_settings_draminit_mc( + const fapi2::Target& i_target, + fapi2::buffer& io_data ) +{ + return fapi2::FAPI2_RC_SUCCESS; +} + /// /// @brief Perform a repair for a single bad DQ bit in a nibble /// Specialization for TARGET_TYPE_DIMM diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C index 2f8b88b4c..1d4a4940c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2019 */ +/* Contributors Listed Below - COPYRIGHT 2016,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -50,6 +50,31 @@ namespace mss namespace memdiags { +/// +/// @brief Set up memory controller specific settings for pre-maint mode read +/// @param[in] i_target the memory controller target +/// @return FAPI2_RC_SUCCESS iff ok +/// @note mc_type::NIMBUS specialization +/// +template<> +fapi2::ReturnCode pre_maint_read_settings( const fapi2::Target& + i_target ) +{ + return fapi2::FAPI2_RC_SUCCESS; +} + +/// +/// @brief Set up memory controller specific settings for pre-scrub +/// @param[in] i_target the memory controller target +/// @return FAPI2_RC_SUCCESS iff ok +/// @note mc_type::NIMBUS specialization +/// +template<> +fapi2::ReturnCode pre_scrub_settings( const fapi2::Target& i_target ) +{ + return fapi2::FAPI2_RC_SUCCESS; +} + /// /// @brief Helper to encapsualte the setting of multi-port address configurations /// @return FAPI2_RC_SUCCESS iff ok -- cgit v1.2.1