提交 486dfb16 编写于 作者: M Mauro Carvalho Chehab

i5000: Fix the fatal error handling

The fatal error channel bits point to a single channel, and not
to a range of channels. Fix the code to properly report it,
instead of printing messages like:
	kernel: EDAC MC0: INTERNAL ERROR: channel-b out of range (4 >= 4)
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 9f70d08a
...@@ -474,7 +474,6 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci, ...@@ -474,7 +474,6 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,
char msg[EDAC_MC_LABEL_LEN + 1 + 160]; char msg[EDAC_MC_LABEL_LEN + 1 + 160];
char *specific = NULL; char *specific = NULL;
u32 allErrors; u32 allErrors;
int branch;
int channel; int channel;
int bank; int bank;
int rank; int rank;
...@@ -486,8 +485,7 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci, ...@@ -486,8 +485,7 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,
if (!allErrors) if (!allErrors)
return; /* if no error, return now */ return; /* if no error, return now */
branch = EXTRACT_FBDCHAN_INDX(info->ferr_fat_fbd); channel = EXTRACT_FBDCHAN_INDX(info->ferr_fat_fbd);
channel = branch;
/* Use the NON-Recoverable macros to extract data */ /* Use the NON-Recoverable macros to extract data */
bank = NREC_BANK(info->nrecmema); bank = NREC_BANK(info->nrecmema);
...@@ -496,9 +494,9 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci, ...@@ -496,9 +494,9 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,
ras = NREC_RAS(info->nrecmemb); ras = NREC_RAS(info->nrecmemb);
cas = NREC_CAS(info->nrecmemb); cas = NREC_CAS(info->nrecmemb);
debugf0("\t\tCSROW= %d Channels= %d,%d (Branch= %d " debugf0("\t\tCSROW= %d Channel= %d "
"DRAM Bank= %d rdwr= %s ras= %d cas= %d)\n", "(DRAM Bank= %d rdwr= %s ras= %d cas= %d)\n",
rank, channel, channel + 1, branch >> 1, bank, rank, channel, bank,
rdwr ? "Write" : "Read", ras, cas); rdwr ? "Write" : "Read", ras, cas);
/* Only 1 bit will be on */ /* Only 1 bit will be on */
...@@ -539,7 +537,7 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci, ...@@ -539,7 +537,7 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,
/* 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, 0, 0, 0,
branch >> 1, -1, rank, channel >> 1, channel & 1, rank,
rdwr ? "Write error" : "Read error", rdwr ? "Write error" : "Read error",
msg, NULL); msg, NULL);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册