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>
This commit is contained in:
@@ -1159,6 +1159,7 @@ static int i5400_init_csrows(struct mem_ctl_info *mci)
|
||||
int csrow_megs;
|
||||
int channel;
|
||||
int csrow;
|
||||
struct dimm_info *dimm;
|
||||
|
||||
pvt = mci->pvt_info;
|
||||
|
||||
@@ -1184,24 +1185,17 @@ static int i5400_init_csrows(struct mem_ctl_info *mci)
|
||||
p_csrow->last_page = 9 + csrow * 20;
|
||||
p_csrow->page_mask = 0xFFF;
|
||||
|
||||
p_csrow->grain = 8;
|
||||
|
||||
csrow_megs = 0;
|
||||
for (channel = 0; channel < pvt->maxch; channel++)
|
||||
for (channel = 0; channel < pvt->maxch; channel++) {
|
||||
csrow_megs += pvt->dimm_info[csrow][channel].megabytes;
|
||||
|
||||
p_csrow->nr_pages = csrow_megs << 8;
|
||||
|
||||
/* Assume DDR2 for now */
|
||||
p_csrow->mtype = MEM_FB_DDR2;
|
||||
|
||||
/* ask what device type on this row */
|
||||
if (MTR_DRAM_WIDTH(mtr))
|
||||
p_csrow->dtype = DEV_X8;
|
||||
else
|
||||
p_csrow->dtype = DEV_X4;
|
||||
|
||||
p_csrow->edac_mode = EDAC_S8ECD8ED;
|
||||
p_csrow->nr_pages = csrow_megs << 8;
|
||||
dimm = p_csrow->channels[channel].dimm;
|
||||
dimm->grain = 8;
|
||||
dimm->dtype = MTR_DRAM_WIDTH(mtr) ? DEV_X8 : DEV_X4;
|
||||
dimm->mtype = MEM_RDDR2;
|
||||
dimm->edac_mode = EDAC_SECDED;
|
||||
}
|
||||
|
||||
empty = 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user