From nobody Sat Jun 13 23:27:03 2026 Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11010024.outbound.protection.outlook.com [52.101.201.24]) (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 17ECF184524; Sat, 13 Jun 2026 19:18:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.201.24 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781378309; cv=fail; b=KuAr24xnXILt/gwIzA4krb3kevZR1RHEIQpV1ikyF4mPK7BmOttOudkXrwz7EGVifGYqWtsv/mamldSzomqPUzmGFOSBSFaWJP7tVaVqvW3I8dhiu30jiMINioZQ0DJaBqMgo9B9SeUkeVqMDtPrgDkIFboAgcBs9U74kNQA59A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781378309; c=relaxed/simple; bh=KU3JMb36j4buZXOnadBMMZ3Q0oEStn0ZpBbq7BkGamk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DbTqKyunp+F0s9qUETAh0W4LJ2Y9Lclc9h72KI62dGgJZlIRwQ8bXkhxAIkl7dmHrw/k1beGKeVEbJZCTK3B7NLsLQQAQP+Prt/XjWBUHHeI33A3cGHyISU9E5pxhyNTmPaFNWxxftebghyP84GMv/5jonzOHlV5JXZt65fHZ4k= 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=mdsEbe64; arc=fail smtp.client-ip=52.101.201.24 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="mdsEbe64" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dque8frW5ZzTqnElHZ/xUsmjDgaXppbtl7fIGXiTjxsGENc97eIvBnMGPdQNza7Faq0+F9WPA96Vf1wbmKJwuT4nzs1A3drMN57YQgIP0GdoTa5k3j8cxq49pBoiucJ2tvHDl3QVtfd/2g+WJO/tDSilb+TtxQOhxlBTt61yU2Giagj3oGpqqrj2OKSqY8ZUtGJWR1EzKV9KBkqKt8bmnoCBomTp7nUyIauABInUeTU5no6rOMmlueM6tsh6Gal60iDOy8iugq4HW8e1lp4y+QBWo7fU8K3GxuU0oGu+Q2Uj5X2jYztaVIf/iTorSeOxRZVgCYKvPeeNPLrM4dWtRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=/t89kBeruZUp+wUbjLTT/T1JLcrs3xz7vgbm4zAbY7I=; b=Kc2eYoF82789qx7E+tEAd7+lwx6BWq7/B7hd1iPqVLauQkeOP9CEKu2R3CXzb9SkIdXCfgMvjtnDvAuVbQpTt2EjzKZxV0yT4jjSRD92QqV7MxnsguzHC5oL3kgBQSKp1Yr5TVZ3vIhU631E76F5+nmzHuSzOV4m3t5awKasCdz4VqOzcHoQqKVxIVwFq8qwaLPFK9JpsxAcWtfjYmONhSwaUJEoMbtkwGlgz+RtgCv7CP4noEriaGuWGRaAw8BXb+xttgk/hNWbxn/cla6yrrzHrW5qf4nrqqcmuOZNpPaRIsKMVpKZMy7NpekL/eGND+qW98N9S22sSVvkSxEI2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux.intel.com 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=/t89kBeruZUp+wUbjLTT/T1JLcrs3xz7vgbm4zAbY7I=; b=mdsEbe64eb1+DfVAJbbJiuJbjleQrjsk848H8F19Q0ULXDAyH0zf3EADKbTqT1sAX4KWcRPXH7wmPAKFaAuHhYxRDChhLo2nyOmTTDurqf/m3g6f+zGhn7xlRZg3/7BKkZkngvJBCId+g1Tq7R5h18YvNUbMoKEjfdhcGYIaI9k= Received: from BY1P220CA0007.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59d::13) by SA1PR12MB8697.namprd12.prod.outlook.com (2603:10b6:806:385::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.113.16; Sat, 13 Jun 2026 19:18:23 +0000 Received: from MWH0EPF000C6188.namprd02.prod.outlook.com (2603:10b6:a03:59d:cafe::6b) by BY1P220CA0007.outlook.office365.com (2603:10b6:a03:59d::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.113.16 via Frontend Transport; Sat, 13 Jun 2026 19:18: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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by MWH0EPF000C6188.mail.protection.outlook.com (10.167.249.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.139.8 via Frontend Transport; Sat, 13 Jun 2026 19:18:22 +0000 Received: from dcsm-trdripper1.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Sat, 13 Jun 2026 14:18:13 -0500 From: Muralidhara M K To: CC: , , Muralidhara M K Subject: [PATCH 1/3] platform/x86/amd/hsmp: Serialize ACPI HSMP is_probed with a probe mutex Date: Sun, 14 Jun 2026 00:47:53 +0530 Message-ID: <20260613191755.2358969-2-muralidhara.mk@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260613191755.2358969-1-muralidhara.mk@amd.com> References: <20260613191755.2358969-1-muralidhara.mk@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000C6188:EE_|SA1PR12MB8697:EE_ X-MS-Office365-Filtering-Correlation-Id: d7367a7a-7d2c-4386-7a43-08dec9808957 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|36860700016|82310400026|1800799024|56012099006|11063799006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: ylRAA15LN1+S8Y2uqxn1CdAWTc9deTyBjeWKEjg18+Db7j3y5xZO299VpdupfApo6xSVb7sO6Ag+9Fce4BUkRN06RnOqnbj82hUOuUXIGe7Ilx2XEkKVmOCihjIyY4o4PvCSaoaqELxJdkF+Fm4qmX4tk//loTqbAWChtokNwEZppQu5GirNnGOVSJjl8R45VTal8fcoibJdiWUbpKWCUcJyigHXrplEEi2pmBUyrA+TLf21lr85lWpVQbuEOiU/sxDCX2ip3YuN3poQoLVfNB+fmZfnL+L9ukmqNkT4r10ZEifcLrn/A8aVjAKRwKOuLgkwrNtCjauaL/4z6vy8Ye5cPR6o3s9ny5ZMOUe0Pp3wfj5hcYnNLoe8CIyDwcy0pZHhpNnQsYBoISRpoUvAVf5e8YkBBTjmAhOFSMarUgtmVFfpPjUpT+g0PvekiC1e7RDuqQ3jTV8a8kkXWZA7Iy45ib4Mu2u/Tg5URRK8k8ZyShKAmARBfOGV5izR3zvCoLRazuyu5Z1GPjxar13XhKzxWjSMJgBn+tdN2KlEkfz7nMw40kjLPQlPG55W6mDukCDs1x3ZuABiFZqw8pAvjbpjfHVcQietJeEcjRedIoWrMX03P3KgCplXGdzKiobjgw9ATj+Zl95x0BXMDd1bss92BtaL/iebpZ8XwYD7MraARnLBonCrkOtU5mlvbRcBkCvVjZWXSaXKfbJnc03egpN6YqwDEXG9LTQJaEOwLt8= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(23010399003)(36860700016)(82310400026)(1800799024)(56012099006)(11063799006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NqN16OshyVxsPkcngOmpDpNDP6Rp8d4Nc3CPsXBAQwsv0y/m9mJMercQaO5A9nSU5WKzX4Nvx4gRrcooyAmTrJ3ssirYcfU3sFpG8gsTSobl/JIRlLGf82dAp1BMkb7oaccon1jflD9o1nUlouMeGrJ320v4y+2jI/TzKOcuJMVh0vdj4SYSyZiUh2QgBiS53rwyF4DO8YJAbuVPujzh5TplaIMQK56eZp4wTiX3AQdZB5QppMvXgvEoNEspQzlnH16oXf4O67DzyAsnKtfNEAgcocFwSqTGPzbBXR9N516HkQAc0fIo45VoGBd4cxx2Vyj3Dp9rQMbENbgdE92tky904I6MJBGjwSbW/ZvAwkTAg3bQVoHMhGugna+GYQAjOmhkwiN/UduKlIjys4RdPpIW7GyiaG+55aTxqp9pX8BI43X3sKmCGNgcg7b7s7Gs X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2026 19:18:22.8988 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7367a7a-7d2c-4386-7a43-08dec9808957 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000C6188.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8697 Content-Type: text/plain; charset="utf-8" Add hsmp_acpi_probe_mutex and hold it across ACPI probe, remove, and init_acpi() so concurrent platform probes cannot race the global is_probed handshake or the one-time socket allocation. Use lockdep_assert_held() in init_acpi() to catch incorrect locking under lockdep. Signed-off-by: Muralidhara M K --- drivers/platform/x86/amd/hsmp/acpi.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/am= d/hsmp/acpi.c index 97ed71593bdf..696884a91c22 100644 --- a/drivers/platform/x86/amd/hsmp/acpi.c +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -18,8 +18,11 @@ #include #include #include +#include +#include #include #include +#include #include #include #include @@ -38,6 +41,8 @@ =20 static struct hsmp_plat_device *hsmp_pdev; =20 +static DEFINE_MUTEX(hsmp_acpi_probe_mutex); + struct hsmp_sys_attr { struct device_attribute dattr; u32 msg_id; @@ -459,11 +464,17 @@ static ssize_t hsmp_freq_limit_source_show(struct dev= ice *dev, struct device_att return len; } =20 +/** + * init_acpi() - Parse ACPI mailbox resources for one socket and validate = HSMP. + * @dev: ACPI companion device for this socket. + */ static int init_acpi(struct device *dev) { u16 sock_ind; int ret; =20 + lockdep_assert_held(&hsmp_acpi_probe_mutex); + ret =3D hsmp_get_uid(dev, &sock_ind); if (ret) return ret; @@ -584,6 +595,8 @@ static int hsmp_acpi_probe(struct platform_device *pdev) if (!hsmp_pdev) return -ENOMEM; =20 + guard(mutex)(&hsmp_acpi_probe_mutex); + if (!hsmp_pdev->is_probed) { hsmp_pdev->num_sockets =3D topology_max_packages(); if (!hsmp_pdev->num_sockets) { @@ -619,6 +632,7 @@ static int hsmp_acpi_probe(struct platform_device *pdev) =20 static void hsmp_acpi_remove(struct platform_device *pdev) { + mutex_lock(&hsmp_acpi_probe_mutex); /* * We register only one misc_device even on multi-socket system. * So, deregister should happen only once. @@ -627,6 +641,7 @@ static void hsmp_acpi_remove(struct platform_device *pd= ev) hsmp_misc_deregister(); hsmp_pdev->is_probed =3D false; } + mutex_unlock(&hsmp_acpi_probe_mutex); } =20 static struct platform_driver amd_hsmp_driver =3D { --=20 2.34.1 From nobody Sat Jun 13 23:27:03 2026 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012013.outbound.protection.outlook.com [52.101.43.13]) (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 425C91E8826; Sat, 13 Jun 2026 19:18:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.13 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781378309; cv=fail; b=DaEHsd2rMbbbtnEhdy5DL4Sqtr+jgkWK//hdYKDQDn8sp3DcR8UBwhNKSfEaBS7/ZwbG/LqBtxK6KAhPyUK69GihPLBWVso25wug8BrNcK0OQddfgXPgn8PBAHHIubtgl6xn5m2zV7EegKMbuy4fxnXVLBYO+qGhi9KV2LaXQ2o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781378309; c=relaxed/simple; bh=qjntSWxLNsihP9wF1SS7kat9qaKbiZSVV6t6aLEdylM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Av/kBFXJUBjG7n3dW1S02JS2Ef2qCUINDR3MQSBqJJdsoSDOpWzV+5FPhwt/xWL09q6uhnm9oywzRA5JU1dWC55xiXahBQpK3S3SrhaRu7kN3NGQIC6FgExqWfynnKvzKu0pnEzEaRQVD187eRAFUHQjemcrg39z5CD4GmcKTxo= 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=eceUtZMG; arc=fail smtp.client-ip=52.101.43.13 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="eceUtZMG" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NY7QHUFIwmOEXQTRsGD5IMhfVqCEuNweGA52PPdNPuBgxkWqhiMfBuHAw9n5MLUjL2UKqdcn+JdMqYIDZuQ/nOATB6eFbxqjBSXtpB2A2QkAWKAIYDvn+8EEv0K4jUBIShWrDS3RkvdNIx3ge7uHBRzddBHoMGTJ1WhL7LYWBWmciJbQU7vOkkf1dfh35VmwiYfdWo/xtNgRHmEiKa7Uc8liiJzPd/I/4KxdddUDpyHjy59oqGRjotMcS9x03JhpJLJZ04pdRNGimiM4qcYvTnKvL5RU+LyMCRJW1w6UnNOtZFCekPjVHskr5UfMoxq0iL1gmFSVbOFT3ba61sLkvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=CvCayFiZW4sd56rB58fVbT8zEfgAtardnZyYeYjxMYg=; b=if254aKk7SZXrAJb1dryolZ1eRzT3HTIRwSiUJ5u1ZgVaRz7B2Avukj5PTnv5rdwD8XnJ0CRc6Z7kmEorFRsSEPiRSjIYTSe/bpt8SJ9bnW/NNd6CahwXfxF3KcwRIKnFyg8KHuRccFqBacwVaVVzIg0Q7WrenEozGvFZoY0irGW4sDhA9o3p6GLM/13u1IpyIs26EDhmI0iJoJD48370h2AkT148geYtBC5t/JPaKjPUQ4grFNrCrOIgFGLhxQGBFo0e/JQX3wLyxFydBP5b7NYUhYsUk0En8JwlSYzzTLkHtLl45MhuZT9MXSNK0AUnVQ15oSuZvRiQ/13B3b+xg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux.intel.com 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=CvCayFiZW4sd56rB58fVbT8zEfgAtardnZyYeYjxMYg=; b=eceUtZMGOJArOz8UOoYp0xW6IGwXcGtR0OaAK4DVgjWZFgVNyERBSp1QXPOL85qBzT9REwWuvUOd4eWFt5X81+wU5qLfwcVykh2hYVAmHEoH5fSi0zVhprnGfPBlQ7gExoEPtAkCroN8mzSCLLQILbfh3vfENVfAYONys//t+FM= Received: from BY1P220CA0003.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59d::10) by SA3PR12MB8812.namprd12.prod.outlook.com (2603:10b6:806:312::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.12; Sat, 13 Jun 2026 19:18:24 +0000 Received: from MWH0EPF000C6188.namprd02.prod.outlook.com (2603:10b6:a03:59d:cafe::20) by BY1P220CA0003.outlook.office365.com (2603:10b6:a03:59d::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.113.16 via Frontend Transport; Sat, 13 Jun 2026 19:18:24 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by MWH0EPF000C6188.mail.protection.outlook.com (10.167.249.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.139.8 via Frontend Transport; Sat, 13 Jun 2026 19:18:24 +0000 Received: from dcsm-trdripper1.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Sat, 13 Jun 2026 14:18:15 -0500 From: Muralidhara M K To: CC: , , Muralidhara M K Subject: [PATCH 2/3] platform/x86/amd/hsmp: Add explicit metric DRAM mapping and per-socket mutexes Date: Sun, 14 Jun 2026 00:47:54 +0530 Message-ID: <20260613191755.2358969-3-muralidhara.mk@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260613191755.2358969-1-muralidhara.mk@amd.com> References: <20260613191755.2358969-1-muralidhara.mk@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000C6188:EE_|SA3PR12MB8812:EE_ X-MS-Office365-Filtering-Correlation-Id: 95bd7942-6ca4-41e7-6ca1-08dec9808a0b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|23010399003|82310400026|1800799024|376014|22082099003|18002099003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info: Y0dvsjnm4/9oD26enEK3lPAN8mLVbRTSKtZKYvX1MexYDAE+m1IAY+LM49CGIHJUvQi40x3K0KzP4x45kgLA2jEUJTcDPV4uTrKUMEHu5zGqtJWY89CP//w2N7I+z2y0FAaT3QmsRtfTqtgO2zYgCsM8XiLMnMd8Msb7hcvYUB0ttDg0ODlJBxaFrkONtVYuVjMMgRhxmMuyU+uCPUnCeMcj6Lr+R1XDOwvHT8kR/M9OmbKDZGE6mIAaXuJOiekaFaKwdZgovcU0t3WI259RIT2Gu4L8PJxJFbpHP369oZorcHRWgdbEUrfjPcrmlEcftcCKQn10Bl3f/gbkQ4VhpdthQzQ2mjeYK9seumgxIIT6HPKB7WLXIVbwG8GznyhlSI1oJJPSjwNsVEqSiPA/d5Dpr8CywbUD4dw575lgu1sDAU7DEAzoabiHl0XSv7heNs474OYvTHYXixwtY9gHn1DiJugdG2nIS1GSVyZFFgIUgRz10xKtfFp4T6EgpnOB+P3kIHsP7ou+ezrgUJr99c25Mg8LERitojh6bb6CutJ5w/ZZ2mDna/ME3/TMIlaLZBsUNS7bzO6AYHctFU7LVmmi9owyQ6VHYgxNRMGD8viHa2ZQeRAhoUblnzop6hW9QNmX7/h3gOk8z2UvZTbOoYCSIIfCmXvyXkHGy5bvkogkM9Ny+ygwYUlcTL3KAcFcrh8mnx6QfoqMinhI/6F0JEXEcF0WBhWkdY6uI48qNGY= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700016)(23010399003)(82310400026)(1800799024)(376014)(22082099003)(18002099003)(11063799006)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1xLQ2dOONohRi1PHHxv9w5nh/6Y4pCG70z/H6LKJozAcFrRDys6ON2S+j+royERTEKEE2KUcq471UrbhuXmEHboPpm8/IRZ3BfFhX4ku44JB2VqNCCipV2Yw4ojibXZeOOotUYb6vV+5SyiUfcraztWvpZQZr/oHdxjZNKxvQIvvLKfkQrCRmMkpQGFqN/57akrqF6BR3k2eDU3qeOT/C4hpVmG0Lx0cTscAj21YLua1XjNn87PJal3rHjeuwI8aDDbvFxq0V3egE7NZEQBwTAKx/O58umB4KBHSmjstnHw1fXoe7M/Xb4vqWmyMA5M54jNzaRth5C0k1sOteUIzQrc4stvMpL7Km4Qcj0JdpePOcN/MWdMuXMc5C8DKScKMKQTFk6d4fz7eaQJUrK2dTVB5ec0ZAcY7xk4UzWPrrJjIc9rJdE8VXciza6o1SOE2 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2026 19:18:24.0793 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 95bd7942-6ca4-41e7-6ca1-08dec9808a0b 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000C6188.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8812 Content-Type: text/plain; charset="utf-8" Add hsmp_destroy_metric_read_locks(), hsmp_init_metric_read_locks(), and switch metric table DRAM from devm_ioremap() to ioremap() so ACPI can coordinate teardown. Embed struct mutex metric_read_lock in each hsmp_socket for later serialization of metric table reads. Call the new helpers from the platform driver probe and remove paths so non-ACPI builds initialize and tear down metric_read_lock consistently with the ACPI driver. Signed-off-by: Muralidhara M K --- drivers/platform/x86/amd/hsmp/hsmp.c | 38 ++++++++++++++++++++++++++-- drivers/platform/x86/amd/hsmp/hsmp.h | 5 ++++ drivers/platform/x86/amd/hsmp/plat.c | 3 +++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/am= d/hsmp/hsmp.c index 631ffc0978d1..81b6c24c3d3a 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.c +++ b/drivers/platform/x86/amd/hsmp/hsmp.c @@ -12,7 +12,11 @@ #include #include #include +#include +#include +#include #include +#include #include =20 #include "hsmp.h" @@ -379,6 +383,37 @@ ssize_t hsmp_metric_tbl_read(struct hsmp_socket *sock,= char *buf, size_t size) } EXPORT_SYMBOL_NS_GPL(hsmp_metric_tbl_read, "AMD_HSMP"); =20 +void hsmp_init_metric_read_locks(struct hsmp_plat_device *pdev, u16 num_so= ckets) +{ + u16 i; + + if (!pdev->sock || !num_sockets) + return; + + for (i =3D 0; i < num_sockets; i++) + mutex_init(&pdev->sock[i].metric_read_lock); +} +EXPORT_SYMBOL_NS_GPL(hsmp_init_metric_read_locks, "AMD_HSMP"); + +void hsmp_destroy_metric_read_locks(struct hsmp_plat_device *pdev, u16 num= _sockets) +{ + u16 i; + + if (!pdev->sock || !num_sockets) + return; + + for (i =3D 0; i < num_sockets; i++) { + struct hsmp_socket *s =3D &pdev->sock[i]; + + if (s->metric_tbl_addr) { + iounmap(s->metric_tbl_addr); + s->metric_tbl_addr =3D NULL; + } + mutex_destroy(&s->metric_read_lock); + } +} +EXPORT_SYMBOL_NS_GPL(hsmp_destroy_metric_read_locks, "AMD_HSMP"); + int hsmp_get_tbl_dram_base(u16 sock_ind) { struct hsmp_socket *sock =3D &hsmp_pdev.sock[sock_ind]; @@ -403,8 +438,7 @@ int hsmp_get_tbl_dram_base(u16 sock_ind) dev_err(sock->dev, "Invalid DRAM address for metric table\n"); return -ENOMEM; } - sock->metric_tbl_addr =3D devm_ioremap(sock->dev, dram_addr, - sizeof(struct hsmp_metric_table)); + sock->metric_tbl_addr =3D ioremap(dram_addr, sizeof(struct hsmp_metric_ta= ble)); if (!sock->metric_tbl_addr) { dev_err(sock->dev, "Failed to ioremap metric table addr\n"); return -ENOMEM; diff --git a/drivers/platform/x86/amd/hsmp/hsmp.h b/drivers/platform/x86/am= d/hsmp/hsmp.h index 0509a442eaae..91bc21232646 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.h +++ b/drivers/platform/x86/amd/hsmp/hsmp.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,8 @@ struct hsmp_socket { struct bin_attribute hsmp_attr; struct hsmp_mbaddr_info mbinfo; void __iomem *metric_tbl_addr; + /* Protects metric table snapshot reads for this socket */ + struct mutex metric_read_lock; void __iomem *virt_base_addr; struct semaphore hsmp_sem; char name[HSMP_ATTR_GRP_NAME_SIZE]; @@ -63,7 +66,9 @@ long hsmp_ioctl(struct file *fp, unsigned int cmd, unsign= ed long arg); void hsmp_misc_deregister(void); int hsmp_misc_register(struct device *dev); int hsmp_get_tbl_dram_base(u16 sock_ind); +void hsmp_init_metric_read_locks(struct hsmp_plat_device *pdev, u16 num_so= ckets); ssize_t hsmp_metric_tbl_read(struct hsmp_socket *sock, char *buf, size_t s= ize); +void hsmp_destroy_metric_read_locks(struct hsmp_plat_device *pdev, u16 num= _sockets); struct hsmp_plat_device *get_hsmp_pdev(void); #if IS_ENABLED(CONFIG_HWMON) int hsmp_create_sensor(struct device *dev, u16 sock_ind); diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/am= d/hsmp/plat.c index e07f68575055..f61d6cd13e3b 100644 --- a/drivers/platform/x86/amd/hsmp/plat.c +++ b/drivers/platform/x86/amd/hsmp/plat.c @@ -211,6 +211,8 @@ static int hsmp_pltdrv_probe(struct platform_device *pd= ev) if (!hsmp_pdev->sock) return -ENOMEM; =20 + hsmp_init_metric_read_locks(hsmp_pdev, hsmp_pdev->num_sockets); + ret =3D init_platform_device(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Failed to init HSMP mailbox\n"); @@ -230,6 +232,7 @@ static int hsmp_pltdrv_probe(struct platform_device *pd= ev) static void hsmp_pltdrv_remove(struct platform_device *pdev) { hsmp_misc_deregister(); + hsmp_destroy_metric_read_locks(hsmp_pdev, hsmp_pdev->num_sockets); } =20 static struct platform_driver amd_hsmp_driver =3D { --=20 2.34.1 From nobody Sat Jun 13 23:27:03 2026 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010038.outbound.protection.outlook.com [52.101.56.38]) (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 B1BEF30ACE6; Sat, 13 Jun 2026 19:18:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.38 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781378311; cv=fail; b=ILKhQ5Fk5U4rPf1KF5+NsyQliel43fkrztzN3XNnfINOZI5ixd58ms8aURlhH+oySslMaS42KNJPnyLaSacxKL+C+Lmx23Vfi7tRMeCQVcRo2cXOaK+y74usy3BFTilp+ejAV9KvSAnjTwjt9hc8+Wt9NThN3kiPQuiuxFMqrHo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781378311; c=relaxed/simple; bh=zjAZH6uHnRNYqUAlFG8EKypizmxIj2X2GXSGVPzZZ6k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fV7ycbMj27V/0ZaXHOm1IXhibJqq3Gh714Qgx5XBaLdWPTebmLX+i/l58J3I8dysx0lheRb9ClJa3VPY6OnrpliIMjFd3ye+TVbzOR//F0uCXGOzfaoorT8q3dd3QK6i81GF5zmM5NXJ0fa49zI2wYvhsC1oH+1FP7R6u9mHsp0= 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=Ks7JUu1i; arc=fail smtp.client-ip=52.101.56.38 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="Ks7JUu1i" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KKiL2Gvnnb+vsaJMdaymZPBRIkZ25rFA+u87x15JukZUMU0qXAcon8+cUWfWHsEbw4NJHyVE1MlINfza+Iym3+yTieVNj3fDfOyDki2tgFFNvZFXZDL5LB7hS9R4GKoyFtVD1ZrWtXFq+SYPxV9lAlE1/cFGTvkkEfI1pt50Dm+1GtlpsEWDgEmpv4ZpkS57NpxInBwsfj8cZ573jlzIEbuTRmI/2QGfQLERgY3J+11MqRFim5GzO7XDQziq67qeP3ZGwE9IerYiRhZTTkcL9vxIcnEnRvIOlliMlZpKUZ2JBkMMO4dIQ4WpBIkrDLCE+ECIITo51EA1sHUSXzC56Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=zmalMuZhO5qeCkSjAK6khsb45LWiP3jhwg5cCyFS1Hc=; b=wqMvuj/5m9Y6tcutM6NHdP5IK8ybEINaFCMYbMiKOYJqhAAPUDHTuRLr1A8xAjXjuhhHiL9pabhSys/Y2U7WJ+j6RU0K3PScTyZdxiAXppcdwDT2x+rl4oeXy9JPzks5k1YCMh7sQaIAl+StjN+J2ToRkEulvovp2yzdXVIvqjif8z4EHT2zwFLZQsrDU6aAv+PhNdNqeNpxW+ZRqg+67pa1bGJQaZnO72XphtcKCIw/gtGNK729GLwRfabPkmYE/5jc2czqyOXfwf/YqKlmMTdVIMW6efvxe3I78JDltB2hMkFssAoEnwRTSTucV+iSRO02kh1o8DByqQdxUk8C+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux.intel.com 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=zmalMuZhO5qeCkSjAK6khsb45LWiP3jhwg5cCyFS1Hc=; b=Ks7JUu1i2o1a6NR/9XF/dCj+LWB0A0QhqfBE63osyN9amnAhQMRn+AJM670TFoJ++CSAbaY9hA5YeiPmEgg0OkKgm7DElb+O/ZJo3lOrRtN73Phsek/05WfGmtNc/cydMm+7ZWCrGW4Znc5IahzKfHHSILYM3cjXnSsPrZY0WxQ= Received: from BY1P220CA0014.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59d::9) by SJ0PR12MB5663.namprd12.prod.outlook.com (2603:10b6:a03:42a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.113.11; Sat, 13 Jun 2026 19:18:25 +0000 Received: from MWH0EPF000C6188.namprd02.prod.outlook.com (2603:10b6:a03:59d:cafe::76) by BY1P220CA0014.outlook.office365.com (2603:10b6:a03:59d::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.113.16 via Frontend Transport; Sat, 13 Jun 2026 19:18:25 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by MWH0EPF000C6188.mail.protection.outlook.com (10.167.249.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.139.8 via Frontend Transport; Sat, 13 Jun 2026 19:18:25 +0000 Received: from dcsm-trdripper1.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Sat, 13 Jun 2026 14:18:17 -0500 From: Muralidhara M K To: CC: , , Muralidhara M K Subject: [PATCH 3/3] platform/x86/amd/hsmp: ACPI HSMP refcounted sockets and coordinated release Date: Sun, 14 Jun 2026 00:47:55 +0530 Message-ID: <20260613191755.2358969-4-muralidhara.mk@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260613191755.2358969-1-muralidhara.mk@amd.com> References: <20260613191755.2358969-1-muralidhara.mk@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000C6188:EE_|SJ0PR12MB5663:EE_ X-MS-Office365-Filtering-Correlation-Id: 779d034e-6cfd-488a-d9a3-08dec9808a8f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|23010399003|376014|82310400026|1800799024|56012099006|11063799006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: q0dWR1g7e1roHcDbwYUxKeSIEPv7xSaM2zFSXJP4wTYVswnahMrRNc6sAC4NvRAXyOk8XKucW7O9oHIVZkRHMSSdbtFujPby9F9ueGz8QSTXjUtDRn2R6gTXB5fXASQ5tZKiOyipYFCC6iE6oQoLRknaWk3nzMInc7NKPEkcxjC3L1lS7t83UPAiSIyan1NpAVwGTdePKWQInGZjXKyApzX5kVTj67lviZ5g75nkfwnpXPNwPey1sg8+Sz1HPXsowS+Dv+X53LaF7h1/a2d43ZUrMC+HcM8kPvd8VwqA0Sb6ShEUBHV/0AZdUaFnJv20vU6MtrBHnPopnUB5m05LVaXD+/D3DaGtp7Wh0dMmHSzzMbtwZfZtuBlO/alFe/teHHdGfET1jNUzdS000DGTDfCSEjTZt+hO5ZYbGr7YaK6sB59TT5XY+8txSYqwpj2DSwNdUssywUn5U583JFtcf8e1s1DVgvU6JYcGtQjIo95y7oorpzM4ayYgEKCXMQrRM/73nuL2w+xn2SwxWloLBCP5gcKFJOnvWecrdOWVOUsHYl6G0YomdUhAb43YaSeHqOQPcZQlDVVE0ZU6Aiiw1c8xHm9oooot93Eewm24S3qMGVTANhABYLPHCKQ7nCPrNN1iHM34qTb745jugzuAoe65G9x/0P1cq1w5FNWhwXDLlDsChXOc1ALvukdR6eksalbezc/o2WxAhIxgulPz21DQWF8f0qevUTpDcZbgkmo= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700016)(23010399003)(376014)(82310400026)(1800799024)(56012099006)(11063799006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F9v+jKF208K3WKvZ1O5ir8Rkf5QDW0dleblknzHUy39P+wHExjPY5hWTV/COw988Jh1rh5tMi7LMa2ReqrJ0cmOHqgD79pdqb8brlqxbQictI9P8xhmnOpMPDN4LOKyAhVRgow8io41WdPzyLUK6JCqo1TS9NypIhcctlOwoEAFWQEnvLLA49WpHtYfJqZawUGa1fzeP2XeRbDOZy8KtCYlJzQXQg8ew6OZuDrJOeYPZf7XudCWpsYFBQfXwFBkL7PD8DvK2eglwNiwgpgtAqtuJa7L/NESrQfk8v4TRYWtAkE4542EMvT0c9CqYo54Sw9F1WTlUB5CF3s4vQe+MKmPEEfXTPJu4NYq47WkmMKa0jV/u5Ql9BOcSK0hn0U+b0YV1wgDe5XcbdGL8JcnLK9MV42XfklaAAHkqFFpGSnKUx9zsU8o5feWTjbpvd8/d X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2026 19:18:25.0081 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 779d034e-6cfd-488a-d9a3-08dec9808a8f 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000C6188.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5663 Content-Type: text/plain; charset="utf-8" Replace the global is_probed flag with miscdevice.this_device for misc registration state, count ACPI socket platform devices with struct kref, and run hsmp_acpi_sock_release() on the final put to deregister /dev/hsmp when needed, unmap metric DRAM, and free the socket array. Extend struct hsmp_plat_device with acpi_sock_kref and acpi_sock_kref_started in this change so ACPI teardown can coordinate with the refcount. Switch ACPI socket storage to kcalloc(), initialize per-socket metric mutexes once the array exists, and free the allocation on early probe failures before any kref reference is handed out. Signed-off-by: Muralidhara M K --- drivers/platform/x86/amd/hsmp/acpi.c | 76 +++++++++++++++++++++------- drivers/platform/x86/amd/hsmp/hsmp.h | 4 +- 2 files changed, 62 insertions(+), 18 deletions(-) diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/am= d/hsmp/acpi.c index 696884a91c22..c6840f6e15b7 100644 --- a/drivers/platform/x86/amd/hsmp/acpi.c +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -587,6 +587,47 @@ static const struct acpi_device_id amd_hsmp_acpi_ids[]= =3D { }; MODULE_DEVICE_TABLE(acpi, amd_hsmp_acpi_ids); =20 +static void hsmp_acpi_sock_release(struct kref *kref) +{ + struct hsmp_plat_device *pdev =3D container_of(kref, struct hsmp_plat_dev= ice, + acpi_sock_kref); + + mutex_lock(&hsmp_acpi_probe_mutex); + if (pdev->mdev.this_device) + hsmp_misc_deregister(); + hsmp_destroy_metric_read_locks(pdev, pdev->num_sockets); + kfree(pdev->sock); + pdev->sock =3D NULL; + pdev->num_sockets =3D 0; + pdev->proto_ver =3D 0; + pdev->acpi_sock_kref_started =3D false; + mutex_unlock(&hsmp_acpi_probe_mutex); +} + +/** + * hsmp_acpi_free_sock_array_early() - Drop the global socket array on ear= ly probe failure. + * + * When init_acpi() or misc_register() fails before any ACPI socket refere= nce + * is handed out via kref, free the array and destroy per-socket mutexes. + */ +static void hsmp_acpi_free_sock_array_early(void) +{ + u16 i; + + lockdep_assert_held(&hsmp_acpi_probe_mutex); + + if (hsmp_pdev->acpi_sock_kref_started) + return; + if (!hsmp_pdev->sock) + return; + + for (i =3D 0; i < hsmp_pdev->num_sockets; i++) + mutex_destroy(&hsmp_pdev->sock[i].metric_read_lock); + kfree(hsmp_pdev->sock); + hsmp_pdev->sock =3D NULL; + hsmp_pdev->num_sockets =3D 0; +} + static int hsmp_acpi_probe(struct platform_device *pdev) { int ret; @@ -597,34 +638,44 @@ static int hsmp_acpi_probe(struct platform_device *pd= ev) =20 guard(mutex)(&hsmp_acpi_probe_mutex); =20 - if (!hsmp_pdev->is_probed) { + if (!hsmp_pdev->sock) { hsmp_pdev->num_sockets =3D topology_max_packages(); if (!hsmp_pdev->num_sockets) { dev_err(&pdev->dev, "No CPU sockets detected\n"); return -ENODEV; } =20 - hsmp_pdev->sock =3D devm_kcalloc(&pdev->dev, hsmp_pdev->num_sockets, - sizeof(*hsmp_pdev->sock), - GFP_KERNEL); + hsmp_pdev->sock =3D kcalloc(hsmp_pdev->num_sockets, + sizeof(*hsmp_pdev->sock), + GFP_KERNEL); if (!hsmp_pdev->sock) return -ENOMEM; + + hsmp_init_metric_read_locks(hsmp_pdev, hsmp_pdev->num_sockets); } =20 ret =3D init_acpi(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Failed to initialize HSMP interface.\n"); + hsmp_acpi_free_sock_array_early(); return ret; } =20 - if (!hsmp_pdev->is_probed) { + if (!hsmp_pdev->mdev.this_device) { ret =3D hsmp_misc_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Failed to register misc device\n"); + hsmp_acpi_free_sock_array_early(); return ret; } - hsmp_pdev->is_probed =3D true; - dev_dbg(&pdev->dev, "AMD HSMP ACPI is probed successfully\n"); + dev_dbg(&pdev->dev, "AMD HSMP ACPI misc device registered\n"); + } + + if (!hsmp_pdev->acpi_sock_kref_started) { + kref_init(&hsmp_pdev->acpi_sock_kref); + hsmp_pdev->acpi_sock_kref_started =3D true; + } else { + kref_get(&hsmp_pdev->acpi_sock_kref); } =20 return 0; @@ -632,16 +683,7 @@ static int hsmp_acpi_probe(struct platform_device *pde= v) =20 static void hsmp_acpi_remove(struct platform_device *pdev) { - mutex_lock(&hsmp_acpi_probe_mutex); - /* - * We register only one misc_device even on multi-socket system. - * So, deregister should happen only once. - */ - if (hsmp_pdev->is_probed) { - hsmp_misc_deregister(); - hsmp_pdev->is_probed =3D false; - } - mutex_unlock(&hsmp_acpi_probe_mutex); + kref_put(&hsmp_pdev->acpi_sock_kref, hsmp_acpi_sock_release); } =20 static struct platform_driver amd_hsmp_driver =3D { diff --git a/drivers/platform/x86/amd/hsmp/hsmp.h b/drivers/platform/x86/am= d/hsmp/hsmp.h index 91bc21232646..5fcc7400cacc 100644 --- a/drivers/platform/x86/amd/hsmp/hsmp.h +++ b/drivers/platform/x86/amd/hsmp/hsmp.h @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,8 @@ struct hsmp_plat_device { struct hsmp_socket *sock; u32 proto_ver; u16 num_sockets; - bool is_probed; + struct kref acpi_sock_kref; + bool acpi_sock_kref_started; }; =20 int hsmp_cache_proto_ver(u16 sock_ind); --=20 2.34.1