From patchwork Mon Jun 13 19:29:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 1643017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=tXKLPRLb; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4LMNhX2H87z9s2R for ; Tue, 14 Jun 2022 06:39:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232800AbiFMUjE (ORCPT ); Mon, 13 Jun 2022 16:39:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235651AbiFMUiW (ORCPT ); Mon, 13 Jun 2022 16:38:22 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2064.outbound.protection.outlook.com [40.107.236.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 505425B8BE; Mon, 13 Jun 2022 12:30:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lffT+0SiOwUqdpeaigq9eJ4bEPRoSlAX6OLr+N1AO6ieKz71r00IH6tWq/7XVJWo9Uu2nZDqsbhbdYZdzbQfBeg+5H8LA9rIiuSS8BKqWK47GgVt7bCY5opNc9xT8jHpIpJ9oyjyj7kkSI7S3SUFRgc8fWSKcDuISwIJXsd739kw3lxtpTEMkxoG0DxYSRGHAEzTJPvvy/gx+X1/NObLm8Iv9FkQwvbLw5KXxcV70HFJooFIyOZQL1wKfwEopvKDLXhF95LpNajzoRNVvJMKr0LUSwu7JdPC1RZ3OwX5OfxzXCqdWmmThXidsPDXAMo7PuqD9YSWJEMgmoO1sm5mPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=z/spjDC00QYSd9p/8Tzq2Gc0e1UPeda46ywch49DRg8=; b=naPWt25BWKgqHUnaBaIrYbo6qFscSOWA0W6PeCBPESbD11QDThyG3jf5VadaCRA3yYK6SUF2WIqLfuNRVPtR//z+odqi+79Wqwgno2RvF1ioxJoEcC+Ucl/UacPpZtk1vRp1p+9jW/r5/czaEuevXCF8qNfUmbIwvcun81MvaBgDPCx5w8Y7br0csHLvI4udicovn7ALchke909cYvf2vGkJ78b2e7mjZeCP/DJLe2iWua4LelfNK9e1YYEmiHeECNiIssW3MbXRJb3BOvQ01U54ElAH7sYOHf8AS5T4MXdUJctur1LOgCabKwiuXJS/giR3xehFwp6EWfblN00y/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=ladisch.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z/spjDC00QYSd9p/8Tzq2Gc0e1UPeda46ywch49DRg8=; b=tXKLPRLbxgjKGUxSbXNBOxA9nfaCegmabF6Qk72cSDhHzqiy3KSimCW9QeTJZRUp+3OJoKKXViVlaR0u94ify5Lzoi/mRjFPibzEQjqIVAUu8eApBdbdYpEj+un6Kef4Z3swzErjR7VP2aQqDnjfGA7dUXQ7nTjdZCwCHoA1BtY= Received: from MWHPR01CA0029.prod.exchangelabs.com (2603:10b6:300:101::15) by BYAPR12MB4759.namprd12.prod.outlook.com (2603:10b6:a03:9d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Mon, 13 Jun 2022 19:30:11 +0000 Received: from CO1NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:300:101:cafe::5e) by MWHPR01CA0029.outlook.office365.com (2603:10b6:300:101::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13 via Frontend Transport; Mon, 13 Jun 2022 19:30:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT010.mail.protection.outlook.com (10.13.175.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5332.12 via Frontend Transport; Mon, 13 Jun 2022 19:30:11 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 13 Jun 2022 14:30:08 -0500 From: Mario Limonciello To: Clemens Ladisch , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "H. Peter Anvin" , Bjorn Helgaas , Yazen Ghannam , Mario Limonciello , Guenter Roeck , Muralidhara M K , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "open list:PCI SUBSYSTEM" CC: , , , Subject: [PATCH v3 1/6] x86/amd_nb: Add AMD Family 17h A0-AF IDs Date: Mon, 13 Jun 2022 14:29:51 -0500 Message-ID: <20220613192956.4911-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220613192956.4911-1-mario.limonciello@amd.com> References: <20220613192956.4911-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c45ae4fb-2984-47f9-f016-08da4d732208 X-MS-TrafficTypeDiagnostic: BYAPR12MB4759:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /DcT1X1ykMladwLnm6CDOiMrW4MfHLW3UKnKBu36rmFEd/kCaHa5MqD3dklzEX93w+bU11RQDp8PrIyrlWFu/pkq323sNRARkY8t4yTcMAsxK0vnFrmGiQShbRenTOVpdeqkQg6yke38cicHrO4nTkvvCC5iUcS00QjqodHhymQ8xIopjBRhTIc1Oc/4lo12qC5RZxAR9aibjgg3/4oh0hey24RwwJUMJyUEbiByIA0kbxYs/UbfA5RriCzfhlZ3s0cAo2i+QH158Znk6yBfOM8PONlyyR/xnf7b9BGYnJd2nD8gLDO/93zh56V5QnpoH0cqEUu+bl5wm+n8G2E/SwGzZ2NdePUHvdyfCuMPFsuqaUE5cHUrL1HP0ga/m8dxaNhhUg+Ru8Hx//6gNEkBFVQLLo6pe2IfBUvEG6MCZ/loC2ur+wtMqLkaDfRAfJbozSlB9b67h9MjQUBWm1r5cThqIhGgtMBOMGgmqHhzVA3PP5jcGcHbC/BN8jcplfB/9hser2FlmqR8iatjwuvnpkh7yl4i2rOkCnA81BUBZmqtzmLuHa1vQiqniIH9dCqkVHNR8b7YPr9Xws+9P42Lx96BpcBfvHMvJo9pD2EXqayUHLCLWMiK6xNyXG34HX9PbTOSUDmYuCro4njsDHy7e3q070lLzWNxySmNByb3wnm985knskCpiR7OKEKuz8U1X7BM82ODH9bLCPQzwsYeEdzXghlxXdc0cLLAKkKyuKk= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230016)(4636009)(40470700004)(46966006)(36840700001)(8676002)(4326008)(6666004)(2906002)(70206006)(70586007)(7416002)(44832011)(5660300002)(26005)(40460700003)(8936002)(508600001)(7696005)(186003)(36756003)(86362001)(36860700001)(110136005)(81166007)(356005)(921005)(1076003)(47076005)(16526019)(426003)(336012)(2616005)(316002)(82310400005)(54906003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 19:30:11.2060 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c45ae4fb-2984-47f9-f016-08da4d732208 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB4759 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_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, UPPERCASE_50_75 autolearn=no 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-pci@vger.kernel.org Add support for SMN communication on Family 17h Model A0h. Signed-off-by: Mario Limonciello Reviewed-by: Yazen Ghannam Acked-by: Bjorn Helgaas # pci_ids.h --- arch/x86/kernel/amd_nb.c | 5 +++++ include/linux/pci_ids.h | 1 + 2 files changed, 6 insertions(+) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 190e0f763375..60c7bd525237 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -19,12 +19,14 @@ #define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480 #define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 +#define PCI_DEVICE_ID_AMD_17H_MA0H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M10H_ROOT 0x14a4 #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444 +#define PCI_DEVICE_ID_AMD_17H_MA0H_DF_F4 0x1728 #define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654 #define PCI_DEVICE_ID_AMD_19H_M10H_DF_F4 0x14b1 #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 @@ -41,6 +43,7 @@ static const struct pci_device_id amd_root_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_MA0H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_ROOT) }, {} @@ -61,6 +64,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_MA0H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) }, @@ -81,6 +85,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_MA0H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) }, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 0178823ce8c2..ec1c226d13e6 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -556,6 +556,7 @@ #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443 +#define PCI_DEVICE_ID_AMD_17H_MA0H_DF_F3 0x1727 #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653 #define PCI_DEVICE_ID_AMD_19H_M10H_DF_F3 0x14b0 #define PCI_DEVICE_ID_AMD_19H_M40H_DF_F3 0x167c From patchwork Mon Jun 13 19:29:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 1643016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=NTcLJXr8; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4LMNhV5r8tz9ryY for ; Tue, 14 Jun 2022 06:39:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231599AbiFMUjD (ORCPT ); Mon, 13 Jun 2022 16:39:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235915AbiFMUiY (ORCPT ); Mon, 13 Jun 2022 16:38:24 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2048.outbound.protection.outlook.com [40.107.243.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDEFE5BD2B; Mon, 13 Jun 2022 12:30:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Old1rWKNbAFtrtlVg+jk+erSr4sEXH/asyflPKpJcL9ywWHWMUCWKjFkI1UM7oSqwUik/pseVKtXt54VrjUqb1bb6lRon1yL5x7I4q3I5d3MXRLw/DMZDeBjmpiao/uSDKxugCX/OXl5bBZGbpxDu4jksPzeLLESnDi0uTqoqHtosVkzUMhABU+GrDcpbgGdLs0W9OJK59ekpGNn+lLn7npASfaU3n+gpGA/9/Z3lQSF4Q5w8O5u+5+RUF5rJU5WZjo5okwzTaP9n2szvwS7//9FM95LKWacA4gB68RRY431Gs/Y9fj2uJSvQX28hqH0Np/SgwqDFJcKDo0CNDAM+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ulfuzw05oiyPgZjysKx2jk0oon55GmjWqqqtDykRQLE=; b=m3n/F9WFT4UkKcFMtyTasPPgf/mjYkVRPqoPo1rc1EWhVuLpKkixt10eXDeDOonIvlBGxVpmYMVo/0BrXHLcjJIldn7JMfXx7ZFLBUfImM2rB9BJsi0aQmcuUZCYrDvk9bPfTfVlK2R5TdlhGrO4KgAL4V7ll5TrbqCUfosbZdtsP+VEJOmbKHkvmUqPiniTrLE4Lr1x2L2rVIHt6rL7ASgvj1FTHaVqvbaxvvB8UYTmF0gC2ieB83UYt/+eH/C8aOSlmovttPrYJaY9BjHP5OdYo/AEqOpgBeNlmEbipnDtZb3xyp0rocbniMJUsIXxq2lWoQYzR1Ioyqi8sGnI8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=ladisch.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ulfuzw05oiyPgZjysKx2jk0oon55GmjWqqqtDykRQLE=; b=NTcLJXr8Rgg3iJmPDIvFCXb8SmiOPdU8w4GklySUToiD5W7b3iBwD2Cu/YOwTG+i6D+0c/3wysqOcrclULlab/7xyDSKDQYE3mzXSsdnE+GSSbCF6dI/0U4aP6c24+XSx4H8AKU5O6MyK6E/8gCIKc1yLSwmFLocen3Rw8ddQQE= Received: from MWHPR01CA0031.prod.exchangelabs.com (2603:10b6:300:101::17) by CY4PR1201MB0231.namprd12.prod.outlook.com (2603:10b6:910:24::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.20; Mon, 13 Jun 2022 19:30:12 +0000 Received: from CO1NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:300:101:cafe::21) by MWHPR01CA0031.outlook.office365.com (2603:10b6:300:101::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14 via Frontend Transport; Mon, 13 Jun 2022 19:30:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT010.mail.protection.outlook.com (10.13.175.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5332.12 via Frontend Transport; Mon, 13 Jun 2022 19:30:12 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 13 Jun 2022 14:30:10 -0500 From: Mario Limonciello To: Clemens Ladisch , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "H. Peter Anvin" , Bjorn Helgaas , Yazen Ghannam , Mario Limonciello , Guenter Roeck , Muralidhara M K , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "open list:PCI SUBSYSTEM" CC: , , , Subject: [PATCH v3 2/6] x86/amd_nb: Add Family 19h model 70h-7Fh IDs Date: Mon, 13 Jun 2022 14:29:52 -0500 Message-ID: <20220613192956.4911-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220613192956.4911-1-mario.limonciello@amd.com> References: <20220613192956.4911-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ca3e660-e59e-487e-348d-08da4d7322b2 X-MS-TrafficTypeDiagnostic: CY4PR1201MB0231:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4hnFGVwzabkAhW5zk+icUgYXT5W9bnHOeBwMY9HWscRKN0vS6ce5fZ9SV3AJBeFtYXkFDEahv4gbuyBekuxv+dZvK4ll2J57kO5vqBBn/HPEpw4cqshoHHX7YvzPX6KloU9/LujevQkw2DHtufND/4Xw3PZp0lIzqEjSWZrgttJowqNUnEU9he7RYR2oJ+ioNmriLB4H4L2TadUHYqJuVK+kCrCs9flvta4ocuC49gv28BZZh2GUJ6ik5RSijdYrdO28zsfJqnYPwXX5nkfSlPyQ+6K6wxuhoJAg7XYc5Lsb5QR0ashyppu1Cfsu4se9+ZGk7u378xXoEOuaTkiItquyxiuXp0z7PNaU9cEJ7mgJB2VnaxtllyZVUdf8ZL233TDYRkFAAbgQr5Eza4cT34Oec7PtWdKJEUyWm1CkLtKuvggPnyO7ytDlqsjBP1Apiise1N5hyfoIQsVN5ElEbCeNjjwwpsPz8I0WcLzY/mGBnrJQGAN8owRyFHwOBHlmEkROxAzA1ti+4i4aQM8Xju/JNUtgf0yygOXTyuShAKyeOoZ+oPAkwMbLcyKQKTLTC516S2gwDwlCw/RTlqMXwcGNTrrF8ot+kzRCwXFpTrETiUv80dcXX2HQ6jABlSuku3we/VVdYd0Pg1iSeHcXd3LMqTWd7FcjJvRli8AEY5a1mPyi6soCOMXiIPhRp5v7wmIA4KnMF4vbd3A0X2gkOc71iJ5+QRuNN3Q0/4zjFgI= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230016)(4636009)(36840700001)(40470700004)(46966006)(82310400005)(36860700001)(86362001)(26005)(356005)(316002)(921005)(40460700003)(81166007)(508600001)(44832011)(2906002)(7416002)(8936002)(5660300002)(8676002)(70206006)(70586007)(4326008)(47076005)(426003)(336012)(1076003)(16526019)(186003)(6666004)(36756003)(2616005)(110136005)(54906003)(7696005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 19:30:12.3153 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ca3e660-e59e-487e-348d-08da4d7322b2 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0231 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_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-pci@vger.kernel.org Add support for SMN communication on Family 19h Model 70h. Signed-off-by: Mario Limonciello Reviewed-by: Yazen Ghannam Acked-by: Guenter Roeck --- v2->v3: * Pick up tags * Move "ROOT" declaration to match others arch/x86/kernel/amd_nb.c | 4 ++++ include/linux/pci_ids.h | 1 + 2 files changed, 5 insertions(+) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 60c7bd525237..cb7a40378ed3 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -21,6 +21,7 @@ #define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 #define PCI_DEVICE_ID_AMD_17H_MA0H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M10H_ROOT 0x14a4 +#define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 @@ -32,6 +33,7 @@ #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M40H_DF_F4 0x167d #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e +#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4 /* Protect the PCI config register pairs used for SMN. */ static DEFINE_MUTEX(smn_mutex); @@ -46,6 +48,7 @@ static const struct pci_device_id amd_root_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_MA0H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) }, {} }; @@ -71,6 +74,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) }, {} }; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index ec1c226d13e6..32a1f85ff0de 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -561,6 +561,7 @@ #define PCI_DEVICE_ID_AMD_19H_M10H_DF_F3 0x14b0 #define PCI_DEVICE_ID_AMD_19H_M40H_DF_F3 0x167c #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d +#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3 #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 #define PCI_DEVICE_ID_AMD_LANCE 0x2000 #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 From patchwork Mon Jun 13 19:29:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 1643018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=jzVu9v82; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4LMNhY04npz9ryY for ; Tue, 14 Jun 2022 06:39:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234023AbiFMUjF (ORCPT ); Mon, 13 Jun 2022 16:39:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242497AbiFMUi0 (ORCPT ); Mon, 13 Jun 2022 16:38:26 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2084.outbound.protection.outlook.com [40.107.237.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5735E5BE57; Mon, 13 Jun 2022 12:30:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OYEkoRqvqQ4vL61CXRe1QK6R4ORa746YJIbxw93lw4mllfMKkoHVHL8lyuxMa9Htl8wyJCOoUGoWctS6jW9oJGpyoVnot4KTu5wVhNNO2zuGHE3fncKAk21gdNyUxke11e9VSIoPqrxSvtlpXejOAizPstBw9oGUQGKRTvtc2cEQFBJqKIjsQwVlSJ44JTH2R6IiFBp+RenNIniz6kphPu7tMkbR5lwkjaUTYQJx4coldGua36j75X+bENG25qi5G9HqVkI0JGr1tjxoLCuFLKULZ+N8Fkyy5OocqBTDUji8wQB92DVn4p7la4HMND7vVkPuAGD3BCogHuf0uqnhbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7IKQ8HtSuexS2DKi3KU9//b4rAAr99NK6swvTkNc+ao=; b=lBgNSBv10+heSlcUNiDGopXIp8VV8kr4HdN9pv3ChK6PXYODN1K2i3eoUi6vFoxQJCZoTgExEAG6Uu0uxn5V5uOFm3XisYvsaJYApysUJt96R5qzUnT0nI76bcpOO32HppmPc+119qIVjJXeXI5wWk1QLUjBLlhs+uAu0iye0RdBUe3snra210FYIdJrEgEACBhdm5kow3vCP2edQnYvLG0bmgpPl8GkqfdSANd6sz84Zza1C9M23x9qK+RtSiaHAlo9gcjqhQLrvvs3m6hAl2wEMayjHvkyP19RE4Z84gx4UhDr0U3wHoM3OfRjE1luqfL1+VIBLmUDLgSMk8M16A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=ladisch.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7IKQ8HtSuexS2DKi3KU9//b4rAAr99NK6swvTkNc+ao=; b=jzVu9v827kTSjm/C88Ru0CHoVFxYRcpGQiJvA/WTYhawn+fpLauEoLt/r09uKGlVkomF5cWZeZ/AU9OqiAOTnEg5YbEMWtTnzuEAZv20vkOZRwo2VHdQmbjW/dwL2dn7L6l4+24pJ/2rThjDkTpdFnOgEv9lgumoFGEoDX92ut0= Received: from MW4PR02CA0018.namprd02.prod.outlook.com (2603:10b6:303:16d::17) by SA0PR12MB4493.namprd12.prod.outlook.com (2603:10b6:806:72::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Mon, 13 Jun 2022 19:30:18 +0000 Received: from CO1NAM11FT067.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::9e) by MW4PR02CA0018.outlook.office365.com (2603:10b6:303:16d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.19 via Frontend Transport; Mon, 13 Jun 2022 19:30:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT067.mail.protection.outlook.com (10.13.174.212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5332.12 via Frontend Transport; Mon, 13 Jun 2022 19:30:17 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 13 Jun 2022 14:30:13 -0500 From: Mario Limonciello To: Clemens Ladisch , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "H. Peter Anvin" , Bjorn Helgaas , Yazen Ghannam , Mario Limonciello , Guenter Roeck , Muralidhara M K , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "open list:PCI SUBSYSTEM" CC: , , , Subject: [PATCH v3 3/6] x86/amd_nb: Add Family 19h model 60h-6Fh IDs Date: Mon, 13 Jun 2022 14:29:53 -0500 Message-ID: <20220613192956.4911-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220613192956.4911-1-mario.limonciello@amd.com> References: <20220613192956.4911-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74733680-bcb6-4a94-4c00-08da4d7325d8 X-MS-TrafficTypeDiagnostic: SA0PR12MB4493:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oSNJTGMpxRV00fNzddUORG3h23M6+9p447XlRLoKdKzfSsdGpE7NpkLjE/4ET8rR5eH0/iImwSRORknqVn1EwtIHlCTlTN1CV9IhUCSrTqG19DpeCVCflX0fjfUNbyqoTwlA4rje6Gcy4GzPbut1/Rt5nvKpo9Bet+PQCH2Lxma59ozctqwOfasDXgSlwoHc+kYdUp7lZeeB4v8xla33xDRPiaOI2W+DCutHoPzf727xEHEo9ceTn4IVfVcJhC22SOCbh8BV3ePBbN4bVvQriWA/R4DOD+9Hh/AtK7UR0TOfTJZbx1/Hj+s+SqJOsPCPlhP5Bj2sy6eBelOCrM+qwatmrg7rp7sXQuGFTe/c6UyyRF5Qj+J+UEEmtVkrHhYz8wZqBC1ieFKRTEMq8y/LSxRIsP61ly7/1ISvpluorlqyQohJC+sHPjEbETc3mCmwcrsmYxVFClo45VEWh9jFlygTXdMk0xSVlfdMYN1FXTAkyl6LVJ0Z4UE9iwSW8Dl8oVSXHYLGggJkTjUyZsrXnBfvF7+AtXqJ0tnFee7SD+VyjgknUWgw5E2Si8Ye1kHbyS5fesXxg/00Y5mIfNEhQcYzOchb6tuNSN6k5ttScEI1mEpwsObEIhaJDHBlOO/h5Nvu3UZnw6m+d2BvaeyibZO+ex3e6wFlQxbkv2ZjH0HUOkUsQVBCbjXJTZH4kOjo3l6GaMeM92Nfbil/VTMqmntIvAXwVryICmozwJvOXwM= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230016)(4636009)(46966006)(40470700004)(36840700001)(47076005)(26005)(16526019)(426003)(36860700001)(7416002)(7696005)(2906002)(5660300002)(6666004)(44832011)(336012)(921005)(356005)(36756003)(8676002)(316002)(54906003)(110136005)(40460700003)(81166007)(508600001)(70586007)(4326008)(2616005)(8936002)(86362001)(1076003)(186003)(82310400005)(70206006)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 19:30:17.5981 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 74733680-bcb6-4a94-4c00-08da4d7325d8 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT067.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4493 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_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-pci@vger.kernel.org Add support for SMN communication on Family 19h Model 60h. Signed-off-by: Mario Limonciello Reviewed-by: Yazen Ghannam --- v2->v3: * Pick up tags * Move ROOT declaration to match others arch/x86/kernel/amd_nb.c | 4 ++++ include/linux/pci_ids.h | 1 + 2 files changed, 5 insertions(+) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index cb7a40378ed3..4266b64631a4 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -21,6 +21,7 @@ #define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 #define PCI_DEVICE_ID_AMD_17H_MA0H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M10H_ROOT 0x14a4 +#define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec @@ -33,6 +34,7 @@ #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M40H_DF_F4 0x167d #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e +#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4 /* Protect the PCI config register pairs used for SMN. */ @@ -48,6 +50,7 @@ static const struct pci_device_id amd_root_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_MA0H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_ROOT) }, { 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) }, {} }; @@ -74,6 +77,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) }, + { 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) }, {} }; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 32a1f85ff0de..7fa460ccf7fa 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -561,6 +561,7 @@ #define PCI_DEVICE_ID_AMD_19H_M10H_DF_F3 0x14b0 #define PCI_DEVICE_ID_AMD_19H_M40H_DF_F3 0x167c #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d +#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_CNB17H_F3 0x1703 #define PCI_DEVICE_ID_AMD_LANCE 0x2000