diff options
author | Jenny Huynh <jhuynh@us.ibm.com> | 2017-05-23 08:12:10 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-05-24 22:34:11 -0400 |
commit | 8461f51d2d93bd5372450f15c4313ac4ddbce07e (patch) | |
tree | 36c40ece9360e8b4f5df55f37e6b7f7a762bb757 | |
parent | e251ab185272a19868e3a860a57b043abe7c25a7 (diff) | |
download | talos-hostboot-8461f51d2d93bd5372450f15c4313ac4ddbce07e.tar.gz talos-hostboot-8461f51d2d93bd5372450f15c4313ac4ddbce07e.zip |
Restore FIR and reorder queue settings after mss sim init
Change-Id: Id17efd130da845fc66ca1347e5b7590352ad956d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40836
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: SHELTON LEUNG <sleung@us.ibm.com>
Reviewed-by: MATTHEW I. HICKMAN <matthew.hickman@ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40838
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+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>
-rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C | 11 |
1 files changed, 10 insertions, 1 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 4a74313b6..a0defbfde 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 @@ -89,11 +89,20 @@ fapi2::ReturnCode p9_mss_scrub( const fapi2::Target<TARGET_TYPE_MCBIST>& i_targe if (l_sim) { + fapi2::ReturnCode l_rc; + // Use some sort of pattern in sim in case the verification folks need to look for something // 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_0); + l_rc = mss::mcbist::sim::sf_init(i_target, mss::mcbist::PATTERN_0); + + // 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; } // In Cronus on hardware (which is how we got here - f/w doesn't call this) we want |