From patchwork Mon Nov 8 21:51:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 12609157 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77619C433EF for ; Mon, 8 Nov 2021 21:51:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 595F761359 for ; Mon, 8 Nov 2021 21:51:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240632AbhKHVyM (ORCPT ); Mon, 8 Nov 2021 16:54:12 -0500 Received: from mail-bn8nam11on2088.outbound.protection.outlook.com ([40.107.236.88]:48513 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S240622AbhKHVyL (ORCPT ); Mon, 8 Nov 2021 16:54:11 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FkihcrRvay73wTYdSzC1f2hBT8kgMl61DcVLaDm5gf4cquWdDq142rCJBLWYFBzzIwTuzOIzSjvaUIxqHKWseRMte1o/JqEjoxz6SFXFUKzgYX4JUvXsCITete+8dfHgbA/S6m+0oUtTyXOaZ+VSB5Km68KdGwFIkXvGwqIsijhEDUv/edz+4QvD2PCP0i1bGkQC57eR5QXLZWfCzliClXulOq4EG6xUKaq/k0SAFI88jBIZH8h5DlSFkyRD8sYiLkHEE1JPiQ1y3VMful+gWCNVT7jv8x1ac+6CxeHwXPzCggXsIJAtsk9NfUUU/UeB6dToQrCHWF1JRBUfOjlJxQ== 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=gCFxtZHioBgTxS7xbEdfHMhcDf400HVw7Pips6zhBt4=; b=TR4dtSh6v16T0nzQ68o3wlDzFGa9JlAyT0JVa+ip6V0Tji0g8AgiGSeX8SXMfCaz2YitD+opAjIAhe/JLM0DELr0I8HEdvY1cQgoMA8A0lKGaPlP5VJapf2uBEbNFnRwP38B3bjcu0krNv5+iyN42iKcQ8q+1Nw0ehFYjnZ0MmifdAtWXqa5EEvjoZq+dQUHCPHwzls5X7Y/ZLARrbpNDjmbvfNCSpFyXCQ5VYZe1ZcpZ75cmVC8erAYgTKwz3C/l8Sswqj7cD4vJFrZW27W0IFXiPxEdSk/SaMqPz0kbp3/185SB7XfEuU2B0BQ2yuDDr5wnl7sbBFmS2DrOKI4iA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=gCFxtZHioBgTxS7xbEdfHMhcDf400HVw7Pips6zhBt4=; b=mZLo5tQS+q7VF9jif0HCgQDD2pF0v0iINbrZv4Lp1u5licGharwlqFTGUlqWTX1M/JFCM3WCRKR4z5eGJeimysDQ9wV5HPsE5Vz7LjBMuw7IrX+yG5hSzlRY6F5hSEtktbyWcLI37zACFxDlF/UgIE8F9enPmZYh9MD8d9OaiuM= Received: from CO2PR04CA0096.namprd04.prod.outlook.com (2603:10b6:104:6::22) by BL1PR12MB5318.namprd12.prod.outlook.com (2603:10b6:208:31d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Mon, 8 Nov 2021 21:51:24 +0000 Received: from CO1NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:104:6:cafe::d9) by CO2PR04CA0096.outlook.office365.com (2603:10b6:104:6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Mon, 8 Nov 2021 21:51:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; 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; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT009.mail.protection.outlook.com (10.13.175.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4669.10 via Frontend Transport; Mon, 8 Nov 2021 21:51:23 +0000 Received: from [127.0.1.1] (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.7; Mon, 8 Nov 2021 15:51:21 -0600 Subject: [PATCH 1/3] x86/amd_nb: Add AMD Family 19h Models (10h-1Fh) and (A0h-AFh) PCI IDs From: Babu Moger To: , , , , , , , , , CC: , , , Date: Mon, 8 Nov 2021 15:51:21 -0600 Message-ID: <163640828133.955062.18349019796157170473.stgit@bmoger-ubuntu> In-Reply-To: <163640820320.955062.9967043475152157959.stgit@bmoger-ubuntu> References: <163640820320.955062.9967043475152157959.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c 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: 4e88f544-b9de-4406-6b91-08d9a301e85a X-MS-TrafficTypeDiagnostic: BL1PR12MB5318: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:935; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JjNX8/usQS2CXwXzER5AtI6lawepzQOuTcr0jqlVBFCmN0lyCi/uaZxc+2+YeI3MjFMnH/SOW42pFG7iQHgc4gM8CewlG/hrnuRBn4Ar2CXTPx+NKpuRfTiqu1T0vinv2n779e5vwSKNMJZPTX11PBbOsrz797wJlLwPqD0a9aQrSf3olvRV5P2FfCzmgQVVteEqNR9NMnE7miL8fF5QhbkmvoZMnvLIOl8heNqbnaMT4oxeQFG4WyR7AAXm1X1dJzWy7zej6L3fW288zXExa3QR67tJ5BnGdWeZElsd425brhcWU6Xa+g6joAPAcnrwJ0RC1NpGB3FazSM+fb89ctd7c0bNaZwFJjUXOKi3mtm8ZHNhY40tcXLkgEi03HYHi8NUfD7IJsvFOBrqyjOQubvfY3APlQvU6I0GHAhdWqZdMReLSl4rul5pMJzDK8bZgXyHbJIjASGNXLbNymInzpY4iD6u0tr9KVYp1e9Qo9g1NQWi7gg/OVl0fNmzeWIkQfNsnK1loBhdsip75Py8+RtBODsJHxC0d0U8YGioZjT2H7WJMuscuqQTxBTSnf8Dqz8c+zlnRuzTIVFv5aikGCXiXHc3atije4Vq1c+9z79bVaKJAp8ClS3XvQ+99oMm1QTQznGI/AWJl38L70oZIs5hExaIWxgUHnXPT4ibB4lijqjXyxPULIF661KjzCvPyl2j6ObQSfTPPgUeMbsc3sycry8M4G5SbRaHNPe/4fFWr5j3vjDfL7r61Vizvwowm08GFYArVstQX+p3Pkqptw== 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:(4636009)(7916004)(46966006)(36840700001)(70206006)(70586007)(82310400003)(8936002)(16526019)(36860700001)(336012)(26005)(47076005)(103116003)(2906002)(8676002)(921005)(4326008)(356005)(508600001)(110136005)(9686003)(81166007)(316002)(7416002)(426003)(54906003)(16576012)(44832011)(86362001)(5660300002)(33716001)(186003)(71626007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2021 21:51:23.6591 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e88f544-b9de-4406-6b91-08d9a301e85a 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: CO1NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5318 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Yazen Ghannam Add the new PCI Device IDs to support new generation of AMD 19h family of processors. Signed-off-by: Yazen Ghannam Signed-off-by: Babu Moger Acked-by: Krzysztof Wilczyński Acked-by: Borislav Petkov 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 c92c9c774c0e..f3e885f3dd0f 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_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_19H_DF_F4 0x1654 +#define PCI_DEVICE_ID_AMD_19H_M10H_DF_F4 0x14b1 #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 @@ -39,6 +41,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_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_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) }, + { 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) }, {} @@ -78,6 +82,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { 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_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) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 011f2f1ea5bb..b5248f27910e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -555,6 +555,7 @@ #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_19H_DF_F3 0x1653 +#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_CNB17H_F3 0x1703 From patchwork Mon Nov 8 21:51:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 12609159 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D152C433FE for ; Mon, 8 Nov 2021 21:51:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63B96619F8 for ; Mon, 8 Nov 2021 21:51:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240658AbhKHVyT (ORCPT ); Mon, 8 Nov 2021 16:54:19 -0500 Received: from mail-dm3nam07on2087.outbound.protection.outlook.com ([40.107.95.87]:26496 "EHLO NAM02-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S240622AbhKHVyS (ORCPT ); Mon, 8 Nov 2021 16:54:18 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ntGjJOXQ9IfMIPLkTw8h8f9VAaohAc2U5L8xqE3AAHuILz5eVgeiK6dFl5WEdIysyaUQtgUrzwTPLZMSiryALzWpa43RBQCDG5cRD+ugBGZpRel68MKD/sCYJKa6L77Prysbr1RSbfkxkVLxO1Qi/DQQKLb3X4uHjRiBTewOmPPxE8suNAqiBB5wjfXjqXDJyb941RmOPlfFf2ILyJ0qv1aTJ0wR85bjRrF8VVuh746404cGQ5Oj9ODqqV76XnUofTeDmw1XG7E2beJl2IZPUWKLGRPBMuZRhgnH+fdRjwYlsh37wqJ5nImIWikz1IO6lEczGkkOJcnwWokyRALpTQ== 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=HcwJe37vXM01ovdSSqBC2LqkFpsfh2N6LkhxZLdSMYA=; b=D/LOj2Ok3DWAq2eMBBJ0FoPf7XYB3p2OouY+pVLfw0jLAKoQeRXRHT+m8EgLp+vfkso/mwp4n43dkwWwzEvqlV+yppGl1VNng/AjTZYuV1OvisjnSswNH650ywFSJU6c9XiW6QoWmy/WO1e6JGnz3TSVpEwreBjNs3BQrTNFvioajEmDvWAxKGHz2+2xeMBAihgVo+UttKK+tBrmy9cSBN5raAP3BUaEkNGlcqbg7BBAMTRpOs9HFwZlmESjjsPBKtVjBgWlYEoPHRxWs3XRPymELd2RFG7p+XGiUlEyGjZxNRNigpcG25yzaACvhKCjjAcHasdEM6EQd1sXXXNo9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=HcwJe37vXM01ovdSSqBC2LqkFpsfh2N6LkhxZLdSMYA=; b=zcyGERZOTT6V2vaY17Ytb5Phn6DU2yRbeRq04K+hw+flgVNU4Y6Y8X2MgKKDmkT4NqKhuYvs+cd1fJ9KUNU5MtYNBWhNwqE8ovZcCLCRquctFOaW8I/8MbWzY92E1L0XD1CFzjZHyojB96UqFF99LLgOrluW36pKCe5wDjpq9g0= Received: from MWHPR11CA0025.namprd11.prod.outlook.com (2603:10b6:300:115::11) by BN9PR12MB5306.namprd12.prod.outlook.com (2603:10b6:408:103::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Mon, 8 Nov 2021 21:51:30 +0000 Received: from CO1NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:300:115:cafe::b6) by MWHPR11CA0025.outlook.office365.com (2603:10b6:300:115::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Mon, 8 Nov 2021 21:51:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; 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; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT068.mail.protection.outlook.com (10.13.175.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4669.10 via Frontend Transport; Mon, 8 Nov 2021 21:51:30 +0000 Received: from [127.0.1.1] (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.7; Mon, 8 Nov 2021 15:51:28 -0600 Subject: [PATCH 2/3] hwmon: (k10temp) Remove unused definitions From: Babu Moger To: , , , , , , , , , CC: , , , Date: Mon, 8 Nov 2021 15:51:27 -0600 Message-ID: <163640828776.955062.15863375803675701204.stgit@bmoger-ubuntu> In-Reply-To: <163640820320.955062.9967043475152157959.stgit@bmoger-ubuntu> References: <163640820320.955062.9967043475152157959.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c 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: 727b0057-6155-47f7-4986-08d9a301ec28 X-MS-TrafficTypeDiagnostic: BN9PR12MB5306: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:262; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qrp75MpMdklErfl0Ll4T7F855o1OqaQBfZZznDWhEN1Xe6WwQZVNeLPIIYWOqgOanREAfjFaqdszEgIgRoyOnEQQPUobDqGGvy6y2d9L4fpth0nI2jQ/AuBZmMfDHBbHss/Z5gOcIzzDYVjv05IdhIt7UW9J6oTDn0aKwNpYOeRxVhxB5Yk0pIcqE0VajiF8bp9s041jv9KinKKEwgo9p7OEK/MtJIKKp0x14W0x651umvmL0szCK+sHff3YOSMZyNObDJ2MHs0TSJAITuduqa22AMslYzhO8NP/UUzCdQo6yEFHgksNm7dpWcOBnm/CyBT4qXFcIjQ5YuOhTf614w5n5rr7Q+YiQalDClJz+Cnm0s3tSKRG/pnqRlhVr7mvF1aOZC/GVZPmigpAHF3KCSKyU7W4pnh8tFwFtxBWY0tYw77DJGNLD7seOg4QYtT+weQsma3PE9bdCuCquARPIs81DVsGMrOKKO5feGNqOuTZAqQvpzZAOpzxgqLvPCnr6M9Xy09Pk8YT6l5bRt1h6ur2wLKiAHC+1GpWBouQTpkZWCzoFf5bnYT6UoZg/ZPNDBDGF2EvAVD5Rn7fBiPqmeIqRwmkVQ0suC8Eph5Ej6egf0M038nBnUa9EPiV+vtlNPpWO7UstlXgKxjUToTMM2RKuiJf2lj2j61IoUdlviG6OEd81UQ2kcX6OdF+i8XqI6PL1CB1Gl7E4F9a82vtHm+TXkf4u8j3eYXshQSaW6GnBLdnpIngtY35mGcqVCO5XNSo9RN/Zr4bjQgfFJI9RQ== 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:(4636009)(7916004)(46966006)(36840700001)(36860700001)(33716001)(356005)(336012)(26005)(508600001)(8676002)(16576012)(9686003)(110136005)(426003)(54906003)(8936002)(186003)(16526019)(103116003)(2906002)(4326008)(316002)(921005)(81166007)(83380400001)(47076005)(82310400003)(70206006)(86362001)(7416002)(70586007)(44832011)(5660300002)(71626007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2021 21:51:30.0414 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 727b0057-6155-47f7-4986-08d9a301ec28 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: CO1NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5306 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org Usage of these definitions were removed after the commit 0a4e668b5d52 ("hwmon: (k10temp) Remove support for displaying voltage and current on Zen CPUs"). So, cleanup them up. Signed-off-by: Babu Moger --- drivers/hwmon/k10temp.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 3618a924e78e..662bad7ed0a2 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -76,26 +76,6 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); #define ZEN_CUR_TEMP_SHIFT 21 #define ZEN_CUR_TEMP_RANGE_SEL_MASK BIT(19) -#define ZEN_SVI_BASE 0x0005A000 - -/* F17h thermal registers through SMN */ -#define F17H_M01H_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0xc) -#define F17H_M01H_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) -#define F17H_M31H_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0x14) -#define F17H_M31H_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) - -#define F17H_M01H_CFACTOR_ICORE 1000000 /* 1A / LSB */ -#define F17H_M01H_CFACTOR_ISOC 250000 /* 0.25A / LSB */ -#define F17H_M31H_CFACTOR_ICORE 1000000 /* 1A / LSB */ -#define F17H_M31H_CFACTOR_ISOC 310000 /* 0.31A / LSB */ - -/* F19h thermal registers through SMN */ -#define F19H_M01_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0x14) -#define F19H_M01_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) - -#define F19H_M01H_CFACTOR_ICORE 1000000 /* 1A / LSB */ -#define F19H_M01H_CFACTOR_ISOC 310000 /* 0.31A / LSB */ - struct k10temp_data { struct pci_dev *pdev; void (*read_htcreg)(struct pci_dev *pdev, u32 *regval); From patchwork Mon Nov 8 21:51:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 12609161 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FBCEC433EF for ; Mon, 8 Nov 2021 21:51:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69852617E4 for ; Mon, 8 Nov 2021 21:51:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240622AbhKHVy0 (ORCPT ); Mon, 8 Nov 2021 16:54:26 -0500 Received: from mail-mw2nam10on2074.outbound.protection.outlook.com ([40.107.94.74]:10721 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S240666AbhKHVyZ (ORCPT ); Mon, 8 Nov 2021 16:54:25 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GQtdFKr7X2tnTVmU7A/rn9rEEuIyvH4k4MVPv4sff7QpVx2BywxfcebVXJ9wnepTYFcTd51khd1U/hx9gwU7LbnpeCU3Et/JvZRjyCdIwB69DGk1twCGMiyvst5bG2k/7JcYCsDNxJZ9Od4IkCXNh7Yfl7eD3gezbFsYe53ZZKPVsPtTOHGLnBQOmX2LYXlo7W7+lNCDHSSE9kMObpT7P+AxxFn9OZQhHVUNzQUze7tPTB9aI1uNM8QV/mI1OxqSw1UXc0TJa9n6aKcpVDUl/7tk+DjA637x1SkZ+NEtlqIwyMhF/LT6XZ6CkVau1xp6fqmtJBOasL7e9F5BgFVaiQ== 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=drXItMepaRaYBHAO1OM1uUvZnxZYdjavDo571gBs5xI=; b=Qm/0YUFjh6IWp9fTVcfCdY84qEGYVmiliAv9iH3gr2Ussy8vUfoW7cL4ae+EhXj5FAmOd+NjAEWmWmD6fXLE4l2rQYoiQso/RZaPYY92lkpcD1U16es3Nj34Q5bp3ff7geyHBwEbL+F3ojNsjpn4aS0QPtlVhNE0OuxhXTrHsnpgsjJFRMRj/ZKH4BmFQt9gRTCUaJrOlxKUHGfPYyJ1TwSx6Spj/Qhaenk/Irnbt5Ydt2TZUqzmnBe/9G5FRsbk56uwLlsnMCQ0OySJOulnGESX0vq5ipXVuMCpiO7ilr7mC9InMcbXOIVGerpOS5nZnLu5roCl+79lyg2Q+uMGXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=drXItMepaRaYBHAO1OM1uUvZnxZYdjavDo571gBs5xI=; b=n/iXeaTmrRIjsNWE+iJcq/8+aKV1+jQFtz1ONR0W9Wnl5txEqdhwbjoFHkjjgxuFzkJrwQhiR0Cs4fSLivqs72vlMdMT/hp15o1tn5MKDNM4edTaa1LqVl0Byfm8pcvSBx2mJhmtAnPaA0aN73xAv4Es6oRPmPhXZuWgOQHTs4Q= Received: from MW2PR2101CA0020.namprd21.prod.outlook.com (2603:10b6:302:1::33) by DM6PR12MB2986.namprd12.prod.outlook.com (2603:10b6:5:39::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Mon, 8 Nov 2021 21:51:37 +0000 Received: from CO1NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:302:1:cafe::4c) by MW2PR2101CA0020.outlook.office365.com (2603:10b6:302:1::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.3 via Frontend Transport; Mon, 8 Nov 2021 21:51:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; 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; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT011.mail.protection.outlook.com (10.13.175.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4669.10 via Frontend Transport; Mon, 8 Nov 2021 21:51:36 +0000 Received: from [127.0.1.1] (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.7; Mon, 8 Nov 2021 15:51:34 -0600 Subject: [PATCH 3/3] hwmon: (k10temp) Add support for AMD Family 19h Models 10h-1Fh and A0h-AFh From: Babu Moger To: , , , , , , , , , CC: , , , Date: Mon, 8 Nov 2021 15:51:34 -0600 Message-ID: <163640829419.955062.12539219969781039915.stgit@bmoger-ubuntu> In-Reply-To: <163640820320.955062.9967043475152157959.stgit@bmoger-ubuntu> References: <163640820320.955062.9967043475152157959.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c 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: c8514862-7293-4391-94fa-08d9a301f00a X-MS-TrafficTypeDiagnostic: DM6PR12MB2986: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bTgKkYZ1uRh0m1fnXlj4YpECwC0WLSm7TgwdxKazvDWCoOLsr/Bf8bsyBIGifaFeTDn26lTo/WE7E7MyRP6KVTSRR930MWL1AmMdJtrR+N/wzCpQG6B+B0xPFvQIiPEgA+YWbR0CL89doO8JxmAajU6V+WjJ4S7fY4cD4LtcidMhKXTDtliLBuPrRte6ibPfP1gH/JiiW5au/2Q8tOAcZegpcbd474f3mZXAWOTyiz7jFZLIRqQXqfXlcl4ETiGF9RXKIzFSsidwqAer/q0jBnuDCgQ3vQRKrtjui+3trdPwM8Y1hWxGZVR6vX3FAFrorWTgtYRy604byyp3Sn2Xv9dl7019r1JSYpNn/Y3B4wlV/UEWHBcaC1Pg6R3cW9mJhXtcQNi0wZO0Wp1OUB7+JvMgHavsliCldvQmpbfydXgAwGEoK6MDUf1duNPhnt0YdIOisMOwpUE36pzqRIHWqdhTaZhDaOmg6tLEfJ2xoPutRh/K96sKROZn+Lh2pVkX7u/yFDCbzGER+q4l3rP7/5awYmUqTpyspXdKgIvHg3/jJqrfvgyczjp1MChJ/Gd5VJNqKGFGyKasklBNcge/dSHE28lSG0a68lhHjuYfJiSwOZ1EGlmmASnqvbn7SCi6+mpXhH7KTGuMRf8qbZgF/59wUQ0GdG0GNuN81fbQGLwMlXOAIarqEkERi29zVF3whKuvv4fUvp4tdG5YKEfdpblRX6dbI5IS35kY/5lgS9ssE2Cr3gKxu9VjIENgFVKvNaHTE9piRuo+npc0pTn0ag== 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:(7916004)(4636009)(46966006)(36840700001)(103116003)(5660300002)(16576012)(110136005)(16526019)(2906002)(8676002)(8936002)(4326008)(921005)(44832011)(316002)(26005)(7416002)(54906003)(508600001)(47076005)(82310400003)(186003)(426003)(81166007)(33716001)(70206006)(86362001)(356005)(9686003)(70586007)(336012)(36860700001)(71626007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2021 21:51:36.5396 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8514862-7293-4391-94fa-08d9a301f00a 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: CO1NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2986 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org Add thermal info support for AMD Family 19h Models 10h-1Fh and A0h-AFh. Thermal info is supported via a new PCI device ID at offset 0x300h. Signed-off-by: Babu Moger --- drivers/hwmon/k10temp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 662bad7ed0a2..880990fa4795 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -433,7 +433,9 @@ 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 0x10 ... 0x1f: case 0x40 ... 0x4f: /* Yellow Carp */ + case 0xa0 ... 0xaf: data->ccd_offset = 0x300; k10temp_get_ccd_support(pdev, data, 8); break; @@ -477,6 +479,7 @@ static const struct pci_device_id k10temp_id_table[] = { { 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_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) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },