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

!5644 [OLK-6.6] x86/mce: Set bios_cmci_threshold for CMCI threshold 

Merge Pull Request from: @leoliu-oc 
 
In the Linux kernel, the CMCI threshold is set to 1 by default. This patch
prevents Linux from overwriting the CMCI threshold set by the bios. With
this patch, the CMCI threshold can be set through the BIOS, which can also
avoid CMCI storms, on Zhaoxin/Centaur CPUs.

### Issue
https://gitee.com/openeuler/kernel/issues/I9CLFC

### Test
Pass. meet expectation 
 
Link:https://gitee.com/openeuler/kernel/pulls/5644

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents ba7871ba d26cd66b

arch/x86/kernel/cpu/mce/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1939,6 +1939,7 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) 
			if (cfg->monarch_timeout < 0)

				cfg->monarch_timeout = USEC_PER_SEC;

		}

		mca_cfg.bios_cmci_threshold = 1;

	}



	if (cfg->monarch_timeout < 0)