Skip to content

Commit

Permalink
Always call i7core_[ur]dimm_check_mc_ecc_err
Browse files Browse the repository at this point in the history
This fixes an error in function i7core_check_error

In commit ca9c90b which converts the
driver to use double buffering, there is a change in the logic.  Before,
if mce_count was zero, it skipped over a couple of statements and
finished out with a call to the *check_mc_ecc_err function.  The current
code checks to see if mce_count is 0 and then exits.

This change reverts the behavior back to the original where if there are
no errors to report, we skip to the end and call the *check_mc_ecc_err
function.

This fix allows the driver to work again on my Nehalem based blades
again.

Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Vernon Mauery authored and Mauro Carvalho Chehab committed May 18, 2010
1 parent 2a6fae3 commit 8a311e1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/edac/i7core_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,7 @@ static void i7core_check_error(struct mem_ctl_info *mci)
count = (pvt->mce_out + MCE_LOG_LEN - pvt->mce_in)
% MCE_LOG_LEN;
if (!count)
return;
goto check_ce_error;

m = pvt->mce_outentry;
if (pvt->mce_in + count > MCE_LOG_LEN) {
Expand Down Expand Up @@ -1703,6 +1703,7 @@ static void i7core_check_error(struct mem_ctl_info *mci)
/*
* Now, let's increment CE error counts
*/
check_ce_error:
if (!pvt->is_registered)
i7core_udimm_check_mc_ecc_err(mci);
else
Expand Down

0 comments on commit 8a311e1

Please sign in to comment.