Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[linux-2.6.git] / drivers / edac / edac_mc.c
index e6ecc7d..3a7cfe8 100644 (file)
@@ -12,8 +12,6 @@
  *
  */
 
-
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
 #include <linux/sysdev.h>
 #include <linux/ctype.h>
 #include <linux/kthread.h>
-
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/edac.h>
-
 #include "edac_mc.h"
 
-#define        EDAC_MC_VERSION "Ver: 2.0.0 " __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
@@ -48,7 +44,7 @@
 #ifdef CONFIG_EDAC_DEBUG
 /* Values of 0 to 4 will generate output */
 int edac_debug_level = 1;
-EXPORT_SYMBOL(edac_debug_level);
+EXPORT_SYMBOL_GPL(edac_debug_level);
 #endif
 
 /* EDAC Controls, setable by module parameter, and sysfs */
@@ -57,23 +53,23 @@ 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 */
 };
 
-
 #define MAX_LISTED_PCI_DEVICES         32
 
 /* List of PCI devices (vendor-id:device-id) that should be skipped */
@@ -84,6 +80,12 @@ static int pci_blacklist_count;
 static struct edac_pci_device_list pci_whitelist[MAX_LISTED_PCI_DEVICES];
 static int pci_whitelist_count ;
 
+#ifndef DISABLE_EDAC_SYSFS
+static struct kobject edac_pci_kobj; /* /sys/devices/system/edac/pci */
+static struct completion edac_pci_kobj_complete;
+#endif /* DISABLE_EDAC_SYSFS */
+#endif /* CONFIG_PCI */
+
 /*  START sysfs data and methods */
 
 #ifndef DISABLE_EDAC_SYSFS
@@ -126,22 +128,24 @@ static const char *edac_caps[] = {
        [EDAC_S16ECD16ED] = "S16ECD16ED"
 };
 
-
 /* sysfs object: /sys/devices/system/edac */
 static struct sysdev_class edac_class = {
        set_kset_name("edac"),
 };
 
-/* sysfs objects:
+/* sysfs object:
  *     /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;
 
 /*
  * /sys/devices/system/edac/mc;
- *     data structures and methods
+ *     data structures and methods
  */
 #if 0
 static ssize_t memctrl_string_show(void *ptr, char *buffer)
@@ -168,33 +172,34 @@ static ssize_t memctrl_int_store(void *ptr, const char *buffer, size_t count)
 }
 
 struct memctrl_dev_attribute {
-       struct attribute        attr;
-       void    *value;
+       struct attribute attr;
+       void *value;
        ssize_t (*show)(void *,char *);
        ssize_t (*store)(void *, const char *, size_t);
 };
 
 /* Set of show/store abstract level functions for memory control object */
-static ssize_t
-memctrl_dev_show(struct kobject *kobj, struct attribute *attr, char *buffer)
+static ssize_t memctrl_dev_show(struct kobject *kobj,
+               struct attribute *attr, char *buffer)
 {
        struct memctrl_dev_attribute *memctrl_dev;
        memctrl_dev = (struct memctrl_dev_attribute*)attr;
 
        if (memctrl_dev->show)
                return memctrl_dev->show(memctrl_dev->value, buffer);
+
        return -EIO;
 }
 
-static ssize_t
-memctrl_dev_store(struct kobject *kobj, struct attribute *attr,
-                       const char *buffer, size_t count)
+static ssize_t memctrl_dev_store(struct kobject *kobj, struct attribute *attr,
+               const char *buffer, size_t count)
 {
        struct memctrl_dev_attribute *memctrl_dev;
        memctrl_dev = (struct memctrl_dev_attribute*)attr;
 
        if (memctrl_dev->store)
                return memctrl_dev->store(memctrl_dev->value, buffer, count);
+
        return -EIO;
 }
 
@@ -230,7 +235,6 @@ MEMCTRL_ATTR(log_ue,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);
 MEMCTRL_ATTR(log_ce,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);
 MEMCTRL_ATTR(poll_msec,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);
 
-
 /* Base Attributes of the memory ECC object */
 static struct memctrl_dev_attribute *memctrl_attr[] = {
        &attr_panic_on_ue,
@@ -244,12 +248,13 @@ static struct memctrl_dev_attribute *memctrl_attr[] = {
 static void edac_memctrl_master_release(struct kobject *kobj)
 {
        debugf1("%s()\n", __func__);
+       complete(&edac_memctrl_kobj_complete);
 }
 
 static struct kobj_type ktype_memctrl = {
-       .release        = edac_memctrl_master_release,
-       .sysfs_ops      = &memctrlfs_ops,
-       .default_attrs  = (struct attribute **) memctrl_attr,
+       .release = edac_memctrl_master_release,
+       .sysfs_ops = &memctrlfs_ops,
+       .default_attrs = (struct attribute **) memctrl_attr,
 };
 
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -275,6 +280,7 @@ static int edac_sysfs_memctrl_setup(void)
 
        /* create the /sys/devices/system/edac directory */
        err = sysdev_class_register(&edac_class);
+
        if (!err) {
                /* Init the MC's kobject */
                memset(&edac_memctrl_kobj, 0, sizeof (edac_memctrl_kobj));
@@ -283,18 +289,18 @@ static int edac_sysfs_memctrl_setup(void)
 
                /* generate sysfs "..../edac/mc"   */
                err = kobject_set_name(&edac_memctrl_kobj,"mc");
+
                if (!err) {
                        /* FIXME: maybe new sysdev_create_subdir() */
                        err = kobject_register(&edac_memctrl_kobj);
-                       if (err) {
+
+                       if (err)
                                debugf1("Failed to register '.../edac/mc'\n");
-                       } else {
+                       else
                                debugf1("Registered '.../edac/mc' kobject\n");
-                       }
                }
-       } else {
+       } else
                debugf1("%s() error=%d\n", __func__, err);
-       }
 
        return err;
 }
@@ -309,14 +315,20 @@ static void edac_sysfs_memctrl_teardown(void)
 #ifndef DISABLE_EDAC_SYSFS
        debugf0("MC: " __FILE__ ": %s()\n", __func__);
 
-       /* Unregister the MC's kobject */
+       /* Unregister the MC's kobject and wait for reference count to reach
+        * 0.
+        */
+       init_completion(&edac_memctrl_kobj_complete);
        kobject_unregister(&edac_memctrl_kobj);
+       wait_for_completion(&edac_memctrl_kobj_complete);
 
        /* Unregister the 'edac' object */
        sysdev_class_unregister(&edac_class);
 #endif  /* DISABLE_EDAC_SYSFS */
 }
 
+#ifdef CONFIG_PCI
+
 #ifndef DISABLE_EDAC_SYSFS
 
 /*
@@ -329,7 +341,6 @@ struct list_control {
        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)
@@ -354,7 +365,6 @@ static ssize_t edac_pci_list_string_show(void *ptr, char *buffer)
        }
 
        len += snprintf(p + len,(PAGE_SIZE-len), "\n");
-
        return (ssize_t) len;
 }
 
@@ -376,7 +386,7 @@ static int parse_one_device(const char **s,const char **e,
 
        /* if null byte, we are done */
        if (!**s) {
-               (*s)++; /* keep *s moving */
+               (*s)++;  /* keep *s moving */
                return 0;
        }
 
@@ -393,6 +403,7 @@ static int parse_one_device(const char **s,const char **e,
 
        /* parse vendor_id */
        runner = *s;
+
        while (runner < *e) {
                /* scan for vendor:device delimiter */
                if (*runner == ':') {
@@ -400,6 +411,7 @@ static int parse_one_device(const char **s,const char **e,
                        runner = p + 1;
                        break;
                }
+
                runner++;
        }
 
@@ -415,12 +427,11 @@ static int parse_one_device(const char **s,const char **e,
        }
 
        *s = runner;
-
        return 1;
 }
 
 static ssize_t edac_pci_list_string_store(void *ptr, const char *buffer,
-                                       size_t count)
+               size_t count)
 {
        struct list_control *listctl;
        struct edac_pci_device_list *list;
@@ -430,14 +441,12 @@ static ssize_t edac_pci_list_string_store(void *ptr, const char *buffer,
 
        s = (char*)buffer;
        e = s + count;
-
        listctl = ptr;
        list = listctl->list;
        index = listctl->count;
-
        *index = 0;
-       while (*index < MAX_LISTED_PCI_DEVICES) {
 
+       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;
@@ -470,15 +479,15 @@ static ssize_t edac_pci_int_store(void *ptr, const char *buffer, size_t count)
 }
 
 struct edac_pci_dev_attribute {
-       struct attribute        attr;
-       void    *value;
+       struct attribute attr;
+       void *value;
        ssize_t (*show)(void *,char *);
        ssize_t (*store)(void *, const char *,size_t);
 };
 
 /* Set of show/store abstract level functions for PCI Parity object */
 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
-                               char *buffer)
+               char *buffer)
 {
        struct edac_pci_dev_attribute *edac_pci_dev;
        edac_pci_dev= (struct edac_pci_dev_attribute*)attr;
@@ -488,8 +497,8 @@ static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
        return -EIO;
 }
 
-static ssize_t edac_pci_dev_store(struct kobject *kobj, struct attribute *attr,
-                               const char *buffer, size_t count)
+static ssize_t edac_pci_dev_store(struct kobject *kobj,
+               struct attribute *attr, const char *buffer, size_t count)
 {
        struct edac_pci_dev_attribute *edac_pci_dev;
        edac_pci_dev= (struct edac_pci_dev_attribute*)attr;
@@ -504,7 +513,6 @@ static struct sysfs_ops edac_pci_sysfs_ops = {
        .store  = edac_pci_dev_store
 };
 
-
 #define EDAC_PCI_ATTR(_name,_mode,_show,_store)                        \
 struct edac_pci_dev_attribute edac_pci_attr_##_name = {                \
        .attr = {.name = __stringify(_name), .mode = _mode },   \
@@ -547,9 +555,11 @@ EDAC_PCI_STRING_ATTR(pci_parity_blacklist,
 #endif
 
 /* PCI Parity control files */
-EDAC_PCI_ATTR(check_pci_parity,S_IRUGO|S_IWUSR,edac_pci_int_show,edac_pci_int_store);
-EDAC_PCI_ATTR(panic_on_pci_parity,S_IRUGO|S_IWUSR,edac_pci_int_show,edac_pci_int_store);
-EDAC_PCI_ATTR(pci_parity_count,S_IRUGO,edac_pci_int_show,NULL);
+EDAC_PCI_ATTR(check_pci_parity, S_IRUGO|S_IWUSR, edac_pci_int_show,
+       edac_pci_int_store);
+EDAC_PCI_ATTR(panic_on_pci_parity, S_IRUGO|S_IWUSR, edac_pci_int_show,
+       edac_pci_int_store);
+EDAC_PCI_ATTR(pci_parity_count, S_IRUGO, edac_pci_int_show, NULL);
 
 /* Base Attributes of the memory ECC object */
 static struct edac_pci_dev_attribute *edac_pci_attr[] = {
@@ -563,12 +573,13 @@ static struct edac_pci_dev_attribute *edac_pci_attr[] = {
 static void edac_pci_release(struct kobject *kobj)
 {
        debugf1("%s()\n", __func__);
+       complete(&edac_pci_kobj_complete);
 }
 
 static struct kobj_type ktype_edac_pci = {
-       .release        = edac_pci_release,
-       .sysfs_ops      = &edac_pci_sysfs_ops,
-       .default_attrs  = (struct attribute **) edac_pci_attr,
+       .release = edac_pci_release,
+       .sysfs_ops = &edac_pci_sysfs_ops,
+       .default_attrs = (struct attribute **) edac_pci_attr,
 };
 
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -591,17 +602,19 @@ static int edac_sysfs_pci_setup(void)
        memset(&edac_pci_kobj, 0, sizeof(edac_pci_kobj));
        edac_pci_kobj.parent = &edac_class.kset.kobj;
        edac_pci_kobj.ktype = &ktype_edac_pci;
-
        err = kobject_set_name(&edac_pci_kobj, "pci");
+
        if (!err) {
                /* Instanstiate the csrow object */
                /* FIXME: maybe new sysdev_create_subdir() */
                err = kobject_register(&edac_pci_kobj);
+
                if (err)
                        debugf1("Failed to register '.../edac/pci'\n");
                else
                        debugf1("Registered '.../edac/pci' kobject\n");
        }
+
        return err;
 }
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -610,11 +623,258 @@ 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
 }
 
+
+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 */
+}
+
+static void edac_sysfs_pci_teardown(void)
+{
+}
+
+static int edac_sysfs_pci_setup(void)
+{
+       return 0;
+}
+#endif /* CONFIG_PCI */
+
 #ifndef DISABLE_EDAC_SYSFS
 
 /* EDAC sysfs CSROW data structures and methods */
@@ -628,6 +888,7 @@ static ssize_t csrow_ch0_dimm_label_show(struct csrow_info *csrow, char *data)
                size = snprintf(data, EDAC_MC_LABEL_LEN,"%s\n",
                        csrow->channels[0].label);
        }
+
        return size;
 }
 
@@ -639,11 +900,12 @@ static ssize_t csrow_ch1_dimm_label_show(struct csrow_info *csrow, char *data)
                size = snprintf(data, EDAC_MC_LABEL_LEN, "%s\n",
                        csrow->channels[1].label);
        }
+
        return size;
 }
 
 static ssize_t csrow_ch0_dimm_label_store(struct csrow_info *csrow,
-                       const char *data, size_t size)
+               const char *data, size_t size)
 {
        ssize_t max_size = 0;
 
@@ -652,11 +914,12 @@ static ssize_t csrow_ch0_dimm_label_store(struct csrow_info *csrow,
                strncpy(csrow->channels[0].label, data, max_size);
                csrow->channels[0].label[max_size] = '\0';
        }
+
        return size;
 }
 
 static ssize_t csrow_ch1_dimm_label_store(struct csrow_info *csrow,
-                       const char *data, size_t size)
+               const char *data, size_t size)
 {
        ssize_t max_size = 0;
 
@@ -665,6 +928,7 @@ static ssize_t csrow_ch1_dimm_label_store(struct csrow_info *csrow,
                strncpy(csrow->channels[1].label, data, max_size);
                csrow->channels[1].label[max_size] = '\0';
        }
+
        return max_size;
 }
 
@@ -685,6 +949,7 @@ static ssize_t csrow_ch0_ce_count_show(struct csrow_info *csrow, char *data)
        if (csrow->nr_channels > 0) {
                size = sprintf(data,"%u\n", csrow->channels[0].ce_count);
        }
+
        return size;
 }
 
@@ -695,6 +960,7 @@ static ssize_t csrow_ch1_ce_count_show(struct csrow_info *csrow, char *data)
        if (csrow->nr_channels > 1) {
                size = sprintf(data,"%u\n", csrow->channels[1].ce_count);
        }
+
        return size;
 }
 
@@ -719,7 +985,7 @@ static ssize_t csrow_edac_mode_show(struct csrow_info *csrow, char *data)
 }
 
 struct csrowdev_attribute {
-       struct attribute        attr;
+       struct attribute attr;
        ssize_t (*show)(struct csrow_info *,char *);
        ssize_t (*store)(struct csrow_info *, const char *,size_t);
 };
@@ -729,24 +995,26 @@ struct csrowdev_attribute {
 
 /* Set of show/store higher level functions for csrow objects */
 static ssize_t csrowdev_show(struct kobject *kobj, struct attribute *attr,
-                               char *buffer)
+               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);
+
        return -EIO;
 }
 
 static ssize_t csrowdev_store(struct kobject *kobj, struct attribute *attr,
-                               const char *buffer, size_t count)
+               const char *buffer, size_t count)
 {
        struct csrow_info *csrow = to_csrow(kobj);
        struct csrowdev_attribute * csrowdev_attr = to_csrowdev_attr(attr);
 
        if (csrowdev_attr->store)
                return csrowdev_attr->store(csrow, buffer, count);
+
        return -EIO;
 }
 
@@ -780,7 +1048,6 @@ CSROWDEV_ATTR(ch1_dimm_label,S_IRUGO|S_IWUSR,
                csrow_ch1_dimm_label_show,
                csrow_ch1_dimm_label_store);
 
-
 /* Attributes of the CSROW<id> object */
 static struct csrowdev_attribute *csrow_attr[] = {
        &attr_dev_type,
@@ -796,27 +1063,29 @@ static struct csrowdev_attribute *csrow_attr[] = {
        NULL,
 };
 
-
 /* 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);
 }
 
 static struct kobj_type ktype_csrow = {
-       .release        = edac_csrow_instance_release,
-       .sysfs_ops      = &csrowfs_ops,
-       .default_attrs  = (struct attribute **) csrow_attr,
+       .release = edac_csrow_instance_release,
+       .sysfs_ops = &csrowfs_ops,
+       .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 )
+               struct csrow_info *csrow, int index)
 {
        int err = 0;
 
        debugf0("%s()\n", __func__);
-
        memset(&csrow->kobj, 0, sizeof(csrow->kobj));
 
        /* generate ..../edac/mc/mc<id>/csrow<index>   */
@@ -826,9 +1095,11 @@ static int edac_create_csrow_object(struct kobject *edac_mci_kobj,
 
        /* name this instance of csrow<id> */
        err = kobject_set_name(&csrow->kobj,"csrow%d",index);
+
        if (!err) {
                /* Instanstiate the csrow object */
                err = kobject_register(&csrow->kobj);
+
                if (err)
                        debugf0("Failed to register CSROW%d\n",index);
                else
@@ -840,8 +1111,8 @@ static int edac_create_csrow_object(struct kobject *edac_mci_kobj,
 
 /* 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 )
+static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,
+               const char *data, size_t count)
 {
        int row, chan;
 
@@ -849,16 +1120,18 @@ static ssize_t mci_reset_counters_store(struct mem_ctl_info  *mci,
        mci->ce_noinfo_count = 0;
        mci->ue_count = 0;
        mci->ce_count = 0;
+
        for (row = 0; row < mci->nr_csrows; row++) {
                struct csrow_info *ri = &mci->csrows[row];
 
                ri->ue_count = 0;
                ri->ce_count = 0;
+
                for (chan = 0; chan < ri->nr_channels; chan++)
                        ri->channels[chan].ce_count = 0;
        }
-       mci->start_time = jiffies;
 
+       mci->start_time = jiffies;
        return count;
 }
 
@@ -916,18 +1189,16 @@ static ssize_t mci_edac_capability_show(struct mem_ctl_info *mci, char *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 *data)
 {
        char *p = data;
 
        p += mci_output_edac_cap(p,mci->edac_cap);
        p += sprintf(p, "\n");
-
        return p - data;
 }
 
@@ -944,13 +1215,13 @@ static int mci_output_mtype_cap(char *buf, unsigned long mtype_cap)
        return p - buf;
 }
 
-static ssize_t mci_supported_mem_type_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_supported_mem_type_show(struct mem_ctl_info *mci,
+               char *data)
 {
        char *p = data;
 
        p += mci_output_mtype_cap(p,mci->mtype_cap);
        p += sprintf(p, "\n");
-
        return p - data;
 }
 
@@ -964,6 +1235,7 @@ static ssize_t mci_size_mb_show(struct mem_ctl_info *mci, char *data)
 
                if (!csrow->nr_pages)
                        continue;
+
                total_pages += csrow->nr_pages;
        }
 
@@ -971,7 +1243,7 @@ static ssize_t mci_size_mb_show(struct mem_ctl_info *mci, char *data)
 }
 
 struct mcidev_attribute {
-       struct attribute        attr;
+       struct attribute attr;
        ssize_t (*show)(struct mem_ctl_info *,char *);
        ssize_t (*store)(struct mem_ctl_info *, const char *,size_t);
 };
@@ -980,30 +1252,32 @@ struct mcidev_attribute {
 #define to_mcidev_attr(a) container_of(a, struct mcidev_attribute, attr)
 
 static ssize_t mcidev_show(struct kobject *kobj, struct attribute *attr,
-                       char *buffer)
+               char *buffer)
 {
        struct mem_ctl_info *mem_ctl_info = to_mci(kobj);
        struct mcidev_attribute * mcidev_attr = to_mcidev_attr(attr);
 
        if (mcidev_attr->show)
                return mcidev_attr->show(mem_ctl_info, buffer);
+
        return -EIO;
 }
 
 static ssize_t mcidev_store(struct kobject *kobj, struct attribute *attr,
-                               const char *buffer, size_t count)
+               const char *buffer, size_t count)
 {
        struct mem_ctl_info *mem_ctl_info = to_mci(kobj);
        struct mcidev_attribute * mcidev_attr = to_mcidev_attr(attr);
 
        if (mcidev_attr->store)
                return mcidev_attr->store(mem_ctl_info, buffer, count);
+
        return -EIO;
 }
 
 static struct sysfs_ops mci_ops = {
-       .show   = mcidev_show,
-       .store  = mcidev_store
+       .show = mcidev_show,
+       .store = mcidev_store
 };
 
 #define MCIDEV_ATTR(_name,_mode,_show,_store)                  \
@@ -1031,7 +1305,6 @@ MCIDEV_ATTR(edac_current_capability,S_IRUGO,
 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,
@@ -1048,24 +1321,22 @@ static struct mcidev_attribute *mci_attr[] = {
        NULL
 };
 
-
 /*
  * Release of a MC controlling instance
  */
 static void edac_mci_instance_release(struct kobject *kobj)
 {
        struct mem_ctl_info *mci;
-       mci = container_of(kobj,struct mem_ctl_info,edac_mci_kobj);
 
-       debugf0("%s() idx=%d calling kfree\n", __func__, mci->mc_idx);
-
-       kfree(mci);
+       mci = to_mci(kobj);
+       debugf0("%s() idx=%d\n", __func__, mci->mc_idx);
+       complete(&mci->kobj_complete);
 }
 
 static struct kobj_type ktype_mci = {
-       .release        = edac_mci_instance_release,
-       .sysfs_ops      = &mci_ops,
-       .default_attrs  = (struct attribute **) mci_attr,
+       .release = edac_mci_instance_release,
+       .sysfs_ops = &mci_ops,
+       .default_attrs = (struct attribute **) mci_attr,
 };
 
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -1093,11 +1364,11 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
        struct kobject *edac_mci_kobj=&mci->edac_mci_kobj;
 
        debugf0("%s() idx=%d\n", __func__, mci->mc_idx);
-
        memset(edac_mci_kobj, 0, sizeof(*edac_mci_kobj));
 
        /* set the name of the mc<id> object */
        err = kobject_set_name(edac_mci_kobj,"mc%d",mci->mc_idx);
+
        if (err)
                return err;
 
@@ -1107,12 +1378,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->pdev->dev.kobj,
+       err = sysfs_create_link(edac_mci_kobj, &mci->dev->kobj,
                                EDAC_DEVICE_SYMLINK);
+
        if (err)
                goto fail0;
 
@@ -1120,33 +1393,33 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
         * under the mc<id> kobject
         */
        for (i = 0; i < mci->nr_csrows; i++) {
-
                csrow = &mci->csrows[i];
 
                /* Only expose populated CSROWs */
                if (csrow->nr_pages > 0) {
                        err = edac_create_csrow_object(edac_mci_kobj,csrow,i);
+
                        if (err)
                                goto fail1;
                }
        }
 
-       /* Mark this MCI instance as having sysfs entries */
-       mci->sysfs_active = MCI_SYSFS_ACTIVE;
-
        return 0;
 
-
        /* CSROW error: backout what has already been registered,  */
 fail1:
        for ( i--; i >= 0; i--) {
-               if (csrow->nr_pages > 0)
+               if (csrow->nr_pages > 0) {
+                       init_completion(&csrow->kobj_complete);
                        kobject_unregister(&mci->csrows[i].kobj);
+                       wait_for_completion(&csrow->kobj_complete);
+               }
        }
 
 fail0:
+       init_completion(&mci->kobj_complete);
        kobject_unregister(edac_mci_kobj);
-
+       wait_for_completion(&mci->kobj_complete);
        return err;
 }
 #endif  /* DISABLE_EDAC_SYSFS */
@@ -1163,13 +1436,17 @@ static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
 
        /* remove all csrow kobjects */
        for (i = 0; i < mci->nr_csrows; i++) {
-               if (mci->csrows[i].nr_pages > 0)
+               if (mci->csrows[i].nr_pages > 0) {
+                       init_completion(&mci->csrows[i].kobj_complete);
                        kobject_unregister(&mci->csrows[i].kobj);
+                       wait_for_completion(&mci->csrows[i].kobj_complete);
+               }
        }
 
        sysfs_remove_link(&mci->edac_mci_kobj, EDAC_DEVICE_SYMLINK);
-
+       init_completion(&mci->kobj_complete);
        kobject_unregister(&mci->edac_mci_kobj);
+       wait_for_completion(&mci->kobj_complete);
 #endif  /* DISABLE_EDAC_SYSFS */
 }
 
@@ -1177,8 +1454,6 @@ static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
 
 #ifdef CONFIG_EDAC_DEBUG
 
-EXPORT_SYMBOL(edac_mc_dump_channel);
-
 void edac_mc_dump_channel(struct channel_info *chan)
 {
        debugf4("\tchannel = %p\n", chan);
@@ -1187,9 +1462,7 @@ void edac_mc_dump_channel(struct channel_info *chan)
        debugf4("\tchannel->label = '%s'\n", chan->label);
        debugf4("\tchannel->csrow = %p\n\n", chan->csrow);
 }
-
-
-EXPORT_SYMBOL(edac_mc_dump_csrow);
+EXPORT_SYMBOL_GPL(edac_mc_dump_channel);
 
 void edac_mc_dump_csrow(struct csrow_info *csrow)
 {
@@ -1205,9 +1478,7 @@ void edac_mc_dump_csrow(struct csrow_info *csrow)
        debugf4("\tcsrow->channels = %p\n", csrow->channels);
        debugf4("\tcsrow->mci = %p\n\n", csrow->mci);
 }
-
-
-EXPORT_SYMBOL(edac_mc_dump_mci);
+EXPORT_SYMBOL_GPL(edac_mc_dump_csrow);
 
 void edac_mc_dump_mci(struct mem_ctl_info *mci)
 {
@@ -1218,14 +1489,14 @@ 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("\tpdev = %p\n", mci->pdev);
+       debugf3("\tdev = %p\n", mci->dev);
        debugf3("\tmod_name:ctl_name = %s:%s\n",
                mci->mod_name, mci->ctl_name);
        debugf3("\tpvt_info = %p\n\n", mci->pvt_info);
 }
+EXPORT_SYMBOL_GPL(edac_mc_dump_mci);
 
-
-#endif                         /* CONFIG_EDAC_DEBUG */
+#endif  /* CONFIG_EDAC_DEBUG */
 
 /* 'ptr' points to a possibly unaligned item X such that sizeof(X) is 'size'.
  * Adjust 'ptr' so that its alignment is at least as stringent as what the
@@ -1234,7 +1505,7 @@ void edac_mc_dump_mci(struct mem_ctl_info *mci)
  * If 'size' is a constant, the compiler will optimize this whole function
  * down to either a no-op or the addition of a constant to the value of 'ptr'.
  */
-static inline char * align_ptr (void *ptr, unsigned size)
+static inline char * align_ptr(void *ptr, unsigned size)
 {
        unsigned align, r;
 
@@ -1261,9 +1532,6 @@ static inline char * align_ptr (void *ptr, unsigned size)
        return (char *) (((unsigned long) ptr) + align - r);
 }
 
-
-EXPORT_SYMBOL(edac_mc_alloc);
-
 /**
  * edac_mc_alloc: Allocate a struct mem_ctl_info structure
  * @size_pvt:  size of private storage needed
@@ -1281,7 +1549,7 @@ EXPORT_SYMBOL(edac_mc_alloc);
  *     struct mem_ctl_info pointer
  */
 struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
-                                       unsigned nr_chans)
+               unsigned nr_chans)
 {
        struct mem_ctl_info *mci;
        struct csrow_info *csi, *csrow;
@@ -1312,8 +1580,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
        chi = (struct channel_info *) (((char *) mci) + ((unsigned long) chi));
        pvt = sz_pvt ? (((char *) mci) + ((unsigned long) pvt)) : NULL;
 
-       memset(mci, 0, size);   /* clear all fields */
-
+       memset(mci, 0, size);  /* clear all fields */
        mci->csrows = csi;
        mci->pvt_info = pvt;
        mci->nr_csrows = nr_csrows;
@@ -1335,45 +1602,19 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
 
        return mci;
 }
-
-
-EXPORT_SYMBOL(edac_mc_free);
+EXPORT_SYMBOL_GPL(edac_mc_alloc);
 
 /**
  * edac_mc_free:  Free a previously allocated 'mci' structure
  * @mci: pointer to a struct mem_ctl_info structure
- *
- * Free up a previously allocated mci structure
- * A MCI structure can be in 2 states after being allocated
- * by edac_mc_alloc().
- *     1) Allocated in a MC driver's probe, but not yet committed
- *     2) Allocated and committed, by a call to  edac_mc_add_mc()
- * edac_mc_add_mc() is the function that adds the sysfs entries
- * thus, this free function must determine which state the 'mci'
- * structure is in, then either free it directly or
- * perform kobject cleanup by calling edac_remove_sysfs_mci_device().
- *
- * VOID Return
  */
 void edac_mc_free(struct mem_ctl_info *mci)
 {
-       /* only if sysfs entries for this mci instance exist
-        * do we remove them and defer the actual kfree via
-        * the kobject 'release()' callback.
-        *
-        * Otherwise, do a straight kfree now.
-        */
-       if (mci->sysfs_active == MCI_SYSFS_ACTIVE)
-               edac_remove_sysfs_mci_device(mci);
-       else
-               kfree(mci);
+       kfree(mci);
 }
+EXPORT_SYMBOL_GPL(edac_mc_free);
 
-
-
-EXPORT_SYMBOL(edac_mc_find_mci_by_pdev);
-
-struct mem_ctl_info *edac_mc_find_mci_by_pdev(struct pci_dev *pdev)
+static struct mem_ctl_info *find_mci_by_dev(struct device *dev)
 {
        struct mem_ctl_info *mci;
        struct list_head *item;
@@ -1383,58 +1624,56 @@ struct mem_ctl_info *edac_mc_find_mci_by_pdev(struct pci_dev *pdev)
        list_for_each(item, &mc_devices) {
                mci = list_entry(item, struct mem_ctl_info, link);
 
-               if (mci->pdev == pdev)
+               if (mci->dev == dev)
                        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)
 {
        struct list_head *item, *insert_before;
        struct mem_ctl_info *p;
-       int i;
 
-       if (list_empty(&mc_devices)) {
-               mci->mc_idx = 0;
-               insert_before = &mc_devices;
-       } else {
-               if (edac_mc_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;
-               }
+       insert_before = &mc_devices;
 
-               insert_before = NULL;
-               i = 0;
+       if (unlikely((p = find_mci_by_dev(mci->dev)) != NULL))
+               goto fail0;
 
-               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 != i) {
-                               insert_before = item;
-                               break;
-                       }
+               if (p->mc_idx >= mci->mc_idx) {
+                       if (unlikely(p->mc_idx == mci->mc_idx))
+                               goto fail1;
 
-                       i++;
+                       insert_before = item;
+                       break;
                }
-
-               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)
+static void complete_mc_list_del(struct rcu_head *head)
 {
        struct mem_ctl_info *mci;
 
@@ -1443,8 +1682,7 @@ static void complete_mc_list_del (struct rcu_head *head)
        complete(&mci->complete);
 }
 
-
-static void del_mc_from_global_list (struct mem_ctl_info *mci)
+static void del_mc_from_global_list(struct mem_ctl_info *mci)
 {
        list_del_rcu(&mci->link);
        init_completion(&mci->complete);
@@ -1452,12 +1690,11 @@ static void del_mc_from_global_list (struct mem_ctl_info *mci)
        wait_for_completion(&mci->complete);
 }
 
-
-EXPORT_SYMBOL(edac_mc_add_mc);
-
 /**
- * edac_mc_add_mc: Insert the 'mci' structure into the mci global list
+ * 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
@@ -1465,21 +1702,24 @@ EXPORT_SYMBOL(edac_mc_add_mc);
  */
 
 /* FIXME - should a warning be printed if no error detection? correction? */
-int edac_mc_add_mc(struct mem_ctl_info *mci)
+int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
 {
        debugf0("%s()\n", __func__);
+       mci->mc_idx = mc_idx;
 #ifdef CONFIG_EDAC_DEBUG
        if (edac_debug_level >= 3)
                edac_mc_dump_mci(mci);
+
        if (edac_debug_level >= 4) {
                int i;
 
                for (i = 0; i < mci->nr_csrows; i++) {
                        int j;
+
                        edac_mc_dump_csrow(&mci->csrows[i]);
                        for (j = 0; j < mci->csrows[i].nr_channels; j++)
-                               edac_mc_dump_channel(&mci->csrows[i].
-                                                         channels[j]);
+                               edac_mc_dump_channel(
+                                       &mci->csrows[i].channels[j]);
                }
        }
 #endif
@@ -1498,8 +1738,8 @@ int edac_mc_add_mc(struct mem_ctl_info *mci)
         }
 
        /* Report action taken */
-       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));
+       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));
 
        up(&mem_ctls_mutex);
        return 0;
@@ -1511,39 +1751,38 @@ fail0:
        up(&mem_ctls_mutex);
        return 1;
 }
-
-
-EXPORT_SYMBOL(edac_mc_del_mc);
+EXPORT_SYMBOL_GPL(edac_mc_add_mc);
 
 /**
- * edac_mc_del_mc:  Remove the specified mci structure from global list
- * @mci:       Pointer to struct mem_ctl_info structure
+ * 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.
  *
- * Returns:
- *     0       Success
- *     1       Failure
+ * Return pointer to removed mci structure, or NULL if device not found.
  */
-int edac_mc_del_mc(struct mem_ctl_info *mci)
+struct mem_ctl_info * edac_mc_del_mc(struct device *dev)
 {
-       int rc = 1;
+       struct mem_ctl_info *mci;
 
-       debugf0("MC%d: %s()\n", mci->mc_idx, __func__);
+       debugf0("MC: %s()\n", __func__);
        down(&mem_ctls_mutex);
+
+       if ((mci = find_mci_by_dev(dev)) == NULL) {
+               up(&mem_ctls_mutex);
+               return NULL;
+       }
+
+       edac_remove_sysfs_mci_device(mci);
        del_mc_from_global_list(mci);
-       edac_printk(KERN_INFO, EDAC_MC,
-               "Removed device %d for %s %s: PCI %s\n", mci->mc_idx,
-               mci->mod_name, mci->ctl_name, pci_name(mci->pdev));
-       rc = 0;
        up(&mem_ctls_mutex);
-
-       return rc;
+       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));
+       return mci;
 }
+EXPORT_SYMBOL_GPL(edac_mc_del_mc);
 
-
-EXPORT_SYMBOL(edac_mc_scrub_block);
-
-void edac_mc_scrub_block(unsigned long page, unsigned long offset,
-                             u32 size)
+void edac_mc_scrub_block(unsigned long page, unsigned long offset, u32 size)
 {
        struct page *pg;
        void *virt_addr;
@@ -1572,13 +1811,10 @@ void edac_mc_scrub_block(unsigned long page, unsigned long offset,
        if (PageHighMem(pg))
                local_irq_restore(flags);
 }
-
+EXPORT_SYMBOL_GPL(edac_mc_scrub_block);
 
 /* FIXME - should return -1 */
-EXPORT_SYMBOL(edac_mc_find_csrow_by_page);
-
-int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
-                                   unsigned long page)
+int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, unsigned long page)
 {
        struct csrow_info *csrows = mci->csrows;
        int row, i;
@@ -1613,17 +1849,13 @@ int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
 
        return row;
 }
-
-
-EXPORT_SYMBOL(edac_mc_handle_ce);
+EXPORT_SYMBOL_GPL(edac_mc_find_csrow_by_page);
 
 /* FIXME - setable log (warning/emerg) levels */
 /* FIXME - integrate with evlog: http://evlog.sourceforge.net/ */
 void edac_mc_handle_ce(struct mem_ctl_info *mci,
-                           unsigned long page_frame_number,
-                           unsigned long offset_in_page,
-                           unsigned long syndrome, int row, int channel,
-                           const char *msg)
+               unsigned long page_frame_number, unsigned long offset_in_page,
+               unsigned long syndrome, int row, int channel, const char *msg)
 {
        unsigned long remapped_page;
 
@@ -1638,6 +1870,7 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
                edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR");
                return;
        }
+
        if (channel >= mci->csrows[row].nr_channels || channel < 0) {
                /* something is wrong */
                edac_mc_printk(mci, KERN_ERR,
@@ -1676,30 +1909,25 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
                    page_frame_number;
 
                edac_mc_scrub_block(remapped_page, offset_in_page,
-                                        mci->csrows[row].grain);
+                                       mci->csrows[row].grain);
        }
 }
+EXPORT_SYMBOL_GPL(edac_mc_handle_ce);
 
-
-EXPORT_SYMBOL(edac_mc_handle_ce_no_info);
-
-void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci,
-                                   const char *msg)
+void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci, const char *msg)
 {
        if (log_ce)
                edac_mc_printk(mci, KERN_WARNING,
                        "CE - no information available: %s\n", msg);
+
        mci->ce_noinfo_count++;
        mci->ce_count++;
 }
-
-
-EXPORT_SYMBOL(edac_mc_handle_ue);
+EXPORT_SYMBOL_GPL(edac_mc_handle_ce_no_info);
 
 void edac_mc_handle_ue(struct mem_ctl_info *mci,
-                           unsigned long page_frame_number,
-                           unsigned long offset_in_page, int row,
-                           const char *msg)
+               unsigned long page_frame_number, unsigned long offset_in_page,
+               int row, const char *msg)
 {
        int len = EDAC_MC_LABEL_LEN * 4;
        char labels[len + 1];
@@ -1720,13 +1948,14 @@ void edac_mc_handle_ue(struct mem_ctl_info *mci,
        }
 
        chars = snprintf(pos, len + 1, "%s",
-                        mci->csrows[row].channels[0].label);
+                       mci->csrows[row].channels[0].label);
        len -= chars;
        pos += chars;
+
        for (chan = 1; (chan < mci->csrows[row].nr_channels) && (len > 0);
             chan++) {
                chars = snprintf(pos, len + 1, ":%s",
-                                mci->csrows[row].channels[chan].label);
+                               mci->csrows[row].channels[chan].label);
                len -= chars;
                pos += chars;
        }
@@ -1739,21 +1968,17 @@ void edac_mc_handle_ue(struct mem_ctl_info *mci,
                        msg);
 
        if (panic_on_ue)
-               panic
-                   ("EDAC MC%d: UE page 0x%lx, offset 0x%lx, grain %d, row %d,"
-                    " labels \"%s\": %s\n", mci->mc_idx,
-                    page_frame_number, offset_in_page,
-                    mci->csrows[row].grain, row, labels, msg);
+               panic("EDAC MC%d: UE page 0x%lx, offset 0x%lx, grain %d, "
+                       "row %d, labels \"%s\": %s\n", mci->mc_idx,
+                       page_frame_number, offset_in_page,
+                       mci->csrows[row].grain, row, labels, msg);
 
        mci->ue_count++;
        mci->csrows[row].ue_count++;
 }
+EXPORT_SYMBOL_GPL(edac_mc_handle_ue);
 
-
-EXPORT_SYMBOL(edac_mc_handle_ue_no_info);
-
-void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci,
-                                   const char *msg)
+void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, const char *msg)
 {
        if (panic_on_ue)
                panic("EDAC MC%d: Uncorrected Error", mci->mc_idx);
@@ -1764,264 +1989,19 @@ void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci,
        mci->ue_noinfo_count++;
        mci->ue_count++;
 }
+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
  */
-static inline void check_mc_devices (void)
+static inline void check_mc_devices(void)
 {
-       unsigned long flags;
        struct list_head *item;
        struct mem_ctl_info *mci;
 
        debugf3("%s()\n", __func__);
-
-       /* during poll, have interrupts off */
-       local_irq_save(flags);
+       down(&mem_ctls_mutex);
 
        list_for_each(item, &mc_devices) {
                mci = list_entry(item, struct mem_ctl_info, link);
@@ -2030,10 +2010,9 @@ static inline void check_mc_devices (void)
                        mci->edac_check(mci);
        }
 
-       local_irq_restore(flags);
+       up(&mem_ctls_mutex);
 }
 
-
 /*
  * Check MC status every poll_msec.
  * Check PCI status every poll_msec as well.
@@ -2079,7 +2058,7 @@ static int __init edac_mc_init(void)
         */
        clear_pci_parity_errors();
 
-       /* Create the MC sysfs entires */
+       /* Create the MC sysfs entries */
        if (edac_sysfs_memctrl_setup()) {
                edac_printk(KERN_ERR, EDAC_MC,
                        "Error initializing sysfs code\n");
@@ -2096,6 +2075,7 @@ static int __init edac_mc_init(void)
 
        /* create our kernel thread */
        edac_thread = kthread_run(edac_kernel_thread, NULL, "kedac");
+
        if (IS_ERR(edac_thread)) {
                /* remove the sysfs entries */
                edac_sysfs_memctrl_teardown();
@@ -2106,7 +2086,6 @@ static int __init edac_mc_init(void)
        return 0;
 }
 
-
 /*
  * edac_mc_exit()
  *      module exit/termination functioni
@@ -2114,7 +2093,6 @@ static int __init edac_mc_init(void)
 static void __exit edac_mc_exit(void)
 {
        debugf0("%s()\n", __func__);
-
        kthread_stop(edac_thread);
 
         /* tear down the sysfs device */
@@ -2122,23 +2100,22 @@ static void __exit edac_mc_exit(void)
        edac_sysfs_pci_teardown();
 }
 
-
-
-
 module_init(edac_mc_init);
 module_exit(edac_mc_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh et al\n"
-             "Based on.work by Dan Hollis et al");
+       "Based on work by Dan Hollis et al");
 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);