From mboxrd@z Thu Jan 1 00:00:00 1970 From: Borislav Petkov Subject: Re: [PATCH v5 10/16] x86/mce: enable Hygon support to MCE infrastructure Date: Wed, 5 Sep 2018 11:22:34 +0200 Message-ID: <20180905092234.GC2237@zn.tnic> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Pu Wen Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, thomas.lendacky@amd.com, pbonzini@redhat.com, tony.luck@intel.com, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-edac@vger.kernel.org List-Id: linux-arch.vger.kernel.org On Wed, Aug 29, 2018 at 08:44:54PM +0800, Pu Wen wrote: > Hygon machine check arch is similar to AMD family 17h. To enable the MCE > infrastructure support, add CPU vendor check for Hygon to share the code > path of AMD. > > Add hygon mce init function mce_hygon_feature_init() to minimize further > maintenance effort. > > Signed-off-by: Pu Wen > --- > arch/x86/include/asm/mce.h | 5 +++++ > arch/x86/kernel/cpu/mcheck/mce-severity.c | 3 ++- > arch/x86/kernel/cpu/mcheck/mce.c | 21 +++++++++++++++------ > 3 files changed, 22 insertions(+), 7 deletions(-) > > diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h > index 3a17107..12357aa 100644 > --- a/arch/x86/include/asm/mce.h > +++ b/arch/x86/include/asm/mce.h > @@ -214,6 +214,11 @@ static inline void mce_amd_feature_init(struct cpuinfo_x86 *c) { } > static inline int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr) { return -EINVAL; }; > #endif > > +static inline void mce_hygon_feature_init(struct cpuinfo_x86 *c) > +{ > + return mce_amd_feature_init(c); > +} > + What happens if CONFIG_X86_MCE_AMD=n ? In general, since you're using AMD code, you need to make CPU_SUP_HYGON depend on a bunch of AMD config items like CONFIG_X86_MCE_AMD, CONFIG_CPU_SUP_AMD, CONFIG_AMD_NB,... Audit your code and see what other config items need to be selected. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v5,10/16] x86/mce: enable Hygon support to MCE infrastructure From: Borislav Petkov Message-Id: <20180905092234.GC2237@zn.tnic> Date: Wed, 5 Sep 2018 11:22:34 +0200 To: Pu Wen Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, thomas.lendacky@amd.com, pbonzini@redhat.com, tony.luck@intel.com, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-edac@vger.kernel.org List-ID: T24gV2VkLCBBdWcgMjksIDIwMTggYXQgMDg6NDQ6NTRQTSArMDgwMCwgUHUgV2VuIHdyb3RlOgo+ IEh5Z29uIG1hY2hpbmUgY2hlY2sgYXJjaCBpcyBzaW1pbGFyIHRvIEFNRCBmYW1pbHkgMTdoLiBU byBlbmFibGUgdGhlIE1DRQo+IGluZnJhc3RydWN0dXJlIHN1cHBvcnQsIGFkZCBDUFUgdmVuZG9y IGNoZWNrIGZvciBIeWdvbiB0byBzaGFyZSB0aGUgY29kZQo+IHBhdGggb2YgQU1ELgo+IAo+IEFk ZCBoeWdvbiBtY2UgaW5pdCBmdW5jdGlvbiBtY2VfaHlnb25fZmVhdHVyZV9pbml0KCkgdG8gbWlu aW1pemUgZnVydGhlcgo+IG1haW50ZW5hbmNlIGVmZm9ydC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBQ dSBXZW4gPHB1d2VuQGh5Z29uLmNuPgo+IC0tLQo+ICBhcmNoL3g4Ni9pbmNsdWRlL2FzbS9tY2Uu aCAgICAgICAgICAgICAgICB8ICA1ICsrKysrCj4gIGFyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNr L21jZS1zZXZlcml0eS5jIHwgIDMgKystCj4gIGFyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNrL21j ZS5jICAgICAgICAgIHwgMjEgKysrKysrKysrKysrKysrLS0tLS0tCj4gIDMgZmlsZXMgY2hhbmdl ZCwgMjIgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvYXJj aC94ODYvaW5jbHVkZS9hc20vbWNlLmggYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9tY2UuaAo+IGlu ZGV4IDNhMTcxMDcuLjEyMzU3YWEgMTAwNjQ0Cj4gLS0tIGEvYXJjaC94ODYvaW5jbHVkZS9hc20v bWNlLmgKPiArKysgYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9tY2UuaAo+IEBAIC0yMTQsNiArMjE0 LDExIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBtY2VfYW1kX2ZlYXR1cmVfaW5pdChzdHJ1Y3QgY3B1 aW5mb194ODYgKmMpIHsgfQo+ICBzdGF0aWMgaW5saW5lIGludCB1bWNfbm9ybWFkZHJfdG9fc3lz YWRkcih1NjQgbm9ybV9hZGRyLCB1MTYgbmlkLCB1OCB1bWMsIHU2NCAqc3lzX2FkZHIpIHsgcmV0 dXJuIC1FSU5WQUw7IH07Cj4gICNlbmRpZgo+ICAKPiArc3RhdGljIGlubGluZSB2b2lkIG1jZV9o eWdvbl9mZWF0dXJlX2luaXQoc3RydWN0IGNwdWluZm9feDg2ICpjKQo+ICt7Cj4gKwlyZXR1cm4g bWNlX2FtZF9mZWF0dXJlX2luaXQoYyk7Cj4gK30KPiArCgpXaGF0IGhhcHBlbnMgaWYgQ09ORklH X1g4Nl9NQ0VfQU1EPW4gPwoKSW4gZ2VuZXJhbCwgc2luY2UgeW91J3JlIHVzaW5nIEFNRCBjb2Rl LCB5b3UgbmVlZCB0byBtYWtlIENQVV9TVVBfSFlHT04KZGVwZW5kIG9uIGEgYnVuY2ggb2YgQU1E IGNvbmZpZyBpdGVtcyBsaWtlIENPTkZJR19YODZfTUNFX0FNRCwKQ09ORklHX0NQVV9TVVBfQU1E LCBDT05GSUdfQU1EX05CLC4uLiBBdWRpdCB5b3VyIGNvZGUgYW5kIHNlZSB3aGF0IG90aGVyCmNv bmZpZyBpdGVtcyBuZWVkIHRvIGJlIHNlbGVjdGVkLgo=