diff options
author | Qiuxu Zhuo <qiuxu.zhuo@intel.com> | 2018-09-18 20:34:33 -0400 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2018-09-22 12:18:57 -0400 |
commit | 6f6da136046294a1e8d2944336eb97412751f653 (patch) | |
tree | 8fa623e0298fd2a82f308bafe5acf9df5eac59db | |
parent | c968ed08594dadb788a93dc2bc128ed4ef35c93e (diff) |
EDAC: Correct DIMM capacity unit symbol
The {i3200|i7core|sb|skx}_edac drivers show DIMM capacity using the
wrong unit symbol: 'Mb' - megabit. Fix them by replacing 'Mb' with
'MiB' - mebibyte.
[Tony: These are all "edac_dbg()" messages, so this won't break scripts
that parse console logs.]
Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Aristeu Rozanski <aris@redhat.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-edac@vger.kernel.org
Link: https://lkml.kernel.org/r/20180919003433.16475-1-tony.luck@intel.com
-rw-r--r-- | drivers/edac/i3200_edac.c | 2 | ||||
-rw-r--r-- | drivers/edac/i7core_edac.c | 2 | ||||
-rw-r--r-- | drivers/edac/sb_edac.c | 2 | ||||
-rw-r--r-- | drivers/edac/skx_edac.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c index d92d56cee101..299b441647cd 100644 --- a/drivers/edac/i3200_edac.c +++ b/drivers/edac/i3200_edac.c | |||
@@ -399,7 +399,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) | |||
399 | if (nr_pages == 0) | 399 | if (nr_pages == 0) |
400 | continue; | 400 | continue; |
401 | 401 | ||
402 | edac_dbg(0, "csrow %d, channel %d%s, size = %ld Mb\n", i, j, | 402 | edac_dbg(0, "csrow %d, channel %d%s, size = %ld MiB\n", i, j, |
403 | stacked ? " (stacked)" : "", PAGES_TO_MiB(nr_pages)); | 403 | stacked ? " (stacked)" : "", PAGES_TO_MiB(nr_pages)); |
404 | 404 | ||
405 | dimm->nr_pages = nr_pages; | 405 | dimm->nr_pages = nr_pages; |
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 8e120bf60624..bd65f573e381 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c | |||
@@ -597,7 +597,7 @@ static int get_dimm_config(struct mem_ctl_info *mci) | |||
597 | /* DDR3 has 8 I/O banks */ | 597 | /* DDR3 has 8 I/O banks */ |
598 | size = (rows * cols * banks * ranks) >> (20 - 3); | 598 | size = (rows * cols * banks * ranks) >> (20 - 3); |
599 | 599 | ||
600 | edac_dbg(0, "\tdimm %d %d Mb offset: %x, bank: %d, rank: %d, row: %#x, col: %#x\n", | 600 | edac_dbg(0, "\tdimm %d %d MiB offset: %x, bank: %d, rank: %d, row: %#x, col: %#x\n", |
601 | j, size, | 601 | j, size, |
602 | RANKOFFSET(dimm_dod[j]), | 602 | RANKOFFSET(dimm_dod[j]), |
603 | banks, ranks, rows, cols); | 603 | banks, ranks, rows, cols); |
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 5aeb9a1ee898..cacd0ca12af6 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c | |||
@@ -1656,7 +1656,7 @@ static int __populate_dimms(struct mem_ctl_info *mci, | |||
1656 | size = ((u64)rows * cols * banks * ranks) >> (20 - 3); | 1656 | size = ((u64)rows * cols * banks * ranks) >> (20 - 3); |
1657 | npages = MiB_TO_PAGES(size); | 1657 | npages = MiB_TO_PAGES(size); |
1658 | 1658 | ||
1659 | edac_dbg(0, "mc#%d: ha %d channel %d, dimm %d, %lld Mb (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n", | 1659 | edac_dbg(0, "mc#%d: ha %d channel %d, dimm %d, %lld MiB (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n", |
1660 | pvt->sbridge_dev->mc, pvt->sbridge_dev->dom, i, j, | 1660 | pvt->sbridge_dev->mc, pvt->sbridge_dev->dom, i, j, |
1661 | size, npages, | 1661 | size, npages, |
1662 | banks, ranks, rows, cols); | 1662 | banks, ranks, rows, cols); |
diff --git a/drivers/edac/skx_edac.c b/drivers/edac/skx_edac.c index fae095162c01..b2987efa2c6d 100644 --- a/drivers/edac/skx_edac.c +++ b/drivers/edac/skx_edac.c | |||
@@ -364,7 +364,7 @@ static int get_dimm_info(u32 mtr, u32 amap, struct dimm_info *dimm, | |||
364 | size = ((1ull << (rows + cols + ranks)) * banks) >> (20 - 3); | 364 | size = ((1ull << (rows + cols + ranks)) * banks) >> (20 - 3); |
365 | npages = MiB_TO_PAGES(size); | 365 | npages = MiB_TO_PAGES(size); |
366 | 366 | ||
367 | edac_dbg(0, "mc#%d: channel %d, dimm %d, %lld Mb (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n", | 367 | edac_dbg(0, "mc#%d: channel %d, dimm %d, %lld MiB (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n", |
368 | imc->mc, chan, dimmno, size, npages, | 368 | imc->mc, chan, dimmno, size, npages, |
369 | banks, 1 << ranks, rows, cols); | 369 | banks, 1 << ranks, rows, cols); |
370 | 370 | ||
@@ -424,7 +424,7 @@ unknown_size: | |||
424 | dimm->mtype = MEM_NVDIMM; | 424 | dimm->mtype = MEM_NVDIMM; |
425 | dimm->edac_mode = EDAC_SECDED; /* likely better than this */ | 425 | dimm->edac_mode = EDAC_SECDED; /* likely better than this */ |
426 | 426 | ||
427 | edac_dbg(0, "mc#%d: channel %d, dimm %d, %llu Mb (%u pages)\n", | 427 | edac_dbg(0, "mc#%d: channel %d, dimm %d, %llu MiB (%u pages)\n", |
428 | imc->mc, chan, dimmno, size >> 20, dimm->nr_pages); | 428 | imc->mc, chan, dimmno, size >> 20, dimm->nr_pages); |
429 | 429 | ||
430 | snprintf(dimm->label, sizeof(dimm->label), "CPU_SrcID#%u_MC#%u_Chan#%u_DIMM#%u", | 430 | snprintf(dimm->label, sizeof(dimm->label), "CPU_SrcID#%u_MC#%u_Chan#%u_DIMM#%u", |