EDAC: Fix DIMM capacity unit symbol
Subsystems (5)
Luck, Tony
maintainerFrom: Qiuxu Zhuo <[email protected]>
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 <[email protected]>
Signed-off-by Tony Luck <[email protected]>
--- 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(-)
drivers/edac/i3200_edac.c +1 -1
@@ -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;
drivers/edac/i7core_edac.c +1 -1
@@ -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);
drivers/edac/sb_edac.c +1 -1
@@ -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);
drivers/edac/skx_edac.c +2 -2
@@ -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",