From: davidwang <davidwang@zhaoxin.com>
To: tony.luck@intel.com, bp@alien8.de, tglx@linutronix.de,
mingo@redhat.com, hpa@zytor.com, x86@kernel.org,
linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: brucechang@via-alliance.com, cooperyan@zhaoxin.com,
qiyuanwang@zhaoxin.com, benjaminpan@viatech.com,
lukelin@viacpu.com, timguo@zhaoxin.com,
David Wang <davidwang@zhaoxin.com>
Subject: [1/2] x86/mce: new centaur CPUs support MCE broadcasting
Date: Fri, 30 Mar 2018 17:53:41 +0800 [thread overview]
Message-ID: <1522403622-31146-2-git-send-email-davidwang@zhaoxin.com> (raw)
This patch is used to tell the kernel that newer Centaur CPU support MCE
broadcasting.
Signed-off-by: David Wang <davidwang@zhaoxin.com>
---
arch/x86/kernel/cpu/mcheck/mce.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 7065846..82b25e1 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1688,6 +1688,17 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
if (c->x86 == 6 && c->x86_model == 45)
quirk_no_way_out = quirk_sandybridge_ifu;
}
+
+ if (c->x86_vendor == X86_VENDOR_CENTAUR) {
+ /*
+ * All newer centaur CPUs support MCE broadcasting. Enable
+ * synchronization with a one second timeout.
+ */
+ if ((c->x86 > 6 || (c->x86 == 6 && c->x86_model == 0xf && c->x86_mask >=0xe)) &&
+ cfg->monarch_timeout < 0)
+ cfg->monarch_timeout = USEC_PER_SEC;
+ }
+
if (cfg->monarch_timeout < 0)
cfg->monarch_timeout = 0;
if (cfg->bootlog != 0)
next reply other threads:[~2018-03-30 9:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-30 9:53 davidwang [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-30 10:26 [1/2] x86/mce: new centaur CPUs support MCE broadcasting Borislav Petkov
2018-04-04 11:18 Borislav Petkov
2018-04-08 2:18 davidwang
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=1522403622-31146-2-git-send-email-davidwang@zhaoxin.com \
--to=davidwang@zhaoxin.com \
--cc=benjaminpan@viatech.com \
--cc=bp@alien8.de \
--cc=brucechang@via-alliance.com \
--cc=cooperyan@zhaoxin.com \
--cc=hpa@zytor.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukelin@viacpu.com \
--cc=mingo@redhat.com \
--cc=qiyuanwang@zhaoxin.com \
--cc=tglx@linutronix.de \
--cc=timguo@zhaoxin.com \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox