diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-27 16:38:08 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-28 18:10:58 -0400 |
commit | 084a4fccef39ac7abb039511f32380f28d0b67e6 (patch) | |
tree | 0596612000c7ec3a848b10f7cc4acdb573218076 /drivers/edac/pasemi_edac.c | |
parent | a7d7d2e1a07e3811dc49af2962c940fd8bbb6c8f (diff) |
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>
Diffstat (limited to 'drivers/edac/pasemi_edac.c')
-rw-r--r-- | drivers/edac/pasemi_edac.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/edac/pasemi_edac.c b/drivers/edac/pasemi_edac.c index 7f71ee436744..4e53270bc336 100644 --- a/drivers/edac/pasemi_edac.c +++ b/drivers/edac/pasemi_edac.c | |||
@@ -135,11 +135,13 @@ static int pasemi_edac_init_csrows(struct mem_ctl_info *mci, | |||
135 | enum edac_type edac_mode) | 135 | enum edac_type edac_mode) |
136 | { | 136 | { |
137 | struct csrow_info *csrow; | 137 | struct csrow_info *csrow; |
138 | struct dimm_info *dimm; | ||
138 | u32 rankcfg; | 139 | u32 rankcfg; |
139 | int index; | 140 | int index; |
140 | 141 | ||
141 | for (index = 0; index < mci->nr_csrows; index++) { | 142 | for (index = 0; index < mci->nr_csrows; index++) { |
142 | csrow = &mci->csrows[index]; | 143 | csrow = &mci->csrows[index]; |
144 | dimm = csrow->channels[0].dimm; | ||
143 | 145 | ||
144 | pci_read_config_dword(pdev, | 146 | pci_read_config_dword(pdev, |
145 | MCDRAM_RANKCFG + (index * 12), | 147 | MCDRAM_RANKCFG + (index * 12), |
@@ -177,10 +179,10 @@ static int pasemi_edac_init_csrows(struct mem_ctl_info *mci, | |||
177 | csrow->last_page = csrow->first_page + csrow->nr_pages - 1; | 179 | csrow->last_page = csrow->first_page + csrow->nr_pages - 1; |
178 | last_page_in_mmc += csrow->nr_pages; | 180 | last_page_in_mmc += csrow->nr_pages; |
179 | csrow->page_mask = 0; | 181 | csrow->page_mask = 0; |
180 | csrow->grain = PASEMI_EDAC_ERROR_GRAIN; | 182 | dimm->grain = PASEMI_EDAC_ERROR_GRAIN; |
181 | csrow->mtype = MEM_DDR; | 183 | dimm->mtype = MEM_DDR; |
182 | csrow->dtype = DEV_UNKNOWN; | 184 | dimm->dtype = DEV_UNKNOWN; |
183 | csrow->edac_mode = edac_mode; | 185 | dimm->edac_mode = edac_mode; |
184 | } | 186 | } |
185 | return 0; | 187 | return 0; |
186 | } | 188 | } |