From patchwork Thu Jun 2 20:11:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12868104 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8EC7C433EF for ; Thu, 2 Jun 2022 20:12:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237871AbiFBUL6 (ORCPT ); Thu, 2 Jun 2022 16:11:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237836AbiFBUL4 (ORCPT ); Thu, 2 Jun 2022 16:11:56 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2075.outbound.protection.outlook.com [40.107.237.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDA9A5F54; Thu, 2 Jun 2022 13:11:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fIXBRsZhfrLd/PH9aH/KlDv1EA3Z9JWriRgdjjrUYT612UcQp6O9UROq7tXEuzHv41KKWGrniEri+MCdS8g6o+DKSkNuLGSm56wQrIHtdfox0TokuTrc53mhHRoC0RPfsfgk0oijguD9YMc5UrrWPpOwSXghchXfgfNeHCtBfG73/3TxFS8ktWDg0YxlhksTG7w8XnEmM+rFmDDFsmf7I90OQTNRmZf7GvjjtWrRAYMb30DEx8xXwuxxEpB4VqgMbCVH5OKQt41R4J39Zc/efNC3W/XUJE9WwDUQgbZmSMMPo8+ZbtpeWTF/UroRUw6qeMUvwPVp4xbfA2x0mzlt9Q== 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=hnXQw6uG7hO3Iakqb1HLXmS1Uebe/dLKlh+LY2X7eME=; b=c0q499oc7EFmso2/8ASCPSwoXYRp+lY1Nkzl1t9fhwbes9wXT2GuVNPhhlKzYoxTaAQLSk6Nm/wJrCVNnL9LOsNkMtWYX8KDbMTqQ62zpKHB8Tc1CsTow8FG61oiL0baNxzNa+gua7khBPRKwlo5bAPjoelkguZb+tkfkcxr65he4iydFAk8oaPuJtW7Cd5qxnlO6qYmvDQZC35sHkozXkPHTsE8uSir/7zy7yEyvrnq/Foh5JnBOrKuJIM2mJvoucDLILclPGCyPjqBn0Fp/UEFFNFRSLyrRlXFT4hwD4noj9cro6b0iaFZdLSvObN/qpEA21wxnOMBbyTyO91Ivw== 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=hnXQw6uG7hO3Iakqb1HLXmS1Uebe/dLKlh+LY2X7eME=; b=xXmqQhJ+1kmrYn3eNQ3cvXXBTcdRIihNaPsWd4tBxIm8OtLtF53UM+ydHWSVrWPtV9dmD9JhK6lTjR9V//5eexQlk2ooEEVFiDU0XyNcsz4ym+1qqlRg5GH90nEYS4GAF2d4e9x6NQVQUZaowzinJcLKSjtZ0ItPXXohugQv7h4= Received: from DM5PR18CA0057.namprd18.prod.outlook.com (2603:10b6:3:22::19) by BY5PR12MB3697.namprd12.prod.outlook.com (2603:10b6:a03:1a2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Thu, 2 Jun 2022 20:11:45 +0000 Received: from DM6NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:3:22:cafe::2f) by DM5PR18CA0057.outlook.office365.com (2603:10b6:3:22::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13 via Frontend Transport; Thu, 2 Jun 2022 20:11:45 +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 DM6NAM11FT048.mail.protection.outlook.com (10.13.173.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5314.12 via Frontend Transport; Thu, 2 Jun 2022 20:11:45 +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; Thu, 2 Jun 2022 15:11:41 -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 , Guenter Roeck , Yazen Ghannam , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Mario Limonciello , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "open list:PCI SUBSYSTEM" CC: , , , Subject: [PATCH v2 1/6] x86/amd_nb: Add AMD Family 17h A0-AF IDs Date: Thu, 2 Jun 2022 15:11:32 -0500 Message-ID: <20220602201137.1415-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220602201137.1415-1-mario.limonciello@amd.com> References: <20220602201137.1415-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: d2990dd7-4f44-4112-e2c8-08da44d41e49 X-MS-TrafficTypeDiagnostic: BY5PR12MB3697: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: 6kHuusmskiVGb5olddFjl+e8pHs7lcqXYmbCYDg+zkYUwIH9HR/x2ceUVMbAU/AnwooYTgIaFL0HeTAie6jGIke+VordzGd7mbod0HAxvUHVRzhfUZDxO0FHaIeRjhGCMjOZOCCHQWL9HqzmQGKDlj1jDBygd84NsYtwlC5/qojZuNmSJkdFtC7rvl3Svrb2erzLG2s5pX2TkrVs72FjpShx3jyNUoGfXzxLnBSNXdpxDBq8+hcG5oBdHW6qSNrQPpmidfAAxpM65srOh9F01Uofysb70BAj3aSvkMBxmsNMVcYatCOnGQqtKkExdyQNE1F3icpuDT0IHSOo5HFfwkFMLFxk4w9WeEe86viEsesRqyaOvItfzaNkRx4ULvv88/bY17Y59hxAkBWA2RmWKoxvSOS7vdikkVfp7BwwwPKFnzfhuBcmoEHtnLMmBr2SP0uM7sGb0sg57NkUqc/qFdObLzMZtdrOkmJKaDqvwOAIuZaHAX/RR90uxq2mz6A8R9pvZKh+9QNIf9QWPMSzYx7YfO+po8olGEqHV0m5ykW+6cUQPhzkTLdoAZezF3qLvlCnIVSnvZerWMad/VWoXrDeeizpVXYj3LwHyKkRSvGxBe+WvfJ+WJLOJinjoto0ckR5cIMnRrc2mv6+tNTMs/8KVLxbnDCgQyWSELodBuwvrqUdvW7e0JSpU8k7IDoBVNk0xdK15wMEB7ITR6mw29xnbqkpAEDVqvm7IPDZN8E= 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:(13230001)(4636009)(46966006)(40470700004)(36840700001)(40460700003)(8676002)(356005)(44832011)(6666004)(26005)(921005)(47076005)(36860700001)(70586007)(36756003)(7416002)(7696005)(8936002)(186003)(4326008)(86362001)(316002)(1076003)(5660300002)(82310400005)(2906002)(81166007)(508600001)(110136005)(83380400001)(426003)(54906003)(70206006)(336012)(16526019)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 20:11:45.7010 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2990dd7-4f44-4112-e2c8-08da44d41e49 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: DM6NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3697 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 Acked-by: Bjorn Helgaas # pci_ids.h Reviewed-by: Yazen Ghannam --- v1->v2: * Drop fixes tag * Fix commit message and definitions for s/17/19/ --- 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 Thu Jun 2 20:11:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12868106 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAACCCCA47F for ; Thu, 2 Jun 2022 20:12:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237569AbiFBUMG (ORCPT ); Thu, 2 Jun 2022 16:12:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238051AbiFBUL4 (ORCPT ); Thu, 2 Jun 2022 16:11:56 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2062.outbound.protection.outlook.com [40.107.94.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34A7DB52; Thu, 2 Jun 2022 13:11:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K80AY7/n8V5nzVzV0C0KFglAe2YnnC6FVa95zSeydqoIvXs54guowoIcKQOfbokwAe8WFrUHA1pT+0tCglzB+XND44kkd7UrHoJ9Yd/P94tGQsi75tHq613FmesGwYRV+DMIChzFux3KAqzHbhl29RsTYOW2QstM+l9WavK9NbaGlrJukLGwAye7ic1VSuZFxUGM7ytICduHq/21lVbrbYN4BQV3dPlpPDPRdx8LFq9cLbxo7rIcdYu/7caCbn2yPzM9UNvnyYn2izcknoosxZQ8tGCtXpAbyBw9J3TM3l01CDLzdzUpglJOgo7mYe5HUlAwo5DEwx56cDH3OlguHw== 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=zOQs/7EHd6J7m/+z1GAyBeYJ8CQ8O8nMfvot06Gej7Q=; b=aX/SOwZVdOT2FcKAg9ogt8Hawe2uxIkdA4Cu8RTLoKxATMWOv1qqhRTDd9UEOrxoEB85SGidjeOKcgYDOfNUzxoZvomDXZ1dJLoRTyO+1WL63btZH3L0kueivs8zSh0/qeoNswvIciqGSFw8G8PSb9aIQt6ACUXKu3JZ1VxQFFWrlwSwYPNwQM6P+vBUZoK3k2rS7jh2ByCIE+yWpY6F/L4GJCwpHo4d+7Ayi+FulZsaylkAZNCmuyXptVhXdsD3eLCHStLh5FffOpYXicB+M+XCyvb27kI6wz2V+1XT4s+obC5m7cR+rGUM4qQ8qG/+bCctn+HE8ImXowv5pFvGtA== 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=zOQs/7EHd6J7m/+z1GAyBeYJ8CQ8O8nMfvot06Gej7Q=; b=NdAUPnv1mIYZY/vJH77el5ssUpcCyafAOw/FWEJB/ZCAhwtYlKTvc8tII5ZKqiveGzrlsGw6D1pkh0RTGeITvrSV8X5n9XLx/O3LMzlpJCjlv7EawJ7BJdZhdlD+0FrWLoDBGDHSAh64F4ptfMtxwcP+4Ttxest2Em4aE/UMy2I= Received: from DM5PR18CA0058.namprd18.prod.outlook.com (2603:10b6:3:22::20) by DM5PR12MB1868.namprd12.prod.outlook.com (2603:10b6:3:106::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Thu, 2 Jun 2022 20:11:46 +0000 Received: from DM6NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:3:22:cafe::c9) by DM5PR18CA0058.outlook.office365.com (2603:10b6:3:22::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13 via Frontend Transport; Thu, 2 Jun 2022 20:11:46 +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 DM6NAM11FT048.mail.protection.outlook.com (10.13.173.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5314.12 via Frontend Transport; Thu, 2 Jun 2022 20:11:46 +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; Thu, 2 Jun 2022 15:11:43 -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 , Guenter Roeck , Yazen Ghannam , Babu Moger , Mario Limonciello , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "open list:PCI SUBSYSTEM" CC: , , Subject: [PATCH v2 2/6] x86/amd_nb: Add Family 19h model 70h-7Fh IDs Date: Thu, 2 Jun 2022 15:11:33 -0500 Message-ID: <20220602201137.1415-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220602201137.1415-1-mario.limonciello@amd.com> References: <20220602201137.1415-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: fbd754a7-e6ba-4b82-2b0b-08da44d41eb5 X-MS-TrafficTypeDiagnostic: DM5PR12MB1868: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: YPN1CoJXIzluYnb6KHhzFv7NV6AjrqEy0us8hS7SF4gxvMoJtPaxN19d3S2hMheBbwejXql476tKTql0A7I8PFPuYF80I5xtVJVnk3QrbKCI/R83bfsut31AQYoGo08xmsMsBUrwTNezCdDoQ1RPmNeg7TywmbbYzZPK8vibIaAsq8oMa7Dixsm0cbjzKBCI6wPtO1ksl12Fc9JiqBUUYce0w4kCzQIFoHpGY3qKDtqdDxvzCuXq3GDH+EalY7aEW/td6OZiqOYMLmmtlEfIrMecMGxQ+LHYFuK9BfcGgAZx4iTAOGeAPWXp9LCmC5AbNNhrHfJ3ak+rSpj84ShkfFDyT+So68raGjKvOtX/5C/YFfUfvpqrmpzeLGi0sIimtonWKbwGr0l2yhlUZJ82hSh5i2800Y5gQymaqnIsnkiyOjQ8kJeL19CdHxEy7ETrnxGx+ASKpOyqMYilHU8rCiQjAy1RmVKXSd5RIe4rPzcepEtTdNuaYTNg94Z1MxwzNDZcsXAAXyUF2DNJv644ki3Z/+ThfSGuy79jqeY7y2XcV9NbY0xIvEqRByRet08hHMad5R0CSD30oL4v2X591+prctnM7IqYScMipz5chpP/hy0TZLf9DbpONywe+2NB6LbDk5UWqyFucVRzQXSeSXUJNHjMOaSy18tyE1Y4XyNL6VXSEjuO79WHGb1Ji+N3YwgAVdx9SnAhR7dz7nB8EGo86TOUjernI+LM4UBme8w= 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:(13230001)(4636009)(40470700004)(46966006)(36840700001)(81166007)(6666004)(26005)(356005)(7696005)(921005)(110136005)(54906003)(36756003)(316002)(86362001)(40460700003)(508600001)(44832011)(426003)(16526019)(186003)(336012)(5660300002)(70206006)(70586007)(2906002)(8676002)(47076005)(4326008)(36860700001)(82310400005)(8936002)(2616005)(7416002)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 20:11:46.3885 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fbd754a7-e6ba-4b82-2b0b-08da44d41eb5 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: DM6NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1868 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 Acked-by: Guenter Roeck Reviewed-by: Yazen Ghannam --- 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..15295f5d9aca 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -32,6 +32,8 @@ #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_ROOT 0x14e8 +#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 Thu Jun 2 20:11:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12868105 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABABACCA47B for ; Thu, 2 Jun 2022 20:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237776AbiFBUMA (ORCPT ); Thu, 2 Jun 2022 16:12:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237834AbiFBUL4 (ORCPT ); Thu, 2 Jun 2022 16:11:56 -0400 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2082.outbound.protection.outlook.com [40.107.101.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71A567679; Thu, 2 Jun 2022 13:11:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jqS17MlAcinQ1hUv0JtTbVms3/C0DYkpqts/qHvx/TSYPn/7R52IGzWDPlrNjel53CJGuKoJapVPSOIcztWmCL21jk1dUE6nFJbcMw3yFz92+n6lcOixabJ0ifVTYWUxbYFXHEfDA+1OehYkDR9mD7caBAEgV+ugGoHbxb1KZqEjpa3T4kD8CKzZIyWltyFMfQSMw6HIHyVjuNj+jRwu1D4sPYCQKrUyz5rWG3mi1t/xpB+UFRpYJ7DIz0d5+4SDxyvQePa2FKv2kbA1iMQGsFDwg5cWC7HaETZXM6RHSu9NbNcXanm8v6+ZlKf/Ouxztp3bzhM3gXjJ8M5bPqmW6A== 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=tItncnJI0XuN8JODRVC81fEkA525PLZ6Su56wn84K28=; b=ReiGnDVCK6RNMQ3RsyQzLPtZArLBA0dSLI3hXVKGDHE3GWV+liZhMEw56RnsYpyw6sPLj+FKIf6hXey/c4cvkqXeMNi6QDhibM6y5H9O4m0n0sllvcHtGu1BbNTVYkhtYSjwZmZhSGQW+JSxZ/IqZEdLCPsP1Ynz8ZE+GPCAuW6kFcrSyvlFCGTCAhDLoBZ9z36la1ANQfPNRG0tFjEYKqTNqwB8BTaAoBBxo6j7DaH9pB4UpNXSmGQqLq/LfaE/ntLjSN4TVsU/CARMWZLeny3pwRUr9m2hD0JeAz/SAUItxyOSGZ8YxKYgcTGEZF1ezrxvaLDathG/rAqenXG1zQ== 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=tItncnJI0XuN8JODRVC81fEkA525PLZ6Su56wn84K28=; b=z/xiz+N2eceOnZB/m2hXGm1QxePktSK84fl3ziGUSh6vH7KKlSgFUEYlKFjqIkPQ9Bcwz3es78F0GcXiLtQvlejZJ9axIjk7l5x5ejem+c/CUMH+O4P3Nt6vr3m6bmuHItkHh4GeF/XJGACVvTH+WiK7+dbSqPH67PJ2Uth3zjA= Received: from DM5PR18CA0051.namprd18.prod.outlook.com (2603:10b6:3:22::13) by DM6PR12MB4124.namprd12.prod.outlook.com (2603:10b6:5:221::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Thu, 2 Jun 2022 20:11:47 +0000 Received: from DM6NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:3:22:cafe::d9) by DM5PR18CA0051.outlook.office365.com (2603:10b6:3:22::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13 via Frontend Transport; Thu, 2 Jun 2022 20:11:47 +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 DM6NAM11FT048.mail.protection.outlook.com (10.13.173.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5314.12 via Frontend Transport; Thu, 2 Jun 2022 20:11:46 +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; Thu, 2 Jun 2022 15:11:45 -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 , Guenter Roeck , Yazen Ghannam , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Mario Limonciello , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "open list:PCI SUBSYSTEM" CC: , , , Subject: [PATCH v2 3/6] x86/amd_nb: Add Family 19h model 60h-6Fh IDs Date: Thu, 2 Jun 2022 15:11:34 -0500 Message-ID: <20220602201137.1415-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220602201137.1415-1-mario.limonciello@amd.com> References: <20220602201137.1415-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: 51b01825-0301-4d3b-7537-08da44d41f01 X-MS-TrafficTypeDiagnostic: DM6PR12MB4124: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: kWXW+27ltCbV+KC/WSjous3vOE8EhKaE/ax5y3x/ybCiGAo4qXDPsrbYP3CUrTn1afjdFerweNoEQfmcPG+AphLYadLFZs9wnBMvUKSSUdEyLYvytO4bDaJ4hu3n1io8ZkIWfjKvVnISi5ISebGgV2L0Qo2QjItQK4BPS9ljEL83DwJMkTyN7ujf6rPNBsAwYPldozupWi6GDYee2DPpUi4ZBwPoXSFaR4S/wsh2pOrFOgyu/ayazjcc2mW3vfwrsMQIaVjqQt7KE/LWn/7AeFXfxLPN9CJiapoc31o8t062EZ82iE6EI5bm+2CQLX52hM8xZbu2C+NTcyVOBOWYGneHkQqrns2RYxOd7SMvVrjAWScTp7CJHFw3bnxzubWGkS7C6aehik412veADUiZKs7Bfq2vDIzIWWNSqWdbyAgzFKST2fb3Tke86REFTnRRNJ0iZJmAuvdkBAkgA5tLg49hyTZiQBCgb+6EsynuAX8b8uaEd0gIGGKm9ALe2bagivFhZL76R33DNhOR9LRU7C0BmCNym5AHFXJDyXBNtkabvAjuWrfSE0wFwG85B/nD+pyoLwX+7vQYa0MzlGspYFy7sQIMH6xe0GfTeFn/sB66mXgzWK2rMkUOZTJNsE53kdNMpYyLEzJ12gmQW8ZQ5hIJscsmyhu1YhxLtHRL/RDHchdHd0y+WAiT3aPZKFZw75JvboflXxoAJFOVNIHmlZJBW3KPAXj6Xjv/yWs9A38= 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:(13230001)(4636009)(46966006)(40470700004)(36840700001)(44832011)(6666004)(316002)(86362001)(2906002)(82310400005)(508600001)(921005)(356005)(8936002)(5660300002)(36756003)(81166007)(7696005)(7416002)(110136005)(2616005)(26005)(40460700003)(186003)(70206006)(70586007)(54906003)(16526019)(426003)(336012)(36860700001)(1076003)(47076005)(4326008)(8676002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 20:11:46.8260 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51b01825-0301-4d3b-7537-08da44d41f01 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: DM6NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4124 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 --- 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 15295f5d9aca..491669c24ffd 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -32,6 +32,8 @@ #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_ROOT 0x14d8 +#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4 #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4 @@ -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