From 779cea6ca02a5d6b668e3882ce066ed0729f98dd Mon Sep 17 00:00:00 2001 From: Arthur Jones Date: Fri, 25 Jul 2008 01:49:06 -0700 Subject: [PATCH] --- yaml --- r: 106045 b: refs/heads/master c: 178d5a742291976d13bff55fa2b130879d4510de h: refs/heads/master i: 106043: bb4f04295bd67fd0b05fb5ce43aef2ea54ee0e65 v: v3 --- [refs] | 2 +- trunk/drivers/edac/i5100_edac.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 22ff545365e6..6f7c0b489707 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43920a598f9358a12eb59eeddc4cd950f03aea8c +refs/heads/master: 178d5a742291976d13bff55fa2b130879d4510de diff --git a/trunk/drivers/edac/i5100_edac.c b/trunk/drivers/edac/i5100_edac.c index 509eec860c37..d85e7992eb6a 100644 --- a/trunk/drivers/edac/i5100_edac.c +++ b/trunk/drivers/edac/i5100_edac.c @@ -75,6 +75,7 @@ #define I5100_FERR_NF_MEM_ANY(a) ((a) & I5100_FERR_NF_MEM_ANY_MASK) #define I5100_NERR_NF_MEM 0xa4 /* MC Next Non-Fatal Errors */ #define I5100_NERR_NF_MEM_ANY(a) I5100_FERR_NF_MEM_ANY(a) +#define I5100_EMASK_MEM 0xa8 /* MC Error Mask Register */ /* device 21 and 22, func 0 */ #define I5100_MTR_0 0x154 /* Memory Technology Registers 0-3 */ @@ -709,6 +710,11 @@ static int __devinit i5100_init_one(struct pci_dev *pdev, goto bail; } + /* enable error reporting... */ + pci_read_config_dword(pdev, I5100_EMASK_MEM, &dw); + dw &= ~I5100_FERR_NF_MEM_ANY_MASK; + pci_write_config_dword(pdev, I5100_EMASK_MEM, dw); + /* device 21, func 0, Channel 0 Memory Map, Error Flag/Mask, etc... */ ch0mm = pci_get_device_func(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_21, 0);