Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb89f5a0 authored by Borislav Petkov's avatar Borislav Petkov Committed by Borislav Petkov
Browse files

amd64_edac: Fix K8 chip select reporting 



This basically reverts 603adaf6 ("amd64_edac: fix K8 chip select
reporting") because it was a clumsy workaround for DIMM sizes reporting
on K8 which got superceded by a much more correct one with 41d8bfab
("amd64_edac: Improve DRAM address mapping") without removing the prior
one. Remove it now finally.

Reported-by: default avatarJosh Hunt <johunt@akamai.com>
Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
parent 33ca0643

drivers/edac/amd64_edac.c

+3 −6
Original line number Diff line number Diff line
@@ -1596,14 +1596,11 @@ static void f1x_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr, 
 */

static void amd64_debug_display_dimm_sizes(struct amd64_pvt *pvt, u8 ctrl)

{

	int dimm, size0, size1, factor = 0;

	int dimm, size0, size1;

	u32 *dcsb = ctrl ? pvt->csels[1].csbases : pvt->csels[0].csbases;

	u32 dbam  = ctrl ? pvt->dbam1 : pvt->dbam0;



	if (boot_cpu_data.x86 == 0xf) {

		if (pvt->dclr0 & WIDTH_128)

			factor = 1;



		/* K8 families < revF not supported yet */

	       if (pvt->ext_model < K8_REV_F)

			return;
@@ -1634,8 +1631,8 @@ static void amd64_debug_display_dimm_sizes(struct amd64_pvt *pvt, u8 ctrl) 
						     DBAM_DIMM(dimm, dbam));



		amd64_info(EDAC_MC ": %d: %5dMB %d: %5dMB\n",

				dimm * 2,     size0 << factor,

				dimm * 2 + 1, size1 << factor);

				dimm * 2,     size0,

				dimm * 2 + 1, size1);

	}

}