Commit 78ec161a authored by Muralidhara M K's avatar Muralidhara M K Committed by Borislav Petkov (AMD)
Browse files

EDAC/amd64: Split determine_memory_type() into dct/umc functions 



Call them from their respective hw_info_get() paths.

Call them after all other hardware registers have been saved, since the
memory type for a device will be determined based on the saved
information.

  [ Yazen: rebased/reworked patch and reworded commit message. ]

Signed-off-by: default avatarMuralidhara M K <muralidhara.mk@amd.com>
Co-developed-by: default avatarNaveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
Signed-off-by: default avatarNaveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
Co-developed-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230127170419.1824692-15-yazen.ghannam@amd.com
parent b29dad9b

drivers/edac/amd64_edac.c

+6 −9
Original line number Diff line number Diff line
@@ -1735,7 +1735,7 @@ static void dct_read_base_mask(struct amd64_pvt *pvt) 
	}

}



static void determine_memory_type_df(struct amd64_pvt *pvt)

static void umc_determine_memory_type(struct amd64_pvt *pvt)

{

	struct amd64_umc *umc;

	u32 i;
@@ -1772,13 +1772,10 @@ static void determine_memory_type_df(struct amd64_pvt *pvt) 
	}

}



static void determine_memory_type(struct amd64_pvt *pvt)

static void dct_determine_memory_type(struct amd64_pvt *pvt)

{

	u32 dram_ctrl, dcsm;



	if (pvt->umc)

		return determine_memory_type_df(pvt);



	switch (pvt->fam) {

	case 0xf:

		if (pvt->ext_model >= K8_REV_F)
@@ -1828,6 +1825,8 @@ static void determine_memory_type(struct amd64_pvt *pvt) 
		WARN(1, KERN_ERR "%s: Family??? 0x%x\n", __func__, pvt->fam);

		pvt->dram_type = MEM_EMPTY;

	}



	edac_dbg(1, "  DIMM type: %s\n", edac_mem_types[pvt->dram_type]);

	return;



ddr3:
@@ -3183,10 +3182,6 @@ static void read_mc_regs(struct amd64_pvt *pvt) 


skip:



	determine_memory_type(pvt);



	if (!pvt->umc)

		edac_dbg(1, "  DIMM type: %s\n", edac_mem_types[pvt->dram_type]);



	determine_ecc_sym_sz(pvt);

}
@@ -3664,6 +3659,7 @@ static int dct_hw_info_get(struct amd64_pvt *pvt) 
	dct_prep_chip_selects(pvt);

	dct_read_base_mask(pvt);

	read_mc_regs(pvt);

	dct_determine_memory_type(pvt);



	return 0;

}
@@ -3677,6 +3673,7 @@ static int umc_hw_info_get(struct amd64_pvt *pvt) 
	umc_prep_chip_selects(pvt);

	umc_read_base_mask(pvt);

	read_mc_regs(pvt);

	umc_determine_memory_type(pvt);



	return 0;

}