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/i5000_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/i5000_edac.c')
-rw-r--r-- | drivers/edac/i5000_edac.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c index 4d7e786065aa..8eb8b6e5b32c 100644 --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
20 | #include <linux/pci_ids.h> | 20 | #include <linux/pci_ids.h> |
21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | #include <linux/edac.h> | ||
22 | #include <asm/mmzone.h> | 23 | #include <asm/mmzone.h> |
23 | 24 | ||
24 | #include "edac_mc.h" | 25 | #include "edac_mc.h" |
@@ -1285,6 +1286,16 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx) | |||
1285 | if (PCI_FUNC(pdev->devfn) != 0) | 1286 | if (PCI_FUNC(pdev->devfn) != 0) |
1286 | return -ENODEV; | 1287 | return -ENODEV; |
1287 | 1288 | ||
1289 | /* make sure error reporting method is sane */ | ||
1290 | switch(edac_op_state) { | ||
1291 | case EDAC_OPSTATE_POLL: | ||
1292 | case EDAC_OPSTATE_NMI: | ||
1293 | break; | ||
1294 | default: | ||
1295 | edac_op_state = EDAC_OPSTATE_POLL; | ||
1296 | break; | ||
1297 | } | ||
1298 | |||
1288 | /* Ask the devices for the number of CSROWS and CHANNELS so | 1299 | /* Ask the devices for the number of CSROWS and CHANNELS so |
1289 | * that we can calculate the memory resources, etc | 1300 | * that we can calculate the memory resources, etc |
1290 | * | 1301 | * |
@@ -1475,3 +1486,5 @@ MODULE_AUTHOR | |||
1475 | ("Linux Networx (http://lnxi.com) Doug Thompson <norsk5@xmission.com>"); | 1486 | ("Linux Networx (http://lnxi.com) Doug Thompson <norsk5@xmission.com>"); |
1476 | MODULE_DESCRIPTION("MC Driver for Intel I5000 memory controllers - " | 1487 | MODULE_DESCRIPTION("MC Driver for Intel I5000 memory controllers - " |
1477 | I5000_REVISION); | 1488 | I5000_REVISION); |
1489 | module_param(edac_op_state, int, 0444); | ||
1490 | MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI"); | ||