diff options
author | Dave Jiang <djiang@mvista.com> | 2007-07-19 04:49:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:04:53 -0400 |
commit | c0d121720220584bba2876b032e58a076b843fa1 (patch) | |
tree | 13ba24c6d875ded1494e1560f336b8551c663ef1 /arch/i386/kernel/traps.c | |
parent | 28f96eeafc89643d411d54c258788a8573576127 (diff) |
drivers/edac: add new nmi rescan
Provides a way for NMI reported errors on x86 to notify the EDAC
subsystem pending ECC errors by writing to a software state variable.
Here's the reworked patch. I added an EDAC stub to the kernel so we can
have variables that are in the kernel even if EDAC is a module. I also
implemented the idea of using the chip driver to select error detection
mode via module parameter and eliminate the kernel compile option.
Please review/test. Thx!
Also, I only made changes to some of the chipset drivers since I am
unfamiliar with the other ones. We can add similar changes as we go.
Signed-off-by: Dave Jiang <djiang@mvista.com>
Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r-- | arch/i386/kernel/traps.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index 109ebbcde58..3e7753c78b9 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
@@ -41,6 +41,10 @@ | |||
41 | #include <linux/mca.h> | 41 | #include <linux/mca.h> |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | #if defined(CONFIG_EDAC) | ||
45 | #include <linux/edac.h> | ||
46 | #endif | ||
47 | |||
44 | #include <asm/processor.h> | 48 | #include <asm/processor.h> |
45 | #include <asm/system.h> | 49 | #include <asm/system.h> |
46 | #include <asm/io.h> | 50 | #include <asm/io.h> |
@@ -638,6 +642,14 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs) | |||
638 | printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on " | 642 | printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on " |
639 | "CPU %d.\n", reason, smp_processor_id()); | 643 | "CPU %d.\n", reason, smp_processor_id()); |
640 | printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n"); | 644 | printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n"); |
645 | |||
646 | #if defined(CONFIG_EDAC) | ||
647 | if(edac_handler_set()) { | ||
648 | edac_atomic_assert_error(); | ||
649 | return; | ||
650 | } | ||
651 | #endif | ||
652 | |||
641 | if (panic_on_unrecovered_nmi) | 653 | if (panic_on_unrecovered_nmi) |
642 | panic("NMI: Not continuing"); | 654 | panic("NMI: Not continuing"); |
643 | 655 | ||