Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a311e17 authored by Vernon Mauery's avatar Vernon Mauery Committed by Mauro Carvalho Chehab
Browse files

Always call i7core_[ur]dimm_check_mc_ecc_err 



This fixes an error in function i7core_check_error

In commit ca9c90ba 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: default avatarVernon Mauery <vernux@us.ibm.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2a6fae32

drivers/edac/i7core_edac.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {
@@ -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