From fd400b1576798d12f0cc41c308cf4026168f8ffb Mon Sep 17 00:00:00 2001 From: Matthew Hickman Date: Wed, 5 Jun 2019 16:34:05 -0500 Subject: Added p9a memdiags implementation Change-Id: Ic7ba89bc9b26c064ed19ecaa8fb3e8b53c38e74e Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/78416 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79690 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Christian R Geddes --- .../memory/lib/utils/mcbist/gen_mss_memdiags.H | 24 +++++++--------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'src/import/generic') diff --git a/src/import/generic/memory/lib/utils/mcbist/gen_mss_memdiags.H b/src/import/generic/memory/lib/utils/mcbist/gen_mss_memdiags.H index 33a3156f3..dad5df32e 100644 --- a/src/import/generic/memory/lib/utils/mcbist/gen_mss_memdiags.H +++ b/src/import/generic/memory/lib/utils/mcbist/gen_mss_memdiags.H @@ -1115,18 +1115,18 @@ fapi_try_exit: } /// -/// @brief Begin scrub helper +/// @brief Begin initialize memory /// @tparam MC the mc type of the T -/// @tparam T fapi2::TargetType of the MCBIST engine +/// @tparam T fapi2::TargetType of the MC engine /// @tparam TT the mcbistTraits associated with T -/// @param[in] i_target MCBIST +/// @param[in] i_target MC /// @return FAPI2_RC_SUCCESS iff ok /// template< mss::mc_type MC = DEFAULT_MC_TYPE, fapi2::TargetType T, typename TT = mcbistTraits > -fapi2::ReturnCode mss_scrub_helper(const fapi2::Target& i_target ) +fapi2::ReturnCode mss_initialize_memory(const fapi2::Target& i_target ) { using ET = mss::mcbistMCTraits; - FAPI_INF("Start mss_scrub_helper for %s", mss::c_str(i_target)); + FAPI_INF("Start mss_initialize_memory for %s", mss::c_str(i_target)); // If there are no DIMM we don't need to bother. In fact, we can't as we didn't setup // attributes for the PHY, etc. @@ -1167,7 +1167,6 @@ fapi2::ReturnCode mss_scrub_helper(const fapi2::Target& i_target ) // Unmask firs and turn off FIFO mode before returning FAPI_TRY ( mss::unmask::after_memdiags( i_target ) ); - FAPI_TRY ( mss::unmask::after_background_scrub( i_target ) ); FAPI_TRY ( mss::reset_reorder_queue_settings(i_target) ); return l_rc; @@ -1192,21 +1191,12 @@ fapi2::ReturnCode mss_scrub_helper(const fapi2::Target& i_target ) FAPI_ASSERT( l_poll_results == true, ET::memdiags_sf_init_failed_init().set_MC_TARGET(i_target), - "p9_mss_scrub (init) timedout %s", mss::c_str(i_target) ); + "sf init for scrub/memdiags timedout %s", mss::c_str(i_target) ); // Unmask firs after memdiags and turn off FIFO mode FAPI_TRY ( mss::unmask::after_memdiags( i_target ) ); FAPI_TRY ( mss::reset_reorder_queue_settings(i_target) ); - // Start background scrub - FAPI_TRY ( mss::memdiags::background_scrub( i_target, - mss::mcbist::stop_conditions(), - mss::mcbist::speed::BG_SCRUB, - mss::mcbist::address() ) ); - - // Unmask firs after background scrub is started - FAPI_TRY ( mss::unmask::after_background_scrub( i_target ) ); - fapi_try_exit: return fapi2::current_err; } @@ -1216,7 +1206,7 @@ fapi_try_exit: /// @tparam MC the mc type of the T /// @tparam T fapi2::TargetType of the MCBIST engine /// @tparam TT the mcbistTraits associated with T -/// @param[in] i_target MCBIST +/// @param[in] i_target MC /// @return FAPI2_RC_SUCCESS iff ok /// template< mss::mc_type MC = DEFAULT_MC_TYPE, fapi2::TargetType T, typename TT = mcbistTraits > -- cgit v1.2.1