From patchwork Wed Aug 9 03:52:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avadhut Naik X-Patchwork-Id: 13347404 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 A3103C04A94 for ; Wed, 9 Aug 2023 03:53:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229735AbjHIDxM (ORCPT ); Tue, 8 Aug 2023 23:53:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229587AbjHIDxL (ORCPT ); Tue, 8 Aug 2023 23:53:11 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2064.outbound.protection.outlook.com [40.107.93.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFE441981; Tue, 8 Aug 2023 20:53:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MMFArlEosY9fVWou4FM69BeOFryH6bnXs/N/1AERYeuu77LF75fG9TVZRPwhB4Pj5EeEicAESXhjDIiBerdgskleOtYAzR0SuGz4xWtDA/o3QIkW+Z7enYVn+0o+OT8z5137dhgaRvObMlYJlewA0iOWyaCNpI/YD4dvi3z/tnrpYjkYil16z5erj71HQqrMldnBQVjEe853lTfGgMMts26kDXUD28pBFfNn/jG3nOMFo9gmiXQYTfI0ee0jZCLeBGeGtEOwY2Vu8CZS7slaAAZXaa8MF8pLzeh3nTtS2O9MLwiVpG9Jv1v8M4u6oK2nONhNBEsv6lBtbHbuRDofRw== 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=285YvYMWoZXnBLNG/an8oCUyFja0ao4SeBYM/7FKyrA=; b=kWe9Srtb41JsPa3ca9mZDPTDzulB2cPr3nJLxPWZI/Tw6WWmQwpAvJH4NntfHQ0lwhchAaB9U7zAzCagp01JgZFALrJpo06CLY/mg4oV8s5fhYi9Vz/Mwx1EMTamt9R4sXKEDigi104vlDXNCG1jqCs3GAzAxLz/5GObdO4JgCWpxw/zWMFLdYdbWfKFpBnJ/VgXJFmjt4px3iEpdhuR7E+AFWyXpXkhNXFj+bUOsoWU55BUJHJRG7Lu5Ew/oY3EzXdAlzgRlqBDj9+aTYpNizEeTDwI2FZRLFblv+tlJGx8Gfwkz815QhZIWfbG1FTTZ2Vc1I4qj6QsEKnW384fFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.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=285YvYMWoZXnBLNG/an8oCUyFja0ao4SeBYM/7FKyrA=; b=W0gT95Mg3vMUi4maB2JghlZyjJuX6rm79BYdU/ZS3SPZ0Qu22epXvqO87F7vAeVovdSKqhqKtJDJmTM6Puwgi5+wZqsVlGcPX0owkUPFilz6t6/1Tr55E3U7TyQIsqegv20TYjobPFSOwSWmm4svk9C5K/MEDL4yILy+459w2Vs= Received: from SN1PR12CA0048.namprd12.prod.outlook.com (2603:10b6:802:20::19) by SA1PR12MB5660.namprd12.prod.outlook.com (2603:10b6:806:238::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Wed, 9 Aug 2023 03:53:05 +0000 Received: from SN1PEPF000252A4.namprd05.prod.outlook.com (2603:10b6:802:20:cafe::fc) by SN1PR12CA0048.outlook.office365.com (2603:10b6:802:20::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 03:53:05 +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 SN1PEPF000252A4.mail.protection.outlook.com (10.167.242.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 03:53:04 +0000 Received: from titanite-d354host.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.2507.27; Tue, 8 Aug 2023 22:53:02 -0500 From: Avadhut Naik To: , , CC: , , , , , Subject: [PATCH v2 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Date: Tue, 8 Aug 2023 22:52:42 -0500 Message-ID: <20230809035244.2722455-2-avadhut.naik@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230809035244.2722455-1-avadhut.naik@amd.com> References: <20230809035244.2722455-1-avadhut.naik@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-TrafficTypeDiagnostic: SN1PEPF000252A4:EE_|SA1PR12MB5660:EE_ X-MS-Office365-Filtering-Correlation-Id: 3fcdab14-b4a0-42dc-29e2-08db988c22c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YQlWgRvHiJ1bD9heta5LyOv1lLCq2lgU3z9CkOe9PAkCeb77Llx+w/BfRIiswhuBFlt/CWFtw70kx7XEjiMduegQ5EyFCUjOdVkDorocJZ5Fr2dySPOjoNovEyo3tGZIqOCm5Kqz/SD1N0tUPc/E3v+pJtmgx7YqQ++zWsRU67E33zLjT8SbKfQV7i83XOJqkbBAgtc8wy2n6GNUxG6aQzNxtzD2kDJSQCFF/OhHVov8YCOx/X483isyXgU7KdUyKYSvYLs0z1Ek5Wwl01+AabrvxWoAWH0sB9gr6yUvwQvHadGzhOUL5k+RurFetWrwzsWoFKnKYPHxgsr/N7gBwC050MTsMtSVOpvKavc0jT45FCboqq2jp60dmzvPWxsAsJPl5ZieQYsJq5wQpUIccyp4MafLdANaJIwkRGEBOFCK5d//AXEbFrOXxJrmhiTh16djd2V+d9xbHznACW2UehPBTx4O3n9yJIffX58C+A8DiQxDbUxpmgy8IYIknGNCaiYk7+G5r/bmprU7hb9Z1y3OCXVUNxn7hx03h6PDzMi7XVJaxVUprpwSn2Ut6DGhRqfGcjA8RaYRjrKbBD8GwgT0IWnNjBNF8zEfbOoMywE8QsOvRLfW+XG+Ks06o9vN/wO2StSscG8C8THHWIlo7OK4ZJDCnUkhaahlPb7hjE0pOnCkQDJf57jTuj1rP86Pb9qwhKhSBvNl60VSIavVj/67Jk7825g3Ls1aaDtQRy3tc+KCaPfxbf6k+WH7ywvMbWurg9Hs2JuI4eoNs5SbXMa7pEgI+u0KhVujnNnkH4s= 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:(13230028)(4636009)(346002)(136003)(376002)(39860400002)(396003)(451199021)(82310400008)(186006)(1800799006)(46966006)(40470700004)(36840700001)(426003)(36860700001)(47076005)(2616005)(40460700003)(40480700001)(44832011)(110136005)(2906002)(5660300002)(316002)(8936002)(54906003)(8676002)(336012)(70586007)(70206006)(16526019)(4326008)(478600001)(82740400003)(41300700001)(81166007)(86362001)(6666004)(7696005)(1076003)(26005)(356005)(36756003)(170073001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 03:53:04.8491 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3fcdab14-b4a0-42dc-29e2-08db988c22c3 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: SN1PEPF000252A4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5660 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org From: Avadhut Naik Add new PCI Device IDs, required to support AMD's new Family 1Ah-based models 00h-1Fh, 20h and 40h-4Fh. Since, models 40h-4Fh and model 20h share some design aspects, the PCI IDs defined in this patch for model 20h are shared by models 40h-4Fh. Co-developed-by: Mario Limonciello Signed-off-by: Mario Limonciello Signed-off-by: Avadhut Naik --- arch/x86/kernel/amd_nb.c | 8 ++++++++ include/linux/pci_ids.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 035a3db5330b..356de955e78d 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -24,6 +24,8 @@ #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 +#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT 0x153a +#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507 #define PCI_DEVICE_ID_AMD_MI200_ROOT 0x14bb #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 @@ -39,6 +41,7 @@ #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4 #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc +#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4 0x12c4 #define PCI_DEVICE_ID_AMD_MI200_DF_F4 0x14d4 /* Protect the PCI config register pairs used for SMN. */ @@ -56,6 +59,8 @@ static const struct pci_device_id amd_root_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) }, {} }; @@ -85,6 +90,8 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { 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) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) }, {} }; @@ -106,6 +113,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) }, {} }; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2dc75df1437f..8f9a459e1671 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -576,6 +576,8 @@ #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_19H_M78H_DF_F3 0x12fb +#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3 +#define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb #define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3 #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 #define PCI_DEVICE_ID_AMD_LANCE 0x2000 From patchwork Wed Aug 9 03:52:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avadhut Naik X-Patchwork-Id: 13347405 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 3ED58EB64DD for ; Wed, 9 Aug 2023 03:53:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229587AbjHIDxY (ORCPT ); Tue, 8 Aug 2023 23:53:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229940AbjHIDxS (ORCPT ); Tue, 8 Aug 2023 23:53:18 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2074.outbound.protection.outlook.com [40.107.244.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BA9B173A; Tue, 8 Aug 2023 20:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UaO1DePBjZJD9av5h/Z8dclDVwDlDPbd3GEHpejmtqsaQE47seDoMZdrYGdfUxk+tBpGkv+emYM5GPmLJ3TEMhq39nPST2ht8KcgTTTOqLP6mwR1I2cT2Za3tjtn8cae9mGk1TzgE/EopRNOhiqhXFGuo3hw7NpKQ21lXF2Elhki+WMDBgVB7q9T89ThWsu8tPcpnA2Zanw79CQbzNEahkUZz5XN18MThGSEMoQWDMqBCRjVz4LjOqaJvVxdzLNcR3o88umNCdWporHct4FdTJe9jwXJlg4hwMDWtE5hICr+Ns2IxS0zYICChbJUoYoel9PcVnGQtnkpxw+TJsWU3A== 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=RvgKNFD9R1NjZcog9Pyj14peLPe3mzOPjFPRmVMvtAE=; b=ID5unPNP2Se/M84QBPNJcdCIxnOy8XAZWV/eCbj5voj1w9hhZHRJF2diT2oXcnj+unlwWCrH/xRB82vIZ6plP2qNWfbpcL+lyYJzmHq4CLhFA6jIIR5F+3xBMQqF1crFR8SV6ABj4aXyrn4Q4iEPtWYdRnt2SJdA75oPdHG82uRC8JHIujUaapIcyWfXgB1JG+IrGqj1bSdqDvpaGtHI8G5J5YRj/X1RwsPvj2jRkhi65yOY7TRmjLKz72zXY5xY12UhBvIYPUf2KLpCLtGJvYMZ3pr28mktB0z53/DKVu4nRtihldlByTtaYAQPTHqe4nzU927brSbiXMXVYec7Rw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.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=RvgKNFD9R1NjZcog9Pyj14peLPe3mzOPjFPRmVMvtAE=; b=D8obXZu/uhAB/hwCYyRvw38QMFdN3Byh2KZ+sMAW/xNXAHrpZro0G2T2o5O5X5kmljEV5dAmVPWS0xYxJLSRMC9o7gt0fz5SROtRDw0NpY9qTIS6ojs8//sqr7Qil1Km5YQvNf7AUxyrNgCaWn3DTEMAPXuZIV1ny2NavnsxbP8= Received: from SA1P222CA0149.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c2::26) by DS0PR12MB9400.namprd12.prod.outlook.com (2603:10b6:8:1b6::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 03:53:15 +0000 Received: from SA2PEPF00001505.namprd04.prod.outlook.com (2603:10b6:806:3c2:cafe::84) by SA1P222CA0149.outlook.office365.com (2603:10b6:806:3c2::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 03:53:15 +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 SA2PEPF00001505.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 03:53:14 +0000 Received: from titanite-d354host.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.2507.27; Tue, 8 Aug 2023 22:53:13 -0500 From: Avadhut Naik To: , , CC: , , , , , Subject: [PATCH v2 2/3] hwmon: (k10temp) Add thermal support for AMD Family 1Ah-based models Date: Tue, 8 Aug 2023 22:52:43 -0500 Message-ID: <20230809035244.2722455-3-avadhut.naik@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230809035244.2722455-1-avadhut.naik@amd.com> References: <20230809035244.2722455-1-avadhut.naik@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-TrafficTypeDiagnostic: SA2PEPF00001505:EE_|DS0PR12MB9400:EE_ X-MS-Office365-Filtering-Correlation-Id: f6606ba6-68fc-4980-6f88-08db988c28c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iRHOhA/wjysoe8vySzCoMMS560ebA7KBdUb3+OK2ANKkcPNHUCHkDoEmiY1uqgeB+RA17yH+D73QgJqvX+JAZf5iYO6OjRBNtvBFt4DVN/f5rR+eZRDgNdnHmDH25oiYrifddY+VbHweLeu7OFlzJZSY9CCQu8xkzpaf2jVPi0mQ8eEwyIwNQZfirGbWrM3SpkNrwxU2wuid1+GIOGEpszzyMlODqGn8onXInw11u/JNOO2vJ0aFJe9tynaqnwIGQOTH5qLDk+eZ0pzOol1FbUgbTpexcTRO2sOhCTn+XNyNgZnhGoJpoxR2VJFih1S3pdMeIOeiIkGWobodSopdWac5ObU10NQN0259yA7NKhYdgPj7cpmjpHY+rJ+2Ehu8iK457bYmYBY6uLehkJFfT6nNIrZ9CxF1+xNkCQerUY28idjtgcokegunOAydy3nPw6tDZHhYFK0GCyx9gCC8lveTp/F/2hXdj6pe+C/RkJnDsBLPwAHXLHVEdCLhfad3GN1AFsmaRbfw4PLsiSU9asIXmMSAeYtfweQIM5cDrmEVnCFc8fufV1HWE9Wjw5ZiHcQqsRO/46Kgqlvnd0Nnllr783EA5Wj8JR5Qf6KcCkd/ccQG2lzC6ZqqsEFg7CL5wHVMcve8s0UoQ0FYep5cLPYjVCDq2qxbBEg2cDxnm8qFdf6IcpDQOlzz8uZWjHoQkdxRC/2zOyZfK8Jhwtv5T6fyb4HPjgbLFq5MAWpSw1YpTnqliXsS/TgPR9qZ9mb7vbmckHy73qj5GsaKXTztRhamFw0uSk9ilqsCWMmi6Ak= 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:(13230028)(4636009)(39860400002)(346002)(136003)(396003)(376002)(186006)(1800799006)(451199021)(82310400008)(40470700004)(36840700001)(46966006)(40460700003)(110136005)(36860700001)(54906003)(82740400003)(356005)(26005)(1076003)(6666004)(7696005)(2616005)(47076005)(426003)(83380400001)(16526019)(478600001)(336012)(81166007)(36756003)(2906002)(8936002)(5660300002)(44832011)(8676002)(70206006)(70586007)(41300700001)(316002)(86362001)(4326008)(40480700001)(170073001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 03:53:14.9278 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6606ba6-68fc-4980-6f88-08db988c28c7 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: SA2PEPF00001505.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9400 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org From: Avadhut Naik Add thermal info support for AMD Family 1Ah-based models. Support is provided on a per-socket granularity. Co-developed-by: Mario Limonciello Signed-off-by: Mario Limonciello Signed-off-by: Avadhut Naik Acked-by: Guenter Roeck --- drivers/hwmon/k10temp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index a267b11731a8..bae0becfa24b 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -65,7 +65,7 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); #define F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET 0xd8200c64 #define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET 0xd8200ca4 -/* Common for Zen CPU families (Family 17h and 18h and 19h) */ +/* Common for Zen CPU families (Family 17h and 18h and 19h and 1Ah) */ #define ZEN_REPORTED_TEMP_CTRL_BASE 0x00059800 #define ZEN_CCD_TEMP(offset, x) (ZEN_REPORTED_TEMP_CTRL_BASE + \ @@ -475,6 +475,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) k10temp_get_ccd_support(pdev, data, 12); break; } + } else if (boot_cpu_data.x86 == 0x1a) { + data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK; + data->read_tempreg = read_tempreg_nb_zen; + data->is_zen = true; } else { data->read_htcreg = read_htcreg_pci; data->read_tempreg = read_tempreg_pci; @@ -521,6 +525,8 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) }, {} }; From patchwork Wed Aug 9 03:52:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avadhut Naik X-Patchwork-Id: 13347406 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 59BE9EB64DD for ; Wed, 9 Aug 2023 03:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230071AbjHIDxo (ORCPT ); Tue, 8 Aug 2023 23:53:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229982AbjHIDxn (ORCPT ); Tue, 8 Aug 2023 23:53:43 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2083.outbound.protection.outlook.com [40.107.243.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 788F41FEA; Tue, 8 Aug 2023 20:53:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aSFcokedlCgDhu7FfuhH2rccFPAliRsylS3IpTVdLn/DMj9WS64KnWXvwMZTZYIXkn0WNVz5S+hpjrdwQ9jTiUu1h6D0Xp06ik3SkYQIF8BVtBnsIjfGHokv/w9qJY7MrzJljNEPjSUhyqmeGZTc2VQmemVaA9mSR1RWaMtUQ7IC9FfM0IxP+oA0f9SiAYo37XqX2qjeeCcH6fanL9Ad9Pu1qDE+rPrtXXpc1gFsU3Xg3hhzIO94RY5Szn9027xLrQ3U15B/dDQX0QbnPXaulDZHGvrJTfs7daxSYMmC8zQpP7Wl7JNwQZlc1+M0Pg+k7ALnoD2vCM8b/T6uNWYg/A== 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=wI33U8UPa/z717YTkblxNZ6VCf/mgkOtNULadtG5VYc=; b=EqYmBQWMxHCnOFPhIg4p6UmIACunuWk/jwtB2ihBZu+o5aaxW4Jcs+zGZbzd+oWWASJ2R69n4rQO4N9SKcLXcoxDqTO7PXTyxBfwATEI6ZYcNI3GrbTZ9Czhsl2UHR6d3xmcNic+nNmCg5uQLD8jP9ZJ0DyIQQs97LdDfg5x28Jl9Cny5piUzm5zym9P1ZNhDN2Z4frGoDmmlVVxEkCL7SZcUfXGuIRyA93/3ErZWYuvMD1pbfp7cq8VXEAq98oviYc10VALVAsTUAmG1Strt9z6//Z6UZ7QHVDzN/CnFWgPNYn+lUFW7efcgN7SP0h2aMxI71+TJvWY3Khh74KHig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.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=wI33U8UPa/z717YTkblxNZ6VCf/mgkOtNULadtG5VYc=; b=mesiuFeTT4oVAdiP6D0SwD15bcGzovmSOzzyvSZYDIy1Zbg8DzSEHbkEMHKSjE10LTUmmYcQAa4vc7cSPn2lHhZ7H0UDRogiyBUjgMozO7fHjArLzMtZ4zHQEQRMkYzek9M87mfoV+VvxL4Way433N9SxHw/huJUw5DIoqI1YoI= Received: from SN7PR04CA0059.namprd04.prod.outlook.com (2603:10b6:806:120::34) by DM4PR12MB8558.namprd12.prod.outlook.com (2603:10b6:8:187::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Wed, 9 Aug 2023 03:53:27 +0000 Received: from SA2PEPF00001508.namprd04.prod.outlook.com (2603:10b6:806:120:cafe::7e) by SN7PR04CA0059.outlook.office365.com (2603:10b6:806:120::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 03:53:27 +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 SA2PEPF00001508.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.20 via Frontend Transport; Wed, 9 Aug 2023 03:53:26 +0000 Received: from titanite-d354host.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.2507.27; Tue, 8 Aug 2023 22:53:26 -0500 From: Avadhut Naik To: , , CC: , , , , , Subject: [PATCH v2 3/3] EDAC/amd64: Add support for AMD Family 1Ah Models 00h-1Fh and 40h-4Fh Date: Tue, 8 Aug 2023 22:52:44 -0500 Message-ID: <20230809035244.2722455-4-avadhut.naik@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230809035244.2722455-1-avadhut.naik@amd.com> References: <20230809035244.2722455-1-avadhut.naik@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-TrafficTypeDiagnostic: SA2PEPF00001508:EE_|DM4PR12MB8558:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d719b27-c7c5-4bd2-8f30-08db988c2ff3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SCT3252SF963ZfJfg83gPPHOxXQHenrv0aAFyVJ+JDqvCKoNl3/9HDj2rib2/8vIqsyC9MMjb6TA1snRD4K9vXCF6PDO2NuDTrRMaF/tFfd1MpNdaC/O1QZWwHJm4sbtsZufFQjpHdMcmbV3QQ7Rq0URaVuBMuj3yMQ4xjs1uGQ4b9ZnDqs6Gxx5ccbh2na1YV1wD5rHVSAM1LvzdSRZ4QrRK0a+nh0VaQOIq6lTyOgdwoXPVINso17I/y7D6vlb1GWtQ+cpArs2GR4zUYF4YQTwmtoNm71NoTQVy0yZ+/SpqtQSlee0NueDQV+SnWMiaXG0kLnIaNmDoyU2k3x61U3ILSD9srV924XAHr0mXAgoJhUbc7F8tyjZsRoa1bCytkjwZkA6qxK12mKCqtNRW405hDVbAYRFKtGuke89/mqnffVLde4XoW9NE5gaapVW+bx3916BW/jx3nFeXAIAqTbX/OIv1CHY55+zajNBmuEnfMeuP4y98buN8GP9vkAFVtDPt/YkG9C7IGDZRNnKCn0sA4KUm3AQXkO0ld9nmbXn3FCUJHkPaVXkISw9JpquF+lwD4gNFAntAuP4OkTAu1ixjH+chb8HuNHqQNWR5eNjF6E2gpZut0HhVJJm+FGFGzdh+1ltfDDTSmPDh9dYsgJK1j1vaoaNbNNreXsvexpoOik9hJ8SLLL7uoZAC+pWPo0VPoBIDyIJjLl36Zbj/zNLAzZfjAR7d/PnyKcJdJZ+o5J12hI71XdilyKfALAmaq0l+Jf06OpVja11Jx9aBw== 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:(13230028)(4636009)(396003)(39860400002)(346002)(136003)(376002)(451199021)(82310400008)(1800799006)(186006)(36840700001)(46966006)(40470700004)(426003)(44832011)(8936002)(5660300002)(8676002)(4326008)(41300700001)(316002)(47076005)(86362001)(40480700001)(36860700001)(2906002)(40460700003)(6666004)(7696005)(2616005)(26005)(1076003)(36756003)(336012)(70586007)(70206006)(356005)(81166007)(478600001)(16526019)(82740400003)(110136005)(54906003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 03:53:26.9766 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d719b27-c7c5-4bd2-8f30-08db988c2ff3 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: SA2PEPF00001508.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8558 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org From: Avadhut Naik Add the necessary support in the module for AMD's new Family 1Ah-based models 00h-1Fh and 40h-4Fh. Signed-off-by: Avadhut Naik --- drivers/edac/amd64_edac.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 597dae7692b1..e3b59c488ed1 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -4150,6 +4150,20 @@ static int per_family_init(struct amd64_pvt *pvt) } break; + case 0x1A: + switch (pvt->model) { + case 0x00 ... 0x1f: + pvt->ctl_name = "F1Ah"; + pvt->max_mcs = 12; + pvt->flags.zn_regs_v2 = 1; + break; + case 0x40 ... 0x4f: + pvt->ctl_name = "F1Ah_M40h"; + pvt->flags.zn_regs_v2 = 1; + break; + } + break; + default: amd64_err("Unsupported family!\n"); return -ENODEV; @@ -4344,6 +4358,7 @@ static const struct x86_cpu_id amd64_cpuids[] = { X86_MATCH_VENDOR_FAM(AMD, 0x17, NULL), X86_MATCH_VENDOR_FAM(HYGON, 0x18, NULL), X86_MATCH_VENDOR_FAM(AMD, 0x19, NULL), + X86_MATCH_VENDOR_FAM(AMD, 0x1A, NULL), { } }; MODULE_DEVICE_TABLE(x86cpu, amd64_cpuids);