From: tip-bot for David Wang <tipbot@zytor.com> To: linux-tip-commits@vger.kernel.org Cc: bp@suse.de, davidwang@zhaoxin.com, greg@kroah.com, linux-edac@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, tony.luck@intel.com, linux-kernel@vger.kernel.org Subject: [tip:ras/core] x86/MCE: Enable MCE broadcasting on new Centaur CPUs Date: Sun, 6 May 2018 03:51:56 -0700 [thread overview] Message-ID: <tip-13e8582245267b872dc6eb4ab695fffc797d99f5@git.kernel.org> (raw) In-Reply-To: <1524652420-17330-2-git-send-email-davidwang@zhaoxin.com> Commit-ID: 13e8582245267b872dc6eb4ab695fffc797d99f5 Gitweb: https://git.kernel.org/tip/13e8582245267b872dc6eb4ab695fffc797d99f5 Author: David Wang <davidwang@zhaoxin.com> AuthorDate: Wed, 25 Apr 2018 18:33:39 +0800 Committer: Thomas Gleixner <tglx@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 <davidwang@zhaoxin.com> Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: lukelin@viacpu.com Cc: qiyuanwang@zhaoxin.com Cc: Greg KH <greg@kroah.com> Cc: brucechang@via-alliance.com Cc: timguo@zhaoxin.com Cc: cooperyan@zhaoxin.com Cc: Tony Luck <tony.luck@intel.com> Cc: benjaminpan@viatech.com Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/1524652420-17330-2-git-send-email-davidwang@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;
WARNING: multiple messages have this Message-ID (diff)
From: tip-bot for Borislav Petkov <tipbot@zytor.com> To: linux-tip-commits@vger.kernel.org Cc: bp@suse.de, davidwang@zhaoxin.com, greg@kroah.com, linux-edac@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, tony.luck@intel.com, linux-kernel@vger.kernel.org Subject: [tip:ras/core] x86/MCE: Enable MCE broadcasting on new Centaur CPUs Date: Sun, 6 May 2018 03:51:56 -0700 [thread overview] Message-ID: <tip-13e8582245267b872dc6eb4ab695fffc797d99f5@git.kernel.org> (raw) Commit-ID: 13e8582245267b872dc6eb4ab695fffc797d99f5 Gitweb: https://git.kernel.org/tip/13e8582245267b872dc6eb4ab695fffc797d99f5 Author: David Wang <davidwang@zhaoxin.com> AuthorDate: Wed, 25 Apr 2018 18:33:39 +0800 Committer: Thomas Gleixner <tglx@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 <davidwang@zhaoxin.com> Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: lukelin@viacpu.com Cc: qiyuanwang@zhaoxin.com Cc: Greg KH <greg@kroah.com> Cc: brucechang@via-alliance.com Cc: timguo@zhaoxin.com Cc: cooperyan@zhaoxin.com Cc: Tony Luck <tony.luck@intel.com> Cc: benjaminpan@viatech.com Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/1524652420-17330-2-git-send-email-davidwang@zhaoxin.com --- arch/x86/kernel/cpu/mcheck/mce.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-edac" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;
next prev parent reply other threads:[~2018-05-06 10:52 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-25 10:33 [PATCH v3 0/2] MCA support for Centaur CPUs David Wang 2018-04-25 10:33 ` [PATCH v3 1/2] x86/mce: new Centaur CPU support MCE broadcasting David Wang 2018-04-25 10:33 ` [v3,1/2] " davidwang 2018-04-30 9:41 ` [PATCH v3 1/2] " Borislav Petkov 2018-04-30 9:41 ` [v3,1/2] " Borislav Petkov 2018-05-06 10:51 ` tip-bot for David Wang [this message] 2018-05-06 10:51 ` [tip:ras/core] x86/MCE: Enable MCE broadcasting on new Centaur CPUs tip-bot for Borislav Petkov 2018-04-25 10:33 ` [PATCH v3 2/2] x86/mce: add CMCI support for " David Wang 2018-04-25 10:33 ` [v3,2/2] " davidwang 2018-04-30 9:48 ` [PATCH v3 2/2] " Borislav Petkov 2018-04-30 9:48 ` [v3,2/2] " Borislav Petkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tip-13e8582245267b872dc6eb4ab695fffc797d99f5@git.kernel.org \ --to=tipbot@zytor.com \ --cc=bp@suse.de \ --cc=davidwang@zhaoxin.com \ --cc=greg@kroah.com \ --cc=hpa@zytor.com \ --cc=linux-edac@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@vger.kernel.org \ --cc=mingo@kernel.org \ --cc=tglx@linutronix.de \ --cc=tony.luck@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.