Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git] / drivers / edac / edac_mc.c
index 98742e2..ea06e3a 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * edac_mc kernel module
- * (C) 2005, 2006 Linux Networx (http://lnxi.com)
+ * (C) 2005 Linux Networx (http://lnxi.com)
  * This file may be distributed under the terms of the
  * GNU General Public License.
  *
@@ -12,6 +12,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
 #include <asm/edac.h>
 #include "edac_mc.h"
 
-#define EDAC_MC_VERSION "Ver: 2.0.1 " __DATE__
+#define EDAC_MC_VERSION "Ver: 2.0.0 " __DATE__
 
+/* For now, disable the EDAC sysfs code.  The sysfs interface that EDAC
+ * presents to user space needs more thought, and is likely to change
+ * substantially.
+ */
+#define DISABLE_EDAC_SYSFS
 
 #ifdef CONFIG_EDAC_DEBUG
 /* Values of 0 to 4 will generate output */
@@ -48,23 +54,35 @@ static int log_ce = 1;
 static int panic_on_ue;
 static int poll_msec = 1000;
 
+static int check_pci_parity = 0;       /* default YES check PCI parity */
+static int panic_on_pci_parity;                /* default no panic on PCI Parity */
+static atomic_t pci_parity_count = ATOMIC_INIT(0);
+
 /* lock to memory controller's control array */
 static DECLARE_MUTEX(mem_ctls_mutex);
 static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices);
 
 static struct task_struct *edac_thread;
 
-#ifdef CONFIG_PCI
-static int check_pci_parity = 0;       /* default YES check PCI parity */
-static int panic_on_pci_parity;                /* default no panic on PCI Parity */
-static atomic_t pci_parity_count = ATOMIC_INIT(0);
+/* Structure of the whitelist and blacklist arrays */
+struct edac_pci_device_list {
+       unsigned int  vendor;           /* Vendor ID */
+       unsigned int  device;           /* Deviice ID */
+};
 
-static struct kobject edac_pci_kobj; /* /sys/devices/system/edac/pci */
-static struct completion edac_pci_kobj_complete;
-#endif /* CONFIG_PCI */
+#define MAX_LISTED_PCI_DEVICES         32
+
+/* List of PCI devices (vendor-id:device-id) that should be skipped */
+static struct edac_pci_device_list pci_blacklist[MAX_LISTED_PCI_DEVICES];
+static int pci_blacklist_count;
+
+/* List of PCI devices (vendor-id:device-id) that should be scanned */
+static struct edac_pci_device_list pci_whitelist[MAX_LISTED_PCI_DEVICES];
+static int pci_whitelist_count ;
 
 /*  START sysfs data and methods */
 
+#ifndef DISABLE_EDAC_SYSFS
 
 static const char *mem_types[] = {
        [MEM_EMPTY] = "Empty",
@@ -109,24 +127,35 @@ static struct sysdev_class edac_class = {
        set_kset_name("edac"),
 };
 
-/* sysfs object:
+/* sysfs objects:
  *     /sys/devices/system/edac/mc
+ *     /sys/devices/system/edac/pci
  */
 static struct kobject edac_memctrl_kobj;
+static struct kobject edac_pci_kobj;
 
 /* We use these to wait for the reference counts on edac_memctrl_kobj and
  * edac_pci_kobj to reach 0.
  */
 static struct completion edac_memctrl_kobj_complete;
+static struct completion edac_pci_kobj_complete;
 
 /*
  * /sys/devices/system/edac/mc;
  *     data structures and methods
  */
+#if 0
+static ssize_t memctrl_string_show(void *ptr, char *buffer)
+{
+       char *value = (char*) ptr;
+       return sprintf(buffer, "%s\n", value);
+}
+#endif
+
 static ssize_t memctrl_int_show(void *ptr, char *buffer)
 {
        int *value = (int*) ptr;
-       return sprintf(buffer, "%u\n", *value);
+       return sprintf(buffer, "%d\n", *value);
 }
 
 static ssize_t memctrl_int_store(void *ptr, const char *buffer, size_t count)
@@ -192,6 +221,11 @@ struct memctrl_dev_attribute attr_##_name = {                      \
        .store  = _store,                                       \
 };
 
+/* cwrow<id> attribute f*/
+#if 0
+MEMCTRL_STRING_ATTR(mc_version,EDAC_MC_VERSION,S_IRUGO,memctrl_string_show,NULL);
+#endif
+
 /* csrow<id> control files */
 MEMCTRL_ATTR(panic_on_ue,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);
 MEMCTRL_ATTR(log_ue,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);
@@ -220,6 +254,8 @@ static struct kobj_type ktype_memctrl = {
        .default_attrs = (struct attribute **) memctrl_attr,
 };
 
+#endif  /* DISABLE_EDAC_SYSFS */
+
 /* Initialize the main sysfs entries for edac:
  *   /sys/devices/system/edac
  *
@@ -229,6 +265,11 @@ static struct kobj_type ktype_memctrl = {
  *         !0 FAILURE
  */
 static int edac_sysfs_memctrl_setup(void)
+#ifdef DISABLE_EDAC_SYSFS
+{
+       return 0;
+}
+#else
 {
        int err=0;
 
@@ -260,6 +301,7 @@ static int edac_sysfs_memctrl_setup(void)
 
        return err;
 }
+#endif  /* DISABLE_EDAC_SYSFS */
 
 /*
  * MC teardown:
@@ -267,6 +309,7 @@ static int edac_sysfs_memctrl_setup(void)
  */
 static void edac_sysfs_memctrl_teardown(void)
 {
+#ifndef DISABLE_EDAC_SYSFS
        debugf0("MC: " __FILE__ ": %s()\n", __func__);
 
        /* Unregister the MC's kobject and wait for reference count to reach
@@ -278,9 +321,142 @@ static void edac_sysfs_memctrl_teardown(void)
 
        /* Unregister the 'edac' object */
        sysdev_class_unregister(&edac_class);
+#endif  /* DISABLE_EDAC_SYSFS */
 }
 
-#ifdef CONFIG_PCI
+#ifndef DISABLE_EDAC_SYSFS
+
+/*
+ * /sys/devices/system/edac/pci;
+ *     data structures and methods
+ */
+
+struct list_control {
+       struct edac_pci_device_list *list;
+       int *count;
+};
+
+#if 0
+/* Output the list as:  vendor_id:device:id<,vendor_id:device_id> */
+static ssize_t edac_pci_list_string_show(void *ptr, char *buffer)
+{
+       struct list_control *listctl;
+       struct edac_pci_device_list *list;
+       char *p = buffer;
+       int len=0;
+       int i;
+
+       listctl = ptr;
+       list = listctl->list;
+
+       for (i = 0; i < *(listctl->count); i++, list++ ) {
+               if (len > 0)
+                       len += snprintf(p + len, (PAGE_SIZE-len), ",");
+
+               len += snprintf(p + len,
+                               (PAGE_SIZE-len),
+                               "%x:%x",
+                               list->vendor,list->device);
+       }
+
+       len += snprintf(p + len,(PAGE_SIZE-len), "\n");
+       return (ssize_t) len;
+}
+
+/**
+ *
+ * Scan string from **s to **e looking for one 'vendor:device' tuple
+ * where each field is a hex value
+ *
+ * return 0 if an entry is NOT found
+ * return 1 if an entry is found
+ *     fill in *vendor_id and *device_id with values found
+ *
+ * In both cases, make sure *s has been moved forward toward *e
+ */
+static int parse_one_device(const char **s,const char **e,
+       unsigned int *vendor_id, unsigned int *device_id)
+{
+       const char *runner, *p;
+
+       /* if null byte, we are done */
+       if (!**s) {
+               (*s)++;  /* keep *s moving */
+               return 0;
+       }
+
+       /* skip over newlines & whitespace */
+       if ((**s == '\n') || isspace(**s)) {
+               (*s)++;
+               return 0;
+       }
+
+       if (!isxdigit(**s)) {
+               (*s)++;
+               return 0;
+       }
+
+       /* parse vendor_id */
+       runner = *s;
+
+       while (runner < *e) {
+               /* scan for vendor:device delimiter */
+               if (*runner == ':') {
+                       *vendor_id = simple_strtol((char*) *s, (char**) &p, 16);
+                       runner = p + 1;
+                       break;
+               }
+
+               runner++;
+       }
+
+       if (!isxdigit(*runner)) {
+               *s = ++runner;
+               return 0;
+       }
+
+       /* parse device_id */
+       if (runner < *e) {
+               *device_id = simple_strtol((char*)runner, (char**)&p, 16);
+               runner = p;
+       }
+
+       *s = runner;
+       return 1;
+}
+
+static ssize_t edac_pci_list_string_store(void *ptr, const char *buffer,
+               size_t count)
+{
+       struct list_control *listctl;
+       struct edac_pci_device_list *list;
+       unsigned int vendor_id, device_id;
+       const char *s, *e;
+       int *index;
+
+       s = (char*)buffer;
+       e = s + count;
+       listctl = ptr;
+       list = listctl->list;
+       index = listctl->count;
+       *index = 0;
+
+       while (*index < MAX_LISTED_PCI_DEVICES) {
+               if (parse_one_device(&s,&e,&vendor_id,&device_id)) {
+                       list[ *index ].vendor = vendor_id;
+                       list[ *index ].device = device_id;
+                       (*index)++;
+               }
+
+               /* check for all data consume */
+               if (s >= e)
+                       break;
+       }
+
+       return count;
+}
+
+#endif
 static ssize_t edac_pci_int_show(void *ptr, char *buffer)
 {
        int *value = ptr;
@@ -348,6 +524,31 @@ struct edac_pci_dev_attribute edac_pci_attr_##_name = {            \
        .store  = _store,                                       \
 };
 
+#if 0
+static struct list_control pci_whitelist_control = {
+       .list = pci_whitelist,
+       .count = &pci_whitelist_count
+};
+
+static struct list_control pci_blacklist_control = {
+       .list = pci_blacklist,
+       .count = &pci_blacklist_count
+};
+
+/* whitelist attribute */
+EDAC_PCI_STRING_ATTR(pci_parity_whitelist,
+       &pci_whitelist_control,
+       S_IRUGO|S_IWUSR,
+       edac_pci_list_string_show,
+       edac_pci_list_string_store);
+
+EDAC_PCI_STRING_ATTR(pci_parity_blacklist,
+       &pci_blacklist_control,
+       S_IRUGO|S_IWUSR,
+       edac_pci_list_string_show,
+       edac_pci_list_string_store);
+#endif
+
 /* PCI Parity control files */
 EDAC_PCI_ATTR(check_pci_parity, S_IRUGO|S_IWUSR, edac_pci_int_show,
        edac_pci_int_store);
@@ -376,11 +577,18 @@ static struct kobj_type ktype_edac_pci = {
        .default_attrs = (struct attribute **) edac_pci_attr,
 };
 
+#endif  /* DISABLE_EDAC_SYSFS */
+
 /**
  * edac_sysfs_pci_setup()
  *
  */
 static int edac_sysfs_pci_setup(void)
+#ifdef DISABLE_EDAC_SYSFS
+{
+       return 0;
+}
+#else
 {
        int err;
 
@@ -404,291 +612,146 @@ static int edac_sysfs_pci_setup(void)
 
        return err;
 }
+#endif  /* DISABLE_EDAC_SYSFS */
 
 static void edac_sysfs_pci_teardown(void)
 {
+#ifndef DISABLE_EDAC_SYSFS
        debugf0("%s()\n", __func__);
        init_completion(&edac_pci_kobj_complete);
        kobject_unregister(&edac_pci_kobj);
        wait_for_completion(&edac_pci_kobj_complete);
+#endif
 }
 
+#ifndef DISABLE_EDAC_SYSFS
 
-static u16 get_pci_parity_status(struct pci_dev *dev, int secondary)
-{
-       int where;
-       u16 status;
+/* EDAC sysfs CSROW data structures and methods */
 
-       where = secondary ? PCI_SEC_STATUS : PCI_STATUS;
-       pci_read_config_word(dev, where, &status);
-
-       /* If we get back 0xFFFF then we must suspect that the card has been
-        * pulled but the Linux PCI layer has not yet finished cleaning up.
-        * We don't want to report on such devices
-        */
-
-       if (status == 0xFFFF) {
-               u32 sanity;
-
-               pci_read_config_dword(dev, 0, &sanity);
+/* Set of more detailed csrow<id> attribute show/store functions */
+static ssize_t csrow_ch0_dimm_label_show(struct csrow_info *csrow, char *data)
+{
+       ssize_t size = 0;
 
-               if (sanity == 0xFFFFFFFF)
-                       return 0;
+       if (csrow->nr_channels > 0) {
+               size = snprintf(data, EDAC_MC_LABEL_LEN,"%s\n",
+                       csrow->channels[0].label);
        }
 
-       status &= PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR |
-               PCI_STATUS_PARITY;
-
-       if (status)
-               /* reset only the bits we are interested in */
-               pci_write_config_word(dev, where, status);
-
-       return status;
+       return size;
 }
 
-typedef void (*pci_parity_check_fn_t) (struct pci_dev *dev);
-
-/* Clear any PCI parity errors logged by this device. */
-static void edac_pci_dev_parity_clear(struct pci_dev *dev)
+static ssize_t csrow_ch1_dimm_label_show(struct csrow_info *csrow, char *data)
 {
-       u8 header_type;
+       ssize_t size = 0;
 
-       get_pci_parity_status(dev, 0);
-
-       /* read the device TYPE, looking for bridges */
-       pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type);
+       if (csrow->nr_channels > 0) {
+               size = snprintf(data, EDAC_MC_LABEL_LEN, "%s\n",
+                       csrow->channels[1].label);
+       }
 
-       if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE)
-               get_pci_parity_status(dev, 1);
+       return size;
 }
 
-/*
- *  PCI Parity polling
- *
- */
-static void edac_pci_dev_parity_test(struct pci_dev *dev)
+static ssize_t csrow_ch0_dimm_label_store(struct csrow_info *csrow,
+               const char *data, size_t size)
 {
-       u16 status;
-       u8  header_type;
-
-       /* read the STATUS register on this device
-        */
-       status = get_pci_parity_status(dev, 0);
-
-       debugf2("PCI STATUS= 0x%04x %s\n", status, dev->dev.bus_id );
-
-       /* check the status reg for errors */
-       if (status) {
-               if (status & (PCI_STATUS_SIG_SYSTEM_ERROR))
-                       edac_printk(KERN_CRIT, EDAC_PCI,
-                               "Signaled System Error on %s\n",
-                               pci_name(dev));
-
-               if (status & (PCI_STATUS_PARITY)) {
-                       edac_printk(KERN_CRIT, EDAC_PCI,
-                               "Master Data Parity Error on %s\n",
-                               pci_name(dev));
-
-                       atomic_inc(&pci_parity_count);
-               }
-
-               if (status & (PCI_STATUS_DETECTED_PARITY)) {
-                       edac_printk(KERN_CRIT, EDAC_PCI,
-                               "Detected Parity Error on %s\n",
-                               pci_name(dev));
+       ssize_t max_size = 0;
 
-                       atomic_inc(&pci_parity_count);
-               }
+       if (csrow->nr_channels > 0) {
+               max_size = min((ssize_t)size,(ssize_t)EDAC_MC_LABEL_LEN-1);
+               strncpy(csrow->channels[0].label, data, max_size);
+               csrow->channels[0].label[max_size] = '\0';
        }
 
-       /* read the device TYPE, looking for bridges */
-       pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type);
-
-       debugf2("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev->dev.bus_id );
-
-       if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {
-               /* On bridges, need to examine secondary status register  */
-               status = get_pci_parity_status(dev, 1);
-
-               debugf2("PCI SEC_STATUS= 0x%04x %s\n",
-                               status, dev->dev.bus_id );
-
-               /* check the secondary status reg for errors */
-               if (status) {
-                       if (status & (PCI_STATUS_SIG_SYSTEM_ERROR))
-                               edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
-                                       "Signaled System Error on %s\n",
-                                       pci_name(dev));
-
-                       if (status & (PCI_STATUS_PARITY)) {
-                               edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
-                                       "Master Data Parity Error on "
-                                       "%s\n", pci_name(dev));
-
-                               atomic_inc(&pci_parity_count);
-                       }
-
-                       if (status & (PCI_STATUS_DETECTED_PARITY)) {
-                               edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
-                                       "Detected Parity Error on %s\n",
-                                       pci_name(dev));
-
-                               atomic_inc(&pci_parity_count);
-                       }
-               }
-       }
+       return size;
 }
 
-/*
- * pci_dev parity list iterator
- *     Scan the PCI device list for one iteration, looking for SERRORs
- *     Master Parity ERRORS or Parity ERRORs on primary or secondary devices
- */
-static inline void edac_pci_dev_parity_iterator(pci_parity_check_fn_t fn)
+static ssize_t csrow_ch1_dimm_label_store(struct csrow_info *csrow,
+               const char *data, size_t size)
 {
-       struct pci_dev *dev = NULL;
+       ssize_t max_size = 0;
 
-       /* request for kernel access to the next PCI device, if any,
-        * and while we are looking at it have its reference count
-        * bumped until we are done with it
-        */
-       while((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-               fn(dev);
+       if (csrow->nr_channels > 1) {
+               max_size = min((ssize_t)size,(ssize_t)EDAC_MC_LABEL_LEN-1);
+               strncpy(csrow->channels[1].label, data, max_size);
+               csrow->channels[1].label[max_size] = '\0';
        }
+
+       return max_size;
 }
 
-static void do_pci_parity_check(void)
+static ssize_t csrow_ue_count_show(struct csrow_info *csrow, char *data)
 {
-       unsigned long flags;
-       int before_count;
-
-       debugf3("%s()\n", __func__);
-
-       if (!check_pci_parity)
-               return;
-
-       before_count = atomic_read(&pci_parity_count);
-
-       /* scan all PCI devices looking for a Parity Error on devices and
-        * bridges
-        */
-       local_irq_save(flags);
-       edac_pci_dev_parity_iterator(edac_pci_dev_parity_test);
-       local_irq_restore(flags);
-
-       /* Only if operator has selected panic on PCI Error */
-       if (panic_on_pci_parity) {
-               /* If the count is different 'after' from 'before' */
-               if (before_count != atomic_read(&pci_parity_count))
-                       panic("EDAC: PCI Parity Error");
-       }
+       return sprintf(data,"%u\n", csrow->ue_count);
 }
 
-static inline void clear_pci_parity_errors(void)
+static ssize_t csrow_ce_count_show(struct csrow_info *csrow, char *data)
 {
-       /* Clear any PCI bus parity errors that devices initially have logged
-        * in their registers.
-        */
-       edac_pci_dev_parity_iterator(edac_pci_dev_parity_clear);
+       return sprintf(data,"%u\n", csrow->ce_count);
 }
 
-#else  /* CONFIG_PCI */
-
-/* pre-process these away */
-#define        do_pci_parity_check()
-#define        clear_pci_parity_errors()
-#define        edac_sysfs_pci_teardown()
-#define        edac_sysfs_pci_setup()  (0)
-
-#endif /* CONFIG_PCI */
+static ssize_t csrow_ch0_ce_count_show(struct csrow_info *csrow, char *data)
+{
+       ssize_t size = 0;
 
-/* EDAC sysfs CSROW data structures and methods
- */
+       if (csrow->nr_channels > 0) {
+               size = sprintf(data,"%u\n", csrow->channels[0].ce_count);
+       }
 
-/* Set of more default csrow<id> attribute show/store functions */
-static ssize_t csrow_ue_count_show(struct csrow_info *csrow, char *data, int private)
-{
-       return sprintf(data,"%u\n", csrow->ue_count);
+       return size;
 }
 
-static ssize_t csrow_ce_count_show(struct csrow_info *csrow, char *data, int private)
+static ssize_t csrow_ch1_ce_count_show(struct csrow_info *csrow, char *data)
 {
-       return sprintf(data,"%u\n", csrow->ce_count);
+       ssize_t size = 0;
+
+       if (csrow->nr_channels > 1) {
+               size = sprintf(data,"%u\n", csrow->channels[1].ce_count);
+       }
+
+       return size;
 }
 
-static ssize_t csrow_size_show(struct csrow_info *csrow, char *data, int private)
+static ssize_t csrow_size_show(struct csrow_info *csrow, char *data)
 {
        return sprintf(data,"%u\n", PAGES_TO_MiB(csrow->nr_pages));
 }
 
-static ssize_t csrow_mem_type_show(struct csrow_info *csrow, char *data, int private)
+static ssize_t csrow_mem_type_show(struct csrow_info *csrow, char *data)
 {
        return sprintf(data,"%s\n", mem_types[csrow->mtype]);
 }
 
-static ssize_t csrow_dev_type_show(struct csrow_info *csrow, char *data, int private)
+static ssize_t csrow_dev_type_show(struct csrow_info *csrow, char *data)
 {
        return sprintf(data,"%s\n", dev_types[csrow->dtype]);
 }
 
-static ssize_t csrow_edac_mode_show(struct csrow_info *csrow, char *data, int private)
+static ssize_t csrow_edac_mode_show(struct csrow_info *csrow, char *data)
 {
        return sprintf(data,"%s\n", edac_caps[csrow->edac_mode]);
 }
 
-/* show/store functions for DIMM Label attributes */
-static ssize_t channel_dimm_label_show(struct csrow_info *csrow,
-               char *data, int channel)
-{
-       return snprintf(data, EDAC_MC_LABEL_LEN,"%s",
-                       csrow->channels[channel].label);
-}
-
-static ssize_t channel_dimm_label_store(struct csrow_info *csrow,
-                               const char *data,
-                               size_t count,
-                               int channel)
-{
-       ssize_t max_size = 0;
-
-       max_size = min((ssize_t)count,(ssize_t)EDAC_MC_LABEL_LEN-1);
-       strncpy(csrow->channels[channel].label, data, max_size);
-       csrow->channels[channel].label[max_size] = '\0';
-
-       return max_size;
-}
-
-/* show function for dynamic chX_ce_count attribute */
-static ssize_t channel_ce_count_show(struct csrow_info *csrow,
-                               char *data,
-                               int channel)
-{
-       return sprintf(data, "%u\n", csrow->channels[channel].ce_count);
-}
-
-/* csrow specific attribute structure */
 struct csrowdev_attribute {
        struct attribute attr;
-       ssize_t (*show)(struct csrow_info *,char *,int);
-       ssize_t (*store)(struct csrow_info *, const char *,size_t,int);
-       int    private;
+       ssize_t (*show)(struct csrow_info *,char *);
+       ssize_t (*store)(struct csrow_info *, const char *,size_t);
 };
 
 #define to_csrow(k) container_of(k, struct csrow_info, kobj)
 #define to_csrowdev_attr(a) container_of(a, struct csrowdev_attribute, attr)
 
-/* Set of show/store higher level functions for default csrow attributes */
-static ssize_t csrowdev_show(struct kobject *kobj,
-                       struct attribute *attr,
-                       char *buffer)
+/* Set of show/store higher level functions for csrow objects */
+static ssize_t csrowdev_show(struct kobject *kobj, struct attribute *attr,
+               char *buffer)
 {
        struct csrow_info *csrow = to_csrow(kobj);
        struct csrowdev_attribute *csrowdev_attr = to_csrowdev_attr(attr);
 
        if (csrowdev_attr->show)
-               return csrowdev_attr->show(csrow,
-                                       buffer,
-                                       csrowdev_attr->private);
+               return csrowdev_attr->show(csrow, buffer);
+
        return -EIO;
 }
 
@@ -699,10 +762,8 @@ static ssize_t csrowdev_store(struct kobject *kobj, struct attribute *attr,
        struct csrowdev_attribute * csrowdev_attr = to_csrowdev_attr(attr);
 
        if (csrowdev_attr->store)
-               return csrowdev_attr->store(csrow,
-                                       buffer,
-                                       count,
-                                       csrowdev_attr->private);
+               return csrowdev_attr->store(csrow, buffer, count);
+
        return -EIO;
 }
 
@@ -711,157 +772,69 @@ static struct sysfs_ops csrowfs_ops = {
        .store  = csrowdev_store
 };
 
-#define CSROWDEV_ATTR(_name,_mode,_show,_store,_private)       \
+#define CSROWDEV_ATTR(_name,_mode,_show,_store)                        \
 struct csrowdev_attribute attr_##_name = {                     \
        .attr = {.name = __stringify(_name), .mode = _mode },   \
        .show   = _show,                                        \
        .store  = _store,                                       \
-       .private = _private,                                    \
 };
 
-/* default cwrow<id>/attribute files */
-CSROWDEV_ATTR(size_mb,S_IRUGO,csrow_size_show,NULL,0);
-CSROWDEV_ATTR(dev_type,S_IRUGO,csrow_dev_type_show,NULL,0);
-CSROWDEV_ATTR(mem_type,S_IRUGO,csrow_mem_type_show,NULL,0);
-CSROWDEV_ATTR(edac_mode,S_IRUGO,csrow_edac_mode_show,NULL,0);
-CSROWDEV_ATTR(ue_count,S_IRUGO,csrow_ue_count_show,NULL,0);
-CSROWDEV_ATTR(ce_count,S_IRUGO,csrow_ce_count_show,NULL,0);
+/* cwrow<id>/attribute files */
+CSROWDEV_ATTR(size_mb,S_IRUGO,csrow_size_show,NULL);
+CSROWDEV_ATTR(dev_type,S_IRUGO,csrow_dev_type_show,NULL);
+CSROWDEV_ATTR(mem_type,S_IRUGO,csrow_mem_type_show,NULL);
+CSROWDEV_ATTR(edac_mode,S_IRUGO,csrow_edac_mode_show,NULL);
+CSROWDEV_ATTR(ue_count,S_IRUGO,csrow_ue_count_show,NULL);
+CSROWDEV_ATTR(ce_count,S_IRUGO,csrow_ce_count_show,NULL);
+CSROWDEV_ATTR(ch0_ce_count,S_IRUGO,csrow_ch0_ce_count_show,NULL);
+CSROWDEV_ATTR(ch1_ce_count,S_IRUGO,csrow_ch1_ce_count_show,NULL);
+
+/* control/attribute files */
+CSROWDEV_ATTR(ch0_dimm_label,S_IRUGO|S_IWUSR,
+               csrow_ch0_dimm_label_show,
+               csrow_ch0_dimm_label_store);
+CSROWDEV_ATTR(ch1_dimm_label,S_IRUGO|S_IWUSR,
+               csrow_ch1_dimm_label_show,
+               csrow_ch1_dimm_label_store);
 
-/* default attributes of the CSROW<id> object */
-static struct csrowdev_attribute *default_csrow_attr[] = {
+/* Attributes of the CSROW<id> object */
+static struct csrowdev_attribute *csrow_attr[] = {
        &attr_dev_type,
        &attr_mem_type,
        &attr_edac_mode,
        &attr_size_mb,
        &attr_ue_count,
        &attr_ce_count,
+       &attr_ch0_ce_count,
+       &attr_ch1_ce_count,
+       &attr_ch0_dimm_label,
+       &attr_ch1_dimm_label,
        NULL,
 };
 
-
-/* possible dynamic channel DIMM Label attribute files */
-CSROWDEV_ATTR(ch0_dimm_label,S_IRUGO|S_IWUSR,
-               channel_dimm_label_show,
-               channel_dimm_label_store,
-               0 );
-CSROWDEV_ATTR(ch1_dimm_label,S_IRUGO|S_IWUSR,
-               channel_dimm_label_show,
-               channel_dimm_label_store,
-               1 );
-CSROWDEV_ATTR(ch2_dimm_label,S_IRUGO|S_IWUSR,
-               channel_dimm_label_show,
-               channel_dimm_label_store,
-               2 );
-CSROWDEV_ATTR(ch3_dimm_label,S_IRUGO|S_IWUSR,
-               channel_dimm_label_show,
-               channel_dimm_label_store,
-               3 );
-CSROWDEV_ATTR(ch4_dimm_label,S_IRUGO|S_IWUSR,
-               channel_dimm_label_show,
-               channel_dimm_label_store,
-               4 );
-CSROWDEV_ATTR(ch5_dimm_label,S_IRUGO|S_IWUSR,
-               channel_dimm_label_show,
-               channel_dimm_label_store,
-               5 );
-
-/* Total possible dynamic DIMM Label attribute file table */
-static struct csrowdev_attribute *dynamic_csrow_dimm_attr[] = {
-               &attr_ch0_dimm_label,
-               &attr_ch1_dimm_label,
-               &attr_ch2_dimm_label,
-               &attr_ch3_dimm_label,
-               &attr_ch4_dimm_label,
-               &attr_ch5_dimm_label
-};
-
-/* possible dynamic channel ce_count attribute files */
-CSROWDEV_ATTR(ch0_ce_count,S_IRUGO|S_IWUSR,
-               channel_ce_count_show,
-               NULL,
-               0 );
-CSROWDEV_ATTR(ch1_ce_count,S_IRUGO|S_IWUSR,
-               channel_ce_count_show,
-               NULL,
-               1 );
-CSROWDEV_ATTR(ch2_ce_count,S_IRUGO|S_IWUSR,
-               channel_ce_count_show,
-               NULL,
-               2 );
-CSROWDEV_ATTR(ch3_ce_count,S_IRUGO|S_IWUSR,
-               channel_ce_count_show,
-               NULL,
-               3 );
-CSROWDEV_ATTR(ch4_ce_count,S_IRUGO|S_IWUSR,
-               channel_ce_count_show,
-               NULL,
-               4 );
-CSROWDEV_ATTR(ch5_ce_count,S_IRUGO|S_IWUSR,
-               channel_ce_count_show,
-               NULL,
-               5 );
-
-/* Total possible dynamic ce_count attribute file table */
-static struct csrowdev_attribute *dynamic_csrow_ce_count_attr[] = {
-               &attr_ch0_ce_count,
-               &attr_ch1_ce_count,
-               &attr_ch2_ce_count,
-               &attr_ch3_ce_count,
-               &attr_ch4_ce_count,
-               &attr_ch5_ce_count
-};
-
-
-#define EDAC_NR_CHANNELS       6
-
-/* Create dynamic CHANNEL files, indexed by 'chan',  under specifed CSROW */
-static int edac_create_channel_files(struct kobject *kobj, int chan)
-{
-       int err=-ENODEV;
-
-       if (chan >= EDAC_NR_CHANNELS)
-               return err;
-
-       /* create the DIMM label attribute file */
-       err = sysfs_create_file(kobj,
-                       (struct attribute *) dynamic_csrow_dimm_attr[chan]);
-
-       if (!err) {
-               /* create the CE Count attribute file */
-               err = sysfs_create_file(kobj,
-                       (struct attribute *) dynamic_csrow_ce_count_attr[chan]);
-       } else {
-               debugf1("%s()  dimm labels and ce_count files created", __func__);
-       }
-
-       return err;
-}
-
-/* No memory to release for this kobj */
+/* No memory to release */
 static void edac_csrow_instance_release(struct kobject *kobj)
 {
        struct csrow_info *cs;
 
+       debugf1("%s()\n", __func__);
        cs = container_of(kobj, struct csrow_info, kobj);
        complete(&cs->kobj_complete);
 }
 
-/* the kobj_type instance for a CSROW */
 static struct kobj_type ktype_csrow = {
        .release = edac_csrow_instance_release,
        .sysfs_ops = &csrowfs_ops,
-       .default_attrs = (struct attribute **) default_csrow_attr,
+       .default_attrs = (struct attribute **) csrow_attr,
 };
 
 /* Create a CSROW object under specifed edac_mc_device */
-static int edac_create_csrow_object(
-               struct kobject *edac_mci_kobj,
-               struct csrow_info *csrow,
-               int index)
+static int edac_create_csrow_object(struct kobject *edac_mci_kobj,
+               struct csrow_info *csrow, int index)
 {
        int err = 0;
-       int chan;
 
+       debugf0("%s()\n", __func__);
        memset(&csrow->kobj, 0, sizeof(csrow->kobj));
 
        /* generate ..../edac/mc/mc<id>/csrow<index>   */
@@ -871,27 +844,21 @@ static int edac_create_csrow_object(
 
        /* name this instance of csrow<id> */
        err = kobject_set_name(&csrow->kobj,"csrow%d",index);
-       if (err)
-               goto error_exit;
 
-       /* Instanstiate the csrow object */
-       err = kobject_register(&csrow->kobj);
        if (!err) {
-               /* Create the dyanmic attribute files on this csrow,
-                * namely, the DIMM labels and the channel ce_count
-                */
-               for (chan = 0; chan < csrow->nr_channels; chan++) {
-                       err = edac_create_channel_files(&csrow->kobj,chan);
-                       if (err)
-                               break;
-               }
+               /* Instanstiate the csrow object */
+               err = kobject_register(&csrow->kobj);
+
+               if (err)
+                       debugf0("Failed to register CSROW%d\n",index);
+               else
+                       debugf0("Registered CSROW%d\n",index);
        }
 
-error_exit:
        return err;
 }
 
-/* default sysfs methods and data structures for the main MCI kobject */
+/* sysfs data structures and methods for the MCI kobjects */
 
 static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,
                const char *data, size_t count)
@@ -917,7 +884,6 @@ static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,
        return count;
 }
 
-/* default attribute files for the MCI object */
 static ssize_t mci_ue_count_show(struct mem_ctl_info *mci, char *data)
 {
        return sprintf(data,"%d\n", mci->ue_count);
@@ -938,14 +904,74 @@ static ssize_t mci_ue_noinfo_show(struct mem_ctl_info *mci, char *data)
        return sprintf(data,"%d\n", mci->ue_noinfo_count);
 }
 
-static ssize_t mci_seconds_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_seconds_show(struct mem_ctl_info *mci, char *data)
+{
+       return sprintf(data,"%ld\n", (jiffies - mci->start_time) / HZ);
+}
+
+static ssize_t mci_mod_name_show(struct mem_ctl_info *mci, char *data)
+{
+       return sprintf(data,"%s %s\n", mci->mod_name, mci->mod_ver);
+}
+
+static ssize_t mci_ctl_name_show(struct mem_ctl_info *mci, char *data)
+{
+       return sprintf(data,"%s\n", mci->ctl_name);
+}
+
+static int mci_output_edac_cap(char *buf, unsigned long edac_cap)
+{
+       char *p = buf;
+       int bit_idx;
+
+       for (bit_idx = 0; bit_idx < 8 * sizeof(edac_cap); bit_idx++) {
+               if ((edac_cap >> bit_idx) & 0x1)
+                       p += sprintf(p, "%s ", edac_caps[bit_idx]);
+       }
+
+       return p - buf;
+}
+
+static ssize_t mci_edac_capability_show(struct mem_ctl_info *mci, char *data)
+{
+       char *p = data;
+
+       p += mci_output_edac_cap(p,mci->edac_ctl_cap);
+       p += sprintf(p, "\n");
+       return p - data;
+}
+
+static ssize_t mci_edac_current_capability_show(struct mem_ctl_info *mci,
+               char *data)
+{
+       char *p = data;
+
+       p += mci_output_edac_cap(p,mci->edac_cap);
+       p += sprintf(p, "\n");
+       return p - data;
+}
+
+static int mci_output_mtype_cap(char *buf, unsigned long mtype_cap)
 {
-       return sprintf(data,"%ld\n", (jiffies - mci->start_time) / HZ);
+       char *p = buf;
+       int bit_idx;
+
+       for (bit_idx = 0; bit_idx < 8 * sizeof(mtype_cap); bit_idx++) {
+               if ((mtype_cap >> bit_idx) & 0x1)
+                       p += sprintf(p, "%s ", mem_types[bit_idx]);
+       }
+
+       return p - buf;
 }
 
-static ssize_t mci_ctl_name_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_supported_mem_type_show(struct mem_ctl_info *mci,
+               char *data)
 {
-       return sprintf(data,"%s\n", mci->ctl_name);
+       char *p = data;
+
+       p += mci_output_mtype_cap(p,mci->mtype_cap);
+       p += sprintf(p, "\n");
+       return p - data;
 }
 
 static ssize_t mci_size_mb_show(struct mem_ctl_info *mci, char *data)
@@ -974,7 +1000,6 @@ struct mcidev_attribute {
 #define to_mci(k) container_of(k, struct mem_ctl_info, edac_mci_kobj)
 #define to_mcidev_attr(a) container_of(a, struct mcidev_attribute, attr)
 
-/* MCI show/store functions for top most object */
 static ssize_t mcidev_show(struct kobject *kobj, struct attribute *attr,
                char *buffer)
 {
@@ -1011,21 +1036,31 @@ struct mcidev_attribute mci_attr_##_name = {                    \
        .store  = _store,                                       \
 };
 
-/* default Control file */
+/* Control file */
 MCIDEV_ATTR(reset_counters,S_IWUSR,NULL,mci_reset_counters_store);
 
-/* default Attribute files */
+/* Attribute files */
 MCIDEV_ATTR(mc_name,S_IRUGO,mci_ctl_name_show,NULL);
+MCIDEV_ATTR(module_name,S_IRUGO,mci_mod_name_show,NULL);
+MCIDEV_ATTR(edac_capability,S_IRUGO,mci_edac_capability_show,NULL);
 MCIDEV_ATTR(size_mb,S_IRUGO,mci_size_mb_show,NULL);
 MCIDEV_ATTR(seconds_since_reset,S_IRUGO,mci_seconds_show,NULL);
 MCIDEV_ATTR(ue_noinfo_count,S_IRUGO,mci_ue_noinfo_show,NULL);
 MCIDEV_ATTR(ce_noinfo_count,S_IRUGO,mci_ce_noinfo_show,NULL);
 MCIDEV_ATTR(ue_count,S_IRUGO,mci_ue_count_show,NULL);
 MCIDEV_ATTR(ce_count,S_IRUGO,mci_ce_count_show,NULL);
+MCIDEV_ATTR(edac_current_capability,S_IRUGO,
+       mci_edac_current_capability_show,NULL);
+MCIDEV_ATTR(supported_mem_type,S_IRUGO,
+       mci_supported_mem_type_show,NULL);
 
 static struct mcidev_attribute *mci_attr[] = {
        &mci_attr_reset_counters,
+       &mci_attr_module_name,
        &mci_attr_mc_name,
+       &mci_attr_edac_capability,
+       &mci_attr_edac_current_capability,
+       &mci_attr_supported_mem_type,
        &mci_attr_size_mb,
        &mci_attr_seconds_since_reset,
        &mci_attr_ue_noinfo_count,
@@ -1053,6 +1088,7 @@ static struct kobj_type ktype_mci = {
        .default_attrs = (struct attribute **) mci_attr,
 };
 
+#endif  /* DISABLE_EDAC_SYSFS */
 
 #define EDAC_DEVICE_SYMLINK    "device"
 
@@ -1065,6 +1101,11 @@ static struct kobj_type ktype_mci = {
  *     !0      Failure
  */
 static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
+#ifdef DISABLE_EDAC_SYSFS
+{
+       return 0;
+}
+#else
 {
        int i;
        int err;
@@ -1076,6 +1117,7 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
 
        /* set the name of the mc<id> object */
        err = kobject_set_name(edac_mci_kobj,"mc%d",mci->mc_idx);
+
        if (err)
                return err;
 
@@ -1085,12 +1127,14 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
 
        /* register the mc<id> kobject */
        err = kobject_register(edac_mci_kobj);
+
        if (err)
                return err;
 
        /* create a symlink for the device */
-       err = sysfs_create_link(edac_mci_kobj, &mci->dev->kobj,
+       err = sysfs_create_link(edac_mci_kobj, &mci->pdev->dev.kobj,
                                EDAC_DEVICE_SYMLINK);
+
        if (err)
                goto fail0;
 
@@ -1103,6 +1147,7 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
                /* Only expose populated CSROWs */
                if (csrow->nr_pages > 0) {
                        err = edac_create_csrow_object(edac_mci_kobj,csrow,i);
+
                        if (err)
                                goto fail1;
                }
@@ -1126,12 +1171,14 @@ fail0:
        wait_for_completion(&mci->kobj_complete);
        return err;
 }
+#endif  /* DISABLE_EDAC_SYSFS */
 
 /*
  * remove a Memory Controller instance
  */
 static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
 {
+#ifndef DISABLE_EDAC_SYSFS
        int i;
 
        debugf0("%s()\n", __func__);
@@ -1149,6 +1196,7 @@ static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
        init_completion(&mci->kobj_complete);
        kobject_unregister(&mci->edac_mci_kobj);
        wait_for_completion(&mci->kobj_complete);
+#endif  /* DISABLE_EDAC_SYSFS */
 }
 
 /* END OF sysfs data and methods */
@@ -1190,7 +1238,7 @@ void edac_mc_dump_mci(struct mem_ctl_info *mci)
        debugf4("\tmci->edac_check = %p\n", mci->edac_check);
        debugf3("\tmci->nr_csrows = %d, csrows = %p\n",
                mci->nr_csrows, mci->csrows);
-       debugf3("\tdev = %p\n", mci->dev);
+       debugf3("\tpdev = %p\n", mci->pdev);
        debugf3("\tmod_name:ctl_name = %s:%s\n",
                mci->mod_name, mci->ctl_name);
        debugf3("\tpvt_info = %p\n\n", mci->pvt_info);
@@ -1315,7 +1363,7 @@ void edac_mc_free(struct mem_ctl_info *mci)
 }
 EXPORT_SYMBOL_GPL(edac_mc_free);
 
-static struct mem_ctl_info *find_mci_by_dev(struct device *dev)
+static struct mem_ctl_info *find_mci_by_pdev(struct pci_dev *pdev)
 {
        struct mem_ctl_info *mci;
        struct list_head *item;
@@ -1325,53 +1373,54 @@ static struct mem_ctl_info *find_mci_by_dev(struct device *dev)
        list_for_each(item, &mc_devices) {
                mci = list_entry(item, struct mem_ctl_info, link);
 
-               if (mci->dev == dev)
+               if (mci->pdev == pdev)
                        return mci;
        }
 
        return NULL;
 }
 
-/* Return 0 on success, 1 on failure.
- * Before calling this function, caller must
- * assign a unique value to mci->mc_idx.
- */
-static int add_mc_to_global_list (struct mem_ctl_info *mci)
+static int add_mc_to_global_list(struct mem_ctl_info *mci)
 {
        struct list_head *item, *insert_before;
        struct mem_ctl_info *p;
+       int i;
 
-       insert_before = &mc_devices;
+       if (list_empty(&mc_devices)) {
+               mci->mc_idx = 0;
+               insert_before = &mc_devices;
+       } else {
+               if (find_mci_by_pdev(mci->pdev)) {
+                       edac_printk(KERN_WARNING, EDAC_MC,
+                               "%s (%s) %s %s already assigned %d\n",
+                               mci->pdev->dev.bus_id,
+                               pci_name(mci->pdev), mci->mod_name,
+                               mci->ctl_name, mci->mc_idx);
+                       return 1;
+               }
 
-       if (unlikely((p = find_mci_by_dev(mci->dev)) != NULL))
-               goto fail0;
+               insert_before = NULL;
+               i = 0;
 
-       list_for_each(item, &mc_devices) {
-               p = list_entry(item, struct mem_ctl_info, link);
+               list_for_each(item, &mc_devices) {
+                       p = list_entry(item, struct mem_ctl_info, link);
 
-               if (p->mc_idx >= mci->mc_idx) {
-                       if (unlikely(p->mc_idx == mci->mc_idx))
-                               goto fail1;
+                       if (p->mc_idx != i) {
+                               insert_before = item;
+                               break;
+                       }
 
-                       insert_before = item;
-                       break;
+                       i++;
                }
+
+               mci->mc_idx = i;
+
+               if (insert_before == NULL)
+                       insert_before = &mc_devices;
        }
 
        list_add_tail_rcu(&mci->link, insert_before);
        return 0;
-
-fail0:
-       edac_printk(KERN_WARNING, EDAC_MC,
-                   "%s (%s) %s %s already assigned %d\n", p->dev->bus_id,
-                   dev_name(p->dev), p->mod_name, p->ctl_name, p->mc_idx);
-       return 1;
-
-fail1:
-       edac_printk(KERN_WARNING, EDAC_MC,
-                   "bug in low-level driver: attempt to assign\n"
-                   "    duplicate mc_idx %d in %s()\n", p->mc_idx, __func__);
-       return 1;
 }
 
 static void complete_mc_list_del(struct rcu_head *head)
@@ -1391,39 +1440,10 @@ static void del_mc_from_global_list(struct mem_ctl_info *mci)
        wait_for_completion(&mci->complete);
 }
 
-/**
- * edac_mc_find: Search for a mem_ctl_info structure whose index is 'idx'.
- *
- * If found, return a pointer to the structure.
- * Else return NULL.
- *
- * Caller must hold mem_ctls_mutex.
- */
-struct mem_ctl_info * edac_mc_find(int idx)
-{
-       struct list_head *item;
-       struct mem_ctl_info *mci;
-
-       list_for_each(item, &mc_devices) {
-               mci = list_entry(item, struct mem_ctl_info, link);
-
-               if (mci->mc_idx >= idx) {
-                       if (mci->mc_idx == idx)
-                               return mci;
-
-                       break;
-               }
-       }
-
-       return NULL;
-}
-EXPORT_SYMBOL(edac_mc_find);
-
 /**
  * edac_mc_add_mc: Insert the 'mci' structure into the mci global list and
  *                 create sysfs entries associated with mci structure
  * @mci: pointer to the mci structure to be added to the list
- * @mc_idx: A unique numeric identifier to be assigned to the 'mci' structure.
  *
  * Return:
  *     0       Success
@@ -1431,10 +1451,9 @@ EXPORT_SYMBOL(edac_mc_find);
  */
 
 /* FIXME - should a warning be printed if no error detection? correction? */
-int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
+int edac_mc_add_mc(struct mem_ctl_info *mci)
 {
        debugf0("%s()\n", __func__);
-       mci->mc_idx = mc_idx;
 #ifdef CONFIG_EDAC_DEBUG
        if (edac_debug_level >= 3)
                edac_mc_dump_mci(mci);
@@ -1467,8 +1486,8 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
         }
 
        /* Report action taken */
-       edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: DEV %s\n",
-               mci->mod_name, mci->ctl_name, dev_name(mci->dev));
+       edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: PCI %s\n",
+               mci->mod_name, mci->ctl_name, pci_name(mci->pdev));
 
        up(&mem_ctls_mutex);
        return 0;
@@ -1485,18 +1504,18 @@ EXPORT_SYMBOL_GPL(edac_mc_add_mc);
 /**
  * edac_mc_del_mc: Remove sysfs entries for specified mci structure and
  *                 remove mci structure from global list
- * @pdev: Pointer to 'struct device' representing mci structure to remove.
+ * @pdev: Pointer to 'struct pci_dev' representing mci structure to remove.
  *
  * Return pointer to removed mci structure, or NULL if device not found.
  */
-struct mem_ctl_info * edac_mc_del_mc(struct device *dev)
+struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev)
 {
        struct mem_ctl_info *mci;
 
        debugf0("MC: %s()\n", __func__);
        down(&mem_ctls_mutex);
 
-       if ((mci = find_mci_by_dev(dev)) == NULL) {
+       if ((mci = find_mci_by_pdev(pdev)) == NULL) {
                up(&mem_ctls_mutex);
                return NULL;
        }
@@ -1505,8 +1524,8 @@ struct mem_ctl_info * edac_mc_del_mc(struct device *dev)
        del_mc_from_global_list(mci);
        up(&mem_ctls_mutex);
        edac_printk(KERN_INFO, EDAC_MC,
-               "Removed device %d for %s %s: DEV %s\n", mci->mc_idx,
-               mci->mod_name, mci->ctl_name, dev_name(mci->dev));
+               "Removed device %d for %s %s: PCI %s\n", mci->mc_idx,
+               mci->mod_name, mci->ctl_name, pci_name(mci->pdev));
        return mci;
 }
 EXPORT_SYMBOL_GPL(edac_mc_del_mc);
@@ -1720,6 +1739,244 @@ void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, const char *msg)
 }
 EXPORT_SYMBOL_GPL(edac_mc_handle_ue_no_info);
 
+#ifdef CONFIG_PCI
+
+static u16 get_pci_parity_status(struct pci_dev *dev, int secondary)
+{
+       int where;
+       u16 status;
+
+       where = secondary ? PCI_SEC_STATUS : PCI_STATUS;
+       pci_read_config_word(dev, where, &status);
+
+       /* If we get back 0xFFFF then we must suspect that the card has been
+        * pulled but the Linux PCI layer has not yet finished cleaning up.
+        * We don't want to report on such devices
+        */
+
+       if (status == 0xFFFF) {
+               u32 sanity;
+
+               pci_read_config_dword(dev, 0, &sanity);
+
+               if (sanity == 0xFFFFFFFF)
+                       return 0;
+       }
+
+       status &= PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR |
+               PCI_STATUS_PARITY;
+
+       if (status)
+               /* reset only the bits we are interested in */
+               pci_write_config_word(dev, where, status);
+
+       return status;
+}
+
+typedef void (*pci_parity_check_fn_t) (struct pci_dev *dev);
+
+/* Clear any PCI parity errors logged by this device. */
+static void edac_pci_dev_parity_clear(struct pci_dev *dev)
+{
+       u8 header_type;
+
+       get_pci_parity_status(dev, 0);
+
+       /* read the device TYPE, looking for bridges */
+       pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type);
+
+       if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE)
+               get_pci_parity_status(dev, 1);
+}
+
+/*
+ *  PCI Parity polling
+ *
+ */
+static void edac_pci_dev_parity_test(struct pci_dev *dev)
+{
+       u16 status;
+       u8  header_type;
+
+       /* read the STATUS register on this device
+        */
+       status = get_pci_parity_status(dev, 0);
+
+       debugf2("PCI STATUS= 0x%04x %s\n", status, dev->dev.bus_id );
+
+       /* check the status reg for errors */
+       if (status) {
+               if (status & (PCI_STATUS_SIG_SYSTEM_ERROR))
+                       edac_printk(KERN_CRIT, EDAC_PCI,
+                               "Signaled System Error on %s\n",
+                               pci_name(dev));
+
+               if (status & (PCI_STATUS_PARITY)) {
+                       edac_printk(KERN_CRIT, EDAC_PCI,
+                               "Master Data Parity Error on %s\n",
+                               pci_name(dev));
+
+                       atomic_inc(&pci_parity_count);
+               }
+
+               if (status & (PCI_STATUS_DETECTED_PARITY)) {
+                       edac_printk(KERN_CRIT, EDAC_PCI,
+                               "Detected Parity Error on %s\n",
+                               pci_name(dev));
+
+                       atomic_inc(&pci_parity_count);
+               }
+       }
+
+       /* read the device TYPE, looking for bridges */
+       pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type);
+
+       debugf2("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev->dev.bus_id );
+
+       if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {
+               /* On bridges, need to examine secondary status register  */
+               status = get_pci_parity_status(dev, 1);
+
+               debugf2("PCI SEC_STATUS= 0x%04x %s\n",
+                               status, dev->dev.bus_id );
+
+               /* check the secondary status reg for errors */
+               if (status) {
+                       if (status & (PCI_STATUS_SIG_SYSTEM_ERROR))
+                               edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
+                                       "Signaled System Error on %s\n",
+                                       pci_name(dev));
+
+                       if (status & (PCI_STATUS_PARITY)) {
+                               edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
+                                       "Master Data Parity Error on "
+                                       "%s\n", pci_name(dev));
+
+                               atomic_inc(&pci_parity_count);
+                       }
+
+                       if (status & (PCI_STATUS_DETECTED_PARITY)) {
+                               edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
+                                       "Detected Parity Error on %s\n",
+                                       pci_name(dev));
+
+                               atomic_inc(&pci_parity_count);
+                       }
+               }
+       }
+}
+
+/*
+ * check_dev_on_list: Scan for a PCI device on a white/black list
+ * @list:      an EDAC  &edac_pci_device_list  white/black list pointer
+ * @free_index:        index of next free entry on the list
+ * @pci_dev:   PCI Device pointer
+ *
+ * see if list contains the device.
+ *
+ * Returns:    0 not found
+ *             1 found on list
+ */
+static int check_dev_on_list(struct edac_pci_device_list *list,
+               int free_index, struct pci_dev *dev)
+{
+       int i;
+       int rc = 0;     /* Assume not found */
+       unsigned short vendor=dev->vendor;
+       unsigned short device=dev->device;
+
+       /* Scan the list, looking for a vendor/device match */
+       for (i = 0; i < free_index; i++, list++ ) {
+               if ((list->vendor == vendor ) && (list->device == device )) {
+                       rc = 1;
+                       break;
+               }
+       }
+
+       return rc;
+}
+
+/*
+ * pci_dev parity list iterator
+ *     Scan the PCI device list for one iteration, looking for SERRORs
+ *     Master Parity ERRORS or Parity ERRORs on primary or secondary devices
+ */
+static inline void edac_pci_dev_parity_iterator(pci_parity_check_fn_t fn)
+{
+       struct pci_dev *dev = NULL;
+
+       /* request for kernel access to the next PCI device, if any,
+        * and while we are looking at it have its reference count
+        * bumped until we are done with it
+        */
+       while((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+               /* if whitelist exists then it has priority, so only scan
+                * those devices on the whitelist
+                */
+               if (pci_whitelist_count > 0 ) {
+                       if (check_dev_on_list(pci_whitelist,
+                                       pci_whitelist_count, dev))
+                               fn(dev);
+               } else {
+                       /*
+                        * if no whitelist, then check if this devices is
+                        * blacklisted
+                        */
+                       if (!check_dev_on_list(pci_blacklist,
+                                       pci_blacklist_count, dev))
+                               fn(dev);
+               }
+       }
+}
+
+static void do_pci_parity_check(void)
+{
+       unsigned long flags;
+       int before_count;
+
+       debugf3("%s()\n", __func__);
+
+       if (!check_pci_parity)
+               return;
+
+       before_count = atomic_read(&pci_parity_count);
+
+       /* scan all PCI devices looking for a Parity Error on devices and
+        * bridges
+        */
+       local_irq_save(flags);
+       edac_pci_dev_parity_iterator(edac_pci_dev_parity_test);
+       local_irq_restore(flags);
+
+       /* Only if operator has selected panic on PCI Error */
+       if (panic_on_pci_parity) {
+               /* If the count is different 'after' from 'before' */
+               if (before_count != atomic_read(&pci_parity_count))
+                       panic("EDAC: PCI Parity Error");
+       }
+}
+
+static inline void clear_pci_parity_errors(void)
+{
+       /* Clear any PCI bus parity errors that devices initially have logged
+        * in their registers.
+        */
+       edac_pci_dev_parity_iterator(edac_pci_dev_parity_clear);
+}
+
+#else  /* CONFIG_PCI */
+
+static inline void do_pci_parity_check(void)
+{
+       /* no-op */
+}
+
+static inline void clear_pci_parity_errors(void)
+{
+       /* no-op */
+}
+
+#endif  /* CONFIG_PCI */
 
 /*
  * Iterate over all MC instances and check for ECC, et al, errors
@@ -1839,12 +2096,10 @@ MODULE_DESCRIPTION("Core library routines for MC reporting");
 
 module_param(panic_on_ue, int, 0644);
 MODULE_PARM_DESC(panic_on_ue, "Panic on uncorrected error: 0=off 1=on");
-#ifdef CONFIG_PCI
 module_param(check_pci_parity, int, 0644);
 MODULE_PARM_DESC(check_pci_parity, "Check for PCI bus parity errors: 0=off 1=on");
 module_param(panic_on_pci_parity, int, 0644);
 MODULE_PARM_DESC(panic_on_pci_parity, "Panic on PCI Bus Parity error: 0=off 1=on");
-#endif
 module_param(log_ue, int, 0644);
 MODULE_PARM_DESC(log_ue, "Log uncorrectable error to console: 0=off 1=on");
 module_param(log_ce, int, 0644);