From 2282f23b8fdbea6c29672b96c6cd9258f9d5da04 Mon Sep 17 00:00:00 2001 From: Stephen Glancy Date: Thu, 12 Apr 2018 14:23:48 -0500 Subject: Fixes DLL error checking to be the highest priority FIR Change-Id: I98e963663afde6e308c78dfceeae6166a0c0f227 RTC:191274 CQ:SW424482 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57134 Tested-by: FSP CI Jenkins Reviewed-by: Louis Stermole Reviewed-by: Marc Gollub Tested-by: Jenkins Server Reviewed-by: ANDRE A. MARIN Tested-by: Hostboot CI Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57149 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- .../chips/p9/procedures/hwp/memory/lib/fir/check.C | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C') diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C b/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C index 53c0dbdb9..ddd5aaa6b 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C @@ -366,6 +366,15 @@ fapi2::ReturnCode bad_fir_bits( const fapi2::Target& // Start by assuming we do not have a FIR o_fir_error = false; + // Checks for PLL unlocks first, as a PLL unlock can cause other FIRs to light up and complicate the error logs + FAPI_TRY(pll_fir(i_target, io_rc, o_fir_error)); + + // Exit if we have found a FIR + if(o_fir_error) + { + return fapi2::FAPI2_RC_SUCCESS; + } + // Loop, check the scoms, and check the FIR // Note: we return out if any FIR is bad for(const auto& l_fir_reg : MCBIST_FIR_REGS) @@ -400,9 +409,6 @@ fapi2::ReturnCode bad_fir_bits( const fapi2::Target& } } - // Lastly, check for PLL unlocks - FAPI_TRY(pll_fir(i_target, io_rc, o_fir_error)); - fapi_try_exit: return fapi2::current_err; } @@ -424,6 +430,15 @@ fapi2::ReturnCode bad_fir_bits( const fapi2::Target& i_t // Start by assuming we do not have a FIR o_fir_error = false; + // Checks for PLL unlocks first, as a PLL unlock can cause other FIRs to light up and complicate the error logs + FAPI_TRY(pll_fir(l_mcbist, io_rc, o_fir_error)); + + // Exit if we have found a FIR + if(o_fir_error) + { + return fapi2::FAPI2_RC_SUCCESS; + } + // Loop, check the scoms, and check the FIR // Note: we return out if any FIR is bad for(const auto& l_fir_reg : MCBIST_FIR_REGS) @@ -455,9 +470,6 @@ fapi2::ReturnCode bad_fir_bits( const fapi2::Target& i_t } } - // Lastly, check for PLL unlocks - FAPI_TRY(pll_fir(l_mcbist, io_rc, o_fir_error)); - fapi_try_exit: return fapi2::current_err; } -- cgit v1.2.1