From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757846AbcIMNeA (ORCPT ); Tue, 13 Sep 2016 09:34:00 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39432 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756473AbcIMNdv (ORCPT ); Tue, 13 Sep 2016 09:33:51 -0400 Date: Tue, 13 Sep 2016 06:33:31 -0700 From: tip-bot for Yazen Ghannam Message-ID: Cc: bp@suse.de, hpa@zytor.com, Yazen.Ghannam@amd.com, mingo@kernel.org, tglx@linutronix.de, aravindksg.lkml@gmail.com, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, Yazen.Ghannam@amd.com, tglx@linutronix.de, mingo@kernel.org, bp@suse.de, aravindksg.lkml@gmail.com, linux-kernel@vger.kernel.org In-Reply-To: <1473384591-5323-2-git-send-email-Yazen.Ghannam@amd.com> References: <1473384591-5323-1-git-send-email-Yazen.Ghannam@amd.com> <1473384591-5323-2-git-send-email-Yazen.Ghannam@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/MCE/AMD, EDAC: Handle reserved bank 4 on Fam17h properly Git-Commit-ID: a884675b873a0185d2626d1f304987c94cef6d74 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a884675b873a0185d2626d1f304987c94cef6d74 Gitweb: http://git.kernel.org/tip/a884675b873a0185d2626d1f304987c94cef6d74 Author: Yazen Ghannam AuthorDate: Mon, 12 Sep 2016 09:59:40 +0200 Committer: Thomas Gleixner CommitDate: Tue, 13 Sep 2016 15:23:14 +0200 x86/MCE/AMD, EDAC: Handle reserved bank 4 on Fam17h properly Bank 4 is reserved on family 0x17 and shouldn't generate any MCE records. However, broken hardware and software is not something unheard of so warn about bank 4 errors. They shouldn't be coming from bank 4 naturally but users can still use mce_amd_inj to simulate errors from it for testing purposed. Also, avoid special handling in the injector mce_amd_inj like it is being done on the older families. [ bp: Rewrite commit message and merge into one patch. Use boot_cpu_data. ] Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Reviewed-by: Aravind Gopalakrishnan Link: http://lkml.kernel.org/r/1473384591-5323-1-git-send-email-Yazen.Ghannam@amd.com Link: http://lkml.kernel.org/r/1473384591-5323-2-git-send-email-Yazen.Ghannam@amd.com Signed-off-by: Thomas Gleixner --- arch/x86/ras/mce_amd_inj.c | 4 +++- drivers/edac/mce_amd.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c index ff8eb1a..f4b442c 100644 --- a/arch/x86/ras/mce_amd_inj.c +++ b/arch/x86/ras/mce_amd_inj.c @@ -308,7 +308,9 @@ static void do_inject(void) * only on the node base core. Refer to D18F3x44[NbMcaToMstCpuEn] for * Fam10h and later BKDGs. */ - if (static_cpu_has(X86_FEATURE_AMD_DCM) && b == 4) { + if (static_cpu_has(X86_FEATURE_AMD_DCM) && + b == 4 && + boot_cpu_data.x86 < 0x17) { toggle_nb_mca_mst_cpu(amd_get_nb_id(cpu)); cpu = get_nbc_for_node(amd_get_nb_id(cpu)); } diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c index e8855a4..daaac2c 100644 --- a/drivers/edac/mce_amd.c +++ b/drivers/edac/mce_amd.c @@ -859,6 +859,9 @@ static void decode_smca_errors(struct mce *m) if (m->bank >= ARRAY_SIZE(smca_banks)) return; + if (boot_cpu_data.x86 >= 0x17 && m->bank == 4) + pr_emerg(HW_ERR "Bank 4 is reserved on Fam17h.\n"); + type = smca_banks[m->bank].type; if (!type) return;