From patchwork Tue Jul 19 19:52: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: 12922981 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 00767C43334 for ; Tue, 19 Jul 2022 19:53:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229496AbiGSTxE (ORCPT ); Tue, 19 Jul 2022 15:53:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235209AbiGSTxD (ORCPT ); Tue, 19 Jul 2022 15:53:03 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2073.outbound.protection.outlook.com [40.107.212.73]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A24352E58; Tue, 19 Jul 2022 12:53:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S4UzIan0PdAxBTjsIMYmsD/kW7hC88AqlRUgyIxoEY1n0a63l8zEf48mDWE9qO9goJQayUD8T2R9e8ZJRw8S2KShcBeD5SBhrEh9mfFG+wRMO9vzWBoz7RQ/LnCePJrrxekRbUuf7Uo9onnM/Nx8wlLCVd7my1dagKb8T8thqi+5hH0/U4oXPxZx8nkO2ecmfs1n6tWxY6U6g+LPkyOiQv9sZylDeZhb3nUUG86IStBhMSoFz6GgFiOlcN9d4WD1Z3IZyDddqhVUInONN+nC0R+OiyatMThiQvbyt4Wh2d1JhU758Lsui9a1ZOLzkEL39nifj6BVJeTDwwiMfC7Nlg== 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=lraqjdspnUZBgZbHj4lK9hf+TQMDQIspSmx+jDuzy24=; b=JZjKfcc8LFar3RtPbhiDcR4hdj13eojjFaDAh94oeQ521R+Z5T9C2bGKvSRB1FldGMz5rCnmfpufg5eEMXYPzPTGKD0Usb1wyIfDZ3ucKM7EO9bUgDQrASzrDZil8RdL5azwih1CEHFrEZcJnb72QUM/20Bhz1b8F8jrX7iViDPIR55xAho47oRCrEbqr+AU+LC6Os3eC0ABZt2biYnOm8ihl1m91z45RMEmcD7N4I3EG2NzR6bnOW27zb/A7kmpkGW51T70SwcbY5pNq3eJwHPDiY9z8DXtod6j6Rvc6CLMbFwCxlGlBa3Bl7Ssz9qgm3EtCYY1989J8eDaEmMxMw== 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=lraqjdspnUZBgZbHj4lK9hf+TQMDQIspSmx+jDuzy24=; b=4mv7bejmnv9eTDoXNheWxbdJHwz191yZA+a9VnoCsdFybkTbVDWAw+3C1A38dwSgvlYozC6/f1veaSuaRtuuLDT+6DUCw1N911kH05upecua6CpO4FfWa7aBcmNBSL2urnQoFTff2Vfr31RHoamqpGP59CBvDIB0Mo9fst/tLKg= Received: from MW4PR04CA0240.namprd04.prod.outlook.com (2603:10b6:303:87::35) by DM5PR12MB1867.namprd12.prod.outlook.com (2603:10b6:3:10d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.20; Tue, 19 Jul 2022 19:52:59 +0000 Received: from CO1NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:303:87:cafe::b8) by MW4PR04CA0240.outlook.office365.com (2603:10b6:303:87::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14 via Frontend Transport; Tue, 19 Jul 2022 19:52:59 +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 CO1NAM11FT023.mail.protection.outlook.com (10.13.175.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:52:59 +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; Tue, 19 Jul 2022 14:52:56 -0500 From: Mario Limonciello To: Clemens Ladisch , Thomas Gleixner , Ingo Molnar , Borislav Petkov , CC: , Guenter Roeck , , , , , Mario Limonciello , Bjorn Helgaas Subject: [PATCH v3 RESEND 1/6] x86/amd_nb: Add AMD Family 17h A0-AF IDs Date: Tue, 19 Jul 2022 14:52:51 -0500 Message-ID: <20220719195256.1516-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220719195256.1516-1-mario.limonciello@amd.com> References: <20220719195256.1516-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ac4db73-6db4-4c0a-3db6-08da69c0488b X-MS-TrafficTypeDiagnostic: DM5PR12MB1867:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qrlkzNmKyFISmq5iYGLwzA6ssjD47jZ2MS94H1h4VLh09DwI3HR01TOT0y0VRTyLCb6Qj5hCPu1e2v18O5+Y5vb5BVTCsUKYTXrMzmlbEZ5LBddijpBBR4ieBYtBBGBHyllAt5OZC0j4+N1k2IpZwDqTR4UCSi181roKKnoN7mol5Gdu0n5NKSey4gdYDr6bDGB6u/waZPqCZGlJ4Z6dlWX1cv2wAxKP5KJVOHjycViSTcCIGsfZtgmeSL3Fo7eKxDZlfa65qYi7w1VJyoEDiM0YQK5fOorrhe7qwFREHtdHDCLoA6Fv9c/id8ye3PpTWgGyApg8FvDS30ioLsWHNz3TixYbWdkhoqYNsOEK2FGlStd8o84Ul0ntW8GrAC1nhGSFYINPKkTqxLFMCZ9ycH3NBomcF+5nhoAWYdSrAedM2OzI7Oymj11N+TDHdBzD98bAIuC2O620KwjInGITA/U46wESXpx2/aYt5yuluqMUgCB1M6gAzFkHm8KuIZO6FcYGOAEHaIr+dHrk0fZkklpG0k0weZN8/FJ/wIRLIN6uL4AcUWSf69x4cU8bAC6PXbaviIkeQAvVMkEF+zutiPZ++fn2Kc+hcOJ8onkcdY+MjdvmsjmgOs05jmK+2GMiGSpcr7POjkPoRNqA4zhhmWGmiOOmN/JmQUkBwAXqNe0b3mJzNo84o89JMxJfS2ai004JgrvpJ5TkUM0pCZJhvSXop2qztD4c8VLhsbWu2fyiTJRH5/PBG+rRtXW3YNQf/bzVnhT9gPH+GUyWbOfAtTroaklzT6cI5EfZeCdu13WtteTswS+Dp0WoTwnEY61HFM1y3mm1iSikrhzx9alNQQ== 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)(396003)(39860400002)(346002)(136003)(376002)(40470700004)(36840700001)(46966006)(86362001)(478600001)(70586007)(8676002)(4326008)(2906002)(70206006)(40460700003)(5660300002)(82740400003)(356005)(44832011)(8936002)(7416002)(81166007)(36756003)(40480700001)(2616005)(1076003)(26005)(47076005)(16526019)(41300700001)(186003)(82310400005)(426003)(336012)(316002)(54906003)(36860700001)(110136005)(7696005)(6666004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 19:52:59.6350 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ac4db73-6db4-4c0a-3db6-08da69c0488b 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: CO1NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1867 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 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 190e0f7633755..60c7bd525237a 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 0178823ce8c20..ec1c226d13e60 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 Tue Jul 19 19:52: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: 12922983 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 49C07CCA482 for ; Tue, 19 Jul 2022 19:53:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235119AbiGSTxF (ORCPT ); Tue, 19 Jul 2022 15:53:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235219AbiGSTxD (ORCPT ); Tue, 19 Jul 2022 15:53: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 E05CA52E4D; Tue, 19 Jul 2022 12:53:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h4D5jEIUjcBQzuw9WiDi7YR/MJhcikZ/+H8pIuqkWrD5o2ANpPb5JlAhizi0ibRKeALk2SycGv36NcnSE5l0EyxPR8DmjblUKQpZyohF/UyTwMVy4D3jSpJaGXD/f5vp0sXHoDsnB7d4LkLKHt6N9ohrIAuWH3elA3TovIcBkW/m817MGzNTU0DCOgCSjga2GmY3L37E2xSRv5Gc4agddSxKrjXGkwX9pMYp/yWeGa3lTXMZu+x+82wEJIYaHTpDM/ZHyV6wjQWnEJaOJIPX8e8qhmPHfoA8BKKhpmfcyCe0rWJN2eY/gMwhUsVt3iZsdLmVgA5pwnKSt80ointy/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=06dxfGY/uHYEXrufOAjnXuE+t8O1Ijb8KbLB0naCBao=; b=BKm7rm1G+mIOSH7S0UcCX6f4J7/woJn0/KiHSPN/sO5ljMa/9pijEbl4h+Rj98yCVGqdvSLkZfdvFiqmGaBUm/6sg3yz36gYZl12ylgsbuEM9gtjWruMVPwA/NGlzGcw1wLCjXi1+HMZ07Id+XN3PCGyMwSuSkZ6xy+1paE3eyrlYEJK/C6dtd2k0INm/zVmejOKJOIrheEXAI/gxi3iZwOx6zW7uKxt9LICSlr4uR1ToQQfSjNNd0snCrp9Y+jUR9aHn8S7RkwiSuv0N2Pr8ocBt5ZL5GGaBQmbCyHiQNRgKf21OfPkuXPACZSpeq77Pjx/XuVpxugZ9deC0TQnHA== 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=06dxfGY/uHYEXrufOAjnXuE+t8O1Ijb8KbLB0naCBao=; b=YPw+Zq7zscFIaXiRkINNJCmX2yBclhOOWNfGhjunBxF9Q1YAkeeK97akgiq3O1vsh6QlJonamSBI97bjW5a7myUoTrKpPZscP7O9iDcnd4TX5lr5bcamVN5vKFqnu7iITZ/mTEKnxLdu4mVEtdzg+eyegKnVlCaXlqIttnothDk= Received: from MW4PR04CA0228.namprd04.prod.outlook.com (2603:10b6:303:87::23) by DM5PR12MB1210.namprd12.prod.outlook.com (2603:10b6:3:75::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12; Tue, 19 Jul 2022 19:53:00 +0000 Received: from CO1NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:303:87:cafe::fc) by MW4PR04CA0228.outlook.office365.com (2603:10b6:303:87::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:53:00 +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 CO1NAM11FT023.mail.protection.outlook.com (10.13.175.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:53:00 +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; Tue, 19 Jul 2022 14:52:57 -0500 From: Mario Limonciello To: Clemens Ladisch , Thomas Gleixner , Ingo Molnar , Borislav Petkov , CC: , Guenter Roeck , , , , , Mario Limonciello Subject: [PATCH v3 RESEND 2/6] x86/amd_nb: Add Family 19h model 70h-7Fh IDs Date: Tue, 19 Jul 2022 14:52:52 -0500 Message-ID: <20220719195256.1516-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220719195256.1516-1-mario.limonciello@amd.com> References: <20220719195256.1516-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 902d96f4-2c5b-4063-37d1-08da69c048e8 X-MS-TrafficTypeDiagnostic: DM5PR12MB1210:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: InSyx44PCWGEbF2qSkRGtlsY8lpI6sQnn/ytdEIBn2sxEYOT+dpX5F3twBMMoq9/pq8vr4+bnsjumXHPpP+we2NAE/LmGoEwOIjANvOVBp+R6kYye7mRefEQ3cQ1OEJF4guKq/78Qj+1JJPnaJDP68MUHaBI55CMem9i9Fyo6hyU3iKJtJ7HUPCTyihd8N9hlLTcaEmPQmBxhB0t2qZjQjhOfyy9A/6Bn6EQ7wC8t/XJEHPgEnGUwQZQm0N+DXr8UbSCi0GJH7J1+qIOmLnE1l56zw6l7oH9OaAQZD9q+1n566JRk8dopmfKe/Kefb8BDHADR+hwSxgJXPvc9AlOV6HKA+tHhaVc/+ZPLuO74UPKmvSsM5HJanW/Py8hKpvjn2D2MM30F9H3K3dSA2vHUbup1D5udiXmAO8dfv6mfdo1gIRxsbNNbUqirSOQI/YXUcWDWKlt5kNewJF2svnNKDno5z5WTyiZKzi4oMjzREUljrg6/kiIUfI0bZaRJVe5n6O/nB5x5HPBR/pFXXd31sGUzG0Bqun4BMcRV7bFGZaEgv9Vox0at+S+m9BxZJUjUvVwG+b4Ko+/SlH9Q9ffyz3vqG3zA+hp39BRCs6/GhgFi+FPZZHQC/1iEEjU7T52BSYNWctNxhgX8Bq9P+e3K4oAgQaCetHwMO7XRFwPs+yZIm3EHmj6IbB6ycFzn9XgRL9scAIGzVGWSD4RG1ysrN926iPX62I+LFUJe54l1rXqEWBiXfQxw8P+v6hGdAs8O+H+EhNfaAytaTisXVIuV8DU7tPotpnOmgqjaAY8y1SPaHCviHCOEoVINQjOV6dBcWhmXFaBdgcrWsRF8uftcg== 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)(376002)(136003)(396003)(39860400002)(346002)(40470700004)(36840700001)(46966006)(82310400005)(86362001)(36860700001)(40460700003)(82740400003)(356005)(8936002)(478600001)(44832011)(41300700001)(5660300002)(81166007)(316002)(54906003)(70206006)(336012)(4326008)(70586007)(8676002)(110136005)(47076005)(426003)(186003)(1076003)(16526019)(40480700001)(2906002)(2616005)(6666004)(7696005)(36756003)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 19:53:00.2287 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 902d96f4-2c5b-4063-37d1-08da69c048e8 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: CO1NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1210 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 Reviewed-by: Yazen Ghannam Acked-by: Guenter Roeck --- 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 60c7bd525237a..cb7a40378ed3c 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 ec1c226d13e60..32a1f85ff0de1 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 Tue Jul 19 19:52: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: 12922984 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 5DEDDC43334 for ; Tue, 19 Jul 2022 19:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237825AbiGSTxH (ORCPT ); Tue, 19 Jul 2022 15:53:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235969AbiGSTxG (ORCPT ); Tue, 19 Jul 2022 15:53:06 -0400 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2088.outbound.protection.outlook.com [40.107.95.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EB4A52E58; Tue, 19 Jul 2022 12:53:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dEj3jV5wJOpQF7SLD+KnNPt2r2fzWg4bjPNXRFHX8jnZfKuTm2u0cd0GqtDjOllZ6txgt/JinMOhCs1eiW50NDgAjJyefYEpwO4ZkBasD1ge+xDUf9xxYayLouXH2G6yraMBepmIVkJSx8ZtjTGQX2F4lO2GETUPnNfheq6tx0MBUR9ga8VqVBBs8jvxDNfXhRNs5wE7NfYjiOTnR0bVA1JA7GkQUze7kh3VECS24m9CVPTVjSSdrkbb2mXrSTobLi/ux8poXe1A5Mq2IMYnfmBF1YTQgoDbe67I65f0t7+aSoQbTEqW0M19TIvJoVTEMNYcMY5UEH4SEgjpOAqh9Q== 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=UVtM41PHZVkwofyD8tKB7HGzFu9ic5r+BzfB3+xWvvk=; b=LHfj0k15SW0nDFSU56noGF/drBDhI25iIq3T3K4e0I65G5FJPLYWMBefWfKcCMxBNMEaKT7DgYupDyv1aH9BosqKPE11/csyMTyIJVPQR0pqKQ0DNFjgBCvMy3TUwEuKySaXVUTFuHLbm5YcUfJ7altAfv6sfNc+2bZrtlReD6YdP0eqogXb9XOQCK5G0pIO2Q5RYR3T9e1/lg5MIqUAhLt/RCFIjirTNz+bfDqgOWOM2ZN2ZkSTlg0zcPokk91TORTxlX914i54sVCieP3hvuPDFtpmW8ovXpxmaovPoiMJ2ntIEokzpQ8tfwO7hqu5uP8Isv3Vz6CQJQJ+WBARyw== 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=UVtM41PHZVkwofyD8tKB7HGzFu9ic5r+BzfB3+xWvvk=; b=ppmkvJDC+/r71RymaiUXFrTNFib5w3DOuGw6HLMuSVjJKpuM0+AKJ5VbR09ocmrSInKHnR7Ii4IsgJ+3oXZEum5QWy4F694woC0m9C4F3DYr+bj70eeNDJ11Zu/Q8yO26aQ4leBrYgZ7DsjxXQskgKWFq+jSrRM+5EGZnGtLTCA= Received: from MW4PR04CA0216.namprd04.prod.outlook.com (2603:10b6:303:87::11) by BN6PR1201MB0019.namprd12.prod.outlook.com (2603:10b6:405:4d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.13; Tue, 19 Jul 2022 19:53:01 +0000 Received: from CO1NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:303:87:cafe::5b) by MW4PR04CA0216.outlook.office365.com (2603:10b6:303:87::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:53:01 +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 CO1NAM11FT023.mail.protection.outlook.com (10.13.175.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:53:01 +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; Tue, 19 Jul 2022 14:52:57 -0500 From: Mario Limonciello To: Clemens Ladisch , Thomas Gleixner , Ingo Molnar , Borislav Petkov , CC: , Guenter Roeck , , , , , Mario Limonciello Subject: [PATCH v3 RESEND 3/6] x86/amd_nb: Add Family 19h model 60h-6Fh IDs Date: Tue, 19 Jul 2022 14:52:53 -0500 Message-ID: <20220719195256.1516-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220719195256.1516-1-mario.limonciello@amd.com> References: <20220719195256.1516-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ce6eb58-64d6-4580-b937-08da69c0496d X-MS-TrafficTypeDiagnostic: BN6PR1201MB0019:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OZbrctS3irsKuE1Q1XNA7+rkIWX/nid8581xocCppXPwhn6/0cNBJXVb/WyXFT94XrEonK/XgdLYzyX45x/T3vgJv+iVS25eWBtveGKv7IJnMdGRLHADA8pKemSvLksgy5yZqvbDENCsrbDKPLi/R1ueI1rKiNuFP7k/innvz5PmThDnPTmQEdbBmwBCdmO6f/wSZusdgGNuhVnRhC+MZXWO9rlZkR88efy00e2nlEgNbU3VNV9Ny+APxI9lnQ76IAH7YvCPWzuQ+FjPchuFSbhbYyuJDPaBZJMj4uUUPheYHOaqWq+F4nfFUaBiG1b9/njgGRG75hbHTkq069xpGWny8u9NTs1k2t0tZGh9vXm8HIM86pk3RG22kEAU0if+BecS/MZZrtkbuXZrZvua0DIJJ4Y1I2EBn9sXBotal2xonbfKCQoLNx7nY30dZjtLSqBx9CKNfNWPnNX3m5NTVJDhjTYaDOO2j9RfEsBEnk6mzTXgBRQngu6kH/WYl7kCue+dUPEKiwsaWkyfn011s2Kj4QZ7JPyuPWoHroPcDhP9LCeUI85iibCaDHODOlBkiGSxkWvQfu4v18Beh+n0b2JBzGPFNNOeUUIWnBulNAcQG5fsZus9uuHUoQUKv544PTf6Xa3vgIOKude+eHl2PpKdIBz/2qwpxvubhOwUOvaNeWBjNyU647PtbCgTH6SJwIELTyBsjUYPp1wJcPo6zdOJ9lyL4zQeqYOpBVCazWR5drD10/OrZc7IzBdSbWTnE46R0PXdJ3HwWRmNLa42w50tO4t7Rn5Ilelr5DxFcxhL+VCwy6875gwjdHzx/QL+aMNGyZDNa5dFvIJ9DKPDIQ== 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)(346002)(39860400002)(396003)(376002)(136003)(46966006)(40470700004)(36840700001)(82740400003)(81166007)(478600001)(86362001)(356005)(2616005)(41300700001)(7696005)(6666004)(26005)(186003)(110136005)(54906003)(1076003)(16526019)(316002)(426003)(47076005)(336012)(40460700003)(40480700001)(5660300002)(70586007)(70206006)(8936002)(8676002)(4326008)(44832011)(36860700001)(36756003)(2906002)(82310400005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 19:53:01.1192 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ce6eb58-64d6-4580-b937-08da69c0496d 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: CO1NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0019 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 cb7a40378ed3c..4266b64631a46 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 32a1f85ff0de1..7fa460ccf7fa1 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 Tue Jul 19 19:52:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12922982 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 CAD52CCA483 for ; Tue, 19 Jul 2022 19:53:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235697AbiGSTxG (ORCPT ); Tue, 19 Jul 2022 15:53:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233730AbiGSTxF (ORCPT ); Tue, 19 Jul 2022 15:53:05 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2089.outbound.protection.outlook.com [40.107.92.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8173252E4D; Tue, 19 Jul 2022 12:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wh7Xea4UPg1DZM6PuZKSLJPrGbg1DBHQ3ZOlexx61/BvgMFcA0uRIdzy6vuXrKYKCFyaNqZRc3UpDbkVZ4oZXYOcBVxrd+nCipuaAGmsviujw6ICCInLUzFnKDJ7pXAWRfndqsTwiiz5ctPGTmUaCVoFFYkixiK4XVVHSd3LKPo8XTYjHnMKmvvvdt+4afQ1GyVfoASIE9wyenWFJlhQOfjbAJk+GbmlHX0NmxP5JrDIXXbqwSWiU6iSI238D5W4kT3ns4L73A9X42E6WfPlSgsAEbFLN0xJJ1OPWgc9qQIcMFP3En3nVy8N3CDSszwC76l0zWWulEuHL/VJhECloA== 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=Qf/4mS8pdAWtPeU/haIICWZ4aiTjbd66LzJo/hVfQMw=; b=moVWA3Hzl1tXQ3kYcEft12Z90MPitwdax6FknqDJh2YCbVxPTrPvFEOSDPZcAgIEx9qsMVXtCpftmB6+hAxqqe9YSLqe7bRVhvqgdBI/0JVSTEAlnQL1y4ViYn04qYMSnLfPMFxbCR/jcFX2lYZLTGZtRITJl2i1C1BHsf8A+9aTBkJrcz+YM75sujqmv/jizR/FTvEDI7b+MS0v4ZirrLUYKyZsGmwPWoQYhg3G51tC2b/rLVILWByofvgjfd5fYauQDqoUQyDnHEYUlqcxJxRG3HvrR1mv+ajbT0OqzJFSN56U+v1SCeQMTub8+v08rrU5eII18bDADdbLFoYRkQ== 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=Qf/4mS8pdAWtPeU/haIICWZ4aiTjbd66LzJo/hVfQMw=; b=Hf5dJr4lW4JdniQzkV6E5+1zzrXNfY2IuKKRsS+FrCXG277yQtkBOcE4rn2hNw3DUCkMPaUqKJHhxrfwqIQ7PaCMRpvghkol0w2NNWmP6a/wQDW9j0JmZgbx31CRG9CyChqiTGfaUyE7/tgDURrMJVmlLQ2kQGZqjILO0m1m3DU= Received: from MW4PR04CA0216.namprd04.prod.outlook.com (2603:10b6:303:87::11) by CY4PR12MB1621.namprd12.prod.outlook.com (2603:10b6:910:10::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.21; Tue, 19 Jul 2022 19:53:02 +0000 Received: from CO1NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:303:87:cafe::84) by MW4PR04CA0216.outlook.office365.com (2603:10b6:303:87::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:53:02 +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 CO1NAM11FT023.mail.protection.outlook.com (10.13.175.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:53:01 +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; Tue, 19 Jul 2022 14:52:58 -0500 From: Mario Limonciello To: Clemens Ladisch , Thomas Gleixner , Ingo Molnar , Borislav Petkov , CC: , Guenter Roeck , , , , , Mario Limonciello Subject: [PATCH v3 RESEND 4/6] hwmon: (k10temp): Add support for family 17h models A0h-AFh Date: Tue, 19 Jul 2022 14:52:54 -0500 Message-ID: <20220719195256.1516-5-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220719195256.1516-1-mario.limonciello@amd.com> References: <20220719195256.1516-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba06beea-d486-47c0-281a-08da69c049e0 X-MS-TrafficTypeDiagnostic: CY4PR12MB1621:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vINKayfGZz29dm60+axq+u8x4EANwyW5hEOLiYQFCFu9FAbxQX5RLh7gZZXHwZxDDcXTbxlJ6LgyFOiKYZtWJ47t3GpSHGO7VLeUzdazfKR318uduKFhBXSarXfH+yahAJ/6CVHQbByksoOFf/YFBxsaZDmmXyZV3fbbqTF2MsDqtMUs/cGRk1l+6oDTuL/iSMzJRdSw0nZkrvf7Ee15DWBySWO2ga1p573vJ27A2ycRDRB0+2teOwEd196GE881f8tR4ddZ49cnO5wQDSLYO2ydHA2MYnP6NTiUpk4ULwH/QAC0RL0zpcd7QETBQbRzJDZT7NyNwOKYqlUqQN3wlC4vKqRIz/DDCN1kUdcl8xNV1D8lceEt2reOwOSL6qBvfp8NJeEXh0g6AGNG84DP1g5xpT747VIvhCgjvT5lglL2Bj/5d0M8Ew/SPuLHwOidwPIOJAQWC8SEu4r7XipbBJ4BxNXxTQxUAc1UYOqWK/Lc7WPyN3h1N2rbTJRfxNRXYDWGpMZ0maCdNbritxC9+xZPsAHxQ5K4+NcUMvbUZqyTniDsMZyBfCIP221+c9uLusun50gTkuZHFbmvHC4gy7RcYLNgoxT52Jxip+Mz2KlvZN2hEUdO5M/2dFj+7EWW4Z4616d4UB6R78QQXOSc2PP9ES2kaY8KKEj1lwuJ/QO3S+PEaVJiwgxH52EsrxXY7nuhU1aegS9sN+JTCsl8LgxAWU9HkB0/ryOlgiP5/o44rhZZ7cM2BDs9EVIJGtpQ94FIxL0Zl9LvXZHHznYvC1YkD1oUNN03SbMvgA6Apos+luP1T0kHHN2xximm17IjFZb7EIo0A8ql/z7GZg6xvg== 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)(136003)(376002)(346002)(39860400002)(396003)(40470700004)(46966006)(36840700001)(36860700001)(4326008)(40480700001)(54906003)(316002)(5660300002)(8936002)(2906002)(40460700003)(82310400005)(44832011)(70586007)(8676002)(16526019)(70206006)(36756003)(356005)(86362001)(41300700001)(6666004)(7696005)(81166007)(336012)(26005)(2616005)(1076003)(186003)(82740400003)(478600001)(47076005)(110136005)(426003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 19:53:01.8536 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba06beea-d486-47c0-281a-08da69c049e0 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: CO1NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1621 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 4e239bd75b1da..5f831e74bc51b 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 Tue Jul 19 19:52:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12922985 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 B2900CCA47F for ; Tue, 19 Jul 2022 19:53:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235219AbiGSTxI (ORCPT ); Tue, 19 Jul 2022 15:53:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236808AbiGSTxH (ORCPT ); Tue, 19 Jul 2022 15:53:07 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2063.outbound.protection.outlook.com [40.107.93.63]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43B4452E77; Tue, 19 Jul 2022 12:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LZ3XeF+rJp7Efe8EVfimRSZ6SJd68EiFQznpguLvEh8jGslU7lyEradM6YwFRr0JxZf42I0mlNKxOO/uD9qWFKRMHcA0oUHugu4oPS2mQ0YJCmEGDHKvYhH3qEqmlKwk3KvDglEuofJlXD19o8mLP67UfUN1umZKBCHfHu3V3X+qKfckD9JpX+laecvgTJgXslyCuSNZHcfTm4DJhZPkOm64TE8IKBL153wyfhvSUjQkYbCrGzH6cAxL7CnId7PrX4btnWbEF0cB6dTiwBJFjiqXnl5pCPOcze3ohrzW0tDU9oiVCFTsyh7n4H6WsowgCIAOvE1o6XpDLaZv32bsag== 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=C8zwTczDi24eqFhyqMZ4iz1NlLs4MT8GsAknQpqYlV4=; b=JcEoP9hZroBUr/CFe/dKXrpWb/IVlJLWelwXq6aG0o/gTEv3vWfIcEM25BE6RsNHVgdRVAQeBzKzPHozdxWLsIpeimKhV6E+oJL2TbrGvKfrKzxB+N10vwfux4oe2b+C0lW47YTTgg/f0tMTIS7MRk4ssstz2U6dUoCmEh8tKRHq2hZ4kE7pP+C7HuWLO/NpcL18GxcD/3uIkY9dh9Fh2tlnOpDjFOaUNOIyTsw810Ys11gneTkYgLEOIa33usqKHaOuQ53wR7P5XfDz/zD94Qu5ZHhoT5cKzpZjhbMrXr9RbzYbvSRGexU4YJnHULdtWbh1En5lME1YiN+ON20o0w== 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=C8zwTczDi24eqFhyqMZ4iz1NlLs4MT8GsAknQpqYlV4=; b=xLJ3ZyShUzINiVm18+QVtmJ439FMahc1JGTXBxFf2b0RwDTbUrCS4ntGZs25HE5THfemXM42P4bhbWBdL6oQ9Ce+jL+PCYgxZ1DIBPSbECYL80Y9NishGMfQMsa5Mf8vPJlgarOHrcmJq9G1sJVTdcn59Xpc7nGSV+KeGPJqHkE= Received: from MW4PR04CA0228.namprd04.prod.outlook.com (2603:10b6:303:87::23) by BYAPR12MB3558.namprd12.prod.outlook.com (2603:10b6:a03:aa::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Tue, 19 Jul 2022 19:53:02 +0000 Received: from CO1NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:303:87:cafe::d) by MW4PR04CA0228.outlook.office365.com (2603:10b6:303:87::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:53:02 +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 CO1NAM11FT023.mail.protection.outlook.com (10.13.175.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:53:02 +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; Tue, 19 Jul 2022 14:52:59 -0500 From: Mario Limonciello To: Clemens Ladisch , Thomas Gleixner , Ingo Molnar , Borislav Petkov , CC: , Guenter Roeck , , , , , Mario Limonciello Subject: [PATCH v3 RESEND 5/6] hwmon: (k10temp): Add support for family 19h models 70h-7Fh Date: Tue, 19 Jul 2022 14:52:55 -0500 Message-ID: <20220719195256.1516-6-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220719195256.1516-1-mario.limonciello@amd.com> References: <20220719195256.1516-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e020b19c-931b-4b42-bfe0-08da69c04a3a X-MS-TrafficTypeDiagnostic: BYAPR12MB3558:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3NjnU67EMdDG6fTxpLhVKNOewfIqxSuDFhXImsVZf0UhsS3rgqqJmFwnTcXq/m8g1Co84lK91fY3xN3r26LhVOmMToDlsCrC7yphkvnFSnQBg1Z75F31+b1hDFZ7zICbqu43cNVnx+dcDST9MJXTleN92IYczo3E0A7b5HPutzxnQD6rzLK4mimpVDIZhAQjVmOnaWZg/IfTxwY2rI+Ckljqbz7IJ+MKCKuvax3w+i2z6UFR1VmzUAgJptYvLpSPaSFjNPTXNoXPi/L7D8pc9uygwrAgab7IZj+rnQ3oZrvqXKmeqypnMmhhZUZvwsGd0QY8uMJ6LYZtLUmWTdZ/kqBKFvPve8Y2entG58v5D4G6A2Q8ZTg2XDenxsmVlqPVkzmnSYcmxW5SOT4YsxdcJN7B57uPlYU3nw0yECZdSJWwfg/a3HRJNUtrUJ4daMgbSc3qCOdxtjL3ZPmaeOpVb/Eyl0XvlAXJ90HWm34N43hjBtw5Sy0VcFpHGsoJEkGOJw+nH6vOqM3lBV/Xue5Zn1DVkoANydQ5vP6LJ1j2bSg3ETY09v+3/iIcCjp1ygjNMpWHXWU67oIw8u4mrhDgmYOBNEsRQ5Kh1V/XoFAJ9cQnbK7/OQHn5D7MHCNWyVqWYmdLmIpJYWasfiEaJYAnhSmwauD35WDfQPw30u2xkTCGO0C0SbbGoZdhNAqFy2Wv88K5903OGl/SLRd9e5rsc7ZjdxI1Jmhjwn/dXXP6DKeFbZZMHG1ZgqAQ1FwVysatlRitOTd6rAcKNbsBBSNC6Vb7yZbprpokIPfNdMBWS37NdZ43dnts1eeTcJDAak26WO3iWX5KVZNuhBeJDAQjEQ== 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)(346002)(39860400002)(376002)(396003)(136003)(36840700001)(40470700004)(46966006)(6666004)(7696005)(2616005)(36860700001)(26005)(1076003)(41300700001)(186003)(47076005)(336012)(426003)(2906002)(82310400005)(54906003)(16526019)(40480700001)(40460700003)(44832011)(110136005)(356005)(478600001)(4326008)(70206006)(70586007)(8936002)(8676002)(82740400003)(86362001)(81166007)(316002)(5660300002)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 19:53:02.4473 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e020b19c-931b-4b42-bfe0-08da69c04a3a 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: CO1NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3558 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 5f831e74bc51b..5f37e2e7833e7 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 Tue Jul 19 19:52:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12922986 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 5F56CC43334 for ; Tue, 19 Jul 2022 19:53:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238202AbiGSTxJ (ORCPT ); Tue, 19 Jul 2022 15:53:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237683AbiGSTxH (ORCPT ); Tue, 19 Jul 2022 15:53:07 -0400 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2043.outbound.protection.outlook.com [40.107.100.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94C3252E7E; Tue, 19 Jul 2022 12:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hhUdgvKY7/aD9iMV//7uUoAuaoIjI5R1Y14OIQjr34FaH/tuTcw5p3NDB/0yud3iazMupX5E00Kgouf/jpbR/b3JMsWQhu9BwCJWyE9AuFsqPY3er/2d9loDoagScDVlPGV9YxhKrzYZjyiOIi6+dPq7hQhggvtVcE9G6693TWXr532eB3oeIC244M/iUDJLOVSHOXsMqHLfK6KEW4/xXWJQJMN0OMvvWM3GX8idHUBmMGrAFAdx1DTbzLYWW7RwKL/nk+P8IKHr4P91VXxDBOdBzy14SNCU8qdJoTIbkWOaqHkO3rfaW3Wv/6OBWBJEePcY3FGSOe6sUu9C/v15Ww== 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=JoCTEt3xZp4z+2Fb/usOZnBgMyFA2YwyhTyEr5+bSQk=; b=UV4DhhGyrnGQzlGfwQPAKKnKyaTJW9pTsvrHWIMaWdKwMZkc8laQHFixTQxh6U5ZU0F/d352k6r8u65zrDh6rixXxspKEeZ9uc88Og6hB9ksK5PEPrnMaqCAvmjoVyj1UEySrnMNEaughpHPTm3SarPm93qdf51qC2pP7j1gSfOK3lwgu3Isr3uqua2d2bKenZSzRfsxKU9ii9B0bPEDQMHUikbjE9hVZAW3lIsGha6SRYLiaKmxwcsnncVqXdLn9m5DTJEF/wEAtOKy+MERZg776Shuf7gEycWZfBlZiYrXVkuEUblajJ67kBLbKfxmb2IIB5uD23OIkdbcnbVJQA== 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=JoCTEt3xZp4z+2Fb/usOZnBgMyFA2YwyhTyEr5+bSQk=; b=wjmlP7zh6sJEKVifqSkChlknz/BchMXzSKFYbqevWmGslOmRYkn1O3BAZ0PPi5wSftxwlLbzLGT1jtYErKtSPGxCk8Q6RU9kzGD+3m86ZJMx/zW+BC5ewS0bhvwWR0xX/MoSg5japJ4o3rLt5Zq5UVcS8AsQaqRnFd9KlfUfi3k= Received: from MW4PR04CA0222.namprd04.prod.outlook.com (2603:10b6:303:87::17) by MN2PR12MB4254.namprd12.prod.outlook.com (2603:10b6:208:1d0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.19; Tue, 19 Jul 2022 19:53:04 +0000 Received: from CO1NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:303:87:cafe::18) by MW4PR04CA0222.outlook.office365.com (2603:10b6:303:87::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26 via Frontend Transport; Tue, 19 Jul 2022 19:53:04 +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 CO1NAM11FT023.mail.protection.outlook.com (10.13.175.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Tue, 19 Jul 2022 19:53:03 +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; Tue, 19 Jul 2022 14:53:00 -0500 From: Mario Limonciello To: Clemens Ladisch , Thomas Gleixner , Ingo Molnar , Borislav Petkov , CC: , Guenter Roeck , , , , , Mario Limonciello Subject: [PATCH v3 RESEND 6/6] hwmon: (k10temp): Add support for family 19h models 60h-6Fh Date: Tue, 19 Jul 2022 14:52:56 -0500 Message-ID: <20220719195256.1516-7-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220719195256.1516-1-mario.limonciello@amd.com> References: <20220719195256.1516-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 921d60ef-a775-4283-fffc-08da69c04b21 X-MS-TrafficTypeDiagnostic: MN2PR12MB4254:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ofoou+rPelEz0Or17oqUdqzGUYefjANxhi6lkTv2lR+W8vn1vSZbau8CYU3HK1ZrrfrgUWSXhNg0KbaeQiqP71nBqASSqoPys3Y9ltb8cQJLOCOZSwa7/h76XIuEBBKyJxjZNna+wgB4hwGTBRgoQKHtrv38LtPdw9JUNO1rw9tsggYVz20BTVTiimKE4cnrv3jbNjmrMVnEY4XnvW2XPtTKKsQD1pGV7GCgL0lMXqezFXXRo98zIKSvRf3sDxMW4RuQR8Opml/xJ39tjzyhsEzZYH9RqOe9L6PY+31mgBvlbwoaOyU3inztfBW/O7xCPmE+8CEI/5LY7V1ZiOzTyIM2RfbTfDDmFTcWTuQ4L9RqhoTNBdIc53srhKmjAfSX9gsZvuRlviZxbO0TiSKv2vh27giN0QlJuW69SWQwTLm03JkkLxjj+xicm5bM8SO7xw1X6LEBcNgjmEjXnumetAuWVmTxoBYC6747GGB+wymVhIvtxZmCFo3dGhAmaV+WdHGIE0tEAVqZnBiEFRxWePi0yKlsF04CJXtDtS/RjSLQCEJPZsMqPukdyF+hxwIzvqy5Zpxl2FaVJbySqzOFO7KsrwWW9AYNBPpKGOwJQcRzPjeQZFCJg4mzUyaR5HwGyyYkVkZhvmfKqwpr5ziRZsWd5PBp6cNOEjeHx3L+AptV7gNSnsvxyTIrkYCgA6UcnNctVPy+ze0IqGaB6/xrI3ivckkIuvhqtRVv9oMTnDUbstqql35fd31BD7nLQAUiyjUW0p+0sLUkNSWifdmup6PplF15mhxUw17TOdHe2DWuL5jZx6n1H+D+iIV6KmBzUWhKukF2bhwR8higwuGIkA== 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)(136003)(376002)(39860400002)(396003)(346002)(40470700004)(36840700001)(46966006)(110136005)(16526019)(1076003)(336012)(186003)(26005)(47076005)(426003)(82310400005)(478600001)(36756003)(40480700001)(36860700001)(86362001)(8936002)(2906002)(5660300002)(54906003)(81166007)(316002)(40460700003)(2616005)(6666004)(7696005)(44832011)(70586007)(70206006)(82740400003)(356005)(41300700001)(4326008)(8676002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 19:53:03.9628 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 921d60ef-a775-4283-fffc-08da69c04b21 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: CO1NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4254 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 5f37e2e7833e7..5a9d47a229e40 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) }, {}