Skip to content

Commit

Permalink
Fixes DLL error checking to be the highest priority FIR
Browse files Browse the repository at this point in the history
Change-Id: I98e963663afde6e308c78dfceeae6166a0c0f227
CQ:SW424482
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57344
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57353
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
sglancy6 authored and dcrowell77 committed Apr 21, 2018
1 parent b90ed8f commit 6ff6218
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions src/import/chips/p9/procedures/hwp/memory/lib/fir/check.C
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,15 @@ fapi2::ReturnCode bad_fir_bits( const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&
// 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)
Expand Down Expand Up @@ -400,9 +409,6 @@ fapi2::ReturnCode bad_fir_bits( const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&
}
}

// Lastly, check for PLL unlocks
FAPI_TRY(pll_fir(i_target, io_rc, o_fir_error));

fapi_try_exit:
return fapi2::current_err;
}
Expand All @@ -424,6 +430,15 @@ fapi2::ReturnCode bad_fir_bits( const fapi2::Target<fapi2::TARGET_TYPE_MCA>& 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)
Expand Down Expand Up @@ -455,9 +470,6 @@ fapi2::ReturnCode bad_fir_bits( const fapi2::Target<fapi2::TARGET_TYPE_MCA>& 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;
}
Expand Down

0 comments on commit 6ff6218

Please sign in to comment.