adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-31 21:26:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86, mce: Fix mce printing

Browse source 
This patch:

 - Adds print_mce_head() instead of first flag
 - Makes the header to be printed always
 - Stops double printing of corrected errors

[ This portion originates from Huang Ying's patch ]

Originally-From: Huang Ying <ying.huang@intel.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
LKML-Reference: <4A30AC83.5010708@jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Hidetoshi Seto 2009-06-11 16:04:35 +09:00 committed by Ingo Molnar
parent 8051dbd2df
commit 77e26cca20
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
arch/x86/kernel/cpu/mcheck/mce.c
View file

@ -180,12 +180,8 @@ void mce_log(struct mce *mce)
set_bit(0, &notify_user); set_bit(0, &notify_user);
} }
static void print_mce(struct mce *m, int *first) static void print_mce(struct mce *m)
{ {
if (*first) {
printk(KERN_EMERG "\n" KERN_EMERG "HARDWARE ERROR\n");
*first = 0;
}
printk(KERN_EMERG printk(KERN_EMERG
"CPU %d: Machine Check Exception: %16Lx Bank %d: %016Lx\n", "CPU %d: Machine Check Exception: %16Lx Bank %d: %016Lx\n",
m->extcpu, m->mcgstatus, m->bank, m->status); m->extcpu, m->mcgstatus, m->bank, m->status);
@ -208,6 +204,11 @@ static void print_mce(struct mce *m, int *first)
m->apicid); m->apicid);
} }
static void print_mce_head(void)
{
printk(KERN_EMERG "\n" KERN_EMERG "HARDWARE ERROR\n");
}
static void print_mce_tail(void) static void print_mce_tail(void)
{ {
printk(KERN_EMERG "This is not a software problem!\n" printk(KERN_EMERG "This is not a software problem!\n"
@ -234,7 +235,6 @@ static void wait_for_panic(void)
static void mce_panic(char *msg, struct mce *final, char *exp) static void mce_panic(char *msg, struct mce *final, char *exp)
{ {
int i; int i;
int first = 1;
/* /*
* Make sure only one CPU runs in machine check panic * Make sure only one CPU runs in machine check panic
@ -245,23 +245,27 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
bust_spinlocks(1); bust_spinlocks(1);
console_verbose(); console_verbose();
print_mce_head();
/* First print corrected ones that are still unlogged */ /* First print corrected ones that are still unlogged */
for (i = 0; i < MCE_LOG_LEN; i++) { for (i = 0; i < MCE_LOG_LEN; i++) {
struct mce *m = &mcelog.entry[i]; struct mce *m = &mcelog.entry[i];
if ((m->status & MCI_STATUS_VAL) && if (!(m->status & MCI_STATUS_VAL))
!(m->status & MCI_STATUS_UC)) continue;
print_mce(m, &first); if (!(m->status & MCI_STATUS_UC))
print_mce(m);
} }
/* Now print uncorrected but with the final one last */ /* Now print uncorrected but with the final one last */
for (i = 0; i < MCE_LOG_LEN; i++) { for (i = 0; i < MCE_LOG_LEN; i++) {
struct mce *m = &mcelog.entry[i]; struct mce *m = &mcelog.entry[i];
if (!(m->status & MCI_STATUS_VAL)) if (!(m->status & MCI_STATUS_VAL))
continue; continue;
if (!(m->status & MCI_STATUS_UC))
continue;
if (!final || memcmp(m, final, sizeof(struct mce))) if (!final || memcmp(m, final, sizeof(struct mce)))
print_mce(m, &first); print_mce(m);
} }
if (final) if (final)
print_mce(final, &first); print_mce(final);
if (cpu_missing) if (cpu_missing)
printk(KERN_EMERG "Some CPUs didn't answer in synchronization\n"); printk(KERN_EMERG "Some CPUs didn't answer in synchronization\n");
print_mce_tail(); print_mce_tail();