From patchwork Sun Dec 29 15:55:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 11312243 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FBC2930 for ; Sun, 29 Dec 2019 15:55:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E8AB208E4 for ; Sun, 29 Dec 2019 15:55:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577634927; bh=Z51fjA/dJTz44FdjBrdddLFQSntfnRIvUBt3qkOudAA=; h=Subject:To:Cc:From:Date:List-ID:From; b=ptLlHGIrD3KKwc1HvXeJhnLR5DTX8l9ro+g7AnSa1eUcU7ZAF1dGascAUPX77O+t3 xTRGfSbjFZKnzGkkpEFekZlKf+mH5ooPqZs80KLQIySwDbDa0yezGi1dN4C6PEW22S nA3C/HFCqj9boqPMiJZpADVn5b88i5E1GqAF8MA8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726575AbfL2Pz0 (ORCPT ); Sun, 29 Dec 2019 10:55:26 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52733 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbfL2Pz0 (ORCPT ); Sun, 29 Dec 2019 10:55:26 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 1EBF621D51; Sun, 29 Dec 2019 10:55:26 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sun, 29 Dec 2019 10:55:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=wjMf0V Or/fnAXTtPZLfSZaQ0ctXH1IQYJ9ANj8o4Ye0=; b=S6jlPYHDKeLfQaDabl1fm/ 7/0RFa1a2BczF9PQZJkcpWDc6hwHtJXK/AaKWAFSiXZtT0WikGykgnxeg7znp3BY kHEp/olJEiRQJDG3BGxUB8oK3j0NIbW8hQT/TKrtgvOVm1WLt8oIfXpAppj2me9A 43zIHXIv0/sAV3Qp3Ft8gvfNbfN5jIw2zEJuRBWuifF0D3J30+C4ZF+hc2Re03u5 +4kpDLVDOtUyacaDxBc4XMLkgfWlRML8JGu4oR6730t0Bmt0SDHZM1PrDm4udMyZ qgSBhOvqWDLbIACNXnRdb+apnZKuc1HEPnMpUQLrQF9mQGxUOtaJCDWBo+eQecuw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrvdeffedgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtjeenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucfkphepkeefrdekiedrkeelrd dutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomhen ucevlhhushhtvghrufhiiigvpedu X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id B6B453060AAA; Sun, 29 Dec 2019 10:55:25 -0500 (EST) Subject: FAILED: patch "[PATCH] x86/mce: Fix possibly incorrect severity calculation on AMD" failed to apply to 4.14-stable tree To: jschoenh@amazon.de, Yazen.Ghannam@amd.com, bp@suse.de, hpa@zytor.com, linux-edac@vger.kernel.org, mingo@kernel.org, stable@vger.kernel.org, tglx@linutronix.de, tony.luck@intel.com, x86@kernel.org Cc: From: Date: Sun, 29 Dec 2019 16:55:16 +0100 Message-ID: <157763491610201@kroah.com> MIME-Version: 1.0 Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From a3a57ddad061acc90bef39635caf2b2330ce8f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=2E=20Sch=C3=B6nherr?= Date: Tue, 10 Dec 2019 01:07:30 +0100 Subject: [PATCH] x86/mce: Fix possibly incorrect severity calculation on AMD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function mce_severity_amd_smca() requires m->bank to be initialized for correct operation. Fix the one case, where mce_severity() is called without doing so. Fixes: 6bda529ec42e ("x86/mce: Grade uncorrected errors for SMCA-enabled systems") Fixes: d28af26faa0b ("x86/MCE: Initialize mce.bank in the case of a fatal error in mce_no_way_out()") Signed-off-by: Jan H. Schönherr Signed-off-by: Borislav Petkov Reviewed-by: Tony Luck Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: linux-edac Cc: Cc: Thomas Gleixner Cc: x86-ml Cc: Yazen Ghannam Link: https://lkml.kernel.org/r/20191210000733.17979-4-jschoenh@amazon.de diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 5f42f25bac8f..2e2a421c8528 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -819,8 +819,8 @@ static int mce_no_way_out(struct mce *m, char **msg, unsigned long *validp, if (quirk_no_way_out) quirk_no_way_out(i, m, regs); + m->bank = i; if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) { - m->bank = i; mce_read_aux(m, i); *msg = tmp; return 1;