From patchwork Thu Jun 6 16:12:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yazen Ghannam X-Patchwork-Id: 13688767 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2081.outbound.protection.outlook.com [40.107.92.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 589D219B3DB; Thu, 6 Jun 2024 16:13:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717690411; cv=fail; b=U5hfbOpYLcaZ6quRAjxgpUm7gS9zxe/hJpwbDQqx79AsCguqRNG+veT2qaN1Xu6mj9zbiAyoqJNfI4e+Qn7sGRbho6AmMAa5WwW9FrahulHU0l+nYPCDGD5LMO0RRAk78FRFbIe1aHQa/LYBB4JTKdPYcfe1/a4jSZlauXCXe/Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717690411; c=relaxed/simple; bh=wS3+mE2h5wAiqHNbd5F0/aPcPHQiIWNi1aQuBqT3Qf4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=pP6m2oVS6+vxBFeIihKZPxZLegKjUs1iIZVapJWPgdByOFrqqbQrIPn3ILoRlSwbg73qbGHjTV0EF8P58bJ8tWvFfCk/lpuXrndI9q3q09ISXeLpPFhSITiktEy7mHPnMYsHdf+cSIEZxnbnlvaKJgUqfEnQ4UhCWAVLRccv4WU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=dXRFRNAq; arc=fail smtp.client-ip=40.107.92.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="dXRFRNAq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bB+f99TuKqWxqLYoovwCtNdmW9T4IRZIUju/DrYJ+KUubaAfYUFiEHmh8/3lgzsZviCykD8F5PxkS1nglf9zHQyzIm1bDQrL86GcEvSa1i7TCs+PywtL/AOCWjfQ5FMF+sagj3T2k1dvcP9/O6XVj0IL6/L5B2kus5oO+W3/R9ALsMNWP/wa1dbtABPlY0pXzRL/jk+KtV9HXrb16GF7QOAxZYaDS7V9SkCZoYWxPhaVtbMFevsSPQ5rH7jyivu/6LS+8zrbqk6A6JNaVq2uXnprC87k8ijF7MDDNesA8KhVCWJnjkBX1/s4aOblqKJILYDrDPl6LgMV1gH3f4GGDw== 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=QSVWdwBYxEnXSQDb11DLW1FrriGwziZwr5kWDaJdBUU=; b=DyaStnTPp4ll++mehWt0Z7tTgPoYUiKW3zeNhq2bPhe9/mRs4JEr/4Crc6cZnz35wjZrvywvOyWKAOLiSsT3VRVZyqc8TSlA5sOBliN6hVNuLVqfzEt7qocX+9jPfz28wkGPv/X0mahtJrEDV7e+xfdKKhC7C+oCg6xnvbMJsoJbaWL/RnxIy0OYoPH5XuW6CU7RV7D2ayDjwBOe3DBo6RRBsFs0Kv0aKzmYSF23xTlxmQ4ddXMBBxtFWsmJeNsdeUxKpwgq5WFiNrKNuOKf7Mv2pZUMtoTLTi0bWbt4XfykU8in+jZ32es7RdaIBVTMdOcADRub9QqB2awGCxNqqw== 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 (0) 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=QSVWdwBYxEnXSQDb11DLW1FrriGwziZwr5kWDaJdBUU=; b=dXRFRNAqC+VtpMgSqUun6o41B9p5+7v2VAnMVyVf8odHqbmAWqGh53Gc3qxH0rjhmTxPXPmZIIiLGW0JD9iX7vgym5ZyTOXkfN+RsoJDE57P9WzfSb8aPuzezp/g4E0dW9Si+KwHojfXctMD+B113gkJyZuOKM0/7b18g1D51/c= Received: from CH0PR04CA0112.namprd04.prod.outlook.com (2603:10b6:610:75::27) by CY5PR12MB9053.namprd12.prod.outlook.com (2603:10b6:930:37::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Thu, 6 Jun 2024 16:13:23 +0000 Received: from CH2PEPF00000146.namprd02.prod.outlook.com (2603:10b6:610:75:cafe::2e) by CH0PR04CA0112.outlook.office365.com (2603:10b6:610:75::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7656.21 via Frontend Transport; Thu, 6 Jun 2024 16:13:23 +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 CH2PEPF00000146.mail.protection.outlook.com (10.167.244.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7633.15 via Frontend Transport; Thu, 6 Jun 2024 16:13:23 +0000 Received: from quartz-7b1chost.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.35; Thu, 6 Jun 2024 11:13:21 -0500 From: Yazen Ghannam Date: Thu, 6 Jun 2024 11:12:58 -0500 Subject: [PATCH v4 5/8] hwmon: (k10temp) Define helper function to read CCD temp Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20240606-fix-smn-bad-read-v4-5-ffde21931c3f@amd.com> References: <20240606-fix-smn-bad-read-v4-0-ffde21931c3f@amd.com> In-Reply-To: <20240606-fix-smn-bad-read-v4-0-ffde21931c3f@amd.com> To: Guenter Roeck , , Yazen Ghannam CC: Mario Limonciello , , , , X-Mailer: b4 0.13.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000146:EE_|CY5PR12MB9053:EE_ X-MS-Office365-Filtering-Correlation-Id: e3c0f5d4-4619-45f6-18d8-08dc864396e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|82310400017|376005|36860700004; X-Microsoft-Antispam-Message-Info: =?utf-8?q?MkXfVeutfY1GnqhqP24XQjachemFQz/?= =?utf-8?q?3rtH8pCxQb3Zj8UnXKM3lRNVQ7eLq7TbYe65ggvLfbO1F8OjrJnbqiPalU5jhNeIh?= =?utf-8?q?TMETlE/WNPXlX2VQgdUG9rnDhwEUl2k70b6Fku4n+EixxWZ/I80J0UJZD9Vdh0Fvz?= =?utf-8?q?DBorQLO/ITESM5wjrrU9QWHws+3QVVRnJ1svFtYhDWUcuTftHyL8P/MTYhblX4g3f?= =?utf-8?q?g62MMOp7yYQn31fnwXYdvf6Bs0kew/6+CBvoO+2xiZ2IJTbmT8OKz4kniZnjglxAR?= =?utf-8?q?HPjlfXdyc7RB4/hYyY5npT1LU8ArN91hFhiLJbF664uBe+SMsE9oPLYTTPxC64hYz?= =?utf-8?q?R1zYP1lpke1UAVYs4Fr34s+T0J1GEwcG9HXkLSZvv+9LKFjXxtJJn8s6LTJ8GiaF4?= =?utf-8?q?pecy+7icfZGIvFiReirEAttFjbaveNXU2G4zB5AqnE2bGO4lov6GrCQkYz53SxHBf?= =?utf-8?q?YxlIm3m/kvEupgsmOWCCITJtvbWa7Ea5GQ/4fRne6PrQhzNYRIyi4R51YXHDz2GWK?= =?utf-8?q?a7/FGuBp5ESqywEvVwMVwraLChNtjElyCufXFVkS2dmLbyaiR+295yKAawTlxr3Cy?= =?utf-8?q?29QtwMbT+NmrcDkfz0ZAqE71Lnd8ZWharsTvAjAU/Qh0U/dcmXu5Zw2uv7qTgl4+3?= =?utf-8?q?NYMTKmcuiONY3ZZ4RS3bkbLMo8NlsvJgvhQ8hDLq/oG/4KBmhNqbCAxQSwCElYETx?= =?utf-8?q?fV8WCKhte30+41KoeGBrQD+26vFyDcsOsjqSP9jrSC2ypY4N6gzIJg7czddzCcovS?= =?utf-8?q?pNYQiu9fWVlezBG9Tr6HFAtFickzjyHaGO0ZHSByf1mP5N/crJgH4d8kp1FU78ljv?= =?utf-8?q?cXxuLrNJK3hUztqSEF0B5dPR0AjxLSh/2lz5Wi7kWbJDb3Cw75hZYeHIJ9e4Szm58?= =?utf-8?q?47oq9PWSpayF3hiqkRjas+5SRUoZXCNDqIbqAfhm71WSarrhf4PbNGypl4EDp7dBq?= =?utf-8?q?PlYDcI91lcivgqBnx7jSfqabT1viTWO+E78lIR76iOHefvXZd/UeBp0WIo2zbAMKt?= =?utf-8?q?wgCM6Cb7546G5FrlA2sbG0fkBURWjilJ9cbpGmCcyCCbXJwBQzA9BGVaXrfPq2ezC?= =?utf-8?q?hF7wjvjXp4tXU2fWsNqc4jDOq/PosWC353nPHlr9U1er54RxwoxSdpUSNX/6x5F6q?= =?utf-8?q?JF1F+spW70igNIKlsThHxQQznM0tRkL6WJVB0Ptk/UXltYPuu3THq3QdcxB9RtnUc?= =?utf-8?q?tSUAZCWC8A8Fx6UW3NRm3Hr9Ds6nabrIeMvYWvFedu8/8jPCrGOav+jFs1FuUaW8A?= =?utf-8?q?37onHcL4yzf0lzq64QM7pGAr61uFacJvMvpx/839ny5O8UjMwIe0o33Wge4/xskwf?= =?utf-8?q?glBYGkGt12oJo5af40GmD46rB0YaKwThfQ=3D=3D?= 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:(13230031)(1800799015)(82310400017)(376005)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2024 16:13:23.1357 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3c0f5d4-4619-45f6-18d8-08dc864396e5 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: CH2PEPF00000146.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB9053 The CCD temperature register is read in two places. These reads are done using an AMD SMN access, and a number of parameters are needed for the operation. Move the SMN access and parameter gathering into a helper function in order to simply the code flow. This also has a benefit of centralizing the hardware register access in a single place in case fixes or special decoding is required. Signed-off-by: Yazen Ghannam Reviewed-by: Mario Limonciello Acked-by: Guenter Roeck --- drivers/hwmon/k10temp.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 6cad35e7f182..315c52de6e54 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -158,6 +158,13 @@ static void read_tempreg_nb_zen(struct pci_dev *pdev, u32 *regval) *regval = 0; } +static int read_ccd_temp_reg(struct k10temp_data *data, int ccd, u32 *regval) +{ + u16 node_id = amd_pci_dev_to_node_id(data->pdev); + + return amd_smn_read(node_id, ZEN_CCD_TEMP(data->ccd_offset, ccd), regval); +} + static long get_raw_temp(struct k10temp_data *data) { u32 regval; @@ -223,9 +230,7 @@ static int k10temp_read_temp(struct device *dev, u32 attr, int channel, *val = 0; break; case 2 ... 13: /* Tccd{1-12} */ - ret = amd_smn_read(amd_pci_dev_to_node_id(data->pdev), - ZEN_CCD_TEMP(data->ccd_offset, channel - 2), - ®val); + ret = read_ccd_temp_reg(data, channel - 2, ®val); if (ret) return ret; @@ -397,8 +402,7 @@ static void k10temp_get_ccd_support(struct pci_dev *pdev, * the register value. And this will incorrectly pass the TEMP_VALID * bit check. */ - if (amd_smn_read(amd_pci_dev_to_node_id(pdev), - ZEN_CCD_TEMP(data->ccd_offset, i), ®val)) + if (read_ccd_temp_reg(data, i, ®val)) continue; if (regval & ZEN_CCD_TEMP_VALID)