Received: by 10.192.165.156 with SMTP id m28csp262706imm; Tue, 17 Apr 2018 09:44:03 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/eeBBhgLKq29vSQaVtLCYD365/jhjuwZQK7K1QMz9yUfbArCDKkjB8Jkrh0cdEbjfYjqdL X-Received: by 2002:a17:902:228:: with SMTP id 37-v6mr2662965plc.141.1523983443827; Tue, 17 Apr 2018 09:44:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523983443; cv=none; d=google.com; s=arc-20160816; b=Q0YDoTwc6SAhHEMJP8yzDxwOIG0k0w4vGrXtLU9FbaCtLH9K4CEdk7FN8FVTwM44n5 Ct3zmHwTDrnIFkBxIqUgF7wUIoQ9bFOjJXaObL5CshNtctNOlTb+LlwoXdUSdSKjyuzu hhFXjC9acm5D/dyWR+iUYrFTbBMMAHhZ+6LPIJmwkcngCQ2ZSkfXe60PY02udOHGL+Tz BlsHUKO2RYnpVPliSFz4t5oa1ynusa+Di06jDTlg8/6iI/xldcBhTclvQIqMH+Atrwc+ j4v/+yOrechhz+9aRTTVSUucF8GDtn2Tx7YxgyTA0N5vgFmNs/0AXgFtNUf42nOA9yIu aQ+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=QonIo7HQ6jbc8qp3AqNrxJGtZrzwTnH/rOu7zzGR/bg=; b=LqMtKILppN633w0+91DrvZwLJ/DVRGOOuwM4zsHpVBqyIqgscWlZyYh2OGPhTgL4Og 503q1dJAIvfzHOhVzjBS+wskUsrQnhY/AVDpKfQzMMVYKmwuG+8w6Sf7VgxkMiWa2wOw s2rx6keBTCagZn7OAOTAXiVEtFpQItYkmQ4gZatDmeWcM3S/opDk8p+eYU+jULDe0Icw eFuaSyedCarZNaSYwIjjsxfXc1ewP3bWyBTDPqvtFOpyrAXDaIVLrnSJrOxkOCILs7xv y+Vhgm724oEnxg6ENJT217VWnNNalgmL7VoU5UCLUr2w1H8LeaOKO3+i+UOa9xTP/TtL xQPQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e188si13214950pfe.103.2018.04.17.09.43.49; Tue, 17 Apr 2018 09:44:03 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754953AbeDQQGW (ORCPT + 99 others); Tue, 17 Apr 2018 12:06:22 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34792 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754905AbeDQQGU (ORCPT ); Tue, 17 Apr 2018 12:06:20 -0400 Received: from localhost (unknown [46.44.180.42]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id A9225D14; Tue, 17 Apr 2018 16:06:19 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yazen Ghannam , Borislav Petkov , Thomas Gleixner Subject: [PATCH 4.14 21/49] x86/MCE/AMD: Define a function to get SMCA bank type Date: Tue, 17 Apr 2018 17:59:00 +0200 Message-Id: <20180417155716.034473186@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417155715.032245882@linuxfoundation.org> References: <20180417155715.032245882@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yazen Ghannam commit 11cf887728a3d1de77cc12ce247b64ef32608891 upstream. Scalable MCA systems have various types of banks. The bank's type can determine how we handle errors from it. For example, if a bank represents a UMC (Unified Memory Controller) then we will need to convert its address from a normalized address to a system physical address before handling the error. [ bp: Verify m->bank is within range and use bank pointer. ] Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Link: http://lkml.kernel.org/r/20171207203955.118171-1-Yazen.Ghannam@amd.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -110,6 +110,20 @@ const char *smca_get_long_name(enum smca } EXPORT_SYMBOL_GPL(smca_get_long_name); +static enum smca_bank_types smca_get_bank_type(struct mce *m) +{ + struct smca_bank *b; + + if (m->bank >= N_SMCA_BANK_TYPES) + return N_SMCA_BANK_TYPES; + + b = &smca_banks[m->bank]; + if (!b->hwid) + return N_SMCA_BANK_TYPES; + + return b->hwid->bank_type; +} + static struct smca_hwid smca_hwid_mcatypes[] = { /* { bank_type, hwid_mcatype, xec_bitmap } */