Change p9_mss_scrub to do a sf_write/sf_read on hardware

Change-Id: Ib5153cf46eed277f68c922ca06fae573f3d477f0
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30957
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Marc Gollub <gollub@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30959
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 7 insertions, 4 deletions

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 b3745e4ed..194df8c5e 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
@@ -77,12 +77,15 @@ fapi2::ReturnCode p9_mss_scrub( const fapi2::Target<TARGET_TYPE_MCBIST>& i_targe
         // TK. Need a verification pattern. This is a not-good pattern for verification ... We don't really
         // have a good pattern for verification defined.
         FAPI_INF("running mss sim init in place of scrub");
-        return mss::mcbist::sim::sf_init(i_target, mss::mcbist::PATTERN_2);
+        return mss::mcbist::sim::sf_init(i_target, mss::mcbist::PATTERN_0);
     }
 
-    // TK do we want these to be arguments to the wrapper?
-    return memdiags::background_scrub(i_target, mss::mcbist::stop_conditions(),
-                                      mss::mcbist::speed::LUDICROUS, mss::mcbist::address());
+    // In Cronus on hardware (which is how we got here - f/w doesn't call this) we want
+    // to call sf_init (0's) and then a sf_read.
+    // 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) );
+    return memdiags::sf_read(i_target, mss::mcbist::stop_conditions(), mss::mcbist::end_boundary::STOP_AFTER_ADDRESS);
 
 fapi_try_exit:
     return fapi2::current_err;