edac: Create a dimm struct and move the labels into it

The way a DIMM is currently represented implies that they're
linked into a per-csrow struct. However, some drivers don't see
csrows, as they're ridden behind some chip like the AMB's
on FBDIMM's, for example.

This forced drivers to fake^Wvirtualize a csrow struct, and to create
a mess under csrow/channel original's concept.

Move the DIMM labels into a per-DIMM struct, and add there
the real location of the socket, in terms of csrow/channel.
Latter patches will modify the location to properly represent the
memory architecture.

All other drivers will use a per-csrow type of location.
Some of those drivers will require a latter conversion, as
they also fake the csrows internally.

TODO: While this patch doesn't change the existing behavior, on
csrows-based memory controllers, a csrow/channel pair points to a memory
rank. There's a known bug at the EDAC core that allows having different
labels for the same DIMM, if it has more than one rank. A latter patch
is need to merge the several ranks for a DIMM into the same dimm_info
struct, in order to avoid having different labels for the same DIMM.

The edac_mc_alloc() will now contain a per-dimm initialization loop that
will be changed by latter patches in order to match other types of
memory architectures.

Reviewed-by: Aristeu Rozanski <arozansk@redhat.com>
Reviewed-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Ranganathan Desikan <ravi@jetztechnologies.com>
Cc: "Arvind R." <arvino55@gmail.com>
Cc: "Niklas Söderlund" <niklas.soderlund@ericsson.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

6 files changed, 49 insertions, 27 deletions

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index feef7733fae7..c1aae7233022 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -44,7 +44,7 @@ static void edac_mc_dump_channel(struct rank_info *chan)
         debugf4("\tchannel = %p\n", chan);
         debugf4("\tchannel->chan_idx = %d\n", chan->chan_idx);
         debugf4("\tchannel->ce_count = %d\n", chan->ce_count);
-        debugf4("\tchannel->label = '%s'\n", chan->label);
+        debugf4("\tchannel->label = '%s'\n", chan->dimm->label);
         debugf4("\tchannel->csrow = %p\n\n", chan->csrow);
 }
 
@@ -157,6 +157,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
         struct mem_ctl_info *mci;
         struct csrow_info *csi, *csrow;
         struct rank_info *chi, *chp, *chan;
+        struct dimm_info *dimm;
         void *pvt;
         unsigned size;
         int row, chn;
@@ -170,7 +171,8 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
         mci = (struct mem_ctl_info *)0;
         csi = edac_align_ptr(&mci[1], sizeof(*csi));
         chi = edac_align_ptr(&csi[nr_csrows], sizeof(*chi));
-        pvt = edac_align_ptr(&chi[nr_chans * nr_csrows], sz_pvt);
+        dimm = edac_align_ptr(&chi[nr_chans * nr_csrows], sizeof(*dimm));
+        pvt = edac_align_ptr(&dimm[nr_chans * nr_csrows], sz_pvt);
         size = ((unsigned long)pvt) + sz_pvt;
 
         mci = kzalloc(size, GFP_KERNEL);
@@ -182,14 +184,22 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
          */
         csi = (struct csrow_info *)(((char *)mci) + ((unsigned long)csi));
         chi = (struct rank_info *)(((char *)mci) + ((unsigned long)chi));
+        dimm = (struct dimm_info *)(((char *)mci) + ((unsigned long)dimm));
         pvt = sz_pvt ? (((char *)mci) + ((unsigned long)pvt)) : NULL;
 
         /* setup index and various internal pointers */
         mci->mc_idx = edac_index;
         mci->csrows = csi;
+        mci->dimms  = dimm;
         mci->pvt_info = pvt;
         mci->nr_csrows = nr_csrows;
 
+        /*
+         * For now, assumes that a per-csrow arrangement for dimms.
+         * This will be latter changed.
+         */
+        dimm = mci->dimms;
+
         for (row = 0; row < nr_csrows; row++) {
                 csrow = &csi[row];
                 csrow->csrow_idx = row;
@@ -202,6 +212,12 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
                         chan = &chp[chn];
                         chan->chan_idx = chn;
                         chan->csrow = csrow;
+
+                        mci->csrows[row].channels[chn].dimm = dimm;
+                        dimm->csrow = row;
+                        dimm->csrow_channel = chn;
+                        dimm++;
+                        mci->nr_dimms++;
                 }
         }
 
@@ -678,6 +694,7 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
                 int row, int channel, const char *msg)
 {
         unsigned long remapped_page;
+        char *label = NULL;
 
         debugf3("MC%d: %s()\n", mci->mc_idx, __func__);
 
@@ -701,6 +718,8 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
                 return;
         }
 
+        label = mci->csrows[row].channels[channel].dimm->label;
+
         if (edac_mc_get_log_ce())
                 /* FIXME - put in DIMM location */
                 edac_mc_printk(mci, KERN_WARNING,
@@ -708,7 +727,7 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
                         "0x%lx, row %d, channel %d, label \"%s\": %s\n",
                         page_frame_number, offset_in_page,
                         mci->csrows[row].grain, syndrome, row, channel,
-                        mci->csrows[row].channels[channel].label, msg);
+                        label, msg);
 
         mci->ce_count++;
         mci->csrows[row].ce_count++;
@@ -754,6 +773,7 @@ void edac_mc_handle_ue(struct mem_ctl_info *mci,
         char *pos = labels;
         int chan;
         int chars;
+        char *label = NULL;
 
         debugf3("MC%d: %s()\n", mci->mc_idx, __func__);
 
@@ -767,15 +787,15 @@ void edac_mc_handle_ue(struct mem_ctl_info *mci,
                 return;
         }
 
-        chars = snprintf(pos, len + 1, "%s",
-                         mci->csrows[row].channels[0].label);
+        label = mci->csrows[row].channels[0].dimm->label;
+        chars = snprintf(pos, len + 1, "%s", 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);
+                label = mci->csrows[row].channels[chan].dimm->label;
+                chars = snprintf(pos, len + 1, ":%s", label);
                 len -= chars;
                 pos += chars;
         }
@@ -824,6 +844,7 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci,
         char labels[len + 1];
         char *pos = labels;
         int chars;
+        char *label;
 
         if (csrow >= mci->nr_csrows) {
                 /* something is wrong */
@@ -858,12 +879,12 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci,
         mci->csrows[csrow].ue_count++;
 
         /* Generate the DIMM labels from the specified channels */
-        chars = snprintf(pos, len + 1, "%s",
-                         mci->csrows[csrow].channels[channela].label);
+        label = mci->csrows[csrow].channels[channela].dimm->label;
+        chars = snprintf(pos, len + 1, "%s", label);
         len -= chars;
         pos += chars;
         chars = snprintf(pos, len + 1, "-%s",
-                         mci->csrows[csrow].channels[channelb].label);
+                        mci->csrows[csrow].channels[channelb].dimm->label);
 
         if (edac_mc_get_log_ue())
                 edac_mc_printk(mci, KERN_EMERG,
@@ -885,6 +906,7 @@ EXPORT_SYMBOL(edac_mc_handle_fbd_ue);
 void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci,
                         unsigned int csrow, unsigned int channel, char *msg)
 {
+        char *label = NULL;
 
         /* Ensure boundary values */
         if (csrow >= mci->nr_csrows) {
@@ -904,12 +926,13 @@ void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci,
                 return;
         }
 
+        label = mci->csrows[csrow].channels[channel].dimm->label;
+
         if (edac_mc_get_log_ce())
                 /* FIXME - put in DIMM location */
                 edac_mc_printk(mci, KERN_WARNING,
                         "CE row %d, channel %d, label \"%s\": %s\n",
-                        csrow, channel,
-                        mci->csrows[csrow].channels[channel].label, msg);
+                        csrow, channel, label, msg);
 
         mci->ce_count++;
         mci->csrows[csrow].ce_count++;
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index e9a28f576d14..af66b2256640 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -170,11 +170,11 @@ static ssize_t channel_dimm_label_show(struct csrow_info *csrow,
                                 char *data, int channel)
 {
         /* if field has not been initialized, there is nothing to send */
-        if (!csrow->channels[channel].label[0])
+        if (!csrow->channels[channel].dimm->label[0])
                 return 0;
 
         return snprintf(data, EDAC_MC_LABEL_LEN, "%s\n",
-                        csrow->channels[channel].label);
+                        csrow->channels[channel].dimm->label);
 }
 
 static ssize_t channel_dimm_label_store(struct csrow_info *csrow,
@@ -184,8 +184,8 @@ static ssize_t channel_dimm_label_store(struct csrow_info *csrow,
         ssize_t max_size = 0;
 
         max_size = min((ssize_t) count, (ssize_t) EDAC_MC_LABEL_LEN - 1);
-        strncpy(csrow->channels[channel].label, data, max_size);
-        csrow->channels[channel].label[max_size] = '\0';
+        strncpy(csrow->channels[channel].dimm->label, data, max_size);
+        csrow->channels[channel].dimm->label[max_size] = '\0';
 
         return max_size;
 }
@@ -952,9 +952,8 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
         /* CSROW error: backout what has already been registered,  */
 fail1:
         for (i--; i >= 0; i--) {
-                if (csrow->nr_pages > 0) {
+                if (mci->csrows[i].nr_pages > 0)
                         kobject_put(&mci->csrows[i].kobj);
-                }
         }
 
         /* remove the mci instance's attributes, if any */
diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index d500749464ea..d55e5529734c 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -433,7 +433,7 @@ static void i5100_handle_ce(struct mem_ctl_info *mci,
                 "CE chan %d, bank %u, rank %u, syndrome 0x%lx, "
                 "cas %u, ras %u, csrow %u, label \"%s\": %s\n",
                 chan, bank, rank, syndrome, cas, ras,
-                csrow, mci->csrows[csrow].channels[0].label, msg);
+                csrow, mci->csrows[csrow].channels[0].dimm->label, msg);
 
         mci->ce_count++;
         mci->csrows[csrow].ce_count++;
@@ -455,7 +455,7 @@ static void i5100_handle_ue(struct mem_ctl_info *mci,
                 "UE chan %d, bank %u, rank %u, syndrome 0x%lx, "
                 "cas %u, ras %u, csrow %u, label \"%s\": %s\n",
                 chan, bank, rank, syndrome, cas, ras,
-                csrow, mci->csrows[csrow].channels[0].label, msg);
+                csrow, mci->csrows[csrow].channels[0].dimm->label, msg);
 
         mci->ue_count++;
         mci->csrows[csrow].ue_count++;
@@ -868,8 +868,8 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci)
                 mci->csrows[i].channels[0].chan_idx = 0;
                 mci->csrows[i].channels[0].ce_count = 0;
                 mci->csrows[i].channels[0].csrow = mci->csrows + i;
-                snprintf(mci->csrows[i].channels[0].label,
-                         sizeof(mci->csrows[i].channels[0].label),
+                snprintf(mci->csrows[i].channels[0].dimm->label,
+                         sizeof(mci->csrows[i].channels[0].dimm->label),
                          "DIMM%u", i5100_rank_to_slot(mci, chan, rank));
 
                 total_pages += npages;
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 85226ccf5290..df0acf02667a 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -746,8 +746,8 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
 
                         csr->edac_mode = mode;
                         csr->mtype = mtype;
-                        snprintf(csr->channels[0].label,
-                                        sizeof(csr->channels[0].label),
+                        snprintf(csr->channels[0].dimm->label,
+                                        sizeof(csr->channels[0].dimm->label),
                                         "CPU#%uChannel#%u_DIMM#%u",
                                         pvt->i7core_dev->socket, i, j);
 
diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
index 0cd8368f88f8..b7aca58bf9eb 100644
--- a/drivers/edac/i82975x_edac.c
+++ b/drivers/edac/i82975x_edac.c
@@ -407,7 +407,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
                  *   [0-3] for dual-channel; i.e. csrow->nr_channels = 2
                  */
                 for (chan = 0; chan < csrow->nr_channels; chan++)
-                        strncpy(csrow->channels[chan].label,
+                        strncpy(csrow->channels[chan].dimm->label,
                                         labels[(index >> 1) + (chan * 2)],
                                         EDAC_MC_LABEL_LEN);
 
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index a203536d90dd..95901c21d5dc 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -651,8 +651,8 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
                                 csr->channels[0].chan_idx = i;
                                 csr->channels[0].ce_count = 0;
                                 pvt->csrow_map[i][j] = csrow;
-                                snprintf(csr->channels[0].label,
-                                         sizeof(csr->channels[0].label),
+                                snprintf(csr->channels[0].dimm->label,
+                                         sizeof(csr->channels[0].dimm->label),
                                          "CPU_SrcID#%u_Channel#%u_DIMM#%u",
                                          pvt->sbridge_dev->source_id, i, j);
                                 last_page += npages;