Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3099789ybj; Mon, 23 Sep 2019 14:51:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqyyybyIA8RJ2RwbonBxhb4kZSOQZoOahnd5IqQr6WhHejSbWUq16U2ja07d/XsrELRvEgDY X-Received: by 2002:a50:aa86:: with SMTP id q6mr2438878edc.288.1569275518733; Mon, 23 Sep 2019 14:51:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569275518; cv=none; d=google.com; s=arc-20160816; b=ShK838QzJVm1B0bQ3/W+gk5tVrM4A5Wos73cK1ymbgHq28bXmQPoiHpXUWu738iv3R egpfOumwd65xt3MO+cepQKegRJw8R2opQ6j+Bti8kmVNrYPd1J6UblIMV+vGGad+KFQ7 Ujgzzku2EGX8yzqgm2MM8qddF/G+Uzu+iLevStfW9W6OBbhFcnItwZsWLOTsA+Dpzsw7 K8obQgVZreQQhPG5SAYWjKFOvp7fcE9itSA9aT0VHyoQUELQGC3/wpoF4veu+9SpL6Hg 2sOFmRDkgCVMIKb2z6K1Vr55Z8XSk8XLKIkiyBzndrWilMYMWn4a/hmvCzPCnxel8pV6 Earw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4p/u8eoCUCiQRceDdADufqB/xgRMq4+bwfACYDQ14Gs=; b=Pp+UBBUIw2L7PZLdTUikzN5SJKG5/VHfthDPPZDBp+kTGbppq0Ne92BmzhR069D2f4 qW7jQVwEksRNybp7EMKOxqwRV6/g/lPYS53PUaBtZkx88WsAILE+C2bgV7ay7T2eftg+ lzX18pctcyhCXYQZdjCSbYuH10dy5D5EBuhHgJr2JDdCYXRnyVAEraddTP8JAkh55PVx ZSDbf0R6yu7Zli0Xq2XEMTAISwL8OuVjzmM8WlAQoGLEoMcH+bdh48VKZR7wfcyRuofu 5VitnfVSc7kJ46C6ybnJwYnpnPXQBSb29OGkd3fgd8i6Lq1n82g+0ZQfAs5Tm21h9OzF Wy/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T32sLot+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c8si8129236edb.82.2019.09.23.14.51.35; Mon, 23 Sep 2019 14:51:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T32sLot+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390760AbfIVSrW (ORCPT + 99 others); Sun, 22 Sep 2019 14:47:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:43626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390641AbfIVSrO (ORCPT ); Sun, 22 Sep 2019 14:47:14 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E4143214D9; Sun, 22 Sep 2019 18:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178034; bh=nxhfcdcem27JgN1iEngjzJ+W+McMsJHgH8HRx+nl0Sc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T32sLot+GnDhVATM5EtOe7zr6kMaxu+HSCbtdCi7z4oMcDL+UxdxGaQRzUecN1CKO 5N3plpMVTmPxwgTktQFhw8x3SXD1ennbwNRkhP3NeTohspqvyVTp/KHTyMsiMCdzrz AB13jBdYyYJ6v8Pcwj7dCXFqtDp7CpxpVV20H9rs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yazen Ghannam , Borislav Petkov , "linux-edac@vger.kernel.org" , James Morse , Mauro Carvalho Chehab , Tony Luck , Sasha Levin Subject: [PATCH AUTOSEL 5.3 115/203] EDAC/amd64: Decode syndrome before translating address Date: Sun, 22 Sep 2019 14:42:21 -0400 Message-Id: <20190922184350.30563-115-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yazen Ghannam [ Upstream commit 8a2eaab7daf03b23ac902481218034ae2fae5e16 ] AMD Family 17h systems currently require address translation in order to report the system address of a DRAM ECC error. This is currently done before decoding the syndrome information. The syndrome information does not depend on the address translation, so the proper EDAC csrow/channel reporting can function without the address. However, the syndrome information will not be decoded if the address translation fails. Decode the syndrome information before doing the address translation. The syndrome information is architecturally defined in MCA_SYND and can be considered robust. The address translation is system-specific and may fail on newer systems without proper updates to the translation algorithm. Fixes: 713ad54675fd ("EDAC, amd64: Define and register UMC error decode function") Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Cc: "linux-edac@vger.kernel.org" Cc: James Morse Cc: Mauro Carvalho Chehab Cc: Tony Luck Link: https://lkml.kernel.org/r/20190821235938.118710-6-Yazen.Ghannam@amd.com Signed-off-by: Sasha Levin --- drivers/edac/amd64_edac.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index ffe56a8fe39da..608fdab566b32 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2550,13 +2550,6 @@ static void decode_umc_error(int node_id, struct mce *m) err.channel = find_umc_channel(m); - if (umc_normaddr_to_sysaddr(m->addr, pvt->mc_node_id, err.channel, &sys_addr)) { - err.err_code = ERR_NORM_ADDR; - goto log_error; - } - - error_address_to_page_and_offset(sys_addr, &err); - if (!(m->status & MCI_STATUS_SYNDV)) { err.err_code = ERR_SYND; goto log_error; @@ -2573,6 +2566,13 @@ static void decode_umc_error(int node_id, struct mce *m) err.csrow = m->synd & 0x7; + if (umc_normaddr_to_sysaddr(m->addr, pvt->mc_node_id, err.channel, &sys_addr)) { + err.err_code = ERR_NORM_ADDR; + goto log_error; + } + + error_address_to_page_and_offset(sys_addr, &err); + log_error: __log_ecc_error(mci, &err, ecc_type); } -- 2.20.1