From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C919EEB64D7 for ; Wed, 14 Jun 2023 02:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242115AbjFNCGw (ORCPT ); Tue, 13 Jun 2023 22:06:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229499AbjFNCGu (ORCPT ); Tue, 13 Jun 2023 22:06:50 -0400 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2ACDE1989; Tue, 13 Jun 2023 19:06:49 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=xueshuai@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0Vl4LPdK_1686708404; Received: from 30.240.112.107(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0Vl4LPdK_1686708404) by smtp.aliyun-inc.com; Wed, 14 Jun 2023 10:06:46 +0800 Message-ID: <9d0adc21-5b71-a949-fc6d-95dd7ef6f0a7@linux.alibaba.com> Date: Wed, 14 Jun 2023 10:06:42 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.11.1 Subject: Re: [PATCH 1/3] x86/MCE/AMD: Split amd_mce_is_memory_error() Content-Language: en-US To: Yazen Ghannam , linux-edac@vger.kernel.org Cc: linux-kernel@vger.kernel.org, tony.luck@intel.com, x86@kernel.org, muralidhara.mk@amd.com, joao.m.martins@oracle.com, william.roche@oracle.com, boris.ostrovsky@oracle.com, john.allen@amd.com, baolin.wang@linux.alibaba.com References: <20230613141142.36801-1-yazen.ghannam@amd.com> <20230613141142.36801-2-yazen.ghannam@amd.com> From: Shuai Xue In-Reply-To: <20230613141142.36801-2-yazen.ghannam@amd.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023/6/13 22:11, Yazen Ghannam wrote: > Define helper functions for legacy and SMCA systems in order to reuse > individual checks in later changes. > > Describe what each function is checking for, and correct the XEC bitmask > for SMCA. > > No functional change intended. > > Signed-off-by: Yazen Ghannam > --- > arch/x86/kernel/cpu/mce/amd.c | 30 +++++++++++++++++++++++++----- > 1 file changed, 25 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c > index 5e74610b39e7..1ccfb0c9257f 100644 > --- a/arch/x86/kernel/cpu/mce/amd.c > +++ b/arch/x86/kernel/cpu/mce/amd.c > @@ -713,17 +713,37 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) > deferred_error_interrupt_enable(c); > } > > -bool amd_mce_is_memory_error(struct mce *m) > +/* > + * DRAM ECC errors are reported in the Northbridge (bank 4) with > + * Extended Error Code 8. > + */ > +static bool legacy_mce_is_memory_error(struct mce *m) > +{ > + return m->bank == 4 && XEC(m->status, 0x1f) == 8; > +} > + > +/* > + * DRAM ECC errors are reported in Unified Memory Controllers with > + * Extended Error Code 0. > + */ > +static bool smca_mce_is_memory_error(struct mce *m) > { > enum smca_bank_types bank_type; > - /* ErrCodeExt[20:16] */ > - u8 xec = (m->status >> 16) & 0x1f; > + > + if (XEC(m->status, 0x3f)) > + return false; > > bank_type = smca_get_bank_type(m->extcpu, m->bank); > + > + return bank_type == SMCA_UMC || bank_type == SMCA_UMC_V2; > +} > + > +bool amd_mce_is_memory_error(struct mce *m) > +{ > if (mce_flags.smca) > - return (bank_type == SMCA_UMC || bank_type == SMCA_UMC_V2) && xec == 0x0; > + return smca_mce_is_memory_error(m); > > - return m->bank == 4 && xec == 0x8; > + return legacy_mce_is_memory_error(m); > } > > static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc) Hi, Yazen, Which tree are you working on? This patch can not be applied to Linus master ? (commit b6dad5178ceaf23f369c3711062ce1f2afc33644) Thanks. Best Regards, Shuai