Unverified Commit a42fc9da authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12612 Hygon model 4h~fh and 10h ATL issue fix 

Merge Pull Request from: @hygon_fanwh 
 
Fix the bug caused by the ATL when translate the normal address to system address for Hygon model 4h~fh and 10h processors.

Reference:
https://gitee.com/openeuler/kernel/pulls/12300
https://gitee.com/openeuler/kernel/pulls/8822
https://gitee.com/openeuler/kernel/pulls/3838 
 
Link:https://gitee.com/openeuler/kernel/pulls/12612

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 723be560 38a8daca

drivers/edac/amd64_edac.c

+6 −2
Original line number Diff line number Diff line
@@ -3150,8 +3150,12 @@ static void decode_umc_error(int node_id, struct mce *m) 


	pvt->ops->get_err_info(m, &err);



	if (hygon_f18h_m4h() && boot_cpu_data.x86_model == 0x6) {

	if (hygon_f18h_m4h() || boot_cpu_data.x86_model == 0x10) {

		if (boot_cpu_data.x86_model == 0x6)

			umc = err.channel << 1;

		else

			umc = err.channel;



		if (umc_normaddr_to_sysaddr(m->addr, pvt->mc_node_id, umc, &sys_addr)) {

			err.err_code = ERR_NORM_ADDR;

			goto log_error;