From: Aristeu Rozanski <aris@redhat.com>
To: Tony Luck <tony.luck@intel.com>
Cc: Borislav Petkov <bp@suse.de>, Qiuxu Zhuo <qiuxu.zhuo@intel.com>,
Borislav Petkov <bp@alien8.de>,
linux-edac@vger.kernel.org
Subject: EDAC: Fix DIMM capacity unit symbol
Date: Wed, 19 Sep 2018 10:33:33 -0400 [thread overview]
Message-ID: <20180919143333.6eahyxqad2sudkzh@redhat.com> (raw)
On Tue, Sep 18, 2018 at 05:34:33PM -0700, Tony Luck wrote:
> From: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
>
> The {i3200|i7core|sb|skx}_edac drivers show DIMM capacity in 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>
> ---
> drivers/edac/i3200_edac.c | 2 +-
> drivers/edac/i7core_edac.c | 2 +-
> drivers/edac/sb_edac.c | 2 +-
> 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)
> 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 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)
> /* 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 07726fb00321..7e5a092b4e9b 100644
> --- a/drivers/edac/sb_edac.c
> +++ b/drivers/edac/sb_edac.c
> @@ -1622,7 +1622,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 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,
> 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);
>
> @@ -424,7 +424,7 @@ static int get_nvdimm_info(struct dimm_info *dimm, struct skx_imc *imc,
> dimm->mtype = MEM_NVDIMM;
> dimm->edac_mode = EDAC_SECDED; /* likely better than this */
>
> - edac_dbg(0, "mc#%d: channel %d, dimm %d, %llu Mb (%u pages)\n",
> + edac_dbg(0, "mc#%d: channel %d, dimm %d, %llu MiB (%u pages)\n",
> imc->mc, chan, dimmno, size >> 20, dimm->nr_pages);
>
> snprintf(dimm->label, sizeof(dimm->label), "CPU_SrcID#%u_MC#%u_Chan#%u_DIMM#%u",
Acked-by: Aristeu Rozanski <aris@redhat.com>
next reply other threads:[~2018-09-19 14:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-19 14:33 Aristeu Rozanski [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-22 16:29 EDAC: Fix DIMM capacity unit symbol Borislav Petkov
2018-09-19 0:34 Luck, Tony
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180919143333.6eahyxqad2sudkzh@redhat.com \
--to=aris@redhat.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=linux-edac@vger.kernel.org \
--cc=qiuxu.zhuo@intel.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox