edac: move nr_pages to dimm struct

The number of pages is a dimm property. Move it to the dimm struct.

After this change, it is possible to add sysfs nodes for the DIMM's that
will properly represent the DIMM stick properties, including its size.

A TODO fix here is to properly represent dual-rank/quad-rank DIMMs when
the memory controller represents the memory via chip select rows.

Reviewed-by: Aristeu Rozanski <arozansk@redhat.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Cc: Doug Thompson <norsk5@yahoo.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: "Niklas Söderlund" <niklas.soderlund@ericsson.com>
Cc: Shaohui Xie <Shaohui.Xie@freescale.com>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 13 insertions, 9 deletions

diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index 5338c7968f78..c08e94064ef6 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -859,7 +859,6 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci)
                  * FIXME: these two are totally bogus -- I don't see how to
                  * map them correctly to this structure...
                  */
-                mci->csrows[i].nr_pages = npages;
                 mci->csrows[i].csrow_idx = i;
                 mci->csrows[i].mci = mci;
                 mci->csrows[i].nr_channels = 1;
@@ -867,14 +866,19 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci)
                 total_pages += npages;
 
                 dimm = mci->csrows[i].channels[0].dimm;
-                dimm->grain = 32;
-                dimm->dtype = (priv->mtr[chan][rank].width == 4) ?
-                              DEV_X4 : DEV_X8;
-                dimm->mtype = MEM_RDDR2;
-                dimm->edac_mode = EDAC_SECDED;
-                snprintf(dimm->label, sizeof(dimm->label),
-                         "DIMM%u",
-                         i5100_rank_to_slot(mci, chan, rank));
+                dimm->nr_pages = npages;
+                if (npages) {
+                        total_pages += npages;
+
+                        dimm->grain = 32;
+                        dimm->dtype = (priv->mtr[chan][rank].width == 4) ?
+                                DEV_X4 : DEV_X8;
+                        dimm->mtype = MEM_RDDR2;
+                        dimm->edac_mode = EDAC_SECDED;
+                        snprintf(dimm->label, sizeof(dimm->label),
+                                "DIMM%u",
+                                i5100_rank_to_slot(mci, chan, rank));
+                }
         }
 }