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, 8 insertions, 6 deletions

diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index 26b40556958e..f3a1a3e1e4e1 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -1236,6 +1236,7 @@ static int i5000_init_csrows(struct mem_ctl_info *mci)
 {
         struct i5000_pvt *pvt;
         struct csrow_info *p_csrow;
+        struct dimm_info *dimm;
         int empty, channel_count;
         int max_csrows;
         int mtr, mtr1;
@@ -1265,21 +1266,22 @@ static int i5000_init_csrows(struct mem_ctl_info *mci)
 
                 csrow_megs = 0;
                 for (channel = 0; channel < pvt->maxch; channel++) {
+                        dimm = p_csrow->channels[channel].dimm;
                         csrow_megs += pvt->dimm_info[csrow][channel].megabytes;
-                        p_csrow->channels[channel].dimm->grain = 8;
+                        dimm->grain = 8;
 
                         /* Assume DDR2 for now */
-                        p_csrow->channels[channel].dimm->mtype = MEM_FB_DDR2;
+                        dimm->mtype = MEM_FB_DDR2;
 
                         /* ask what device type on this row */
                         if (MTR_DRAM_WIDTH(mtr))
-                                p_csrow->channels[channel].dimm->dtype = DEV_X8;
+                                dimm->dtype = DEV_X8;
                         else
-                                p_csrow->channels[channel].dimm->dtype = DEV_X4;
+                                dimm->dtype = DEV_X4;
 
-                        p_csrow->channels[channel].dimm->edac_mode = EDAC_S8ECD8ED;
+                        dimm->edac_mode = EDAC_S8ECD8ED;
+                        dimm->nr_pages = (csrow_megs << 8) / pvt->maxch;
                 }
-                p_csrow->nr_pages = csrow_megs << 8;
 
                 empty = 0;
         }