From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753538AbbKXJcf (ORCPT ); Tue, 24 Nov 2015 04:32:35 -0500 Received: from terminus.zytor.com ([198.137.202.10]:55249 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753073AbbKXJcd (ORCPT ); Tue, 24 Nov 2015 04:32:33 -0500 Date: Tue, 24 Nov 2015 01:31:35 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: mingo@kernel.org, tony.luck@intel.com, luto@amacapital.net, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, brgerst@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, bp@suse.de, bp@alien8.de, dvlasenk@redhat.com Reply-To: mingo@kernel.org, tony.luck@intel.com, tglx@linutronix.de, luto@amacapital.net, peterz@infradead.org, torvalds@linux-foundation.org, brgerst@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, bp@suse.de, bp@alien8.de, dvlasenk@redhat.com In-Reply-To: <1448350880-5573-4-git-send-email-bp@alien8.de> References: <1448350880-5573-4-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce: Add the missing memory error check on AMD Git-Commit-ID: db548a28fcee0f38cf4c7c726becf24c8afacf02 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: db548a28fcee0f38cf4c7c726becf24c8afacf02 Gitweb: http://git.kernel.org/tip/db548a28fcee0f38cf4c7c726becf24c8afacf02 Author: Borislav Petkov AuthorDate: Tue, 24 Nov 2015 08:41:19 +0100 Committer: Ingo Molnar CommitDate: Tue, 24 Nov 2015 09:12:35 +0100 x86/mce: Add the missing memory error check on AMD We simply need to look at the extended error code when detecting whether the error is of type memory. Signed-off-by: Borislav Petkov Acked-by: Tony Luck Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1448350880-5573-4-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/mcheck/mce.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index fb8b1db..e00e85a 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -522,10 +522,10 @@ static bool memory_error(struct mce *m) struct cpuinfo_x86 *c = &boot_cpu_data; if (c->x86_vendor == X86_VENDOR_AMD) { - /* - * coming soon - */ - return false; + /* ErrCodeExt[20:16] */ + u8 xec = (m->status >> 16) & 0x1f; + + return (xec == 0x0 || xec == 0x8); } else if (c->x86_vendor == X86_VENDOR_INTEL) { /* * Intel SDM Volume 3B - 15.9.2 Compound Error Codes