edac: move dimm properties to struct dimm_info

On systems based on chip select rows, all channels need to use memories
with the same properties, otherwise the memories on channels A and B
won't be recognized.

However, such assumption is not true for all types of memory
controllers.

Controllers for FB-DIMM's don't have such requirements.

Also, modern Intel controllers seem to be capable of handling such
differences.

So, we need to get rid of storing the DIMM information into a per-csrow
data, storing it, instead at the right place.

The first step is to move grain, mtype, dtype and edac_mode to the
per-dimm struct.

Reviewed-by: Aristeu Rozanski <arozansk@redhat.com>
Reviewed-by: Borislav Petkov <borislav.petkov@amd.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: Mark Gross <mark.gross@intel.com>
Cc: Jason Uhlenkott <juhlenko@akamai.com>
Cc: Tim Small <tim@buttersideup.com>
Cc: Ranganathan Desikan <ravi@jetztechnologies.com>
Cc: "Arvind R." <arvino55@gmail.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Egor Martovetsky <egor@pasemi.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Joe Perches <joe@perches.com>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Hitoshi Mitake <h.mitake@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: James Bottomley <James.Bottomley@parallels.com>
Cc: "Niklas Söderlund" <niklas.soderlund@ericsson.com>
Cc: Shaohui Xie <Shaohui.Xie@freescale.com>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: Mike Williams <mike@mikebwilliams.com>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 17 insertions, 14 deletions

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 95901c21d5dc..21147ac38c4d 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -551,7 +551,7 @@ static int sbridge_get_active_channels(const u8 bus, unsigned *channels,
         return 0;
 }
 
-static int get_dimm_config(const struct mem_ctl_info *mci)
+static int get_dimm_config(struct mem_ctl_info *mci)
 {
         struct sbridge_pvt *pvt = mci->pvt_info;
         struct csrow_info *csr;
@@ -561,6 +561,7 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
         u32 reg;
         enum edac_type mode;
         enum mem_type mtype;
+        struct dimm_info *dimm;
 
         pci_read_config_dword(pvt->pci_br, SAD_TARGET, &reg);
         pvt->sbridge_dev->source_id = SOURCE_ID(reg);
@@ -612,6 +613,7 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
         /* On all supported DDR3 DIMM types, there are 8 banks available */
         banks = 8;
 
+        dimm = mci->dimms;
         for (i = 0; i < NUM_CHANNELS; i++) {
                 u32 mtr;
 
@@ -634,29 +636,30 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
                                         pvt->sbridge_dev->mc, i, j,
                                         size, npages,
                                         banks, ranks, rows, cols);
-                                csr = &mci->csrows[csrow];
 
+                                /*
+                                 * Fake stuff. This controller doesn't see
+                                 * csrows.
+                                 */
+                                csr = &mci->csrows[csrow];
                                 csr->first_page = last_page;
                                 csr->last_page = last_page + npages - 1;
-                                csr->page_mask = 0UL;   /* Unused */
                                 csr->nr_pages = npages;
-                                csr->grain = 32;
                                 csr->csrow_idx = csrow;
-                                csr->dtype = (banks == 8) ? DEV_X8 : DEV_X4;
-                                csr->ce_count = 0;
-                                csr->ue_count = 0;
-                                csr->mtype = mtype;
-                                csr->edac_mode = mode;
                                 csr->nr_channels = 1;
                                 csr->channels[0].chan_idx = i;
-                                csr->channels[0].ce_count = 0;
                                 pvt->csrow_map[i][j] = csrow;
-                                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;
                                 csrow++;
+
+                                csr->channels[0].dimm = dimm;
+                                dimm->grain = 32;
+                                dimm->dtype = (banks == 8) ? DEV_X8 : DEV_X4;
+                                dimm->mtype = mtype;
+                                dimm->edac_mode = mode;
+                                snprintf(dimm->label, sizeof(dimm->label),
+                                         "CPU_SrcID#%u_Channel#%u_DIMM#%u",
+                                         pvt->sbridge_dev->source_id, i, j);
                         }
                 }
         }