From patchwork Thu Aug 10 12:35:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 134035 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp487356vqi; Thu, 10 Aug 2023 08:10:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEL29ZJfzAOc+Hfdy/PtvvI5hblSB7fLnnKJBQtIicCwfTolyZSLi61Osm3Fm5IaS0oVUH X-Received: by 2002:a17:902:e54a:b0:1bc:8fca:9d59 with SMTP id n10-20020a170902e54a00b001bc8fca9d59mr2690957plf.29.1691680211703; Thu, 10 Aug 2023 08:10:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691680211; cv=none; d=google.com; s=arc-20160816; b=srRswVIpY0iT3G5Y6QPwgrZagp37izlWLfK9Y6ti/yzQfcGf9Fx7R7qEtQ2djyhhfS F/UiRNmbX0ClDkp7l+YhSySG9lO96tuf04pYXYGIATA6tCvrU39oCtdjm3X+UyTtBiKL 1Ab4QlvO4lsQ7QnxYd5gonDM5AH20tzdiqumF/V2L98cs05iYF2h68hEWjMR33ck9VA7 7sOhawoPw7/9cla7+ZUlnJANGqgN8behKWNUBYw9+V1hxznqiRm8l8YiftUg3etObgbI r9hgCHN2N7H3KOjRp4CXwAAVFIzq2MQ+o2iR9p8b2tjqS7fDS4gSiQdLNEN0cIyD5qNH Hq4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=4AOA3juOIQNmrX4YecMJliaKSwuiLgc7BWVyKrv+dgw=; fh=SQ1lUSDhbK4ARMm6mc/55qsB0byr7CtNIHhTClGD6q8=; b=Y2MwnRdgBPQMGXY4mirDyRlhSIj1HV+TfJscuj1T80keQt4XLhgScznJMcTkfuD9wb KHacdtQ78Zhkbmz9k50c/E2R6yoYnTdrHsGk0P6NrpoyP/q0KGUzDBsA0UF2B9mWhbOG Ks+thsghKyIUCPxllglG9M0QYw+N77IPtu+5ssjCUU5PU80FsiYvpXoNtY3hgv8Zdhh/ chpiFFqmARWt29m5abe91x04+d5akZArmak7L5vbL5BCJ0aaVnGKpnGvP3BlQ/gb1lBw tNuaz6lvU6A/+wxG5BL1ucr1faT7q9H+9R5+HqL6VdN0D4PU+EpSUoy4s3aBDBA4JnX+ NB6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=DJC7lwsX; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=jgiurzG1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h13-20020a170902f54d00b001bc17ab8d6esi1685763plf.530.2023.08.10.08.09.48; Thu, 10 Aug 2023 08:10:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=DJC7lwsX; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=jgiurzG1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235196AbjHJMfK (ORCPT + 99 others); Thu, 10 Aug 2023 08:35:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231437AbjHJMfJ (ORCPT ); Thu, 10 Aug 2023 08:35:09 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A42F8213B; Thu, 10 Aug 2023 05:35:08 -0700 (PDT) Date: Thu, 10 Aug 2023 12:35:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691670906; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4AOA3juOIQNmrX4YecMJliaKSwuiLgc7BWVyKrv+dgw=; b=DJC7lwsXgKBIjUuVBSV4CeQ8cIp2UCrqz9iRn+CW5b8CRyWXg55gnTphy7qEzeLKZMmm4W f7Vlnhb7n0Hp0ZOteuReHl6DJ76Bj/a7bcf2rexuoVzWyyiHlPkr2O7YED8FbJOKMZQ/iy oJFpEZ7MX9rgg/Ud2JBYVUP+hCRC1Fdxt3tFQpxLs29OjANPJE4vDbSADlydmS1aEOjwSu nkWVi+bev3QXN7Z/LfyG4woeLqv9WHmPbSEmuPws4nWs5/OFwzv0sM5r8Kx328k7bzXAXd BNir2QKGIrBypL4Ebt4QinPc4rem/xW3nGERHdkvdUFBMvrmNk3QcMmy/Ol6EQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691670906; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4AOA3juOIQNmrX4YecMJliaKSwuiLgc7BWVyKrv+dgw=; b=jgiurzG1vy9C5oICQkvNIrUzQVpfZG301AIXmUVqVYZyveNqCZcusQpFOleulV8na/QZNd nq8uDdu3SOahqGBA== From: "tip-bot2 for Avadhut Naik" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/misc] EDAC/amd64: Add support for AMD family 1Ah models 00h-1Fh and 40h-4Fh Cc: Avadhut Naik , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230809035244.2722455-4-avadhut.naik@amd.com> References: <20230809035244.2722455-4-avadhut.naik@amd.com> MIME-Version: 1.0 Message-ID: <169167090547.27769.8367401801807081552.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773855269427617041 X-GMAIL-MSGID: 1773855269427617041 The following commit has been merged into the x86/misc branch of tip: Commit-ID: c4d07c371283cb0453c8ce187551e4d064cc407e Gitweb: https://git.kernel.org/tip/c4d07c371283cb0453c8ce187551e4d064cc407e Author: Avadhut Naik AuthorDate: Tue, 08 Aug 2023 22:52:44 -05:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 10 Aug 2023 14:25:21 +02:00 EDAC/amd64: Add support for AMD family 1Ah models 00h-1Fh and 40h-4Fh Add support for family 1Ah-based models 00h-1Fh and 40h-4Fh. [ bp: Simplify. ] Signed-off-by: Avadhut Naik Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20230809035244.2722455-4-avadhut.naik@amd.com --- drivers/edac/amd64_edac.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 597dae7..9b6642d 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -4150,6 +4150,20 @@ static int per_family_init(struct amd64_pvt *pvt) } break; + case 0x1A: + switch (pvt->model) { + case 0x00 ... 0x1f: + pvt->ctl_name = "F1Ah"; + pvt->max_mcs = 12; + pvt->flags.zn_regs_v2 = 1; + break; + case 0x40 ... 0x4f: + pvt->ctl_name = "F1Ah_M40h"; + pvt->flags.zn_regs_v2 = 1; + break; + } + break; + default: amd64_err("Unsupported family!\n"); return -ENODEV; @@ -4344,6 +4358,7 @@ static const struct x86_cpu_id amd64_cpuids[] = { X86_MATCH_VENDOR_FAM(AMD, 0x17, NULL), X86_MATCH_VENDOR_FAM(HYGON, 0x18, NULL), X86_MATCH_VENDOR_FAM(AMD, 0x19, NULL), + X86_MATCH_VENDOR_FAM(AMD, 0x1A, NULL), { } }; MODULE_DEVICE_TABLE(x86cpu, amd64_cpuids);