diff options
author | Arthur Jones <ajones@riverbed.com> | 2008-07-25 04:49:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 13:53:48 -0400 |
commit | 178d5a742291976d13bff55fa2b130879d4510de (patch) | |
tree | 3a7bb968023b1a7f60771ddb3410ed4a5470f13c /drivers/edac | |
parent | 43920a598f9358a12eb59eeddc4cd950f03aea8c (diff) |
edac: i5100 fix unmask ecc bits
Explicitly unmask ECC errors we are interested in reporting.
Signed-off-by: Arthur Jones <ajones@riverbed.com>
Signed-off-by: Doug 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')
-rw-r--r-- | drivers/edac/i5100_edac.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c index 509eec860c37..d85e7992eb6a 100644 --- a/drivers/edac/i5100_edac.c +++ b/drivers/edac/i5100_edac.c | |||
@@ -75,6 +75,7 @@ | |||
75 | #define I5100_FERR_NF_MEM_ANY(a) ((a) & I5100_FERR_NF_MEM_ANY_MASK) | 75 | #define I5100_FERR_NF_MEM_ANY(a) ((a) & I5100_FERR_NF_MEM_ANY_MASK) |
76 | #define I5100_NERR_NF_MEM 0xa4 /* MC Next Non-Fatal Errors */ | 76 | #define I5100_NERR_NF_MEM 0xa4 /* MC Next Non-Fatal Errors */ |
77 | #define I5100_NERR_NF_MEM_ANY(a) I5100_FERR_NF_MEM_ANY(a) | 77 | #define I5100_NERR_NF_MEM_ANY(a) I5100_FERR_NF_MEM_ANY(a) |
78 | #define I5100_EMASK_MEM 0xa8 /* MC Error Mask Register */ | ||
78 | 79 | ||
79 | /* device 21 and 22, func 0 */ | 80 | /* device 21 and 22, func 0 */ |
80 | #define I5100_MTR_0 0x154 /* Memory Technology Registers 0-3 */ | 81 | #define I5100_MTR_0 0x154 /* Memory Technology Registers 0-3 */ |
@@ -709,6 +710,11 @@ static int __devinit i5100_init_one(struct pci_dev *pdev, | |||
709 | goto bail; | 710 | goto bail; |
710 | } | 711 | } |
711 | 712 | ||
713 | /* enable error reporting... */ | ||
714 | pci_read_config_dword(pdev, I5100_EMASK_MEM, &dw); | ||
715 | dw &= ~I5100_FERR_NF_MEM_ANY_MASK; | ||
716 | pci_write_config_dword(pdev, I5100_EMASK_MEM, dw); | ||
717 | |||
712 | /* device 21, func 0, Channel 0 Memory Map, Error Flag/Mask, etc... */ | 718 | /* device 21, func 0, Channel 0 Memory Map, Error Flag/Mask, etc... */ |
713 | ch0mm = pci_get_device_func(PCI_VENDOR_ID_INTEL, | 719 | ch0mm = pci_get_device_func(PCI_VENDOR_ID_INTEL, |
714 | PCI_DEVICE_ID_INTEL_5100_21, 0); | 720 | PCI_DEVICE_ID_INTEL_5100_21, 0); |