mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 08:08:54 +00:00
Code Issues Releases Wiki Activity

amd64_edac: Fix csrows size and pages computation

Browse source 
Make sure code pays attention to K8 having only one DCT, reformat and
cleanup code, correct debug messages, remove unused code.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
This commit is contained in:
Borislav Petkov 2012-09-12 19:00:38 +02:00 committed by Borislav Petkov
parent 0a5dfc3140
commit 10de6497a5
1 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
drivers/edac/amd64_edac.c
View file

@ -2087,6 +2087,7 @@ static u32 amd64_csrow_nr_pages(struct amd64_pvt *pvt, u8 dct, int csrow_nr)
u32 cs_mode, nr_pages; u32 cs_mode, nr_pages;
u32 dbam = dct ? pvt->dbam1 : pvt->dbam0; u32 dbam = dct ? pvt->dbam1 : pvt->dbam0;
/* /*
* The math on this doesn't look right on the surface because x/2*4 can * The math on this doesn't look right on the surface because x/2*4 can
* be simplified to x*2 but this expression makes use of the fact that * be simplified to x*2 but this expression makes use of the fact that
@ -2098,9 +2099,9 @@ static u32 amd64_csrow_nr_pages(struct amd64_pvt *pvt, u8 dct, int csrow_nr)
nr_pages = pvt->ops->dbam_to_cs(pvt, dct, cs_mode) << (20 - PAGE_SHIFT); nr_pages = pvt->ops->dbam_to_cs(pvt, dct, cs_mode) << (20 - PAGE_SHIFT);
edac_dbg(0, " (csrow=%d) DBAM map index= %d\n", csrow_nr, cs_mode); edac_dbg(0, "csrow: %d, channel: %d, DBAM idx: %d\n",
edac_dbg(0, " nr_pages/channel= %u channel-count = %d\n", csrow_nr, dct, cs_mode);
nr_pages, pvt->channel_count); edac_dbg(0, "nr_pages/channel: %u\n", nr_pages);
return nr_pages; return nr_pages;
} }
@ -2111,15 +2112,14 @@ static u32 amd64_csrow_nr_pages(struct amd64_pvt *pvt, u8 dct, int csrow_nr)
*/ */
static int init_csrows(struct mem_ctl_info *mci) static int init_csrows(struct mem_ctl_info *mci)
{ {
struct amd64_pvt *pvt = mci->pvt_info;
struct csrow_info *csrow; struct csrow_info *csrow;
struct dimm_info *dimm; struct dimm_info *dimm;
struct amd64_pvt *pvt = mci->pvt_info;
u64 base, mask;
u32 val;
int i, j, empty = 1;
enum mem_type mtype;
enum edac_type edac_mode; enum edac_type edac_mode;
enum mem_type mtype;
int i, j, empty = 1;
int nr_pages = 0; int nr_pages = 0;
u32 val;
amd64_read_pci_cfg(pvt->F3, NBCFG, &val); amd64_read_pci_cfg(pvt->F3, NBCFG, &val);
@ -2129,29 +2129,35 @@ static int init_csrows(struct mem_ctl_info *mci)
pvt->mc_node_id, val, pvt->mc_node_id, val,
!!(val & NBCFG_CHIPKILL), !!(val & NBCFG_ECC_ENABLE)); !!(val & NBCFG_CHIPKILL), !!(val & NBCFG_ECC_ENABLE));
/*
* We iterate over DCT0 here but we look at DCT1 in parallel, if needed.
*/
for_each_chip_select(i, 0, pvt) { for_each_chip_select(i, 0, pvt) {
csrow = mci->csrows[i]; bool row_dct0 = !!csrow_enabled(i, 0, pvt);
bool row_dct1 = false;
if (!csrow_enabled(i, 0, pvt) && !csrow_enabled(i, 1, pvt)) { if (boot_cpu_data.x86 != 0xf)
edac_dbg(1, "----CSROW %d VALID for MC node %d\n", row_dct1 = !!csrow_enabled(i, 1, pvt);
i, pvt->mc_node_id);
if (!row_dct0 && !row_dct1)
continue; continue;
}
csrow = mci->csrows[i];
empty = 0; empty = 0;
if (csrow_enabled(i, 0, pvt))
nr_pages = amd64_csrow_nr_pages(pvt, 0, i);
if (csrow_enabled(i, 1, pvt))
nr_pages += amd64_csrow_nr_pages(pvt, 1, i);
get_cs_base_and_mask(pvt, i, 0, &base, &mask); edac_dbg(1, "MC node: %d, csrow: %d\n",
/* 8 bytes of resolution */ pvt->mc_node_id, i);
if (row_dct0)
nr_pages = amd64_csrow_nr_pages(pvt, 0, i);
/* K8 has only one DCT */
if (boot_cpu_data.x86 != 0xf && row_dct1)
nr_pages += amd64_csrow_nr_pages(pvt, 1, i);
mtype = amd64_determine_memory_type(pvt, i); mtype = amd64_determine_memory_type(pvt, i);
edac_dbg(1, " for MC node %d csrow %d:\n", pvt->mc_node_id, i); edac_dbg(1, "Total csrow%d pages: %u\n", i, nr_pages);
edac_dbg(1, " nr_pages: %u\n",
nr_pages * pvt->channel_count);
/* /*
* determine whether CHIPKILL or JUST ECC or NO ECC is operating * determine whether CHIPKILL or JUST ECC or NO ECC is operating