From 8461f51d2d93bd5372450f15c4313ac4ddbce07e Mon Sep 17 00:00:00 2001 From: Jenny Huynh Date: Tue, 23 May 2017 08:12:10 -0500 Subject: 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 Tested-by: Hostboot CI Reviewed-by: SHELTON LEUNG Reviewed-by: MATTHEW I. HICKMAN Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40838 Reviewed-by: Hostboot Team Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C') 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& 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 -- cgit v1.2.1