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

Commit ebbe914b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_fixes_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 

Pull EDAC fixes from Borislav Petkov:
 "Correct severity of reported errors in several EDAC drivers.  From
  Jason Baron"

* tag 'edac_fixes_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  e7xxx_edac: Report CE events properly
  cpc925_edac: Report UE events properly
  i82860_edac: Report CE events properly
  i3200_edac: Report CE events properly
parents d9b9692a 8030122a

drivers/edac/cpc925_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci) 


	if (apiexcp & UECC_EXCP_DETECTED) {

		cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n");

		edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,

		edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,

				     pfn, offset, 0,

				     csrow, -1, -1,

				     mci->ctl_name, "");

drivers/edac/e7xxx_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static void process_ce(struct mem_ctl_info *mci, struct e7xxx_error_info *info) 
static void process_ce_no_info(struct mem_ctl_info *mci)

{

	edac_dbg(3, "\n");

	edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0, -1, -1, -1,

	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, 0, 0, 0, -1, -1, -1,

			     "e7xxx CE log register overflow", "");

}

drivers/edac/i3200_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -242,11 +242,11 @@ static void i3200_process_error_info(struct mem_ctl_info *mci, 
					     -1, -1,

					     "i3000 UE", "");

		} else if (log & I3200_ECCERRLOG_CE) {

			edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,

			edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,

					     0, 0, eccerrlog_syndrome(log),

					     eccerrlog_row(channel, log),

					     -1, -1,

					     "i3000 UE", "");

					     "i3000 CE", "");

		}

	}

}

drivers/edac/i82860_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int i82860_process_error_info(struct mem_ctl_info *mci, 
				     dimm->location[0], dimm->location[1], -1,

				     "i82860 UE", "");

	else

		edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,

		edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,

				     info->eap, 0, info->derrsyn,

				     dimm->location[0], dimm->location[1], -1,

				     "i82860 CE", "");