EDAC: Correct DIMM capacity unit symbol

BugLink: https://bugs.launchpad.net/bugs/1853915
[ Upstream commit 6f6da136046294a1e8d2944336eb97412751f653 ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index d92d56cee10170df7600d3812dd1b1c1ad698abe..299b441647cd5c62740403c7476e79bf35983e13 100644 (file)
--- 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)
                        if (nr_pages == 0)
                                continue;
 
-                       edac_dbg(0, "csrow %d, channel %d%s, size = %ld Mb\n", i, j,
+                       edac_dbg(0, "csrow %d, channel %d%s, size = %ld MiB\n", i, j,
                                 stacked ? " (stacked)" : "", PAGES_TO_MiB(nr_pages));
 
                        dimm->nr_pages = nr_pages;

diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index ae119917e1e8b861541e59d80ffd8202926308d4..6c9411801590218f4ae41a61a1632cbfaf649eeb 100644 (file)
--- 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)
                        /* DDR3 has 8 I/O banks */
                        size = (rows * cols * banks * ranks) >> (20 - 3);
 
-                       edac_dbg(0, "\tdimm %d %d Mb offset: %x, bank: %d, rank: %d, row: %#x, col: %#x\n",
+                       edac_dbg(0, "\tdimm %d %d MiB offset: %x, bank: %d, rank: %d, row: %#x, col: %#x\n",
                                 j, size,
                                 RANKOFFSET(dimm_dod[j]),
                                 banks, ranks, rows, cols);

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index b6b9ac968730dc59dc1447f35ddce72eb03f0612..5b68fccedac49882db88afe30754a7ad691f3bd2 100644 (file)
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -1615,7 +1615,7 @@ static int __populate_dimms(struct mem_ctl_info *mci,
                                size = ((u64)rows * cols * banks * ranks) >> (20 - 3);
                                npages = MiB_TO_PAGES(size);
 
-                               edac_dbg(0, "mc#%d: ha %d channel %d, dimm %d, %lld Mb (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n",
+                               edac_dbg(0, "mc#%d: ha %d channel %d, dimm %d, %lld MiB (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n",
                                         pvt->sbridge_dev->mc, pvt->sbridge_dev->dom, i, j,
                                         size, npages,
                                         banks, ranks, rows, cols);

diff --git a/drivers/edac/skx_edac.c b/drivers/edac/skx_edac.c
index b1585e1c4f13c27adf1aff400c66a63f54018b26..819e8077812378154a1e3ea8b1911d3965404746 100644 (file)
--- a/drivers/edac/skx_edac.c
+++ b/drivers/edac/skx_edac.c
@@ -362,7 +362,7 @@ static int get_dimm_info(u32 mtr, u32 amap, struct dimm_info *dimm,
        size = ((1ull << (rows + cols + ranks)) * banks) >> (20 - 3);
        npages = MiB_TO_PAGES(size);
 
-       edac_dbg(0, "mc#%d: channel %d, dimm %d, %lld Mb (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n",
+       edac_dbg(0, "mc#%d: channel %d, dimm %d, %lld MiB (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n",
                 imc->mc, chan, dimmno, size, npages,
                 banks, 1 << ranks, rows, cols);