diff options
| author |   Borislav Petkov <borislav.petkov@amd.com> | 2012-09-13 18:53:58 +0200 |
|---|---|---|
| committer |   Borislav Petkov <bp@alien8.de> | 2012-11-28 11:54:40 +0100 |
| commit | 16a528ee3975c860dc93fbfc718fe9aa25ed92bc (patch) | |
| tree | ea0d20d3544df6dfe2977634d1a4cc837f80b964 /drivers | |
| parent | EDAC: Pass mci parent (diff) | |
| download | linux-dev-16a528ee3975c860dc93fbfc718fe9aa25ed92bc.tar.xz linux-dev-16a528ee3975c860dc93fbfc718fe9aa25ed92bc.zip | |
EDAC: Fix csrow size reported in sysfs
On csrow-based memory controllers, we combine the csrow size from both
channels and there's no need to do that again in csrow_size_show which
leads to double the size of a csrow.
Fix it.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/amd64_edac.c | 1 | ||||
| -rw-r--r-- | drivers/edac/edac_mc_sysfs.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 307ff66266a0..f74a684269ff 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2174,6 +2174,7 @@ static int init_csrows(struct mem_ctl_info *mci) dimm->edac_mode = edac_mode; dimm->nr_pages = nr_pages; } + csrow->nr_pages = nr_pages; } return empty; diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index cf13bff94f5c..bd46610979c7 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -180,6 +180,9 @@ static ssize_t csrow_size_show(struct device *dev, int i; u32 nr_pages = 0; + if (csrow->mci->csbased) + return sprintf(data, "%u\n", PAGES_TO_MiB(csrow->nr_pages)); + for (i = 0; i < csrow->nr_channels; i++) nr_pages += csrow->channels[i]->dimm->nr_pages; return sprintf(data, "%u\n", PAGES_TO_MiB(nr_pages)); |