edac: rewrite the sysfs code to use struct device

author Mauro Carvalho Chehab <mchehab@redhat.com>

Mon, 16 Apr 2012 19:41:11 +0000 (16:41 -0300)

committer Mauro Carvalho Chehab <mchehab@redhat.com>

Mon, 11 Jun 2012 16:23:30 +0000 (13:23 -0300)
author Mauro Carvalho Chehab <mchehab@redhat.com>
Mon, 16 Apr 2012 19:41:11 +0000 (16:41 -0300)
committer Mauro Carvalho Chehab <mchehab@redhat.com>
Mon, 11 Jun 2012 16:23:30 +0000 (13:23 -0300)
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c

index 811f09a38f3a57966cbc257bb5f4c34d699d78b2..61ae34643b49697923cc05a612c4e008d020b1f8 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -218,7 +218,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
         unsigned size, tot_dimms = 1, count = 1;
         unsigned tot_csrows = 1, tot_channels = 1, tot_errcount = 0;
         void *pvt, *p, *ptr = NULL;
         unsigned size, tot_dimms = 1, count = 1;
         unsigned tot_csrows = 1, tot_channels = 1, tot_errcount = 0;
         void *pvt, *p, *ptr = NULL;
-       int i, j, err, row, chn, n, len;
+       int i, j, row, chn, n, len;
         bool per_rank = false;
  
         BUG_ON(n_layers > EDAC_MAX_LAYERS || n_layers == 0);
         bool per_rank = false;
  
         BUG_ON(n_layers > EDAC_MAX_LAYERS || n_layers == 0);
@@ -374,15 +374,6 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
         mci->op_state = OP_ALLOC;
         INIT_LIST_HEAD(&mci->grp_kobj_list);
  
         mci->op_state = OP_ALLOC;
         INIT_LIST_HEAD(&mci->grp_kobj_list);
  
-       /*
-        * Initialize the 'root' kobj for the edac_mc controller
-        */
-       err = edac_mc_register_sysfs_main_kobj(mci);
-       if (err) {
-               kfree(mci);
-               return NULL;
-       }
-
         /* at this point, the root kobj is valid, and in order to
          * 'free' the object, then the function:
          *      edac_mc_unregister_sysfs_main_kobj() must be called
         /* at this point, the root kobj is valid, and in order to
          * 'free' the object, then the function:
          *      edac_mc_unregister_sysfs_main_kobj() must be called
@@ -403,7 +394,7 @@ void edac_mc_free(struct mem_ctl_info *mci)
  {
         debugf1("%s()\n", __func__);
  
  {
         debugf1("%s()\n", __func__);
  
-       edac_mc_unregister_sysfs_main_kobj(mci);
+       edac_unregister_sysfs(mci);
  
         /* free the mci instance memory here */
         kfree(mci);
  
         /* free the mci instance memory here */
         kfree(mci);
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c

index 595371941ef9e07d3c768607abaaf2d1f8f7173d..7002c9cab9998cb183f4724c182b37e9cf50396f 100644 (file)
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -7,17 +7,20 @@
   *
   * Written Doug Thompson <norsk5@xmission.com> www.softwarebitmaker.com
   *
   *
   * Written Doug Thompson <norsk5@xmission.com> www.softwarebitmaker.com
   *
+ * (c) 2012 - Mauro Carvalho Chehab <mchehab@redhat.com>
+ *     The entire API were re-written, and ported to use struct device
+ *
   */
  
  #include <linux/ctype.h>
  #include <linux/slab.h>
  #include <linux/edac.h>
  #include <linux/bug.h>
   */
  
  #include <linux/ctype.h>
  #include <linux/slab.h>
  #include <linux/edac.h>
  #include <linux/bug.h>
+#include <linux/pm_runtime.h>
  
  #include "edac_core.h"
  #include "edac_module.h"
  
  
  #include "edac_core.h"
  #include "edac_module.h"
  
-
  /* MC EDAC Controls, setable by module parameter, and sysfs */
  static int edac_mc_log_ue = 1;
  static int edac_mc_log_ce = 1;
  /* MC EDAC Controls, setable by module parameter, and sysfs */
  static int edac_mc_log_ue = 1;
  static int edac_mc_log_ce = 1;
@@ -78,6 +81,8 @@ module_param_call(edac_mc_poll_msec, edac_set_poll_msec, param_get_int,
                   &edac_mc_poll_msec, 0644);
  MODULE_PARM_DESC(edac_mc_poll_msec, "Polling period in milliseconds");
  
                   &edac_mc_poll_msec, 0644);
  MODULE_PARM_DESC(edac_mc_poll_msec, "Polling period in milliseconds");
  
+static struct device mci_pdev;
+
  /*
   * various constants for Memory Controllers
   */
  /*
   * various constants for Memory Controllers
   */
@@ -125,308 +130,336 @@ static const char *edac_caps[] = {
         [EDAC_S16ECD16ED] = "S16ECD16ED"
  };
  
         [EDAC_S16ECD16ED] = "S16ECD16ED"
  };
  
-/* EDAC sysfs CSROW data structures and methods
+/*
+ * EDAC sysfs CSROW data structures and methods
+ */
+
+#define to_csrow(k) container_of(k, struct csrow_info, dev)
+
+/*
+ * We need it to avoid namespace conflicts between the legacy API
+ * and the per-dimm/per-rank one
   */
   */
+#define DEVICE_ATTR_LEGACY(_name, _mode, _show, _store) \
+       struct device_attribute dev_attr_legacy_##_name = __ATTR(_name, _mode, _show, _store)
+
+struct dev_ch_attribute {
+       struct device_attribute attr;
+       int channel;
+};
+
+#define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
+       struct dev_ch_attribute dev_attr_legacy_##_name = \
+               { __ATTR(_name, _mode, _show, _store), (_var) }
+
+#define to_channel(k) (container_of(k, struct dev_ch_attribute, attr)->channel)
  
  /* Set of more default csrow<id> attribute show/store functions */
  
  /* 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)
+static ssize_t csrow_ue_count_show(struct device *dev,
+                                  struct device_attribute *mattr, char *data)
  {
  {
+       struct csrow_info *csrow = to_csrow(dev);
+
         return sprintf(data, "%u\n", csrow->ue_count);
  }
  
         return sprintf(data, "%u\n", csrow->ue_count);
  }
  
-static ssize_t csrow_ce_count_show(struct csrow_info *csrow, char *data,
-                               int private)
+static ssize_t csrow_ce_count_show(struct device *dev,
+                                  struct device_attribute *mattr, char *data)
  {
  {
+       struct csrow_info *csrow = to_csrow(dev);
+
         return sprintf(data, "%u\n", csrow->ce_count);
  }
  
         return sprintf(data, "%u\n", csrow->ce_count);
  }
  
-static ssize_t csrow_size_show(struct csrow_info *csrow, char *data,
-                               int private)
+static ssize_t csrow_size_show(struct device *dev,
+                              struct device_attribute *mattr, char *data)
  {
  {
+       struct csrow_info *csrow = to_csrow(dev);
         int i;
         u32 nr_pages = 0;
  
         for (i = 0; i < csrow->nr_channels; i++)
                 nr_pages += csrow->channels[i].dimm->nr_pages;
         int i;
         u32 nr_pages = 0;
  
         for (i = 0; i < csrow->nr_channels; i++)
                 nr_pages += csrow->channels[i].dimm->nr_pages;
-
         return sprintf(data, "%u\n", PAGES_TO_MiB(nr_pages));
  }
  
         return sprintf(data, "%u\n", PAGES_TO_MiB(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 device *dev,
+                                  struct device_attribute *mattr, char *data)
  {
  {
+       struct csrow_info *csrow = to_csrow(dev);
+
         return sprintf(data, "%s\n", mem_types[csrow->channels[0].dimm->mtype]);
  }
  
         return sprintf(data, "%s\n", mem_types[csrow->channels[0].dimm->mtype]);
  }
  
-static ssize_t csrow_dev_type_show(struct csrow_info *csrow, char *data,
-                               int private)
+static ssize_t csrow_dev_type_show(struct device *dev,
+                                  struct device_attribute *mattr, char *data)
  {
  {
+       struct csrow_info *csrow = to_csrow(dev);
+
         return sprintf(data, "%s\n", dev_types[csrow->channels[0].dimm->dtype]);
  }
  
         return sprintf(data, "%s\n", dev_types[csrow->channels[0].dimm->dtype]);
  }
  
-static ssize_t csrow_edac_mode_show(struct csrow_info *csrow, char *data,
-                               int private)
+static ssize_t csrow_edac_mode_show(struct device *dev,
+                                   struct device_attribute *mattr,
+                                   char *data)
  {
  {
+       struct csrow_info *csrow = to_csrow(dev);
+
         return sprintf(data, "%s\n", edac_caps[csrow->channels[0].dimm->edac_mode]);
  }
  
  /* show/store functions for DIMM Label attributes */
         return sprintf(data, "%s\n", edac_caps[csrow->channels[0].dimm->edac_mode]);
  }
  
  /* show/store functions for DIMM Label attributes */
-static ssize_t channel_dimm_label_show(struct csrow_info *csrow,
-                               char *data, int channel)
+static ssize_t channel_dimm_label_show(struct device *dev,
+                                      struct device_attribute *mattr,
+                                      char *data)
  {
  {
+       struct csrow_info *csrow = to_csrow(dev);
+       unsigned chan = to_channel(mattr);
+       struct rank_info *rank = &csrow->channels[chan];
+
         /* if field has not been initialized, there is nothing to send */
         /* if field has not been initialized, there is nothing to send */
-       if (!csrow->channels[channel].dimm->label[0])
+       if (!rank->dimm->label[0])
                 return 0;
  
         return snprintf(data, EDAC_MC_LABEL_LEN, "%s\n",
                 return 0;
  
         return snprintf(data, EDAC_MC_LABEL_LEN, "%s\n",
-                       csrow->channels[channel].dimm->label);
+                       rank->dimm->label);
  }
  
  }
  
-static ssize_t channel_dimm_label_store(struct csrow_info *csrow,
-                                       const char *data,
-                                       size_t count, int channel)
+static ssize_t channel_dimm_label_store(struct device *dev,
+                                       struct device_attribute *mattr,
+                                       const char *data, size_t count)
  {
  {
+       struct csrow_info *csrow = to_csrow(dev);
+       unsigned chan = to_channel(mattr);
+       struct rank_info *rank = &csrow->channels[chan];
+
         ssize_t max_size = 0;
  
         max_size = min((ssize_t) count, (ssize_t) EDAC_MC_LABEL_LEN - 1);
         ssize_t max_size = 0;
  
         max_size = min((ssize_t) count, (ssize_t) EDAC_MC_LABEL_LEN - 1);
-       strncpy(csrow->channels[channel].dimm->label, data, max_size);
-       csrow->channels[channel].dimm->label[max_size] = '\0';
+       strncpy(rank->dimm->label, data, max_size);
+       rank->dimm->label[max_size] = '\0';
  
         return max_size;
  }
  
  /* show function for dynamic chX_ce_count attribute */
  
         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)
+static ssize_t channel_ce_count_show(struct device *dev,
+                                    struct device_attribute *mattr, char *data)
  {
  {
-       return sprintf(data, "%u\n", csrow->channels[channel].ce_count);
+       struct csrow_info *csrow = to_csrow(dev);
+       unsigned chan = to_channel(mattr);
+       struct rank_info *rank = &csrow->channels[chan];
+
+       return sprintf(data, "%u\n", rank->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;
-};
+/* cwrow<id>/attribute files */
+DEVICE_ATTR_LEGACY(size_mb, S_IRUGO, csrow_size_show, NULL);
+DEVICE_ATTR_LEGACY(dev_type, S_IRUGO, csrow_dev_type_show, NULL);
+DEVICE_ATTR_LEGACY(mem_type, S_IRUGO, csrow_mem_type_show, NULL);
+DEVICE_ATTR_LEGACY(edac_mode, S_IRUGO, csrow_edac_mode_show, NULL);
+DEVICE_ATTR_LEGACY(ue_count, S_IRUGO, csrow_ue_count_show, NULL);
+DEVICE_ATTR_LEGACY(ce_count, S_IRUGO, csrow_ce_count_show, NULL);
  
  
-#define to_csrow(k) container_of(k, struct csrow_info, kobj)
-#define to_csrowdev_attr(a) container_of(a, struct csrowdev_attribute, attr)
+/* default attributes of the CSROW<id> object */
+static struct attribute *csrow_attrs[] = {
+       &dev_attr_legacy_dev_type.attr,
+       &dev_attr_legacy_mem_type.attr,
+       &dev_attr_legacy_edac_mode.attr,
+       &dev_attr_legacy_size_mb.attr,
+       &dev_attr_legacy_ue_count.attr,
+       &dev_attr_legacy_ce_count.attr,
+       NULL,
+};
  
  
-/* Set of show/store higher level functions for default csrow attributes */
-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);
+static struct attribute_group csrow_attr_grp = {
+       .attrs  = csrow_attrs,
+};
  
  
-       if (csrowdev_attr->show)
-               return csrowdev_attr->show(csrow,
-                                       buffer, csrowdev_attr->private);
-       return -EIO;
-}
+static const struct attribute_group *csrow_attr_groups[] = {
+       &csrow_attr_grp,
+       NULL
+};
  
  
-static ssize_t csrowdev_store(struct kobject *kobj, struct attribute *attr,
-                       const char *buffer, size_t count)
+static void csrow_attr_release(struct device *device)
  {
  {
-       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, csrowdev_attr->private);
-       return -EIO;
+       debugf1("Releasing csrow device %s\n", dev_name(device));
  }
  
  }
  
-static const struct sysfs_ops csrowfs_ops = {
-       .show = csrowdev_show,
-       .store = csrowdev_store
+static struct device_type csrow_attr_type = {
+       .groups         = csrow_attr_groups,
+       .release        = csrow_attr_release,
  };
  
  };
  
-#define CSROWDEV_ATTR(_name,_mode,_show,_store,_private)       \
-static 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);
+/*
+ * possible dynamic channel DIMM Label attribute files
+ *
+ */
  
  
-/* default attributes of the CSROW<id> object */
-static struct csrowdev_attribute *default_csrow_attr[] = {
-       &attr_dev_type,
-       &attr_mem_type,
-       &attr_edac_mode,
-       &attr_size_mb,
-       &attr_ue_count,
-       &attr_ce_count,
-       NULL,
-};
+#define EDAC_NR_CHANNELS       6
  
  
-/* possible dynamic channel DIMM Label attribute files */
-CSROWDEV_ATTR(ch0_dimm_label, S_IRUGO | S_IWUSR,
+DEVICE_CHANNEL(ch0_dimm_label, S_IRUGO | S_IWUSR,
         channel_dimm_label_show, channel_dimm_label_store, 0);
         channel_dimm_label_show, channel_dimm_label_store, 0);
-CSROWDEV_ATTR(ch1_dimm_label, S_IRUGO | S_IWUSR,
+DEVICE_CHANNEL(ch1_dimm_label, S_IRUGO | S_IWUSR,
         channel_dimm_label_show, channel_dimm_label_store, 1);
         channel_dimm_label_show, channel_dimm_label_store, 1);
-CSROWDEV_ATTR(ch2_dimm_label, S_IRUGO | S_IWUSR,
+DEVICE_CHANNEL(ch2_dimm_label, S_IRUGO | S_IWUSR,
         channel_dimm_label_show, channel_dimm_label_store, 2);
         channel_dimm_label_show, channel_dimm_label_store, 2);
-CSROWDEV_ATTR(ch3_dimm_label, S_IRUGO | S_IWUSR,
+DEVICE_CHANNEL(ch3_dimm_label, S_IRUGO | S_IWUSR,
         channel_dimm_label_show, channel_dimm_label_store, 3);
         channel_dimm_label_show, channel_dimm_label_store, 3);
-CSROWDEV_ATTR(ch4_dimm_label, S_IRUGO | S_IWUSR,
+DEVICE_CHANNEL(ch4_dimm_label, S_IRUGO | S_IWUSR,
         channel_dimm_label_show, channel_dimm_label_store, 4);
         channel_dimm_label_show, channel_dimm_label_store, 4);
-CSROWDEV_ATTR(ch5_dimm_label, S_IRUGO | S_IWUSR,
+DEVICE_CHANNEL(ch5_dimm_label, S_IRUGO | S_IWUSR,
         channel_dimm_label_show, channel_dimm_label_store, 5);
  
  /* Total possible dynamic DIMM Label attribute file table */
         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
+static struct device_attribute *dynamic_csrow_dimm_attr[] = {
+       &dev_attr_legacy_ch0_dimm_label.attr,
+       &dev_attr_legacy_ch1_dimm_label.attr,
+       &dev_attr_legacy_ch2_dimm_label.attr,
+       &dev_attr_legacy_ch3_dimm_label.attr,
+       &dev_attr_legacy_ch4_dimm_label.attr,
+       &dev_attr_legacy_ch5_dimm_label.attr
  };
  
  /* possible dynamic channel ce_count attribute files */
  };
  
  /* 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);
+DEVICE_CHANNEL(ch0_ce_count, S_IRUGO | S_IWUSR,
+                  channel_ce_count_show, NULL, 0);
+DEVICE_CHANNEL(ch1_ce_count, S_IRUGO | S_IWUSR,
+                  channel_ce_count_show, NULL, 1);
+DEVICE_CHANNEL(ch2_ce_count, S_IRUGO | S_IWUSR,
+                  channel_ce_count_show, NULL, 2);
+DEVICE_CHANNEL(ch3_ce_count, S_IRUGO | S_IWUSR,
+                  channel_ce_count_show, NULL, 3);
+DEVICE_CHANNEL(ch4_ce_count, S_IRUGO | S_IWUSR,
+                  channel_ce_count_show, NULL, 4);
+DEVICE_CHANNEL(ch5_ce_count, S_IRUGO | S_IWUSR,
+                  channel_ce_count_show, NULL, 5);
  
  /* Total possible dynamic ce_count attribute file table */
  
  /* 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
+static struct device_attribute *dynamic_csrow_ce_count_attr[] = {
+       &dev_attr_legacy_ch0_ce_count.attr,
+       &dev_attr_legacy_ch1_ce_count.attr,
+       &dev_attr_legacy_ch2_ce_count.attr,
+       &dev_attr_legacy_ch3_ce_count.attr,
+       &dev_attr_legacy_ch4_ce_count.attr,
+       &dev_attr_legacy_ch5_ce_count.attr
  };
  
  };
  
-#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)
+/* Create a CSROW object under specifed edac_mc_device */
+static int edac_create_csrow_object(struct mem_ctl_info *mci,
+                                   struct csrow_info *csrow, int index)
  {
  {
-       int err = -ENODEV;
+       int err, chan;
  
  
-       if (chan >= EDAC_NR_CHANNELS)
-               return err;
+       if (csrow->nr_channels >= EDAC_NR_CHANNELS)
+               return -ENODEV;
  
  
-       /* 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__);
-       }
+       csrow->dev.type = &csrow_attr_type;
+       csrow->dev.bus = &mci->bus;
+       device_initialize(&csrow->dev);
+       csrow->dev.parent = &mci->dev;
+       dev_set_name(&csrow->dev, "csrow%d", index);
+       dev_set_drvdata(&csrow->dev, csrow);
  
  
-       return err;
-}
+       debugf0("%s(): creating (virtual) csrow node %s\n", __func__,
+               dev_name(&csrow->dev));
  
  
-/* No memory to release for this kobj */
-static void edac_csrow_instance_release(struct kobject *kobj)
-{
-       struct mem_ctl_info *mci;
-       struct csrow_info *cs;
+       err = device_add(&csrow->dev);
+       if (err < 0)
+               return err;
  
  
-       debugf1("%s()\n", __func__);
+       for (chan = 0; chan < csrow->nr_channels; chan++) {
+               err = device_create_file(&csrow->dev,
+                                        dynamic_csrow_dimm_attr[chan]);
+               if (err < 0)
+                       goto error;
+               err = device_create_file(&csrow->dev,
+                                        dynamic_csrow_ce_count_attr[chan]);
+               if (err < 0) {
+                       device_remove_file(&csrow->dev,
+                                          dynamic_csrow_dimm_attr[chan]);
+                       goto error;
+               }
+       }
  
  
-       cs = container_of(kobj, struct csrow_info, kobj);
-       mci = cs->mci;
+       return 0;
  
  
-       kobject_put(&mci->edac_mci_kobj);
-}
+error:
+       for (--chan; chan >= 0; chan--) {
+               device_remove_file(&csrow->dev,
+                                       dynamic_csrow_dimm_attr[chan]);
+               device_remove_file(&csrow->dev,
+                                          dynamic_csrow_ce_count_attr[chan]);
+       }
+       put_device(&csrow->dev);
  
  
-/* 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,
-};
+       return err;
+}
  
  /* Create a CSROW object under specifed edac_mc_device */
  
  /* Create a CSROW object under specifed edac_mc_device */
-static int edac_create_csrow_object(struct mem_ctl_info *mci,
-                                       struct csrow_info *csrow, int index)
+static int edac_create_csrow_objects(struct mem_ctl_info *mci)
  {
  {
-       struct kobject *kobj_mci = &mci->edac_mci_kobj;
-       struct kobject *kobj;
-       int chan;
-       int err;
+       int err, i, chan;
+       struct csrow_info *csrow;
  
  
-       /* generate ..../edac/mc/mc<id>/csrow<index>   */
-       memset(&csrow->kobj, 0, sizeof(csrow->kobj));
-       csrow->mci = mci;       /* include container up link */
+       for (i = 0; i < mci->nr_csrows; i++) {
+               err = edac_create_csrow_object(mci, &mci->csrows[i], i);
+               if (err < 0)
+                       goto error;
+       }
+       return 0;
  
  
-       /* bump the mci instance's kobject's ref count */
-       kobj = kobject_get(&mci->edac_mci_kobj);
-       if (!kobj) {
-               err = -ENODEV;
-               goto err_out;
+error:
+       for (--i; i >= 0; i--) {
+               csrow = &mci->csrows[i];
+               for (chan = csrow->nr_channels - 1; chan >= 0; chan--) {
+                       device_remove_file(&csrow->dev,
+                                               dynamic_csrow_dimm_attr[chan]);
+                       device_remove_file(&csrow->dev,
+                                               dynamic_csrow_ce_count_attr[chan]);
+               }
+               put_device(&mci->csrows[i].dev);
         }
  
         }
  
-       /* Instanstiate the csrow object */
-       err = kobject_init_and_add(&csrow->kobj, &ktype_csrow, kobj_mci,
-                                  "csrow%d", index);
-       if (err)
-               goto err_release_top_kobj;
+       return err;
+}
  
  
-       /* At this point, to release a csrow kobj, one must
-        * call the kobject_put and allow that tear down
-        * to work the releasing
-        */
+static void edac_delete_csrow_objects(struct mem_ctl_info *mci)
+{
+       int i, chan;
+       struct csrow_info *csrow;
  
  
-       /* 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) {
-                       /* special case the unregister here */
-                       kobject_put(&csrow->kobj);
-                       goto err_out;
+       for (i = mci->nr_csrows - 1; i >= 0; i--) {
+               csrow = &mci->csrows[i];
+               for (chan = csrow->nr_channels - 1; chan >= 0; chan--) {
+                       debugf1("Removing csrow %d channel %d sysfs nodes\n",
+                               i, chan);
+                       device_remove_file(&csrow->dev,
+                                               dynamic_csrow_dimm_attr[chan]);
+                       device_remove_file(&csrow->dev,
+                                               dynamic_csrow_ce_count_attr[chan]);
                 }
                 }
+               put_device(&mci->csrows[i].dev);
+               device_del(&mci->csrows[i].dev);
         }
         }
-       kobject_uevent(&csrow->kobj, KOBJ_ADD);
-       return 0;
-
-       /* error unwind stack */
-err_release_top_kobj:
-       kobject_put(&mci->edac_mci_kobj);
-
-err_out:
-       return err;
  }
  
  }
  
-/* default sysfs methods and data structures for the main MCI kobject */
+/*
+ * Memory controller device
+ */
+
+#define to_mci(k) container_of(k, struct mem_ctl_info, dev)
  
  
-static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,
+static ssize_t mci_reset_counters_store(struct device *dev,
+                                       struct device_attribute *mattr,
                                         const char *data, size_t count)
  {
                                         const char *data, size_t count)
  {
-       int row, chan;
-
-       mci->ue_noinfo_count = 0;
-       mci->ce_noinfo_count = 0;
+       struct mem_ctl_info *mci = to_mci(dev);
+       int cnt, row, chan, i;
         mci->ue_mc = 0;
         mci->ce_mc = 0;
         mci->ue_mc = 0;
         mci->ce_mc = 0;
+       mci->ue_noinfo_count = 0;
+       mci->ce_noinfo_count = 0;
  
         for (row = 0; row < mci->nr_csrows; row++) {
                 struct csrow_info *ri = &mci->csrows[row];
  
         for (row = 0; row < mci->nr_csrows; row++) {
                 struct csrow_info *ri = &mci->csrows[row];
@@ -438,6 +471,13 @@ static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,
                         ri->channels[chan].ce_count = 0;
         }
  
                         ri->channels[chan].ce_count = 0;
         }
  
+       cnt = 1;
+       for (i = 0; i < mci->n_layers; i++) {
+               cnt *= mci->layers[i].size;
+               memset(mci->ce_per_layer[i], 0, cnt * sizeof(u32));
+               memset(mci->ue_per_layer[i], 0, cnt * sizeof(u32));
+       }
+
         mci->start_time = jiffies;
         return count;
  }
         mci->start_time = jiffies;
         return count;
  }
@@ -451,9 +491,11 @@ static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,
   * Negative value still means that an error has occurred while setting
   * the scrub rate.
   */
   * Negative value still means that an error has occurred while setting
   * the scrub rate.
   */
-static ssize_t mci_sdram_scrub_rate_store(struct mem_ctl_info *mci,
+static ssize_t mci_sdram_scrub_rate_store(struct device *dev,
+                                         struct device_attribute *mattr,
                                           const char *data, size_t count)
  {
                                           const char *data, size_t count)
  {
+       struct mem_ctl_info *mci = to_mci(dev);
         unsigned long bandwidth = 0;
         int new_bw = 0;
  
         unsigned long bandwidth = 0;
         int new_bw = 0;
  
@@ -476,8 +518,11 @@ static ssize_t mci_sdram_scrub_rate_store(struct mem_ctl_info *mci,
  /*
   * ->get_sdram_scrub_rate() return value semantics same as above.
   */
  /*
   * ->get_sdram_scrub_rate() return value semantics same as above.
   */
-static ssize_t mci_sdram_scrub_rate_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_sdram_scrub_rate_show(struct device *dev,
+                                        struct device_attribute *mattr,
+                                        char *data)
  {
  {
+       struct mem_ctl_info *mci = to_mci(dev);
         int bandwidth = 0;
  
         if (!mci->get_sdram_scrub_rate)
         int bandwidth = 0;
  
         if (!mci->get_sdram_scrub_rate)
@@ -493,38 +538,65 @@ static ssize_t mci_sdram_scrub_rate_show(struct mem_ctl_info *mci, char *data)
  }
  
  /* default attribute files for the MCI object */
  }
  
  /* default attribute files for the MCI object */
-static ssize_t mci_ue_count_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_ue_count_show(struct device *dev,
+                                struct device_attribute *mattr,
+                                char *data)
  {
  {
+       struct mem_ctl_info *mci = to_mci(dev);
+
         return sprintf(data, "%d\n", mci->ue_mc);
  }
  
         return sprintf(data, "%d\n", mci->ue_mc);
  }
  
-static ssize_t mci_ce_count_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_ce_count_show(struct device *dev,
+                                struct device_attribute *mattr,
+                                char *data)
  {
  {
+       struct mem_ctl_info *mci = to_mci(dev);
+
         return sprintf(data, "%d\n", mci->ce_mc);
  }
  
         return sprintf(data, "%d\n", mci->ce_mc);
  }
  
-static ssize_t mci_ce_noinfo_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_ce_noinfo_show(struct device *dev,
+                                 struct device_attribute *mattr,
+                                 char *data)
  {
  {
+       struct mem_ctl_info *mci = to_mci(dev);
+
         return sprintf(data, "%d\n", mci->ce_noinfo_count);
  }
  
         return sprintf(data, "%d\n", mci->ce_noinfo_count);
  }
  
-static ssize_t mci_ue_noinfo_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_ue_noinfo_show(struct device *dev,
+                                 struct device_attribute *mattr,
+                                 char *data)
  {
  {
+       struct mem_ctl_info *mci = to_mci(dev);
+
         return sprintf(data, "%d\n", mci->ue_noinfo_count);
  }
  
         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 device *dev,
+                               struct device_attribute *mattr,
+                               char *data)
  {
  {
+       struct mem_ctl_info *mci = to_mci(dev);
+
         return sprintf(data, "%ld\n", (jiffies - mci->start_time) / HZ);
  }
  
         return sprintf(data, "%ld\n", (jiffies - mci->start_time) / HZ);
  }
  
-static ssize_t mci_ctl_name_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_ctl_name_show(struct device *dev,
+                                struct device_attribute *mattr,
+                                char *data)
  {
  {
+       struct mem_ctl_info *mci = to_mci(dev);
+
         return sprintf(data, "%s\n", mci->ctl_name);
  }
  
         return sprintf(data, "%s\n", mci->ctl_name);
  }
  
-static ssize_t mci_size_mb_show(struct mem_ctl_info *mci, char *data)
+static ssize_t mci_size_mb_show(struct device *dev,
+                               struct device_attribute *mattr,
+                               char *data)
  {
  {
+       struct mem_ctl_info *mci = to_mci(dev);
         int total_pages = 0, csrow_idx, j;
  
         for (csrow_idx = 0; csrow_idx < mci->nr_csrows; csrow_idx++) {
         int total_pages = 0, csrow_idx, j;
  
         for (csrow_idx = 0; csrow_idx < mci->nr_csrows; csrow_idx++) {
@@ -540,360 +612,53 @@ static ssize_t mci_size_mb_show(struct mem_ctl_info *mci, char *data)
         return sprintf(data, "%u\n", PAGES_TO_MiB(total_pages));
  }
  
         return sprintf(data, "%u\n", PAGES_TO_MiB(total_pages));
  }
  
-#define to_mci(k) container_of(k, struct mem_ctl_info, edac_mci_kobj)
-#define to_mcidev_attr(a) container_of(a,struct mcidev_sysfs_attribute,attr)
-
-/* MCI show/store functions for top most object */
-static ssize_t mcidev_show(struct kobject *kobj, struct attribute *attr,
-                       char *buffer)
-{
-       struct mem_ctl_info *mem_ctl_info = to_mci(kobj);
-       struct mcidev_sysfs_attribute *mcidev_attr = to_mcidev_attr(attr);
-
-       debugf1("%s() mem_ctl_info %p\n", __func__, mem_ctl_info);
-
-       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)
-{
-       struct mem_ctl_info *mem_ctl_info = to_mci(kobj);
-       struct mcidev_sysfs_attribute *mcidev_attr = to_mcidev_attr(attr);
-
-       debugf1("%s() mem_ctl_info %p\n", __func__, mem_ctl_info);
-
-       if (mcidev_attr->store)
-               return mcidev_attr->store(mem_ctl_info, buffer, count);
-
-       return -EIO;
-}
-
-/* Intermediate show/store table */
-static const struct sysfs_ops mci_ops = {
-       .show = mcidev_show,
-       .store = mcidev_store
-};
-
-#define MCIDEV_ATTR(_name,_mode,_show,_store)                  \
-static struct mcidev_sysfs_attribute mci_attr_##_name = {                      \
-       .attr = {.name = __stringify(_name), .mode = _mode },   \
-       .show   = _show,                                        \
-       .store  = _store,                                       \
-};
-
  /* default Control file */
  /* default Control file */
-MCIDEV_ATTR(reset_counters, S_IWUSR, NULL, mci_reset_counters_store);
+DEVICE_ATTR(reset_counters, S_IWUSR, NULL, mci_reset_counters_store);
  
  /* default Attribute files */
  
  /* default Attribute files */
-MCIDEV_ATTR(mc_name, S_IRUGO, mci_ctl_name_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);
+DEVICE_ATTR(mc_name, S_IRUGO, mci_ctl_name_show, NULL);
+DEVICE_ATTR(size_mb, S_IRUGO, mci_size_mb_show, NULL);
+DEVICE_ATTR(seconds_since_reset, S_IRUGO, mci_seconds_show, NULL);
+DEVICE_ATTR(ue_noinfo_count, S_IRUGO, mci_ue_noinfo_show, NULL);
+DEVICE_ATTR(ce_noinfo_count, S_IRUGO, mci_ce_noinfo_show, NULL);
+DEVICE_ATTR(ue_count, S_IRUGO, mci_ue_count_show, NULL);
+DEVICE_ATTR(ce_count, S_IRUGO, mci_ce_count_show, NULL);
  
  /* memory scrubber attribute file */
  
  /* memory scrubber attribute file */
-MCIDEV_ATTR(sdram_scrub_rate, S_IRUGO | S_IWUSR, mci_sdram_scrub_rate_show,
+DEVICE_ATTR(sdram_scrub_rate, S_IRUGO | S_IWUSR, mci_sdram_scrub_rate_show,
         mci_sdram_scrub_rate_store);
  
         mci_sdram_scrub_rate_store);
  
-static struct mcidev_sysfs_attribute *mci_attr[] = {
-       &mci_attr_reset_counters,
-       &mci_attr_mc_name,
-       &mci_attr_size_mb,
-       &mci_attr_seconds_since_reset,
-       &mci_attr_ue_noinfo_count,
-       &mci_attr_ce_noinfo_count,
-       &mci_attr_ue_count,
-       &mci_attr_ce_count,
-       &mci_attr_sdram_scrub_rate,
+static struct attribute *mci_attrs[] = {
+       &dev_attr_reset_counters.attr,
+       &dev_attr_mc_name.attr,
+       &dev_attr_size_mb.attr,
+       &dev_attr_seconds_since_reset.attr,
+       &dev_attr_ue_noinfo_count.attr,
+       &dev_attr_ce_noinfo_count.attr,
+       &dev_attr_ue_count.attr,
+       &dev_attr_ce_count.attr,
+       &dev_attr_sdram_scrub_rate.attr,
         NULL
  };
  
         NULL
  };
  
-
-/*
- * Release of a MC controlling instance
- *
- *     each MC control instance has the following resources upon entry:
- *             a) a ref count on the top memctl kobj
- *             b) a ref count on this module
- *
- *     this function must decrement those ref counts and then
- *     issue a free on the instance's memory
- */
-static void edac_mci_control_release(struct kobject *kobj)
-{
-       struct mem_ctl_info *mci;
-
-       mci = to_mci(kobj);
-
-       debugf0("%s() mci instance idx=%d releasing\n", __func__, mci->mc_idx);
-
-       /* decrement the module ref count */
-       module_put(mci->owner);
-}
-
-static struct kobj_type ktype_mci = {
-       .release = edac_mci_control_release,
-       .sysfs_ops = &mci_ops,
-       .default_attrs = (struct attribute **)mci_attr,
-};
-
-/* EDAC memory controller sysfs kset:
- *     /sys/devices/system/edac/mc
- */
-static struct kset *mc_kset;
-
-/*
- * edac_mc_register_sysfs_main_kobj
- *
- *     setups and registers the main kobject for each mci
- */
-int edac_mc_register_sysfs_main_kobj(struct mem_ctl_info *mci)
-{
-       struct kobject *kobj_mci;
-       int err;
-
-       debugf1("%s()\n", __func__);
-
-       kobj_mci = &mci->edac_mci_kobj;
-
-       /* Init the mci's kobject */
-       memset(kobj_mci, 0, sizeof(*kobj_mci));
-
-       /* Record which module 'owns' this control structure
-        * and bump the ref count of the module
-        */
-       mci->owner = THIS_MODULE;
-
-       /* bump ref count on this module */
-       if (!try_module_get(mci->owner)) {
-               err = -ENODEV;
-               goto fail_out;
-       }
-
-       /* this instance become part of the mc_kset */
-       kobj_mci->kset = mc_kset;
-
-       /* register the mc<id> kobject to the mc_kset */
-       err = kobject_init_and_add(kobj_mci, &ktype_mci, NULL,
-                                  "mc%d", mci->mc_idx);
-       if (err) {
-               debugf1("%s()Failed to register '.../edac/mc%d'\n",
-                       __func__, mci->mc_idx);
-               goto kobj_reg_fail;
-       }
-       kobject_uevent(kobj_mci, KOBJ_ADD);
-
-       /* At this point, to 'free' the control struct,
-        * edac_mc_unregister_sysfs_main_kobj() must be used
-        */
-
-       debugf1("%s() Registered '.../edac/mc%d' kobject\n",
-               __func__, mci->mc_idx);
-
-       return 0;
-
-       /* Error exit stack */
-
-kobj_reg_fail:
-       module_put(mci->owner);
-
-fail_out:
-       return err;
-}
-
-/*
- * edac_mc_register_sysfs_main_kobj
- *
- *     tears down and the main mci kobject from the mc_kset
- */
-void edac_mc_unregister_sysfs_main_kobj(struct mem_ctl_info *mci)
-{
-       debugf1("%s()\n", __func__);
-
-       /* delete the kobj from the mc_kset */
-       kobject_put(&mci->edac_mci_kobj);
-}
-
-#define EDAC_DEVICE_SYMLINK    "device"
-
-#define grp_to_mci(k) (container_of(k, struct mcidev_sysfs_group_kobj, kobj)->mci)
-
-/* MCI show/store functions for top most object */
-static ssize_t inst_grp_show(struct kobject *kobj, struct attribute *attr,
-                       char *buffer)
-{
-       struct mem_ctl_info *mem_ctl_info = grp_to_mci(kobj);
-       struct mcidev_sysfs_attribute *mcidev_attr = to_mcidev_attr(attr);
-
-       debugf1("%s() mem_ctl_info %p\n", __func__, mem_ctl_info);
-
-       if (mcidev_attr->show)
-               return mcidev_attr->show(mem_ctl_info, buffer);
-
-       return -EIO;
-}
-
-static ssize_t inst_grp_store(struct kobject *kobj, struct attribute *attr,
-                       const char *buffer, size_t count)
-{
-       struct mem_ctl_info *mem_ctl_info = grp_to_mci(kobj);
-       struct mcidev_sysfs_attribute *mcidev_attr = to_mcidev_attr(attr);
-
-       debugf1("%s() mem_ctl_info %p\n", __func__, mem_ctl_info);
-
-       if (mcidev_attr->store)
-               return mcidev_attr->store(mem_ctl_info, buffer, count);
-
-       return -EIO;
-}
-
-/* No memory to release for this kobj */
-static void edac_inst_grp_release(struct kobject *kobj)
-{
-       struct mcidev_sysfs_group_kobj *grp;
-       struct mem_ctl_info *mci;
-
-       debugf1("%s()\n", __func__);
-
-       grp = container_of(kobj, struct mcidev_sysfs_group_kobj, kobj);
-       mci = grp->mci;
-}
-
-/* Intermediate show/store table */
-static struct sysfs_ops inst_grp_ops = {
-       .show = inst_grp_show,
-       .store = inst_grp_store
+static struct attribute_group mci_attr_grp = {
+       .attrs  = mci_attrs,
  };
  
  };
  
-/* the kobj_type instance for a instance group */
-static struct kobj_type ktype_inst_grp = {
-       .release = edac_inst_grp_release,
-       .sysfs_ops = &inst_grp_ops,
+static const struct attribute_group *mci_attr_groups[] = {
+       &mci_attr_grp,
+       NULL
  };
  
  };
  
-
-/*
- * edac_create_mci_instance_attributes
- *     create MC driver specific attributes bellow an specified kobj
- * This routine calls itself recursively, in order to create an entire
- * object tree.
- */
-static int edac_create_mci_instance_attributes(struct mem_ctl_info *mci,
-                               const struct mcidev_sysfs_attribute *sysfs_attrib,
-                               struct kobject *kobj)
+static void mci_attr_release(struct device *device)
  {
  {
-       int err;
-
-       debugf4("%s()\n", __func__);
-
-       while (sysfs_attrib) {
-               debugf4("%s() sysfs_attrib = %p\n",__func__, sysfs_attrib);
-               if (sysfs_attrib->grp) {
-                       struct mcidev_sysfs_group_kobj *grp_kobj;
-
-                       grp_kobj = kzalloc(sizeof(*grp_kobj), GFP_KERNEL);
-                       if (!grp_kobj)
-                               return -ENOMEM;
-
-                       grp_kobj->grp = sysfs_attrib->grp;
-                       grp_kobj->mci = mci;
-                       list_add_tail(&grp_kobj->list, &mci->grp_kobj_list);
-
-                       debugf0("%s() grp %s, mci %p\n", __func__,
-                               sysfs_attrib->grp->name, mci);
-
-                       err = kobject_init_and_add(&grp_kobj->kobj,
-                                               &ktype_inst_grp,
-                                               &mci->edac_mci_kobj,
-                                               sysfs_attrib->grp->name);
-                       if (err < 0) {
-                               printk(KERN_ERR "kobject_init_and_add failed: %d\n", err);
-                               return err;
-                       }
-                       err = edac_create_mci_instance_attributes(mci,
-                                       grp_kobj->grp->mcidev_attr,
-                                       &grp_kobj->kobj);
-
-                       if (err < 0)
-                               return err;
-               } else if (sysfs_attrib->attr.name) {
-                       debugf4("%s() file %s\n", __func__,
-                               sysfs_attrib->attr.name);
-
-                       err = sysfs_create_file(kobj, &sysfs_attrib->attr);
-                       if (err < 0) {
-                               printk(KERN_ERR "sysfs_create_file failed: %d\n", err);
-                               return err;
-                       }
-               } else
-                       break;
-
-               sysfs_attrib++;
-       }
-
-       return 0;
+       debugf1("Releasing mci device %s\n", dev_name(device));
  }
  
  }
  
-/*
- * edac_remove_mci_instance_attributes
- *     remove MC driver specific attributes at the topmost level
- *     directory of this mci instance.
- */
-static void edac_remove_mci_instance_attributes(struct mem_ctl_info *mci,
-                               const struct mcidev_sysfs_attribute *sysfs_attrib,
-                               struct kobject *kobj, int count)
-{
-       struct mcidev_sysfs_group_kobj *grp_kobj, *tmp;
-
-       debugf1("%s()\n", __func__);
-
-       /*
-        * loop if there are attributes and until we hit a NULL entry
-        * Remove first all the attributes
-        */
-       while (sysfs_attrib) {
-               debugf4("%s() sysfs_attrib = %p\n",__func__, sysfs_attrib);
-               if (sysfs_attrib->grp) {
-                       debugf4("%s() seeking for group %s\n",
-                               __func__, sysfs_attrib->grp->name);
-                       list_for_each_entry(grp_kobj,
-                                           &mci->grp_kobj_list, list) {
-                               debugf4("%s() grp_kobj->grp = %p\n",__func__, grp_kobj->grp);
-                               if (grp_kobj->grp == sysfs_attrib->grp) {
-                                       edac_remove_mci_instance_attributes(mci,
-                                                   grp_kobj->grp->mcidev_attr,
-                                                   &grp_kobj->kobj, count + 1);
-                                       debugf4("%s() group %s\n", __func__,
-                                               sysfs_attrib->grp->name);
-                                       kobject_put(&grp_kobj->kobj);
-                               }
-                       }
-                       debugf4("%s() end of seeking for group %s\n",
-                               __func__, sysfs_attrib->grp->name);
-               } else if (sysfs_attrib->attr.name) {
-                       debugf4("%s() file %s\n", __func__,
-                               sysfs_attrib->attr.name);
-                       sysfs_remove_file(kobj, &sysfs_attrib->attr);
-               } else
-                       break;
-               sysfs_attrib++;
-       }
-
-       /* Remove the group objects */
-       if (count)
-               return;
-       list_for_each_entry_safe(grp_kobj, tmp,
-                                &mci->grp_kobj_list, list) {
-               list_del(&grp_kobj->list);
-               kfree(grp_kobj);
-       }
-}
+static struct device_type mci_attr_type = {
+       .groups         = mci_attr_groups,
+       .release        = mci_attr_release,
+};
  
  
  /*
  
  
  /*
@@ -906,77 +671,80 @@ static void edac_remove_mci_instance_attributes(struct mem_ctl_info *mci,
   */
  int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
  {
   */
  int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
  {
-       int i, j;
-       int err;
-       struct csrow_info *csrow;
-       struct kobject *kobj_mci = &mci->edac_mci_kobj;
+       int i, err;
  
         debugf0("%s() idx=%d\n", __func__, mci->mc_idx);
  
  
         debugf0("%s() idx=%d\n", __func__, mci->mc_idx);
  
-       INIT_LIST_HEAD(&mci->grp_kobj_list);
+       /* get the /sys/devices/system/edac subsys reference */
  
  
-       /* create a symlink for the device */
-       err = sysfs_create_link(kobj_mci, &mci->pdev->kobj,
-                               EDAC_DEVICE_SYMLINK);
-       if (err) {
-               debugf1("%s() failure to create symlink\n", __func__);
-               goto fail0;
-       }
+       mci->dev.type = &mci_attr_type;
+       device_initialize(&mci->dev);
  
  
-       /* If the low level driver desires some attributes,
-        * then create them now for the driver.
+       mci->dev.parent = &mci_pdev;
+       mci->dev.bus = &mci->bus;
+       dev_set_name(&mci->dev, "mc%d", mci->mc_idx);
+       dev_set_drvdata(&mci->dev, mci);
+       pm_runtime_forbid(&mci->dev);
+
+       /*
+        * The memory controller needs its own bus, in order to avoid
+        * namespace conflicts at /sys/bus/edac.
          */
          */
-       if (mci->mc_driver_sysfs_attributes) {
-               err = edac_create_mci_instance_attributes(mci,
-                                       mci->mc_driver_sysfs_attributes,
-                                       &mci->edac_mci_kobj);
-               if (err) {
-                       debugf1("%s() failure to create mci attributes\n",
-                               __func__);
-                       goto fail0;
-               }
+       debugf0("creating bus %s\n",mci->bus.name);
+       mci->bus.name = kstrdup(dev_name(&mci->dev), GFP_KERNEL);
+       err = bus_register(&mci->bus);
+       if (err < 0)
+               return err;
+
+       debugf0("%s(): creating device %s\n", __func__,
+               dev_name(&mci->dev));
+       err = device_add(&mci->dev);
+       if (err < 0) {
+               bus_unregister(&mci->bus);
+               kfree(mci->bus.name);
+               return err;
         }
  
         }
  
-       /* Make directories for each CSROW object under the mc<id> kobject
+       /*
+        * Create the dimm/rank devices
          */
          */
-       for (i = 0; i < mci->nr_csrows; i++) {
-               int nr_pages = 0;
-
-               csrow = &mci->csrows[i];
-               for (j = 0; j < csrow->nr_channels; j++)
-                       nr_pages += csrow->channels[j].dimm->nr_pages;
-
-               if (nr_pages > 0) {
-                       err = edac_create_csrow_object(mci, csrow, i);
-                       if (err) {
-                               debugf1("%s() failure: create csrow %d obj\n",
-                                       __func__, i);
-                               goto fail1;
-                       }
+       for (i = 0; i < mci->tot_dimms; i++) {
+               struct dimm_info *dimm = &mci->dimms[i];
+               /* Only expose populated DIMMs */
+               if (dimm->nr_pages == 0)
+                       continue;
+#ifdef CONFIG_EDAC_DEBUG
+               debugf1("%s creating dimm%d, located at ",
+                       __func__, i);
+               if (edac_debug_level >= 1) {
+                       int lay;
+                       for (lay = 0; lay < mci->n_layers; lay++)
+                               printk(KERN_CONT "%s %d ",
+                                       edac_layer_name[mci->layers[lay].type],
+                                       dimm->location[lay]);
+                       printk(KERN_CONT "\n");
                 }
                 }
+#endif
         }
  
         }
  
+       err = edac_create_csrow_objects(mci);
+       if (err < 0)
+               goto fail;
+
         return 0;
  
         return 0;
  
-fail1:
+fail:
         for (i--; i >= 0; i--) {
         for (i--; i >= 0; i--) {
-               int nr_pages = 0;
-
-               csrow = &mci->csrows[i];
-               for (j = 0; j < csrow->nr_channels; j++)
-                       nr_pages += csrow->channels[j].dimm->nr_pages;
-               if (nr_pages > 0)
-                       kobject_put(&mci->csrows[i].kobj);
+               struct dimm_info *dimm = &mci->dimms[i];
+               if (dimm->nr_pages == 0)
+                       continue;
+               put_device(&dimm->dev);
+               device_del(&dimm->dev);
         }
         }
-
-       /* remove the mci instance's attributes, if any */
-       edac_remove_mci_instance_attributes(mci,
-               mci->mc_driver_sysfs_attributes, &mci->edac_mci_kobj, 0);
-
-       /* remove the symlink */
-       sysfs_remove_link(kobj_mci, EDAC_DEVICE_SYMLINK);
-
-fail0:
+       put_device(&mci->dev);
+       device_del(&mci->dev);
+       bus_unregister(&mci->bus);
+       kfree(mci->bus.name);
         return err;
  }
  
         return err;
  }
  
@@ -985,98 +753,70 @@ fail0:
   */
  void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
  {
   */
  void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
  {
-       struct csrow_info *csrow;
-       int i, j;
+       int i;
  
         debugf0("%s()\n", __func__);
  
  
         debugf0("%s()\n", __func__);
  
-       /* remove all csrow kobjects */
-       debugf4("%s()  unregister this mci kobj\n", __func__);
-       for (i = 0; i < mci->nr_csrows; i++) {
-               int nr_pages = 0;
-
-               csrow = &mci->csrows[i];
-               for (j = 0; j < csrow->nr_channels; j++)
-                       nr_pages += csrow->channels[j].dimm->nr_pages;
-               if (nr_pages > 0) {
-                       debugf0("%s()  unreg csrow-%d\n", __func__, i);
-                       kobject_put(&mci->csrows[i].kobj);
-               }
-       }
+       edac_delete_csrow_objects(mci);
  
  
-       /* remove this mci instance's attribtes */
-       if (mci->mc_driver_sysfs_attributes) {
-               debugf4("%s()  unregister mci private attributes\n", __func__);
-               edac_remove_mci_instance_attributes(mci,
-                                               mci->mc_driver_sysfs_attributes,
-                                               &mci->edac_mci_kobj, 0);
+       for (i = 0; i < mci->tot_dimms; i++) {
+               struct dimm_info *dimm = &mci->dimms[i];
+               if (dimm->nr_pages == 0)
+                       continue;
+               debugf0("%s(): removing device %s\n", __func__,
+                       dev_name(&dimm->dev));
+               put_device(&dimm->dev);
+               device_del(&dimm->dev);
         }
         }
-
-       /* remove the symlink */
-       debugf4("%s()  remove_link\n", __func__);
-       sysfs_remove_link(&mci->edac_mci_kobj, EDAC_DEVICE_SYMLINK);
-
-       /* unregister this instance's kobject */
-       debugf4("%s()  remove_mci_instance\n", __func__);
-       kobject_put(&mci->edac_mci_kobj);
  }
  
  }
  
+void edac_unregister_sysfs(struct mem_ctl_info *mci)
+{
+       debugf1("Unregistering device %s\n", dev_name(&mci->dev));
+       put_device(&mci->dev);
+       device_del(&mci->dev);
+       bus_unregister(&mci->bus);
+       kfree(mci->bus.name);
+}
  
  
+static void mc_attr_release(struct device *device)
+{
+       debugf1("Releasing device %s\n", dev_name(device));
+}
  
  
-
+static struct device_type mc_attr_type = {
+       .release        = mc_attr_release,
+};
  /*
  /*
- * edac_setup_sysfs_mc_kset(void)
- *
- * Initialize the mc_kset for the 'mc' entry
- *     This requires creating the top 'mc' directory with a kset
- *     and its controls/attributes.
- *
- *     To this 'mc' kset, instance 'mci' will be grouped as children.
- *
- * Return:  0 SUCCESS
- *         !0 FAILURE error code
+ * Init/exit code for the module. Basically, creates/removes /sys/class/rc
   */
   */
-int edac_sysfs_setup_mc_kset(void)
+int __init edac_mc_sysfs_init(void)
  {
  {
-       int err = -EINVAL;
         struct bus_type *edac_subsys;
         struct bus_type *edac_subsys;
-
-       debugf1("%s()\n", __func__);
+       int err;
  
         /* get the /sys/devices/system/edac subsys reference */
         edac_subsys = edac_get_sysfs_subsys();
         if (edac_subsys == NULL) {
  
         /* get the /sys/devices/system/edac subsys reference */
         edac_subsys = edac_get_sysfs_subsys();
         if (edac_subsys == NULL) {
-               debugf1("%s() no edac_subsys error=%d\n", __func__, err);
-               goto fail_out;
+               debugf1("%s() no edac_subsys\n", __func__);
+               return -EINVAL;
         }
  
         }
  
-       /* Init the MC's kobject */
-       mc_kset = kset_create_and_add("mc", NULL, &edac_subsys->dev_root->kobj);
-       if (!mc_kset) {
-               err = -ENOMEM;
-               debugf1("%s() Failed to register '.../edac/mc'\n", __func__);
-               goto fail_kset;
-       }
+       mci_pdev.bus = edac_subsys;
+       mci_pdev.type = &mc_attr_type;
+       device_initialize(&mci_pdev);
+       dev_set_name(&mci_pdev, "mc");
  
  
-       debugf1("%s() Registered '.../edac/mc' kobject\n", __func__);
+       err = device_add(&mci_pdev);
+       if (err < 0)
+               return err;
  
         return 0;
  
         return 0;
-
-fail_kset:
-       edac_put_sysfs_subsys();
-
-fail_out:
-       return err;
  }
  
  }
  
-/*
- * edac_sysfs_teardown_mc_kset
- *
- *     deconstruct the mc_ket for memory controllers
- */
-void edac_sysfs_teardown_mc_kset(void)
+void __exit edac_mc_sysfs_exit(void)
  {
  {
-       kset_unregister(mc_kset);
+       put_device(&mci_pdev);
+       device_del(&mci_pdev);
         edac_put_sysfs_subsys();
  }
         edac_put_sysfs_subsys();
  }
-
diff --git a/drivers/edac/edac_module.c b/drivers/edac/edac_module.c

index 5ddaa86d6a6e86ef8ed0671070168d7541cd7073..8735a0d3ed0cf9834ebd192598c199788899ea57 100644 (file)
--- a/drivers/edac/edac_module.c
+++ b/drivers/edac/edac_module.c
@@ -90,10 +90,7 @@ static int __init edac_init(void)
          */
         edac_pci_clear_parity_errors();
  
          */
         edac_pci_clear_parity_errors();
  
-       /*
-        * now set up the mc_kset under the edac class object
-        */
-       err = edac_sysfs_setup_mc_kset();
+       err = edac_mc_sysfs_init();
         if (err)
                 goto error;
  
         if (err)
                 goto error;
  
@@ -101,15 +98,11 @@ static int __init edac_init(void)
         err = edac_workqueue_setup();
         if (err) {
                 edac_printk(KERN_ERR, EDAC_MC, "init WorkQueue failure\n");
         err = edac_workqueue_setup();
         if (err) {
                 edac_printk(KERN_ERR, EDAC_MC, "init WorkQueue failure\n");
-               goto workq_fail;
+               goto error;
         }
  
         return 0;
  
         }
  
         return 0;
  
-       /* Error teardown stack */
-workq_fail:
-       edac_sysfs_teardown_mc_kset();
-
  error:
         return err;
  }
  error:
         return err;
  }
@@ -124,7 +117,7 @@ static void __exit edac_exit(void)
  
         /* tear down the various subsystems */
         edac_workqueue_teardown();
  
         /* tear down the various subsystems */
         edac_workqueue_teardown();
-       edac_sysfs_teardown_mc_kset();
+       edac_mc_sysfs_exit();
  }
  
  /*
  }
  
  /*
diff --git a/drivers/edac/edac_module.h b/drivers/edac/edac_module.h

index 0ea7d14cb930748e75aadbb18e48e4616fdc315e..1af13676e857f17314f0e264a1e487b0b799d853 100644 (file)
--- a/drivers/edac/edac_module.h
+++ b/drivers/edac/edac_module.h
@@ -19,12 +19,12 @@
   *
   * edac_mc objects
   */
   *
   * edac_mc objects
   */
-extern int edac_sysfs_setup_mc_kset(void);
-extern void edac_sysfs_teardown_mc_kset(void);
-extern int edac_mc_register_sysfs_main_kobj(struct mem_ctl_info *mci);
-extern void edac_mc_unregister_sysfs_main_kobj(struct mem_ctl_info *mci);
+       /* on edac_mc_sysfs.c */
+int edac_mc_sysfs_init(void);
+void edac_mc_sysfs_exit(void);
  extern int edac_create_sysfs_mci_device(struct mem_ctl_info *mci);
  extern void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci);
  extern int edac_create_sysfs_mci_device(struct mem_ctl_info *mci);
  extern void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci);
+void edac_unregister_sysfs(struct mem_ctl_info *mci);
  extern int edac_get_log_ue(void);
  extern int edac_get_log_ce(void);
  extern int edac_get_panic_on_ue(void);
  extern int edac_get_log_ue(void);
  extern int edac_get_log_ce(void);
  extern int edac_get_panic_on_ue(void);
@@ -34,6 +34,7 @@ extern int edac_mc_get_panic_on_ue(void);
  extern int edac_get_poll_msec(void);
  extern int edac_mc_get_poll_msec(void);
  
  extern int edac_get_poll_msec(void);
  extern int edac_mc_get_poll_msec(void);
  
+       /* on edac_device.c */
  extern int edac_device_register_sysfs_main_kobj(
                                 struct edac_device_ctl_info *edac_dev);
  extern void edac_device_unregister_sysfs_main_kobj(
  extern int edac_device_register_sysfs_main_kobj(
                                 struct edac_device_ctl_info *edac_dev);
  extern void edac_device_unregister_sysfs_main_kobj(
diff --git a/include/linux/edac.h b/include/linux/edac.h

index 4e32e8d31e0a5dcc624ecdbf808a9954dff4aa7a..a2b0b6fc002c0a58471beec97ff870d862e79966 100644 (file)
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -13,6 +13,7 @@
  #define _LINUX_EDAC_H_
  
  #include <linux/atomic.h>
  #define _LINUX_EDAC_H_
  
  #include <linux/atomic.h>
+#include <linux/device.h>
  #include <linux/kobject.h>
  #include <linux/completion.h>
  #include <linux/workqueue.h>
  #include <linux/kobject.h>
  #include <linux/completion.h>
  #include <linux/workqueue.h>
@@ -448,14 +449,15 @@ struct edac_mc_layer {
         __p;                                                            \
  })
  
         __p;                                                            \
  })
  
-
-/* FIXME: add the proper per-location error counts */
  struct dimm_info {
  struct dimm_info {
+       struct device dev;
+
         char label[EDAC_MC_LABEL_LEN + 1];      /* DIMM label on motherboard */
  
         /* Memory location data */
         unsigned location[EDAC_MAX_LAYERS];
  
         char label[EDAC_MC_LABEL_LEN + 1];      /* DIMM label on motherboard */
  
         /* Memory location data */
         unsigned location[EDAC_MAX_LAYERS];
  
+       struct kobject kobj;            /* sysfs kobject for this csrow */
         struct mem_ctl_info *mci;       /* the parent */
  
         u32 grain;              /* granularity of reported error in bytes */
         struct mem_ctl_info *mci;       /* the parent */
  
         u32 grain;              /* granularity of reported error in bytes */
@@ -484,6 +486,8 @@ struct dimm_info {
   *       patches in this series will fix this issue.
   */
  struct rank_info {
   *       patches in this series will fix this issue.
   */
  struct rank_info {
+       struct device dev;
+
         int chan_idx;
         struct csrow_info *csrow;
         struct dimm_info *dimm;
         int chan_idx;
         struct csrow_info *csrow;
         struct dimm_info *dimm;
@@ -492,6 +496,8 @@ struct rank_info {
  };
  
  struct csrow_info {
  };
  
  struct csrow_info {
+       struct device dev;
+
         /* Used only by edac_mc_find_csrow_by_page() */
         unsigned long first_page;       /* first page number in csrow */
         unsigned long last_page;        /* last page number in csrow */
         /* Used only by edac_mc_find_csrow_by_page() */
         unsigned long first_page;       /* first page number in csrow */
         unsigned long last_page;        /* last page number in csrow */
@@ -517,15 +523,6 @@ struct mcidev_sysfs_group {
         const struct mcidev_sysfs_attribute *mcidev_attr; /* group attributes */
  };
  
         const struct mcidev_sysfs_attribute *mcidev_attr; /* group attributes */
  };
  
-struct mcidev_sysfs_group_kobj {
-       struct list_head list;          /* list for all instances within a mc */
-
-       struct kobject kobj;            /* kobj for the group */
-
-       const struct mcidev_sysfs_group *grp;   /* group description table */
-       struct mem_ctl_info *mci;       /* the parent */
-};
-
  /* mcidev_sysfs_attribute structure
   *     used for driver sysfs attributes and in mem_ctl_info
   *     sysfs top level entries
  /* mcidev_sysfs_attribute structure
   *     used for driver sysfs attributes and in mem_ctl_info
   *     sysfs top level entries
@@ -536,13 +533,27 @@ struct mcidev_sysfs_attribute {
         const struct mcidev_sysfs_group *grp;   /* Points to a group of attributes */
  
         /* Ops for show/store values at the attribute - not used on group */
         const struct mcidev_sysfs_group *grp;   /* Points to a group of attributes */
  
         /* Ops for show/store values at the attribute - not used on group */
-        ssize_t (*show)(struct mem_ctl_info *,char *);
-        ssize_t (*store)(struct mem_ctl_info *, const char *,size_t);
+       ssize_t (*show)(struct mem_ctl_info *, char *);
+       ssize_t (*store)(struct mem_ctl_info *, const char *, size_t);
+
+       void *priv;
+};
+
+/*
+ * struct errcount_attribute - used to store the several error counts
+ */
+struct errcount_attribute_data {
+       int n_layers;
+       int pos[EDAC_MAX_LAYERS];
+       int layer0, layer1, layer2;
  };
  
  /* MEMORY controller information structure
   */
  struct mem_ctl_info {
  };
  
  /* MEMORY controller information structure
   */
  struct mem_ctl_info {
+       struct device                   dev;
+       struct bus_type                 bus;
+
         struct list_head link;  /* for global list of mem_ctl_info structs */
  
         struct module *owner;   /* Module owner of this control struct */
         struct list_head link;  /* for global list of mem_ctl_info structs */
  
         struct module *owner;   /* Module owner of this control struct */
@@ -587,7 +598,15 @@ struct mem_ctl_info {
         struct csrow_info *csrows;
         unsigned nr_csrows, num_cschannel;
  
         struct csrow_info *csrows;
         unsigned nr_csrows, num_cschannel;
  
-       /* Memory Controller hierarchy */
+       /*
+        * Memory Controller hierarchy
+        *
+        * There are basically two types of memory controller: the ones that
+        * sees memory sticks ("dimms"), and the ones that sees memory ranks.
+        * All old memory controllers enumerate memories per rank, but most
+        * of the recent drivers enumerate memories per DIMM, instead.
+        * When the memory controller is per rank, mem_is_per_rank is true.
+        */
         unsigned n_layers;
         struct edac_mc_layer *layers;
         bool mem_is_per_rank;
         unsigned n_layers;
         struct edac_mc_layer *layers;
         bool mem_is_per_rank;
author	Mauro Carvalho Chehab <mchehab@redhat.com>
	Mon, 16 Apr 2012 19:41:11 +0000 (16:41 -0300)
committer	Mauro Carvalho Chehab <mchehab@redhat.com>
	Mon, 11 Jun 2012 16:23:30 +0000 (13:23 -0300)
drivers/edac/edac_mc.c		patch \| blob \| history
drivers/edac/edac_mc_sysfs.c		patch \| blob \| history
drivers/edac/edac_module.c		patch \| blob \| history
drivers/edac/edac_module.h		patch \| blob \| history
include/linux/edac.h		patch \| blob \| history