diff options
Diffstat (limited to 'src/import/chips/p9/procedures/hwp/memory')
5 files changed, 18 insertions, 9 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C b/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C index b31883c39..866091439 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C +++ b/src/import/chips/p9/procedures/hwp/memory/lab/sdk/example/C/mss_lab_sfwrite.C @@ -104,8 +104,8 @@ int main(int i_argc, char* i_argv[]) // retrieve the Cronus string representing the fapi2 target mss::logf(mss::DEBUG, "MCBIST C_str: %s", mss::c_str(fapi2_mcbist_target)); - rc = memdiags::sf_init(fapi2_mcbist_target, mss::mcbist::PATTERN_5); - mss::lab::is_ok(rc, "memdiags::sf_init failed"); + rc = mss::memdiags::sf_init(fapi2_mcbist_target, mss::mcbist::PATTERN_5); + mss::lab::is_ok(rc, "mss::memdiags::sf_init failed"); // Just for giggles, poll here looking for the FIR bit ... { @@ -128,7 +128,7 @@ int main(int i_argc, char* i_argv[]) }, l_probes); - mss::lab::is_ok(l_poll_results == true, "memdiags::sf_write timedout"); + mss::lab::is_ok(l_poll_results == true, "mss::memdiags::sf_write timedout"); } mss::log(mss::DEBUG, "Finished"); 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 09ab4f568..ae057621e 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 @@ -53,6 +53,9 @@ using fapi2::TARGET_TYPE_SYSTEM; using fapi2::FAPI2_RC_SUCCESS; using fapi2::FAPI2_RC_INVALID_PARAMETER; +namespace mss +{ + namespace memdiags { @@ -746,3 +749,5 @@ fapi_try_exit: } } + +} diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H index 9ce8ad0aa..09322b4b5 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H @@ -43,6 +43,9 @@ #include <lib/mcbist/patterns.H> #include <lib/mcbist/settings.H> +namespace mss +{ + namespace memdiags { @@ -398,4 +401,5 @@ fapi2::ReturnCode continue_cmd( const fapi2::Target<T>& i_target, } // namespace +} // namespace #endif diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C index e5b082077..9b0bb9874 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C @@ -122,7 +122,7 @@ extern "C" // We start the sf_init (write 0's) and it'll tickle the MCBIST complete FIR. PRD will see that // and start a background scrub. - FAPI_TRY( memdiags::sf_init(i_target, mss::mcbist::PATTERN_0) ); + FAPI_TRY( mss::memdiags::sf_init(i_target, mss::mcbist::PATTERN_0) ); // If we're in the sim, we want to poll for the FIR bit. I don't think this ever really happens // unless we're expressly testing this API. diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C index 11ad22d99..02a1cd282 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C @@ -109,7 +109,7 @@ fapi2::ReturnCode p9_mss_scrub( const fapi2::Target<TARGET_TYPE_MCBIST>& i_targe // to call sf_init (0's) // TK we need to check FIR given the way this is right now, we should adjust with better stop // conditions when we learn more about what we want to find in the lab - FAPI_TRY( memdiags::sf_init(i_target, mss::mcbist::PATTERN_0) ); + FAPI_TRY( mss::memdiags::sf_init(i_target, mss::mcbist::PATTERN_0) ); // Poll for completion. l_poll_results = mss::poll(i_target, MCBIST_MCBISTFIRQ, l_poll_parameters, @@ -131,10 +131,10 @@ fapi2::ReturnCode p9_mss_scrub( const fapi2::Target<TARGET_TYPE_MCBIST>& i_targe FAPI_TRY ( mss::reset_reorder_queue_settings(i_target) ); // Start background scrub - FAPI_TRY ( memdiags::background_scrub( i_target, - mss::mcbist::stop_conditions(), - mss::mcbist::speed::BG_SCRUB, - mss::mcbist::address() ) ); + 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 ) ); |
