From patchwork Thu Aug 10 12:35:06 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: 133993 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp413975vqi; Thu, 10 Aug 2023 06:17:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFC8S8YofDGF1B2DeApmUMtAgwj/zlQz2a805b7Bx18VulxRDdEq3v1mGnZxO2IUkViU5qI X-Received: by 2002:ac2:5e32:0:b0:4f8:631b:bf77 with SMTP id o18-20020ac25e32000000b004f8631bbf77mr1694862lfg.22.1691673433960; Thu, 10 Aug 2023 06:17:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691673433; cv=none; d=google.com; s=arc-20160816; b=trMZfnyZAsO8vU7mrTNgsKBFrgBOyvkzF/EOA0iFRSWQL+yPS7CVoObD7RRm2G+3g5 v+NMZn1RcOCIqq4cfMLVd6TdmsUxXbzOE/Edr8BHnP9YMJqgCdL5An0imlNh9EVkudlo yQIWWqcP0GGOXCrNJBiWNDHvx+3+swTJhJhN6cLg1NLaxUhlkgpSSSTSKe1Gb6cuECXR JENE1OMTifLYZZnicDqLZvL8wsi67x/xYqPx2DH7pLDiinCXZnNc7KBl5M3tiPaeV5Uq Qg2Zlj8umLd5gETDRa3tO95gruAk0TuXN+fzgplPrtLQo/lIklrO+k9FcS7tpGfFFwR2 TNWA== 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=mN7Z+flaS0yAXVVR8ATHPLhCN6Pf3GQ3UZ3YZUXZQ68=; fh=QWfzOMC1nZgTVdBExzBW95L6vYXZOFCfw1XU60XUHnA=; b=JlK+1BD9BCEXaAEXvgvR9r49BN1XzbGpyXmCd+r0cmPNBvBJEKmPP2g155jOtjt74o szK9g8tLwmQVyaT+f9/YhDEzgd9dLsoa+m7pssuAZ8F4epGVDVJ+0hY88hVll7abrjT/ 5tyeNXSz9MP8r1QxROtWrrW8AQEidzzzcIjaSGeW9Mcx/eeHNTIg6ZCvxz5lzigJ2kB3 UIcsTG1iq/RtPkxDJrvpGptZaY5/aMmBuJdfR8GkKbIPmIqMAst1w/OEMJJOhxxD/1Sc 8oZXsoik914wzwwgT8qa1Fb4+HnU5521KgC+/WsNnB0zYiHVQA1L1VDqbWJ0XpBXiYj1 HVpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GuiQtS1s; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=aVKLjAV6; 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 r15-20020aa7c14f000000b005232e129627si1446844edp.670.2023.08.10.06.16.42; Thu, 10 Aug 2023 06:17:13 -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=GuiQtS1s; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=aVKLjAV6; 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 S235472AbjHJMfN (ORCPT + 99 others); Thu, 10 Aug 2023 08:35:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233488AbjHJMfJ (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 A4397213F; Thu, 10 Aug 2023 05:35:08 -0700 (PDT) Date: Thu, 10 Aug 2023 12:35:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691670907; 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=mN7Z+flaS0yAXVVR8ATHPLhCN6Pf3GQ3UZ3YZUXZQ68=; b=GuiQtS1saG8HdcwTOecl8j8zPzc5EGUxCKIqPpeeCAG22iD+2iERXRlYqrEZartGZn6Las qyK1KGWohyZG/DaObB/o5KtgtvHto8KbORQGRZw/qd6aJofTWBvEczcUtxI6vWgrS9DRhi BhRqmohNXigZtgtc2De140bRLjlnZ8A+UHXeFNJU86Jzv9IGRsu+0pWYgeCboo+1lDDrn0 qgEsF+2cZ2uejY3sSCvfETzch6yAOv+tD3q3n7A0d79FgT9VqOZbWxN8MI+A8JzNO6pWOJ 3G4dWAiJ3MO+qLrc5ssTGoTFsJegomq0HN96/a9HHGxSIho79uJKXc+gphflbQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691670907; 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=mN7Z+flaS0yAXVVR8ATHPLhCN6Pf3GQ3UZ3YZUXZQ68=; b=aVKLjAV62nAnIaop8bTB6Ax/TmHpYlBjKlz1WmwL9GWpB0Q0ULwWAZlR9Jugeuxv0hCDit cNxOBABKjZp0pvCw== 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] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Cc: Mario Limonciello , Avadhut Naik , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230809035244.2722455-2-avadhut.naik@amd.com> References: <20230809035244.2722455-2-avadhut.naik@amd.com> MIME-Version: 1.0 Message-ID: <169167090661.27769.2299802216757803629.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: 1773733407909086649 X-GMAIL-MSGID: 1773848162379235241 The following commit has been merged into the x86/misc branch of tip: Commit-ID: c64016609b6f66b753b5f37929a191477fa584c0 Gitweb: https://git.kernel.org/tip/c64016609b6f66b753b5f37929a191477fa584c0 Author: Avadhut Naik AuthorDate: Tue, 08 Aug 2023 22:52:42 -05:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 10 Aug 2023 14:12:48 +02:00 x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Add new PCI Device IDs required to support AMD's new Family 1Ah-based models 00h-1Fh, 20h and 40h-4Fh. [ bp: Zap a useless sentence. ] Co-developed-by: Mario Limonciello Signed-off-by: Mario Limonciello Signed-off-by: Avadhut Naik Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20230809035244.2722455-2-avadhut.naik@amd.com --- arch/x86/kernel/amd_nb.c | 8 ++++++++ include/linux/pci_ids.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 035a3db..356de95 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -24,6 +24,8 @@ #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 +#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT 0x153a +#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507 #define PCI_DEVICE_ID_AMD_MI200_ROOT 0x14bb #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 @@ -39,6 +41,7 @@ #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4 #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc +#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4 0x12c4 #define PCI_DEVICE_ID_AMD_MI200_DF_F4 0x14d4 /* Protect the PCI config register pairs used for SMN. */ @@ -56,6 +59,8 @@ static const struct pci_device_id amd_root_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) }, {} }; @@ -85,6 +90,8 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) }, {} }; @@ -106,6 +113,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) }, {} }; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2dc75df..8f9a459 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -576,6 +576,8 @@ #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F3 0x14e3 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3 #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb +#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3 +#define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb #define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3 #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 #define PCI_DEVICE_ID_AMD_LANCE 0x2000