Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Fix DIMMs per DCTs output
+8
-20
+8
-20
drivers/edac/amd64_edac.c
+8
-20
drivers/edac/amd64_edac.c
···
826
826
/* Display and decode various NB registers for debug purposes. */
827
827
static void amd64_dump_misc_regs(struct amd64_pvt *pvt)
828
828
{
829
-
int ganged;
830
-
831
829
debugf1("F3xE8 (NB Cap): 0x%08x\n", pvt->nbcap);
832
830
833
831
debugf1(" NB two channel DRAM capable: %s\n",
···
849
851
debugf1(" DramHoleValid: %s\n",
850
852
(pvt->dhar & DHAR_VALID) ? "yes" : "no");
851
853
854
+
amd64_debug_display_dimm_sizes(0, pvt);
855
+
852
856
/* everything below this point is Fam10h and above */
853
-
if (boot_cpu_data.x86 == 0xf) {
854
-
amd64_debug_display_dimm_sizes(0, pvt);
857
+
if (boot_cpu_data.x86 == 0xf)
855
858
return;
856
-
}
859
+
860
+
amd64_debug_display_dimm_sizes(1, pvt);
857
861
858
862
amd64_info("using %s syndromes.\n", ((pvt->syn_type == 8) ? "x8" : "x4"));
859
863
860
864
/* Only if NOT ganged does dclr1 have valid info */
861
865
if (!dct_ganging_enabled(pvt))
862
866
amd64_dump_dramcfg_low(pvt->dclr1, 1);
863
-
864
-
/*
865
-
* Determine if ganged and then dump memory sizes for first controller,
866
-
* and if NOT ganged dump info for 2nd controller.
867
-
*/
868
-
ganged = dct_ganging_enabled(pvt);
869
-
870
-
amd64_debug_display_dimm_sizes(0, pvt);
871
-
872
-
if (!ganged)
873
-
amd64_debug_display_dimm_sizes(1, pvt);
874
867
}
875
868
876
869
/* Read in both of DBAM registers */
···
1633
1644
WARN_ON(ctrl != 0);
1634
1645
}
1635
1646
1636
-
debugf1("F2x%d80 (DRAM Bank Address Mapping): 0x%08x\n",
1637
-
ctrl, ctrl ? pvt->dbam1 : pvt->dbam0);
1647
+
dbam = (ctrl && !dct_ganging_enabled(pvt)) ? pvt->dbam1 : pvt->dbam0;
1648
+
dcsb = (ctrl && !dct_ganging_enabled(pvt)) ? pvt->dcsb1 : pvt->dcsb0;
1638
1649
1639
-
dbam = ctrl ? pvt->dbam1 : pvt->dbam0;
1640
-
dcsb = ctrl ? pvt->dcsb1 : pvt->dcsb0;
1650
+
debugf1("F2x%d80 (DRAM Bank Address Mapping): 0x%08x\n", ctrl, dbam);
1641
1651
1642
1652
edac_printk(KERN_DEBUG, EDAC_MC, "DCT%d chip selects:\n", ctrl);
1643
1653