* [v3,2/2] x86/mce: add CMCI support for Centaur CPUs
@ 2018-04-25 10:33 davidwang
0 siblings, 0 replies; 2+ messages in thread
From: davidwang @ 2018-04-25 10:33 UTC (permalink / raw)
To: bp, tony.luck, tglx, mingo, hpa, gregkh, x86, linux-kernel,
linux-edac
Cc: brucechang, cooperyan, qiyuanwang, benjaminpan, lukelin, timguo,
David Wang
Newer Centaur support CMCI mechnism, which is compatible with INTEL CMCI.
Signed-off-by: David Wang <davidwang@zhaoxin.com>
---
arch/x86/kernel/cpu/mcheck/mce.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 38ccab8..f9a7295 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1757,6 +1757,8 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
}
case X86_VENDOR_CENTAUR:
mce_centaur_feature_init(c);
+ mce_intel_feature_init(c);
+ mce_adjust_timer = cmci_intel_adjust_timer;
break;
default:
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [v3,2/2] x86/mce: add CMCI support for Centaur CPUs
@ 2018-04-30 9:48 Borislav Petkov
0 siblings, 0 replies; 2+ messages in thread
From: Borislav Petkov @ 2018-04-30 9:48 UTC (permalink / raw)
To: David Wang
Cc: tony.luck, tglx, mingo, hpa, gregkh, x86, linux-kernel,
linux-edac, brucechang, cooperyan, qiyuanwang, benjaminpan,
lukelin, timguo
On Wed, Apr 25, 2018 at 06:33:40PM +0800, David Wang wrote:
> Newer Centaur support CMCI mechnism, which is compatible with INTEL CMCI.
>
> Signed-off-by: David Wang <davidwang@zhaoxin.com>
> ---
> arch/x86/kernel/cpu/mcheck/mce.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
> index 38ccab8..f9a7295 100644
> --- a/arch/x86/kernel/cpu/mcheck/mce.c
> +++ b/arch/x86/kernel/cpu/mcheck/mce.c
> @@ -1757,6 +1757,8 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
> }
> case X86_VENDOR_CENTAUR:
> mce_centaur_feature_init(c);
> + mce_intel_feature_init(c);
> + mce_adjust_timer = cmci_intel_adjust_timer;
This won't work in configs with CONFIG_X86_MCE_INTEL disabled.
You need to define CONFIG_X86_MCE_CENTAUR or so which depends on
CONFIG_CPU_SUP_CENTAUR and CONFIG_X86_MCE_INTEL and which then makes
sure the intel CMCI et al stuff is enabled.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-30 9:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-30 9:48 [v3,2/2] x86/mce: add CMCI support for Centaur CPUs Borislav Petkov
-- strict thread matches above, loose matches on Subject: below --
2018-04-25 10:33 davidwang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox