evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edac: edac_mc_handle_error(): add an error_count parameter

Browse source 
In order to avoid loosing error events, it is desirable to group
error events together and generate a single trace for several identical
errors.

The trace API already allows reporting multiple errors. Change the
handle_error function to also allow that.

The changes at the drivers were made by this small script:

	$file .=$_ while (<>);
	$file =~ s/(edac_mc_handle_error)\s*\(([^\,]+)\,([^\,]+)\,/$1($2,$3, 1,/g;
	print $file;

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2012-06-04 13:27:43 -03:00
parent 03f7eae80f
commit 9eb07a7fb8
28 changed files with 104 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/edac/amd64_edac.c
View file

@ -1046,7 +1046,7 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr,
if (!src_mci) { if (!src_mci) {
amd64_mc_err(mci, "failed to map error addr 0x%lx to a node\n", amd64_mc_err(mci, "failed to map error addr 0x%lx to a node\n",
(unsigned long)sys_addr); (unsigned long)sys_addr);
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
page, offset, syndrome, page, offset, syndrome,
-1, -1, -1, -1, -1, -1,
"failed to map error addr to a node", "failed to map error addr to a node",
@ -1057,7 +1057,7 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr,
/* Now map the sys_addr to a CSROW */ /* Now map the sys_addr to a CSROW */
csrow = sys_addr_to_csrow(src_mci, sys_addr); csrow = sys_addr_to_csrow(src_mci, sys_addr);
if (csrow < 0) { if (csrow < 0) {
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
page, offset, syndrome, page, offset, syndrome,
-1, -1, -1, -1, -1, -1,
"failed to map error addr to a csrow", "failed to map error addr to a csrow",
@ -1077,7 +1077,7 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr,
amd64_mc_warn(src_mci, "unknown syndrome 0x%04x - " amd64_mc_warn(src_mci, "unknown syndrome 0x%04x - "
"possible error reporting race\n", "possible error reporting race\n",
syndrome); syndrome);
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
page, offset, syndrome, page, offset, syndrome,
csrow, -1, -1, csrow, -1, -1,
"unknown syndrome - possible error reporting race", "unknown syndrome - possible error reporting race",
@ -1096,7 +1096,7 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr,
channel = ((sys_addr & BIT(3)) != 0); channel = ((sys_addr & BIT(3)) != 0);
} }
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, src_mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, src_mci, 1,
page, offset, syndrome, page, offset, syndrome,
csrow, channel, -1, csrow, channel, -1,
"", ""); "", "");
@ -1608,7 +1608,7 @@ static void f1x_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr,
csrow = f1x_translate_sysaddr_to_cs(pvt, sys_addr, &nid, &chan); csrow = f1x_translate_sysaddr_to_cs(pvt, sys_addr, &nid, &chan);
if (csrow < 0) { if (csrow < 0) {
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
page, offset, syndrome, page, offset, syndrome,
-1, -1, -1, -1, -1, -1,
"failed to map error addr to a csrow", "failed to map error addr to a csrow",
@ -1624,7 +1624,7 @@ static void f1x_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr,
if (dct_ganging_enabled(pvt)) if (dct_ganging_enabled(pvt))
chan = get_channel_from_ecc_syndrome(mci, syndrome); chan = get_channel_from_ecc_syndrome(mci, syndrome);
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
page, offset, syndrome, page, offset, syndrome,
csrow, chan, -1, csrow, chan, -1,
"", ""); "", "");
@ -1909,7 +1909,7 @@ static void amd64_handle_ce(struct mem_ctl_info *mci, struct mce *m)
/* Ensure that the Error Address is VALID */ /* Ensure that the Error Address is VALID */
if (!(m->status & MCI_STATUS_ADDRV)) { if (!(m->status & MCI_STATUS_ADDRV)) {
amd64_mc_err(mci, "HW has no ERROR_ADDRESS available\n"); amd64_mc_err(mci, "HW has no ERROR_ADDRESS available\n");
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
0, 0, 0, 0, 0, 0,
-1, -1, -1, -1, -1, -1,
"HW has no ERROR_ADDRESS available", "HW has no ERROR_ADDRESS available",
@ -1937,7 +1937,7 @@ static void amd64_handle_ue(struct mem_ctl_info *mci, struct mce *m)
if (!(m->status & MCI_STATUS_ADDRV)) { if (!(m->status & MCI_STATUS_ADDRV)) {
amd64_mc_err(mci, "HW has no ERROR_ADDRESS available\n"); amd64_mc_err(mci, "HW has no ERROR_ADDRESS available\n");
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
0, 0, 0, 0, 0, 0,
-1, -1, -1, -1, -1, -1,
"HW has no ERROR_ADDRESS available", "HW has no ERROR_ADDRESS available",
@ -1956,7 +1956,7 @@ static void amd64_handle_ue(struct mem_ctl_info *mci, struct mce *m)
if (!src_mci) { if (!src_mci) {
amd64_mc_err(mci, "ERROR ADDRESS (0x%lx) NOT mapped to a MC\n", amd64_mc_err(mci, "ERROR ADDRESS (0x%lx) NOT mapped to a MC\n",
(unsigned long)sys_addr); (unsigned long)sys_addr);
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
page, offset, 0, page, offset, 0,
-1, -1, -1, -1, -1, -1,
"ERROR ADDRESS NOT mapped to a MC", "ERROR ADDRESS NOT mapped to a MC",
@ -1970,13 +1970,13 @@ static void amd64_handle_ue(struct mem_ctl_info *mci, struct mce *m)
if (csrow < 0) { if (csrow < 0) {
amd64_mc_err(mci, "ERROR_ADDRESS (0x%lx) NOT mapped to CS\n", amd64_mc_err(mci, "ERROR_ADDRESS (0x%lx) NOT mapped to CS\n",
(unsigned long)sys_addr); (unsigned long)sys_addr);
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
page, offset, 0, page, offset, 0,
-1, -1, -1, -1, -1, -1,
"ERROR ADDRESS NOT mapped to CS", "ERROR ADDRESS NOT mapped to CS",
""); "");
} else { } else {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
page, offset, 0, page, offset, 0,
csrow, -1, -1, csrow, -1, -1,
"", ""); "", "");

4
drivers/edac/amd76x_edac.c
View file

@ -145,7 +145,7 @@ static int amd76x_process_error_info(struct mem_ctl_info *mci,
if (handle_errors) { if (handle_errors) {
row = (info->ecc_mode_status >> 4) & 0xf; row = (info->ecc_mode_status >> 4) & 0xf;
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
mci->csrows[row]->first_page, 0, 0, mci->csrows[row]->first_page, 0, 0,
row, 0, -1, row, 0, -1,
mci->ctl_name, ""); mci->ctl_name, "");
@ -160,7 +160,7 @@ static int amd76x_process_error_info(struct mem_ctl_info *mci,
if (handle_errors) { if (handle_errors) {
row = info->ecc_mode_status & 0xf; row = info->ecc_mode_status & 0xf;
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
mci->csrows[row]->first_page, 0, 0, mci->csrows[row]->first_page, 0, 0,
row, 0, -1, row, 0, -1,
mci->ctl_name, ""); mci->ctl_name, "");

4
drivers/edac/cell_edac.c
View file

@ -48,7 +48,7 @@ static void cell_edac_count_ce(struct mem_ctl_info *mci, int chan, u64 ar)
syndrome = (ar & 0x000000001fe00000ul) >> 21; syndrome = (ar & 0x000000001fe00000ul) >> 21;
/* TODO: Decoding of the error address */ /* TODO: Decoding of the error address */
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
csrow->first_page + pfn, offset, syndrome, csrow->first_page + pfn, offset, syndrome,
0, chan, -1, "", ""); 0, chan, -1, "", "");
} }
@ -70,7 +70,7 @@ static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar)
offset = address & ~PAGE_MASK; offset = address & ~PAGE_MASK;
/* TODO: Decoding of the error address */ /* TODO: Decoding of the error address */
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
csrow->first_page + pfn, offset, 0, csrow->first_page + pfn, offset, 0,
0, chan, -1, "", ""); 0, chan, -1, "", "");
} }

4
drivers/edac/cpc925_edac.c
View file

@ -554,7 +554,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci)
if (apiexcp & CECC_EXCP_DETECTED) { if (apiexcp & CECC_EXCP_DETECTED) {
cpc925_mc_printk(mci, KERN_INFO, "DRAM CECC Fault\n"); cpc925_mc_printk(mci, KERN_INFO, "DRAM CECC Fault\n");
channel = cpc925_mc_find_channel(mci, syndrome); channel = cpc925_mc_find_channel(mci, syndrome);
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
pfn, offset, syndrome, pfn, offset, syndrome,
csrow, channel, -1, csrow, channel, -1,
mci->ctl_name, ""); mci->ctl_name, "");
@ -562,7 +562,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci)
if (apiexcp & UECC_EXCP_DETECTED) { if (apiexcp & UECC_EXCP_DETECTED) {
cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n"); cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n");
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
pfn, offset, 0, pfn, offset, 0,
csrow, -1, -1, csrow, -1, -1,
mci->ctl_name, ""); mci->ctl_name, "");

8
drivers/edac/e752x_edac.c
View file

@ -371,7 +371,7 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one,
channel = !(error_one & 1); channel = !(error_one & 1);
/* e752x mc reads 34:6 of the DRAM linear address */ /* e752x mc reads 34:6 of the DRAM linear address */
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
page, offset_in_page(sec1_add << 4), sec1_syndrome, page, offset_in_page(sec1_add << 4), sec1_syndrome,
row, channel, -1, row, channel, -1,
"e752x CE", ""); "e752x CE", "");
@ -408,7 +408,7 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one,
edac_mc_find_csrow_by_page(mci, block_page); edac_mc_find_csrow_by_page(mci, block_page);
/* e752x mc reads 34:6 of the DRAM linear address */ /* e752x mc reads 34:6 of the DRAM linear address */
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
block_page, block_page,
offset_in_page(error_2b << 4), 0, offset_in_page(error_2b << 4), 0,
row, -1, -1, row, -1, -1,
@ -427,7 +427,7 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one,
edac_mc_find_csrow_by_page(mci, block_page); edac_mc_find_csrow_by_page(mci, block_page);
/* e752x mc reads 34:6 of the DRAM linear address */ /* e752x mc reads 34:6 of the DRAM linear address */
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
block_page, block_page,
offset_in_page(error_2b << 4), 0, offset_in_page(error_2b << 4), 0,
row, -1, -1, row, -1, -1,
@ -454,7 +454,7 @@ static inline void process_ue_no_info_wr(struct mem_ctl_info *mci,
return; return;
edac_dbg(3, "\n"); edac_dbg(3, "\n");
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
-1, -1, -1, -1, -1, -1,
"e752x UE log memory write", ""); "e752x UE log memory write", "");
} }

8
drivers/edac/e7xxx_edac.c
View file

@ -219,14 +219,14 @@ static void process_ce(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
row = edac_mc_find_csrow_by_page(mci, page); row = edac_mc_find_csrow_by_page(mci, page);
/* convert syndrome to channel */ /* convert syndrome to channel */
channel = e7xxx_find_channel(syndrome); channel = e7xxx_find_channel(syndrome);
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, page, 0, syndrome, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, page, 0, syndrome,
row, channel, -1, "e7xxx CE", ""); row, channel, -1, "e7xxx CE", "");
} }
static void process_ce_no_info(struct mem_ctl_info *mci) static void process_ce_no_info(struct mem_ctl_info *mci)
{ {
edac_dbg(3, "\n"); edac_dbg(3, "\n");
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, -1, -1, -1, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0, -1, -1, -1,
"e7xxx CE log register overflow", ""); "e7xxx CE log register overflow", "");
} }
@ -242,7 +242,7 @@ static void process_ue(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
block_page = error_2b >> 6; /* convert to 4k address */ block_page = error_2b >> 6; /* convert to 4k address */
row = edac_mc_find_csrow_by_page(mci, block_page); row = edac_mc_find_csrow_by_page(mci, block_page);
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, block_page, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, block_page, 0, 0,
row, -1, -1, "e7xxx UE", ""); row, -1, -1, "e7xxx UE", "");
} }
@ -250,7 +250,7 @@ static void process_ue_no_info(struct mem_ctl_info *mci)
{ {
edac_dbg(3, "\n"); edac_dbg(3, "\n");
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, -1, -1, -1, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0, -1, -1, -1,
"e7xxx UE log register overflow", ""); "e7xxx UE log register overflow", "");
} }

1
drivers/edac/edac_core.h
View file

@ -455,6 +455,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
unsigned long page); unsigned long page);
void edac_mc_handle_error(const enum hw_event_mc_err_type type, void edac_mc_handle_error(const enum hw_event_mc_err_type type,
struct mem_ctl_info *mci, struct mem_ctl_info *mci,
const u16 error_count,
const unsigned long page_frame_number, const unsigned long page_frame_number,
const unsigned long offset_in_page, const unsigned long offset_in_page,
const unsigned long syndrome, const unsigned long syndrome,

56
drivers/edac/edac_mc.c
View file

@ -897,15 +897,16 @@ const char *edac_layer_name[] = {
EXPORT_SYMBOL_GPL(edac_layer_name); EXPORT_SYMBOL_GPL(edac_layer_name);
static void edac_inc_ce_error(struct mem_ctl_info *mci, static void edac_inc_ce_error(struct mem_ctl_info *mci,
bool enable_per_layer_report, bool enable_per_layer_report,
const int pos[EDAC_MAX_LAYERS]) const int pos[EDAC_MAX_LAYERS],
const u16 count)
{ {
int i, index = 0; int i, index = 0;
mci->ce_mc++; mci->ce_mc += count;
if (!enable_per_layer_report) { if (!enable_per_layer_report) {
mci->ce_noinfo_count++; mci->ce_noinfo_count += count;
return; return;
} }
@ -913,7 +914,7 @@ static void edac_inc_ce_error(struct mem_ctl_info *mci,
if (pos[i] < 0) if (pos[i] < 0)
break; break;
index += pos[i]; index += pos[i];
mci->ce_per_layer[i][index]++; mci->ce_per_layer[i][index] += count;
if (i < mci->n_layers - 1) if (i < mci->n_layers - 1)
index *= mci->layers[i + 1].size; index *= mci->layers[i + 1].size;
@ -922,14 +923,15 @@ static void edac_inc_ce_error(struct mem_ctl_info *mci,
static void edac_inc_ue_error(struct mem_ctl_info *mci, static void edac_inc_ue_error(struct mem_ctl_info *mci,
bool enable_per_layer_report, bool enable_per_layer_report,
const int pos[EDAC_MAX_LAYERS]) const int pos[EDAC_MAX_LAYERS],
const u16 count)
{ {
int i, index = 0; int i, index = 0;
mci->ue_mc++; mci->ue_mc += count;
if (!enable_per_layer_report) { if (!enable_per_layer_report) {
mci->ce_noinfo_count++; mci->ce_noinfo_count += count;
return; return;
} }
@ -937,7 +939,7 @@ static void edac_inc_ue_error(struct mem_ctl_info *mci,
if (pos[i] < 0) if (pos[i] < 0)
break; break;
index += pos[i]; index += pos[i];
mci->ue_per_layer[i][index]++; mci->ue_per_layer[i][index] += count;
if (i < mci->n_layers - 1) if (i < mci->n_layers - 1)
index *= mci->layers[i + 1].size; index *= mci->layers[i + 1].size;
@ -945,6 +947,7 @@ static void edac_inc_ue_error(struct mem_ctl_info *mci,
} }
static void edac_ce_error(struct mem_ctl_info *mci, static void edac_ce_error(struct mem_ctl_info *mci,
const u16 error_count,
const int pos[EDAC_MAX_LAYERS], const int pos[EDAC_MAX_LAYERS],
const char *msg, const char *msg,
const char *location, const char *location,
@ -961,16 +964,18 @@ static void edac_ce_error(struct mem_ctl_info *mci,
if (edac_mc_get_log_ce()) { if (edac_mc_get_log_ce()) {
if (other_detail && *other_detail) if (other_detail && *other_detail)
edac_mc_printk(mci, KERN_WARNING, edac_mc_printk(mci, KERN_WARNING,
"CE %s on %s (%s %s - %s)\n", "%d CE %s on %s (%s %s - %s)\n",
error_count,
msg, label, location, msg, label, location,
detail, other_detail); detail, other_detail);
else else
edac_mc_printk(mci, KERN_WARNING, edac_mc_printk(mci, KERN_WARNING,
"CE %s on %s (%s %s)\n", "%d CE %s on %s (%s %s)\n",
error_count,
msg, label, location, msg, label, location,
detail); detail);
} }
edac_inc_ce_error(mci, enable_per_layer_report, pos); edac_inc_ce_error(mci, enable_per_layer_report, pos, error_count);
if (mci->scrub_mode & SCRUB_SW_SRC) { if (mci->scrub_mode & SCRUB_SW_SRC) {
/* /*
@ -994,6 +999,7 @@ static void edac_ce_error(struct mem_ctl_info *mci,
} }
static void edac_ue_error(struct mem_ctl_info *mci, static void edac_ue_error(struct mem_ctl_info *mci,
const u16 error_count,
const int pos[EDAC_MAX_LAYERS], const int pos[EDAC_MAX_LAYERS],
const char *msg, const char *msg,
const char *location, const char *location,
@ -1005,12 +1011,14 @@ static void edac_ue_error(struct mem_ctl_info *mci,
if (edac_mc_get_log_ue()) { if (edac_mc_get_log_ue()) {
if (other_detail && *other_detail) if (other_detail && *other_detail)
edac_mc_printk(mci, KERN_WARNING, edac_mc_printk(mci, KERN_WARNING,
"UE %s on %s (%s %s - %s)\n", "%d UE %s on %s (%s %s - %s)\n",
error_count,
msg, label, location, detail, msg, label, location, detail,
other_detail); other_detail);
else else
edac_mc_printk(mci, KERN_WARNING, edac_mc_printk(mci, KERN_WARNING,
"UE %s on %s (%s %s)\n", "%d UE %s on %s (%s %s)\n",
error_count,
msg, label, location, detail); msg, label, location, detail);
} }
@ -1023,7 +1031,7 @@ static void edac_ue_error(struct mem_ctl_info *mci,
msg, label, location, detail); msg, label, location, detail);
} }
edac_inc_ue_error(mci, enable_per_layer_report, pos); edac_inc_ue_error(mci, enable_per_layer_report, pos, error_count);
} }
#define OTHER_LABEL " or " #define OTHER_LABEL " or "
@ -1033,6 +1041,7 @@ static void edac_ue_error(struct mem_ctl_info *mci,
* *
* @type: severity of the error (CE/UE/Fatal) * @type: severity of the error (CE/UE/Fatal)
* @mci: a struct mem_ctl_info pointer * @mci: a struct mem_ctl_info pointer
* @error_count: Number of errors of the same type
* @page_frame_number: mem page where the error occurred * @page_frame_number: mem page where the error occurred
* @offset_in_page: offset of the error inside the page * @offset_in_page: offset of the error inside the page
* @syndrome: ECC syndrome * @syndrome: ECC syndrome
@ -1047,6 +1056,7 @@ static void edac_ue_error(struct mem_ctl_info *mci,
*/ */
void edac_mc_handle_error(const enum hw_event_mc_err_type type, void edac_mc_handle_error(const enum hw_event_mc_err_type type,
struct mem_ctl_info *mci, struct mem_ctl_info *mci,
const u16 error_count,
const unsigned long page_frame_number, const unsigned long page_frame_number,
const unsigned long offset_in_page, const unsigned long offset_in_page,
const unsigned long syndrome, const unsigned long syndrome,
@ -1065,7 +1075,6 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
int i; int i;
long grain; long grain;
bool enable_per_layer_report = false; bool enable_per_layer_report = false;
u16 error_count; /* FIXME: make it a parameter */
u8 grain_bits; u8 grain_bits;
edac_dbg(3, "MC%d\n", mci->mc_idx); edac_dbg(3, "MC%d\n", mci->mc_idx);
@ -1169,13 +1178,13 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
strcpy(label, "unknown memory"); strcpy(label, "unknown memory");
if (type == HW_EVENT_ERR_CORRECTED) { if (type == HW_EVENT_ERR_CORRECTED) {
if (row >= 0) { if (row >= 0) {
mci->csrows[row]->ce_count++; mci->csrows[row]->ce_count += error_count;
if (chan >= 0) if (chan >= 0)
mci->csrows[row]->channels[chan]->ce_count++; mci->csrows[row]->channels[chan]->ce_count += error_count;
} }
} else } else
if (row >= 0) if (row >= 0)
mci->csrows[row]->ue_count++; mci->csrows[row]->ue_count += error_count;
} }
/* Fill the RAM location data */ /* Fill the RAM location data */
@ -1193,7 +1202,6 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
/* Report the error via the trace interface */ /* Report the error via the trace interface */
error_count = 1; /* FIXME: allow change it */
grain_bits = fls_long(grain) + 1; grain_bits = fls_long(grain) + 1;
trace_mc_event(type, msg, label, error_count, trace_mc_event(type, msg, label, error_count,
mci->mc_idx, top_layer, mid_layer, low_layer, mci->mc_idx, top_layer, mid_layer, low_layer,
@ -1206,16 +1214,16 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
"page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx", "page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx",
page_frame_number, offset_in_page, page_frame_number, offset_in_page,
grain, syndrome); grain, syndrome);
edac_ce_error(mci, pos, msg, location, label, detail, edac_ce_error(mci, error_count, pos, msg, location, label,
other_detail, enable_per_layer_report, detail, other_detail, enable_per_layer_report,
page_frame_number, offset_in_page, grain); page_frame_number, offset_in_page, grain);
} else { } else {
snprintf(detail, sizeof(detail), snprintf(detail, sizeof(detail),
"page:0x%lx offset:0x%lx grain:%ld", "page:0x%lx offset:0x%lx grain:%ld",
page_frame_number, offset_in_page, grain); page_frame_number, offset_in_page, grain);
edac_ue_error(mci, pos, msg, location, label, detail, edac_ue_error(mci, error_count, pos, msg, location, label,
other_detail, enable_per_layer_report); detail, other_detail, enable_per_layer_report);
} }
} }
EXPORT_SYMBOL_GPL(edac_mc_handle_error); EXPORT_SYMBOL_GPL(edac_mc_handle_error);

2
drivers/edac/edac_mc_sysfs.c
View file

@ -823,7 +823,7 @@ static ssize_t edac_fake_inject_write(struct file *file,
mci->fake_inject_layer[1], mci->fake_inject_layer[1],
mci->fake_inject_layer[2] mci->fake_inject_layer[2]
); );
edac_mc_handle_error(type, mci, 0, 0, 0, edac_mc_handle_error(type, mci, 1, 0, 0, 0,
mci->fake_inject_layer[0], mci->fake_inject_layer[0],
mci->fake_inject_layer[1], mci->fake_inject_layer[1],
mci->fake_inject_layer[2], mci->fake_inject_layer[2],

6
drivers/edac/i3000_edac.c
View file

@ -245,7 +245,7 @@ static int i3000_process_error_info(struct mem_ctl_info *mci,
return 1; return 1;
if ((info->errsts ^ info->errsts2) & I3000_ERRSTS_BITS) { if ((info->errsts ^ info->errsts2) & I3000_ERRSTS_BITS) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
-1, -1, -1, -1, -1, -1,
"UE overwrote CE", ""); "UE overwrote CE", "");
info->errsts = info->errsts2; info->errsts = info->errsts2;
@ -258,12 +258,12 @@ static int i3000_process_error_info(struct mem_ctl_info *mci,
row = edac_mc_find_csrow_by_page(mci, pfn); row = edac_mc_find_csrow_by_page(mci, pfn);
if (info->errsts & I3000_ERRSTS_UE) if (info->errsts & I3000_ERRSTS_UE)
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
pfn, offset, 0, pfn, offset, 0,
row, -1, -1, row, -1, -1,
"i3000 UE", ""); "i3000 UE", "");
else else
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
pfn, offset, info->derrsyn, pfn, offset, info->derrsyn,
row, multi_chan ? channel : 0, -1, row, multi_chan ? channel : 0, -1,
"i3000 CE", ""); "i3000 CE", "");

6
drivers/edac/i3200_edac.c
View file

@ -218,7 +218,7 @@ static void i3200_process_error_info(struct mem_ctl_info *mci,
return; return;
if ((info->errsts ^ info->errsts2) & I3200_ERRSTS_BITS) { if ((info->errsts ^ info->errsts2) & I3200_ERRSTS_BITS) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
-1, -1, -1, "UE overwrote CE", ""); -1, -1, -1, "UE overwrote CE", "");
info->errsts = info->errsts2; info->errsts = info->errsts2;
} }
@ -226,13 +226,13 @@ static void i3200_process_error_info(struct mem_ctl_info *mci,
for (channel = 0; channel < nr_channels; channel++) { for (channel = 0; channel < nr_channels; channel++) {
log = info->eccerrlog[channel]; log = info->eccerrlog[channel];
if (log & I3200_ECCERRLOG_UE) { if (log & I3200_ECCERRLOG_UE) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
0, 0, 0, 0, 0, 0,
eccerrlog_row(channel, log), eccerrlog_row(channel, log),
-1, -1, -1, -1,
"i3000 UE", ""); "i3000 UE", "");
} else if (log & I3200_ECCERRLOG_CE) { } else if (log & I3200_ECCERRLOG_CE) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
0, 0, eccerrlog_syndrome(log), 0, 0, eccerrlog_syndrome(log),
eccerrlog_row(channel, log), eccerrlog_row(channel, log),
-1, -1, -1, -1,

8
drivers/edac/i5000_edac.c
View file

@ -519,7 +519,7 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,
bank, ras, cas, allErrors, specific); bank, ras, cas, allErrors, specific);
/* Call the helper to output message */ /* Call the helper to output message */
edac_mc_handle_error(HW_EVENT_ERR_FATAL, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_FATAL, mci, 1, 0, 0, 0,
channel >> 1, channel & 1, rank, channel >> 1, channel & 1, rank,
rdwr ? "Write error" : "Read error", rdwr ? "Write error" : "Read error",
msg); msg);
@ -618,7 +618,7 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,
rank, bank, ras, cas, ue_errors, specific); rank, bank, ras, cas, ue_errors, specific);
/* Call the helper to output message */ /* Call the helper to output message */
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
channel >> 1, -1, rank, channel >> 1, -1, rank,
rdwr ? "Write error" : "Read error", rdwr ? "Write error" : "Read error",
msg); msg);
@ -672,7 +672,7 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,
specific); specific);
/* Call the helper to output message */ /* Call the helper to output message */
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, 0, 0, 0,
channel >> 1, channel % 2, rank, channel >> 1, channel % 2, rank,
rdwr ? "Write error" : "Read error", rdwr ? "Write error" : "Read error",
msg); msg);
@ -718,7 +718,7 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,
"Err=%#x (%s)", misc_errors, specific); "Err=%#x (%s)", misc_errors, specific);
/* Call the helper to output message */ /* Call the helper to output message */
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, 0, 0, 0,
branch >> 1, -1, -1, branch >> 1, -1, -1,
"Misc error", msg); "Misc error", msg);
} }

4
drivers/edac/i5100_edac.c
View file

@ -431,7 +431,7 @@ static void i5100_handle_ce(struct mem_ctl_info *mci,
"bank %u, cas %u, ras %u\n", "bank %u, cas %u, ras %u\n",
bank, cas, ras); bank, cas, ras);
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
0, 0, syndrome, 0, 0, syndrome,
chan, rank, -1, chan, rank, -1,
msg, detail); msg, detail);
@ -453,7 +453,7 @@ static void i5100_handle_ue(struct mem_ctl_info *mci,
"bank %u, cas %u, ras %u\n", "bank %u, cas %u, ras %u\n",
bank, cas, ras); bank, cas, ras);
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
0, 0, syndrome, 0, 0, syndrome,
chan, rank, -1, chan, rank, -1,
msg, detail); msg, detail);

4
drivers/edac/i5400_edac.c
View file

@ -554,7 +554,7 @@ static void i5400_proccess_non_recoverable_info(struct mem_ctl_info *mci,
"Bank=%d Buffer ID = %d RAS=%d CAS=%d Err=0x%lx (%s)", "Bank=%d Buffer ID = %d RAS=%d CAS=%d Err=0x%lx (%s)",
bank, buf_id, ras, cas, allErrors, error_name[errnum]); bank, buf_id, ras, cas, allErrors, error_name[errnum]);
edac_mc_handle_error(tp_event, mci, 0, 0, 0, edac_mc_handle_error(tp_event, mci, 1, 0, 0, 0,
branch >> 1, -1, rank, branch >> 1, -1, rank,
rdwr ? "Write error" : "Read error", rdwr ? "Write error" : "Read error",
msg); msg);
@ -626,7 +626,7 @@ static void i5400_process_nonfatal_error_info(struct mem_ctl_info *mci,
branch >> 1, bank, rdwr_str(rdwr), ras, cas, branch >> 1, bank, rdwr_str(rdwr), ras, cas,
allErrors, error_name[errnum]); allErrors, error_name[errnum]);
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, 0, 0, 0,
branch >> 1, channel % 2, rank, branch >> 1, channel % 2, rank,
rdwr ? "Write error" : "Read error", rdwr ? "Write error" : "Read error",
msg); msg);

4
drivers/edac/i7300_edac.c
View file

@ -449,7 +449,7 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci)
"Bank=%d RAS=%d CAS=%d Err=0x%lx (%s))", "Bank=%d RAS=%d CAS=%d Err=0x%lx (%s))",
bank, ras, cas, errors, specific); bank, ras, cas, errors, specific);
edac_mc_handle_error(HW_EVENT_ERR_FATAL, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_FATAL, mci, 1, 0, 0, 0,
branch, -1, rank, branch, -1, rank,
is_wr ? "Write error" : "Read error", is_wr ? "Write error" : "Read error",
pvt->tmp_prt_buffer); pvt->tmp_prt_buffer);
@ -495,7 +495,7 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci)
"DRAM-Bank=%d RAS=%d CAS=%d, Err=0x%lx (%s))", "DRAM-Bank=%d RAS=%d CAS=%d, Err=0x%lx (%s))",
bank, ras, cas, errors, specific); bank, ras, cas, errors, specific);
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, 0, 0,
syndrome, syndrome,
branch >> 1, channel % 2, rank, branch >> 1, channel % 2, rank,
is_wr ? "Write error" : "Read error", is_wr ? "Write error" : "Read error",

4
drivers/edac/i7core_edac.c
View file

@ -1544,7 +1544,7 @@ static void i7core_rdimm_update_errcount(struct mem_ctl_info *mci,
int i; int i;
for (i = 0; i < add; i++) { for (i = 0; i < add; i++) {
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, 0, 0, 0,
chan, dimm, -1, "error", ""); chan, dimm, -1, "error", "");
} }
} }
@ -1796,7 +1796,7 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci,
* only one event * only one event
*/ */
if (uncorrected_error || !pvt->is_registered) if (uncorrected_error || !pvt->is_registered)
edac_mc_handle_error(tp_event, mci, edac_mc_handle_error(tp_event, mci, 1,
m->addr >> PAGE_SHIFT, m->addr >> PAGE_SHIFT,
m->addr & ~PAGE_MASK, m->addr & ~PAGE_MASK,
syndrome, syndrome,

4
drivers/edac/i82443bxgx_edac.c
View file

@ -156,7 +156,7 @@ static int i82443bxgx_edacmc_process_error_info(struct mem_ctl_info *mci,
if (info->eap & I82443BXGX_EAP_OFFSET_SBE) { if (info->eap & I82443BXGX_EAP_OFFSET_SBE) {
error_found = 1; error_found = 1;
if (handle_errors) if (handle_errors)
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
page, pageoffset, 0, page, pageoffset, 0,
edac_mc_find_csrow_by_page(mci, page), edac_mc_find_csrow_by_page(mci, page),
0, -1, mci->ctl_name, ""); 0, -1, mci->ctl_name, "");
@ -165,7 +165,7 @@ static int i82443bxgx_edacmc_process_error_info(struct mem_ctl_info *mci,
if (info->eap & I82443BXGX_EAP_OFFSET_MBE) { if (info->eap & I82443BXGX_EAP_OFFSET_MBE) {
error_found = 1; error_found = 1;
if (handle_errors) if (handle_errors)
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
page, pageoffset, 0, page, pageoffset, 0,
edac_mc_find_csrow_by_page(mci, page), edac_mc_find_csrow_by_page(mci, page),
0, -1, mci->ctl_name, ""); 0, -1, mci->ctl_name, "");

6
drivers/edac/i82860_edac.c
View file

@ -109,7 +109,7 @@ static int i82860_process_error_info(struct mem_ctl_info *mci,
return 1; return 1;
if ((info->errsts ^ info->errsts2) & 0x0003) { if ((info->errsts ^ info->errsts2) & 0x0003) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
-1, -1, -1, "UE overwrote CE", ""); -1, -1, -1, "UE overwrote CE", "");
info->errsts = info->errsts2; info->errsts = info->errsts2;
} }
@ -119,12 +119,12 @@ static int i82860_process_error_info(struct mem_ctl_info *mci,
dimm = mci->csrows[row]->channels[0]->dimm; dimm = mci->csrows[row]->channels[0]->dimm;
if (info->errsts & 0x0002) if (info->errsts & 0x0002)
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
info->eap, 0, 0, info->eap, 0, 0,
dimm->location[0], dimm->location[1], -1, dimm->location[0], dimm->location[1], -1,
"i82860 UE", ""); "i82860 UE", "");
else else
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
info->eap, 0, info->derrsyn, info->eap, 0, info->derrsyn,
dimm->location[0], dimm->location[1], -1, dimm->location[0], dimm->location[1], -1,
"i82860 CE", ""); "i82860 CE", "");

6
drivers/edac/i82875p_edac.c
View file

@ -236,7 +236,7 @@ static int i82875p_process_error_info(struct mem_ctl_info *mci,
return 1; return 1;
if ((info->errsts ^ info->errsts2) & 0x0081) { if ((info->errsts ^ info->errsts2) & 0x0081) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
-1, -1, -1, -1, -1, -1,
"UE overwrote CE", ""); "UE overwrote CE", "");
info->errsts = info->errsts2; info->errsts = info->errsts2;
@ -246,12 +246,12 @@ static int i82875p_process_error_info(struct mem_ctl_info *mci,
row = edac_mc_find_csrow_by_page(mci, info->eap); row = edac_mc_find_csrow_by_page(mci, info->eap);
if (info->errsts & 0x0080) if (info->errsts & 0x0080)
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
info->eap, 0, 0, info->eap, 0, 0,
row, -1, -1, row, -1, -1,
"i82875p UE", ""); "i82875p UE", "");
else else
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
info->eap, 0, info->derrsyn, info->eap, 0, info->derrsyn,
row, multi_chan ? (info->des & 0x1) : 0, row, multi_chan ? (info->des & 0x1) : 0,
-1, "i82875p CE", ""); -1, "i82875p CE", "");

6
drivers/edac/i82975x_edac.c
View file

@ -288,7 +288,7 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci,
return 1; return 1;
if ((info->errsts ^ info->errsts2) & 0x0003) { if ((info->errsts ^ info->errsts2) & 0x0003) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
-1, -1, -1, "UE overwrote CE", ""); -1, -1, -1, "UE overwrote CE", "");
info->errsts = info->errsts2; info->errsts = info->errsts2;
} }
@ -314,12 +314,12 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci,
(1 << mci->csrows[row]->channels[chan]->dimm->grain)); (1 << mci->csrows[row]->channels[chan]->dimm->grain));
if (info->errsts & 0x0002) if (info->errsts & 0x0002)
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
page, offst, 0, page, offst, 0,
row, -1, -1, row, -1, -1,
"i82975x UE", ""); "i82975x UE", "");
else else
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
page, offst, info->derrsyn, page, offst, info->derrsyn,
row, chan ? chan : 0, -1, row, chan ? chan : 0, -1,
"i82975x CE", ""); "i82975x CE", "");

4
drivers/edac/mpc85xx_edac.c
View file

@ -866,13 +866,13 @@ static void mpc85xx_mc_check(struct mem_ctl_info *mci)
mpc85xx_mc_printk(mci, KERN_ERR, "PFN out of range!\n"); mpc85xx_mc_printk(mci, KERN_ERR, "PFN out of range!\n");
if (err_detect & DDR_EDE_SBE) if (err_detect & DDR_EDE_SBE)
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
pfn, err_addr & ~PAGE_MASK, syndrome, pfn, err_addr & ~PAGE_MASK, syndrome,
row_index, 0, -1, row_index, 0, -1,
mci->ctl_name, ""); mci->ctl_name, "");
if (err_detect & DDR_EDE_MBE) if (err_detect & DDR_EDE_MBE)
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
pfn, err_addr & ~PAGE_MASK, syndrome, pfn, err_addr & ~PAGE_MASK, syndrome,
row_index, 0, -1, row_index, 0, -1,
mci->ctl_name, ""); mci->ctl_name, "");

4
drivers/edac/mv64x60_edac.c
View file

@ -611,13 +611,13 @@ static void mv64x60_mc_check(struct mem_ctl_info *mci)
/* first bit clear in ECC Err Reg, 1 bit error, correctable by HW */ /* first bit clear in ECC Err Reg, 1 bit error, correctable by HW */
if (!(reg & 0x1)) if (!(reg & 0x1))
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
err_addr >> PAGE_SHIFT, err_addr >> PAGE_SHIFT,
err_addr & PAGE_MASK, syndrome, err_addr & PAGE_MASK, syndrome,
0, 0, -1, 0, 0, -1,
mci->ctl_name, ""); mci->ctl_name, "");
else /* 2 bit error, UE */ else /* 2 bit error, UE */
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
err_addr >> PAGE_SHIFT, err_addr >> PAGE_SHIFT,
err_addr & PAGE_MASK, 0, err_addr & PAGE_MASK, 0,
0, 0, -1, 0, 0, -1,

4
drivers/edac/pasemi_edac.c
View file

@ -110,14 +110,14 @@ static void pasemi_edac_process_error_info(struct mem_ctl_info *mci, u32 errsta)
/* uncorrectable/multi-bit errors */ /* uncorrectable/multi-bit errors */
if (errsta & (MCDEBUG_ERRSTA_MBE_STATUS | if (errsta & (MCDEBUG_ERRSTA_MBE_STATUS |
MCDEBUG_ERRSTA_RFL_STATUS)) { MCDEBUG_ERRSTA_RFL_STATUS)) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
mci->csrows[cs]->first_page, 0, 0, mci->csrows[cs]->first_page, 0, 0,
cs, 0, -1, mci->ctl_name, ""); cs, 0, -1, mci->ctl_name, "");
} }
/* correctable/single-bit errors */ /* correctable/single-bit errors */
if (errsta & MCDEBUG_ERRSTA_SBE_STATUS) if (errsta & MCDEBUG_ERRSTA_SBE_STATUS)
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
mci->csrows[cs]->first_page, 0, 0, mci->csrows[cs]->first_page, 0, 0,
cs, 0, -1, mci->ctl_name, ""); cs, 0, -1, mci->ctl_name, "");
} }

4
drivers/edac/ppc4xx_edac.c
View file

@ -727,7 +727,7 @@ ppc4xx_edac_handle_ce(struct mem_ctl_info *mci,
for (row = 0; row < mci->nr_csrows; row++) for (row = 0; row < mci->nr_csrows; row++)
if (ppc4xx_edac_check_bank_error(status, row)) if (ppc4xx_edac_check_bank_error(status, row))
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
0, 0, 0, 0, 0, 0,
row, 0, -1, row, 0, -1,
message, ""); message, "");
@ -758,7 +758,7 @@ ppc4xx_edac_handle_ue(struct mem_ctl_info *mci,
for (row = 0; row < mci->nr_csrows; row++) for (row = 0; row < mci->nr_csrows; row++)
if (ppc4xx_edac_check_bank_error(status, row)) if (ppc4xx_edac_check_bank_error(status, row))
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
page, offset, 0, page, offset, 0,
row, 0, -1, row, 0, -1,
message, ""); message, "");

4
drivers/edac/r82600_edac.c
View file

@ -179,7 +179,7 @@ static int r82600_process_error_info(struct mem_ctl_info *mci,
error_found = 1; error_found = 1;
if (handle_errors) if (handle_errors)
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
page, 0, syndrome, page, 0, syndrome,
edac_mc_find_csrow_by_page(mci, page), edac_mc_find_csrow_by_page(mci, page),
0, -1, 0, -1,
@ -191,7 +191,7 @@ static int r82600_process_error_info(struct mem_ctl_info *mci,
if (handle_errors) if (handle_errors)
/* 82600 doesn't give enough info */ /* 82600 doesn't give enough info */
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
page, 0, 0, page, 0, 0,
edac_mc_find_csrow_by_page(mci, page), edac_mc_find_csrow_by_page(mci, page),
0, -1, 0, -1,

4
drivers/edac/sb_edac.c
View file

@ -1447,13 +1447,13 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,
/* FIXME: need support for channel mask */ /* FIXME: need support for channel mask */
/* Call the helper to output message */ /* Call the helper to output message */
edac_mc_handle_error(tp_event, mci, edac_mc_handle_error(tp_event, mci, 1,
m->addr >> PAGE_SHIFT, m->addr & ~PAGE_MASK, 0, m->addr >> PAGE_SHIFT, m->addr & ~PAGE_MASK, 0,
channel, dimm, -1, channel, dimm, -1,
optype, msg); optype, msg);
return; return;
err_parsing: err_parsing:
edac_mc_handle_error(tp_event, mci, 0, 0, 0, edac_mc_handle_error(tp_event, mci, 1, 0, 0, 0,
-1, -1, -1, -1, -1, -1,
msg, ""); msg, "");

2
drivers/edac/tile_edac.c
View file

@ -71,7 +71,7 @@ static void tile_edac_check(struct mem_ctl_info *mci)
if (mem_error.sbe_count != priv->ce_count) { if (mem_error.sbe_count != priv->ce_count) {
dev_dbg(mci->pdev, "ECC CE err on node %d\n", priv->node); dev_dbg(mci->pdev, "ECC CE err on node %d\n", priv->node);
priv->ce_count = mem_error.sbe_count; priv->ce_count = mem_error.sbe_count;
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
0, 0, 0, 0, 0, 0,
0, 0, -1, 0, 0, -1,
mci->ctl_name, ""); mci->ctl_name, "");

6
drivers/edac/x38_edac.c
View file

@ -215,7 +215,7 @@ static void x38_process_error_info(struct mem_ctl_info *mci,
return; return;
if ((info->errsts ^ info->errsts2) & X38_ERRSTS_BITS) { if ((info->errsts ^ info->errsts2) & X38_ERRSTS_BITS) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
-1, -1, -1, -1, -1, -1,
"UE overwrote CE", ""); "UE overwrote CE", "");
info->errsts = info->errsts2; info->errsts = info->errsts2;
@ -224,13 +224,13 @@ static void x38_process_error_info(struct mem_ctl_info *mci,
for (channel = 0; channel < x38_channel_num; channel++) { for (channel = 0; channel < x38_channel_num; channel++) {
log = info->eccerrlog[channel]; log = info->eccerrlog[channel];
if (log & X38_ECCERRLOG_UE) { if (log & X38_ECCERRLOG_UE) {
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
0, 0, 0, 0, 0, 0,
eccerrlog_row(channel, log), eccerrlog_row(channel, log),
-1, -1, -1, -1,
"x38 UE", ""); "x38 UE", "");
} else if (log & X38_ECCERRLOG_CE) { } else if (log & X38_ECCERRLOG_CE) {
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
0, 0, eccerrlog_syndrome(log), 0, 0, eccerrlog_syndrome(log),
eccerrlog_row(channel, log), eccerrlog_row(channel, log),
-1, -1, -1, -1,