From: Borislav Petkov <bp@alien8.de>
To: Tony W Wang-oc <TonyWWang-oc@zhaoxin.com>
Cc: "tony.luck@intel.com" <tony.luck@intel.com>,
"tglx@linutronix.de" <tglx@linutronix.de>,
"mingo@redhat.com" <mingo@redhat.com>,
"hpa@zytor.com" <hpa@zytor.com>,
"x86@kernel.org" <x86@kernel.org>,
"linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"yazen.ghannam@amd.com" <yazen.ghannam@amd.com>,
"vishal.l.verma@intel.com" <vishal.l.verma@intel.com>,
"qiuxu.zhuo@intel.com" <qiuxu.zhuo@intel.com>,
David Wang <DavidWang@zhaoxin.com>,
"Cooper Yan(BJ-RD)" <CooperYan@zhaoxin.com>,
"Qiyuan Wang(BJ-RD)" <QiyuanWang@zhaoxin.com>,
"Herry Yang(BJ-RD)" <HerryYang@zhaoxin.com>
Subject: Re: [PATCH v2 3/4] x86/mce: Add Zhaoxin CMCI support
Date: Tue, 10 Sep 2019 14:37:20 +0200 [thread overview]
Message-ID: <20190910123720.GF23931@zn.tnic> (raw)
In-Reply-To: <e8d11f3ce0f64a9f9a4cefcc8059747b@zhaoxin.com>
On Tue, Sep 10, 2019 at 08:19:44AM +0000, Tony W Wang-oc wrote:
> @@ -1777,6 +1777,29 @@ static void mce_centaur_feature_init(struct cpuinfo_x86 *c)
> }
> }
>
> +#ifdef CONFIG_CPU_SUP_ZHAOXIN
What's that ifdeffery for since you have it in the header already?
> +void mce_zhaoxin_feature_init(struct cpuinfo_x86 *c)
> +{
> + struct mce_bank *mce_banks = this_cpu_ptr(mce_banks_array);
> +
> + /*
> + * These CPUs bank8 SVAD error may be triggered unexpected when
"These CPUs bank8 SVAD"??
> + * bringup virtual machine. it is not hardware bug. Always disable
> + * bank8 SVAD error by default.
> + */
That comment is incomprehensible. Please rewrite.
> + if ((c->x86 == 6 && c->x86_model == 0x19 &&
> + (c->x86_stepping > 3 && c->x86_stepping < 8)) ||
> + (c->x86 == 6 && c->x86_model == 0x1f) ||
> + (c->x86 == 7 && c->x86_model == 0x1b)) {
As before: potential to simplify the test here?
> + if (this_cpu_read(mce_num_banks) > 8)
> + mce_banks[8].ctl = 0;
> + }
> +
> + intel_init_cmci();
> + mce_adjust_timer = cmci_intel_adjust_timer;
> +}
> +#endif
> +
> static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
> {
> switch (c->x86_vendor) {
> @@ -1798,6 +1821,10 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
> mce_centaur_feature_init(c);
> break;
>
> + case X86_VENDOR_ZHAOXIN:
> + mce_zhaoxin_feature_init(c);
> + break;
> +
> default:
> break;
> }
> diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
> index eee4b12..b49cba7 100644
> --- a/arch/x86/kernel/cpu/mce/intel.c
> +++ b/arch/x86/kernel/cpu/mce/intel.c
> @@ -85,7 +85,8 @@ static int cmci_supported(int *banks)
> * initialization is vendor keyed and this
> * makes sure none of the backdoors are entered otherwise.
> */
That comment above needs fixing too.
> - if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
> + if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL &&
> + boot_cpu_data.x86_vendor != X86_VENDOR_ZHAOXIN)
> return 0;
<---- newline here.
> if (!boot_cpu_has(X86_FEATURE_APIC) || lapic_get_maxlvt() < 6)
> return 0;
> --
> 2.7.4
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
next prev parent reply other threads:[~2019-09-10 12:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-10 8:19 [PATCH v2 3/4] x86/mce: Add Zhaoxin CMCI support Tony W Wang-oc
2019-09-10 12:37 ` Borislav Petkov [this message]
2019-09-11 10:12 ` 答复: " Tony W Wang-oc
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=20190910123720.GF23931@zn.tnic \
--to=bp@alien8.de \
--cc=CooperYan@zhaoxin.com \
--cc=DavidWang@zhaoxin.com \
--cc=HerryYang@zhaoxin.com \
--cc=QiyuanWang@zhaoxin.com \
--cc=TonyWWang-oc@zhaoxin.com \
--cc=hpa@zytor.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=qiuxu.zhuo@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=vishal.l.verma@intel.com \
--cc=x86@kernel.org \
--cc=yazen.ghannam@amd.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: 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;
as well as URLs for NNTP newsgroup(s).