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: 12868112 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 984EDCCA47E for ; Thu, 2 Jun 2022 20:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238065AbiFBUL7 (ORCPT ); Thu, 2 Jun 2022 16:11:59 -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-hwmon@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: 12868116 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 267BCCCA47B for ; Thu, 2 Jun 2022 20:12:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237476AbiFBUMI (ORCPT ); Thu, 2 Jun 2022 16:12:08 -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-hwmon@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: 12868110 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 85AE4C43334 for ; Thu, 2 Jun 2022 20:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237867AbiFBUMA (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-hwmon@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 From patchwork Thu Jun 2 20:11:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12868111 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 77DC2CCA480 for ; Thu, 2 Jun 2022 20:12:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238061AbiFBUMC (ORCPT ); Thu, 2 Jun 2022 16:12:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237676AbiFBUL4 (ORCPT ); Thu, 2 Jun 2022 16:11:56 -0400 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2050.outbound.protection.outlook.com [40.107.100.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5489CB87E; Thu, 2 Jun 2022 13:11:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JwnfnBzToLdowQ+N4hKHHAhqKchwH1qk2uiUj6Iiy4AiCARtzu09osGr5yBZjudk8JSpUUeiu6gd80AouSXFCkipc8tUw3fts99PWXdNu0Z54+DHzsDG+3i2A3DED0Er0sUzMi7HI5YTtTIiLGc4JnPEN9yGvlTPR25cXE0kn2SvwbCLVORrwQfQqwzniJ9rk/bKdG+OmivEA3ua1Cur0uQKXho3fkQMFmXBxQCWB/1jF5HegV7Rw26SSoozEfVcfk3Vfm/zt2STCX0jDLl49L2Wsn3xsLzsGG5n5hMa3qzLV7N6bsx0PuAiXCPpkBBqsWzY94C1fDaI6jBMqYaC4A== 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=TtyGdWOUtX7++ZhJyDyzd1RtNQ3n/bBgTMe4AW1yqNY=; b=fwUU460bXVjEKnkwh/XwYBv/G+dxykRnMCrxkQ23FUHb7TQXaXoKH4paJntqsDc3+yCFGL1WnSrcuTIi+Y8lT/jxd8LgY+NllUpsF2zTYjjPiOvrvardiUs4Qo8mVY6SJjzLYxOxKzt84UVPsGB9O2Zav4Ut4XBqZRcfWXrOYT2Xf5gfC+ndDsVSnSfS2NXrzADtiHuO79E/kdsKn73NhZe+oHQ5HKJM4JpBYfQrYe7vK1twYDz1jVt//UpvbsKSEP6A3LSHIVR4/BulZ4Ux5GSPt89HTuFAg4q1XuylbPvqRc8xTVeW0F0zdc6VJ1SitzrRFreF1T2l5M+WkPq2mQ== 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=TtyGdWOUtX7++ZhJyDyzd1RtNQ3n/bBgTMe4AW1yqNY=; b=t5OJVffHomH86B48obZ/29jEurRi9fiQ65Tjk7e17why7FvcD98vaTEIkaVe8eDHulfARHQ8EaTfRB/eojnYoUBbuwaZN/XARHRle49cYApD3PG0d29S/ylym1srJF2alq+ve/Bdt+J2jj+VXEgppdIRbpCo2iiyucMR8wSC8Zk= Received: from DM5PR18CA0072.namprd18.prod.outlook.com (2603:10b6:3:22::34) by DM6PR12MB2699.namprd12.prod.outlook.com (2603:10b6:5:4a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.17; Thu, 2 Jun 2022 20:11:48 +0000 Received: from DM6NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:3:22:cafe::2f) by DM5PR18CA0072.outlook.office365.com (2603:10b6:3:22::34) 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:48 +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:47 +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:46 -0500 From: Mario Limonciello To: Clemens Ladisch , Jean Delvare , Guenter Roeck , "open list:K10TEMP HARDWARE MONITORING DRIVER" , open list CC: , , , , , Mario Limonciello Subject: [PATCH v2 4/6] hwmon: (k10temp): Add support for family 17h models A0h-AFh Date: Thu, 2 Jun 2022 15:11:35 -0500 Message-ID: <20220602201137.1415-5-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: 7c5a7ead-00c7-4c64-5763-08da44d41fa8 X-MS-TrafficTypeDiagnostic: DM6PR12MB2699: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: 0U6TQQv8a5PGLVpiZnNokY6yPLb1fmnlGlq5wZpjLSYaDNRDpuC1AavVtRH7S5uDmllyJBN5waGIJ7g3vZvJ7VcyxDembACcMBDs0ddf/UA/kc4CIu0zntnSCC2NIz3ajjfkEtDzrKbrKk8UlzxIKG0EfryQlc+Xqbs1ulzM8aAv5f6U8gLhcefa9nYV4mVWSkIAiPkLnuAzzFnB9NJB5n294R/7Klo0LZ+p1oHSxrpy1800YljSVJsPKEEVukbfiJ3fGS2YiEyqaIVmExFmevPVNAslp4tp7MIqE7MBTy8GhSK0HzGXUPRKIDM+HBiuafuxwNsU3w/0BlZoSqBTIX4VMAlXiojqbfp7ZCFLHjdcbwbiuGL+9bUktphvzspDNO3wJPyroK4hgKaTzmfFEQ/W/HW+GdgE9Sc48kp/JXfu2e6A2FPnKgSKmuXmHWUmrZzSF/DVtYn5wswV40Q9QJHTkiRHgb+ZwHCd2f6sSq7i2/WYPCKaR1DOZO0jdQj3yKPwiEkOcg2DGn3iLXFC1RN2YVe6GmuV99MjXSt0plDoNhAsCsOI+lLU6Ui+VLFRgQ1H7Zmd13p9QFwQV3C1YpmfaQcHME9Z8tCXBknhVbq528Tg9os/6IKfvXlyXB87xpk3+nrQTd3iloyjk5NsA2jspwthg/JqAjLoqHDQneiEDUiK9WGEicT63DoILzL5XkEc6SyxnPlNdLfupNS3jA== 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)(70586007)(54906003)(4326008)(40460700003)(8676002)(5660300002)(6666004)(336012)(426003)(26005)(47076005)(8936002)(82310400005)(44832011)(316002)(36756003)(508600001)(86362001)(70206006)(110136005)(2906002)(7696005)(36860700001)(16526019)(2616005)(186003)(1076003)(81166007)(356005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 20:11:47.9978 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c5a7ead-00c7-4c64-5763-08da44d41fa8 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: DM6PR12MB2699 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org Add the support for CCD offsets used on family 17h models A0h-AFh. Signed-off-by: Mario Limonciello Acked-by: Guenter Roeck --- drivers/hwmon/k10temp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 4e239bd75b1d..5f831e74bc51 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -428,6 +428,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) data->ccd_offset = 0x154; k10temp_get_ccd_support(pdev, data, 8); break; + case 0xa0 ... 0xaf: + data->ccd_offset = 0x300; + k10temp_get_ccd_support(pdev, data, 8); + break; } } else if (boot_cpu_data.x86 == 0x19) { data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK; @@ -489,6 +493,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_MA0H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) }, From patchwork Thu Jun 2 20:11:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12868115 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 81DDACCA47E for ; Thu, 2 Jun 2022 20:12:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237464AbiFBUMG (ORCPT ); Thu, 2 Jun 2022 16:12:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238140AbiFBUMD (ORCPT ); Thu, 2 Jun 2022 16:12:03 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2074.outbound.protection.outlook.com [40.107.212.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E819B8D; Thu, 2 Jun 2022 13:11:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hf6V3+sRjNsoe+3JymHZP4E9QOBH3WP/oQ89AkRqfQu/hLiD6yKp0bhusnakuXwUZG+BjmvKp4IsdxGX0XAvV2idAVl9/HnMupFsbeQFM3iA/5U2X0qGe2Ofn0Ij4TQJ3SbEZcUwxB+8POvkchLFZiFYiuM3Gpz0aNuXu1py60RFhJ6hqzxghPoi+Rq+6lYJD9HqqqDM2/UeCILSNacxgjaqgjgZ+KGpjraa8Ww8K9rFuSKqYTgyi8EO4ZMuinAA9jadTtKvXsfA0u0jcbBNRpGP7DdDIUXaVMgDqQqKcfaPKSt19EWbfrWd6F5pdWhYASMbHakXC2xz/UNduvh53w== 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=2dRRDtyfuZSUkr5LYhGnHNslyDFA5ROC+AwBrrA+azU=; b=KLE2EZnYFypF/uB4H31IiWpZ/g2LKV6LO4cSf7nZhHVuNtsLGggmABbJO7hw/RJiiIvFCYrTqFubJj0RFFqWATMRPAcfldGuyYT0fOgoUnESzvcVEL1eybtRc/hseWzLaWxRaO7IewLYssa1ZVUDrLMqM1w4TgK/C/+xlqa43AsJhtwA0SOTGcdDXXuQDunYZ5LkJvuS8UMnJm3MGRvQbungGdquzRbYH6HSnNdgrGdQnyl/H5JcJQFE5rkm4zHNav/gVOJk1mcvNW1R5IRjY5GBqAPYbOzXHtLG5W4IjcYgxkZ7tXm/Dtz3+2uIt0t4wHi5wuJL+H2bBV/aPtqNvw== 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=2dRRDtyfuZSUkr5LYhGnHNslyDFA5ROC+AwBrrA+azU=; b=nMufSjlHBE/xwk9P82iAt1AjR93FAcX0eVnuibNy5/XO+N2Ykadbh05e2dHcEdoHzOrTCcxMiZzFVhhfbw6ZKKpUOyIRKWvjikxpw55PzSpfMNoO54w5XSw3MPkHxOpne5o8upsWXIS/OeyC/0qZZNLu0IkUDN4T19nflDQePq0= Received: from DM6PR11CA0031.namprd11.prod.outlook.com (2603:10b6:5:190::44) by BL3PR12MB6452.namprd12.prod.outlook.com (2603:10b6:208:3bb::17) 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:54 +0000 Received: from DM6NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:5:190:cafe::3b) by DM6PR11CA0031.outlook.office365.com (2603:10b6:5:190::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.14 via Frontend Transport; Thu, 2 Jun 2022 20:11:53 +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 DM6NAM11FT051.mail.protection.outlook.com (10.13.172.243) 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:52 +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:47 -0500 From: Mario Limonciello To: Clemens Ladisch , Jean Delvare , Guenter Roeck , "open list:K10TEMP HARDWARE MONITORING DRIVER" , open list CC: , , , , , Mario Limonciello Subject: [PATCH v2 5/6] hwmon: (k10temp): Add support for family 19h models 70h-7Fh Date: Thu, 2 Jun 2022 15:11:36 -0500 Message-ID: <20220602201137.1415-6-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: ea39f804-d2a0-4d00-5f66-08da44d42257 X-MS-TrafficTypeDiagnostic: BL3PR12MB6452: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: 0P/8PCkHcKuu9KFqi7swoefkhNEU3KX1EmPd/VAmNc7WvOpLTxSKqDePAyBZ408qNa7akwvU5uFm26WKRlexTWYEYyqlsjZjqTe9LTJioY3DRe5rNZ1vPjq/UONgca+dnfSffdCxc/lhr58XeuaDYxnM8AWeAzzFTNpXgKJhPSssqYKULVNXpFAV0qdOGj1ib5JBcw2PXz7aPjyKYHlQKxq0ljxpvd5Zh1IehqLy6awTBdLT4VSOY+ZwA4+kbTp7GmKhIPiFc3ageyqUsbb/jgUY/i+ZIx1YIASkK62jvwhLcmfsrP039xWfXrrt61E9I7AGbGQlE0bgvUgRx4+U0E3mTENzBap0zHgF1hko3cHd0TvbsQjJCGIpzovUU1PXdSyb0eoNq8MkdJyyekTuUy1CgAUZmK1z0wzF/PSPB8Nzmr09ilk3DZj0FbkK4zknAopzheemNApsNjROzNkMVa+6rM56KkO3GyOnFQ2MOqK96qSu0028XzdYFB+wqvkoMsG6g9rKcxd5hfDnoti5awnbUaihdjYiwtstf8xVsVMpAE73UIddQOptr7UAT1M/B33sIWvmHbEdDRRRpMZZv7kQM97UKWxJDPruGh1WpQ5nl4TYteBvKQNmgpwrYiqdjvkTbFzPZNlgXKoJi2WN/Bm9E8YTlygGW2ak3VsbXIa70I3qd0nX6e9xb8rgArqF7TdEkSQsshYONvXyWFG01A== 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)(36840700001)(46966006)(186003)(40460700003)(16526019)(1076003)(508600001)(36756003)(316002)(26005)(82310400005)(54906003)(5660300002)(426003)(81166007)(70586007)(8676002)(70206006)(36860700001)(47076005)(336012)(110136005)(7696005)(2616005)(8936002)(86362001)(356005)(44832011)(2906002)(6666004)(4326008)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 20:11:52.4691 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea39f804-d2a0-4d00-5f66-08da44d42257 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: DM6NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6452 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org Add the support for CCD offsets used on family 19h models 70h-7Fh. Signed-off-by: Mario Limonciello Acked-by: Guenter Roeck --- drivers/hwmon/k10temp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 5f831e74bc51..5f37e2e7833e 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -449,6 +449,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) data->ccd_offset = 0x300; k10temp_get_ccd_support(pdev, data, 8); break; + case 0x70 ... 0x7f: + data->ccd_offset = 0x308; + k10temp_get_ccd_support(pdev, data, 8); + break; case 0x10 ... 0x1f: case 0xa0 ... 0xaf: data->ccd_offset = 0x300; @@ -498,6 +502,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) }, {} }; From patchwork Thu Jun 2 20:11:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12868114 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 278FCC43334 for ; Thu, 2 Jun 2022 20:12:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237937AbiFBUMF (ORCPT ); Thu, 2 Jun 2022 16:12:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238149AbiFBUMD (ORCPT ); Thu, 2 Jun 2022 16:12:03 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2079.outbound.protection.outlook.com [40.107.212.79]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4ED90CED; Thu, 2 Jun 2022 13:11:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EmAb2XvEpBiZcOTnN295du4ebQCX7vAcOYhWTZTbpF/zveHlnP+XzIofYZzgqR3M3Iz87EQ/36xA4oKkrrwp2SS5zDAvag6UdvLYZiHjqzBkBrX813DVE/ibG2kJq3eeP9pBWulXc8rXW+GWjIBlwr4sARPs77y3soWSFgbO03lOysTzHh289QADztBWLCpJhwtyfszSpkw9RJSMCxPaVs5Fss8YPwVeRgvoMPkZM7w8lobLwgjXro/4Z17SkklXfWRlPKJT5lgrViWPKfJGOB7mF3yQOXthCnEzNeQps8W+n/0uFfKV0Q2l7y9F5gQNMPm6AzUG0ufTImBYvonnIg== 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=AfcuSF487zx4NXZjRutDNaI9irrccV0HRpn5cReQJ5w=; b=EVhN8jBagNTJubvSHQ+y6Z5ilHtrSoZn545nvpc4Qoi0gnAcVG8sWvucz74lVFU6o3bmy8n5xtry1B53dpXpya0z/pUbyA8PJ5GD3Kj2X0h5sFY2XeuiCRIuQ6t1FU//mZeLdAYfH5m3FmDLWzvYcDyRWUMrIdJGlu9epTUL4ijL8xiA7IX44y4Mjv5+AzieXN0GuW39Kz8tsr+HD/MQ6RIy1zYrngZHTmmzbFJHPHciMhx4tC5i7gKK1lOR1GTcE7ZFWblHcbqVLRPu074cBJec2SzIKlnr/8qi6ezJWPsKa12BoMYYuEps+t5rIFYt1gP3imOTASQak1WMNTKytw== 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=AfcuSF487zx4NXZjRutDNaI9irrccV0HRpn5cReQJ5w=; b=CjFn0viB+zh2/C8w0gtfLAfuC7d7GZCnB0uIiXoCe9vAPFRbS5Shcq6utmeyrjMlpiw1lQfbxKkVVhXSpC3K6gr+otMIWZhnSYCY6j5n1aJvhY2DYzzsblTUG04aUhyNcJIt01ZiGdTct0S93RU72AanbS3Wx658a9zIqEcwhnk= Received: from DM6PR11CA0027.namprd11.prod.outlook.com (2603:10b6:5:190::40) by DM6PR12MB4796.namprd12.prod.outlook.com (2603:10b6:5:16a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.16; Thu, 2 Jun 2022 20:11:55 +0000 Received: from DM6NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:5:190:cafe::cb) by DM6PR11CA0027.outlook.office365.com (2603:10b6:5:190::40) 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:55 +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 DM6NAM11FT051.mail.protection.outlook.com (10.13.172.243) 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:55 +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:48 -0500 From: Mario Limonciello To: Clemens Ladisch , Jean Delvare , Guenter Roeck , "open list:K10TEMP HARDWARE MONITORING DRIVER" , open list CC: , , , , , Mario Limonciello Subject: [PATCH v2 6/6] hwmon: (k10temp): Add support for family 19h models 60h-6Fh Date: Thu, 2 Jun 2022 15:11:37 -0500 Message-ID: <20220602201137.1415-7-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: e22f1424-1183-41b0-d113-08da44d423d4 X-MS-TrafficTypeDiagnostic: DM6PR12MB4796: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: WNrUYpSanHA0ER4fqqxvnwwBeyouN7rPyc5pbBquK4mugkyGqfwQaRODKMzPwL8JhjgD+zSvBIg2C7P1iiAD6zlUblTQZPAP4R8ps0hbheAiQL0jQoTljP6CCYRHH0lqv1PhiFmakGsHVqgnymqpCbqMTnBBMlS6I890/9YhsnxRH6KAlalJMK+lsSunzbDcKYe4tqkQvU0wEyein3tdTJZNxyt9NgdfAz2tMwHOxW4/GQxqpbDcSbJrGErJuRDz1fz9M6ebu12tQVdf21aAnI2JoCfuSCzCWs3x0LGwRmz9yymehyKeaNGMNw6Xvwfg/mzF9zK4116B2WQUl1gx5Me4ZNqn8TEBm5juAChJQ7ZcF56BsZeAaNS9O8BLXp5r7/HWLDc73N09AQIMo6a0afjJM1AqO2V4nfzDxGqXuzKDIx4p6cLaK9sgzBwTlGoDtQcmRQ0gR3yiGeOdahpof4LwVUVI4tog4mYJk7zpE/gkurUGhk6Qh5D6oOYPsBm14zamNvqFhiPezRKuocsS/8wPWa1pptIJTPilVH+htP3XNkp3Rpwv6ALiPxj6ZGIiU4MYKSX+NhOytvC9SokJeQ4DC9YgUr8uKN37pNwf9I/nVKlc98xAYhaIctHdpeYW3xqqIdDbzsePbdp7DZMBHlZeFFBOANLLgcNImeud+f2CINZtXck2pjimyHe+PhisRqyPuQ5ilGU8CB7mRg5jsg== 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)(36860700001)(8936002)(5660300002)(316002)(54906003)(36756003)(7696005)(40460700003)(70586007)(70206006)(2616005)(110136005)(26005)(4326008)(6666004)(82310400005)(81166007)(1076003)(47076005)(8676002)(356005)(186003)(16526019)(2906002)(508600001)(44832011)(86362001)(336012)(426003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 20:11:55.0158 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e22f1424-1183-41b0-d113-08da44d423d4 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: DM6NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4796 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org Add the support for CCD offsets used on family 19h models 60h-6Fh. Signed-off-by: Mario Limonciello Acked-by: Guenter Roeck --- drivers/hwmon/k10temp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 5f37e2e7833e..5a9d47a229e4 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -449,6 +449,7 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) data->ccd_offset = 0x300; k10temp_get_ccd_support(pdev, data, 8); break; + case 0x60 ... 0x6f: case 0x70 ... 0x7f: data->ccd_offset = 0x308; k10temp_get_ccd_support(pdev, data, 8); @@ -502,6 +503,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) }, {}