diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-27 12:12:32 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-28 18:10:57 -0400 |
commit | a7d7d2e1a07e3811dc49af2962c940fd8bbb6c8f (patch) | |
tree | 6c3ac39bf25fb7810668f57476c7b5872d5b418b /drivers/edac/i82975x_edac.c | |
parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) |
edac: Create a dimm struct and move the labels into it
The way a DIMM is currently represented implies that they're
linked into a per-csrow struct. However, some drivers don't see
csrows, as they're ridden behind some chip like the AMB's
on FBDIMM's, for example.
This forced drivers to fake^Wvirtualize a csrow struct, and to create
a mess under csrow/channel original's concept.
Move the DIMM labels into a per-DIMM struct, and add there
the real location of the socket, in terms of csrow/channel.
Latter patches will modify the location to properly represent the
memory architecture.
All other drivers will use a per-csrow type of location.
Some of those drivers will require a latter conversion, as
they also fake the csrows internally.
TODO: While this patch doesn't change the existing behavior, on
csrows-based memory controllers, a csrow/channel pair points to a memory
rank. There's a known bug at the EDAC core that allows having different
labels for the same DIMM, if it has more than one rank. A latter patch
is need to merge the several ranks for a DIMM into the same dimm_info
struct, in order to avoid having different labels for the same DIMM.
The edac_mc_alloc() will now contain a per-dimm initialization loop that
will be changed by latter patches in order to match other types of
memory architectures.
Reviewed-by: Aristeu Rozanski <arozansk@redhat.com>
Reviewed-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Ranganathan Desikan <ravi@jetztechnologies.com>
Cc: "Arvind R." <arvino55@gmail.com>
Cc: "Niklas Söderlund" <niklas.soderlund@ericsson.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/edac/i82975x_edac.c')
-rw-r--r-- | drivers/edac/i82975x_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c index 0cd8368f88f8..b7aca58bf9eb 100644 --- a/drivers/edac/i82975x_edac.c +++ b/drivers/edac/i82975x_edac.c | |||
@@ -407,7 +407,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci, | |||
407 | * [0-3] for dual-channel; i.e. csrow->nr_channels = 2 | 407 | * [0-3] for dual-channel; i.e. csrow->nr_channels = 2 |
408 | */ | 408 | */ |
409 | for (chan = 0; chan < csrow->nr_channels; chan++) | 409 | for (chan = 0; chan < csrow->nr_channels; chan++) |
410 | strncpy(csrow->channels[chan].label, | 410 | strncpy(csrow->channels[chan].dimm->label, |
411 | labels[(index >> 1) + (chan * 2)], | 411 | labels[(index >> 1) + (chan * 2)], |
412 | EDAC_MC_LABEL_LEN); | 412 | EDAC_MC_LABEL_LEN); |
413 | 413 | ||