Commit-ID: 13e8582245267b872dc6eb4ab695fffc797d99f5 Gitweb: https://git.kernel.org/tip/13e8582245267b872dc6eb4ab695fffc797d99f5 Author: David Wang <davidw...@zhaoxin.com> AuthorDate: Wed, 25 Apr 2018 18:33:39 +0800 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Sun, 6 May 2018 12:46:25 +0200
x86/MCE: Enable MCE broadcasting on new Centaur CPUs Newer Centaur multi-core CPUs also support MCE broadcasting to all cores. Add a Centaur-specific init function setting that up. [ bp: - make mce_centaur_feature_init() static - flip check to do the f/m/s first for better readability - touch up text ] Signed-off-by: David Wang <davidw...@zhaoxin.com> Signed-off-by: Borislav Petkov <b...@suse.de> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Cc: luke...@viacpu.com Cc: qiyuanw...@zhaoxin.com Cc: Greg KH <g...@kroah.com> Cc: brucech...@via-alliance.com Cc: tim...@zhaoxin.com Cc: cooper...@zhaoxin.com Cc: Tony Luck <tony.l...@intel.com> Cc: benjamin...@viatech.com Cc: linux-edac <linux-e...@vger.kernel.org> Link: http://lkml.kernel.org/r/1524652420-17330-2-git-send-email-davidw...@zhaoxin.com --- arch/x86/kernel/cpu/mcheck/mce.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 42cf2880d0ed..cd76380af79f 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1727,6 +1727,21 @@ static void __mcheck_cpu_init_early(struct cpuinfo_x86 *c) } } +static void mce_centaur_feature_init(struct cpuinfo_x86 *c) +{ + struct mca_config *cfg = &mca_cfg; + + /* + * All newer Centaur CPUs support MCE broadcasting. Enable + * synchronization with a one second timeout. + */ + if ((c->x86 == 6 && c->x86_model == 0xf && c->x86_stepping >= 0xe) || + c->x86 > 6) { + if (cfg->monarch_timeout < 0) + cfg->monarch_timeout = USEC_PER_SEC; + } +} + static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) { switch (c->x86_vendor) { @@ -1739,6 +1754,9 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) mce_amd_feature_init(c); break; } + case X86_VENDOR_CENTAUR: + mce_centaur_feature_init(c); + break; default: break;
