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 /drivers/edac/e7xxx_edac.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 'drivers/edac/e7xxx_edac.c')
-rw-r--r-- | drivers/edac/e7xxx_edac.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c index 310d91b41c96..0827b9a7b386 100644 --- a/drivers/edac/e7xxx_edac.c +++ b/drivers/edac/e7xxx_edac.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
28 | #include <linux/pci_ids.h> | 28 | #include <linux/pci_ids.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/edac.h> | ||
30 | #include "edac_mc.h" | 31 | #include "edac_mc.h" |
31 | 32 | ||
32 | #define E7XXX_REVISION " Ver: 2.0.1 " __DATE__ | 33 | #define E7XXX_REVISION " Ver: 2.0.1 " __DATE__ |
@@ -419,6 +420,17 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) | |||
419 | struct e7xxx_error_info discard; | 420 | struct e7xxx_error_info discard; |
420 | 421 | ||
421 | debugf0("%s(): mci\n", __func__); | 422 | debugf0("%s(): mci\n", __func__); |
423 | |||
424 | /* make sure error reporting method is sane */ | ||
425 | switch(edac_op_state) { | ||
426 | case EDAC_OPSTATE_POLL: | ||
427 | case EDAC_OPSTATE_NMI: | ||
428 | break; | ||
429 | default: | ||
430 | edac_op_state = EDAC_OPSTATE_POLL; | ||
431 | break; | ||
432 | } | ||
433 | |||
422 | pci_read_config_dword(pdev, E7XXX_DRC, &drc); | 434 | pci_read_config_dword(pdev, E7XXX_DRC, &drc); |
423 | 435 | ||
424 | drc_chan = dual_channel_active(drc, dev_idx); | 436 | drc_chan = dual_channel_active(drc, dev_idx); |
@@ -565,3 +577,5 @@ MODULE_LICENSE("GPL"); | |||
565 | MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh et al\n" | 577 | MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh et al\n" |
566 | "Based on.work by Dan Hollis et al"); | 578 | "Based on.work by Dan Hollis et al"); |
567 | MODULE_DESCRIPTION("MC support for Intel e7xxx memory controllers"); | 579 | MODULE_DESCRIPTION("MC support for Intel e7xxx memory controllers"); |
580 | module_param(edac_op_state, int, 0444); | ||
581 | MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI"); | ||