]> err.no Git - linux-2.6/blobdiff - drivers/edac/edac_device.c
drivers-edac: turn on edac device error logging
[linux-2.6] / drivers / edac / edac_device.c
index 173f4ba0f7c8101285c4a1eb0f03da53127a3eea..55d14d008dd6ee7776e8ed3319675f0abcc182d6 100644 (file)
@@ -32,7 +32,9 @@
 #include "edac_core.h"
 #include "edac_module.h"
 
-/* lock to memory controller's control array 'edac_device_list' */
+/* lock for the list: 'edac_device_list', manipulation of this list
+ * is protected by the 'device_ctls_mutex' lock
+ */
 static DEFINE_MUTEX(device_ctls_mutex);
 static struct list_head edac_device_list = LIST_HEAD_INIT(edac_device_list);
 
@@ -81,7 +83,7 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
        void *pvt;
        int err;
 
-       debugf1("%s() instances=%d blocks=%d\n",
+       debugf4("%s() instances=%d blocks=%d\n",
                __func__, nr_instances, nr_blocks);
 
        /* Calculate the size of memory we need to allocate AND
@@ -153,9 +155,16 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
        dev_ctl->instances = dev_inst;
        dev_ctl->pvt_info = pvt;
 
+       /* Default logging of CEs and UEs */
+       dev_ctl->log_ce = 1;
+       dev_ctl->log_ue = 1;
+
        /* Name of this edac device */
        snprintf(dev_ctl->name,sizeof(dev_ctl->name),"%s",edac_device_name);
 
+       debugf4("%s() edac_dev=%p next after end=%p\n",
+               __func__, dev_ctl, pvt + sz_private );
+
        /* Initialize every Instance */
        for (instance = 0; instance < nr_instances; instance++) {
                inst = &dev_inst[instance];
@@ -175,8 +184,10 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
                        snprintf(blk->name, sizeof(blk->name),
                                 "%s%d", edac_block_name, block+offset_value);
 
-                       debugf1("%s() instance=%d block=%d name=%s\n",
-                               __func__, instance, block, blk->name);
+                       debugf4("%s() instance=%d inst_p=%p block=#%d "
+                               "block_p=%p name='%s'\n",
+                               __func__, instance, inst, block,
+                               blk, blk->name);
 
                        /* if there are NO attributes OR no attribute pointer
                         * then continue on to next block iteration
@@ -189,20 +200,32 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
                        attrib_p = &dev_attrib[block*nr_instances*nr_attrib];
                        blk->block_attributes = attrib_p;
 
+                       debugf4("%s() THIS BLOCK_ATTRIB=%p\n",
+                               __func__, blk->block_attributes);
+
                        /* Initialize every user specified attribute in this
                         * block with the data the caller passed in
+                        * Each block gets its own copy of pointers,
+                        * and its unique 'value'
                         */
                        for (attr = 0; attr < nr_attrib; attr++) {
                                attrib = &attrib_p[attr];
-                               attrib->attr = attrib_spec->attr;
-                               attrib->show = attrib_spec->show;
-                               attrib->store = attrib_spec->store;
-
-                               /* up reference this block */
-                               attrib->block = blk;
 
-                               /* bump the attrib_spec */
-                               attrib_spec++;
+                               /* populate the unique per attrib
+                                * with the code pointers and info
+                                */
+                               attrib->attr = attrib_spec[attr].attr;
+                               attrib->show = attrib_spec[attr].show;
+                               attrib->store = attrib_spec[attr].store;
+
+                               attrib->block = blk;    /* up link */
+
+                               debugf4("%s() alloc-attrib=%p attrib_name='%s' "
+                                       "attrib-spec=%p spec-name=%s\n",
+                                       __func__, attrib, attrib->attr.name,
+                                       &attrib_spec[attr],
+                                       attrib_spec[attr].attr.name
+                                       );
                        }
                }
        }
@@ -256,7 +279,7 @@ static struct edac_device_ctl_info *find_edac_device_by_dev(struct device *dev)
        struct edac_device_ctl_info *edac_dev;
        struct list_head *item;
 
-       debugf3("%s()\n", __func__);
+       debugf0("%s()\n", __func__);
 
        list_for_each(item, &edac_device_list) {
                edac_dev = list_entry(item, struct edac_device_ctl_info, link);
@@ -386,13 +409,20 @@ EXPORT_SYMBOL_GPL(edac_device_find);
 /*
  * edac_device_workq_function
  *     performs the operation scheduled by a workq request
+ *
+ *     this workq is embedded within an edac_device_ctl_info
+ *     structure, that needs to be polled for possible error events.
+ *
+ *     This operation is to acquire the list mutex lock
+ *     (thus preventing insertation or deletion)
+ *     and then call the device's poll function IFF this device is
+ *     running polled and there is a poll function defined.
  */
 static void edac_device_workq_function(struct work_struct *work_req)
 {
        struct delayed_work *d_work = (struct delayed_work *)work_req;
        struct edac_device_ctl_info *edac_dev = to_edac_device_ctl_work(d_work);
 
-       //debugf0("%s() here and running\n", __func__);
        mutex_lock(&device_ctls_mutex);
 
        /* Only poll controllers that are running polled and have a check */
@@ -403,8 +433,17 @@ static void edac_device_workq_function(struct work_struct *work_req)
 
        mutex_unlock(&device_ctls_mutex);
 
-       /* Reschedule */
-       queue_delayed_work(edac_workqueue, &edac_dev->work, edac_dev->delay);
+       /* Reschedule the workq for the next time period to start again
+        * if the number of msec is for 1 sec, then adjust to the next
+        * whole one second to save timers fireing all over the period
+        * between integral seconds
+        */
+       if (edac_dev->poll_msec == 1000)
+               queue_delayed_work(edac_workqueue, &edac_dev->work,
+                               round_jiffies(edac_dev->delay));
+       else
+               queue_delayed_work(edac_workqueue, &edac_dev->work,
+                               edac_dev->delay);
 }
 
 /*
@@ -417,11 +456,26 @@ void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev,
 {
        debugf0("%s()\n", __func__);
 
+       /* take the arg 'msec' and set it into the control structure
+        * to used in the time period calculation
+        * then calc the number of jiffies that represents
+        */
        edac_dev->poll_msec = msec;
-       edac_dev->delay = msecs_to_jiffies(msec);       /* Calc delay jiffies */
+       edac_dev->delay = msecs_to_jiffies(msec);
 
        INIT_DELAYED_WORK(&edac_dev->work, edac_device_workq_function);
-       queue_delayed_work(edac_workqueue, &edac_dev->work, edac_dev->delay);
+
+       /* optimize here for the 1 second case, which will be normal value, to
+        * fire ON the 1 second time event. This helps reduce all sorts of
+        * timers firing on sub-second basis, while they are happy
+        * to fire together on the 1 second exactly
+        */
+       if (edac_dev->poll_msec == 1000)
+               queue_delayed_work(edac_workqueue, &edac_dev->work,
+                               round_jiffies(edac_dev->delay));
+       else
+               queue_delayed_work(edac_workqueue, &edac_dev->work,
+                               edac_dev->delay);
 }
 
 /*
@@ -441,16 +495,20 @@ void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev)
 
 /*
  * edac_device_reset_delay_period
+ *
+ *     need to stop any outstanding workq queued up at this time
+ *     because we will be resetting the sleep time.
+ *     Then restart the workq on the new delay
  */
-
 void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
                                        unsigned long value)
 {
-       mutex_lock(&device_ctls_mutex);
-
-       /* cancel the current workq request */
+       /* cancel the current workq request, without the mutex lock */
        edac_device_workq_teardown(edac_dev);
 
+       /* acquire the mutex before doing the workq setup */
+       mutex_lock(&device_ctls_mutex);
+
        /* restart the workq request, with new delay value */
        edac_device_workq_setup(edac_dev, value);
 
@@ -544,7 +602,7 @@ struct edac_device_ctl_info *edac_device_del_device(struct device *dev)
 {
        struct edac_device_ctl_info *edac_dev;
 
-       debugf0("MC: %s()\n", __func__);
+       debugf0("%s()\n", __func__);
 
        mutex_lock(&device_ctls_mutex);