x86/mce: Set bios_cmci_threshold for CMCI threshold

leoliu-oc · opsiff · commit 66015fc16a5b · 2024-06-15T22:01:37.000+08:00
zhaoxin inclusion
category: bugfix
CVE: NA

-----------------

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.

Signed-off-by: leoliu-oc &lt;leoliu-oc@zhaoxin.com&gt;
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
@@ -1946,6 +1946,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)

Original file line number	Diff line number	Diff line change
`@@ -1946,6 +1946,7 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)`
`1946`	`1946`	`if (cfg->monarch_timeout < 0)`
`1947`	`1947`	`cfg->monarch_timeout = USEC_PER_SEC;`
`1948`	`1948`	`}`
	`1949`	`+ mca_cfg.bios_cmci_threshold = 1;`
`1949`	`1950`	`}`
`1950`	`1951`
`1951`	`1952`	`if (cfg->monarch_timeout < 0)`