From patchwork Tue Nov 5 15:33:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 13863106 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2075.outbound.protection.outlook.com [40.107.100.75]) (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 5C7DA7346D; Tue, 5 Nov 2024 15:33:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730820824; cv=fail; b=udpt4MiDg50q9RylHAYyufo6jfW1sbNK8NSjGs8NbTs348ejwn6M22I1ZMNZdYAlJuk2JL1KtMI4vtaXaq5iQyAX2JFeyBy4YKafGzZJky0LbX0AdXyOi+jUyopUnjkGGCWfHIKSpiozBhlLaub7gBcjXWM5IfLnKo4stJFQpKk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730820824; c=relaxed/simple; bh=xE8tgTFhgfeuOgCsUZhC1WiaGITJjtf48n9pdqNlCns=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Qb3iL9FaPXPfQ4jC8eg7XwhlVFrloXq8XXLeicc05kB/8MR36nicKflcXoT7HN97oCmR039rgDkIZbinBznHViYxyHxsjUCP/c4Iod11JRWXqrJ//S/Ave8obAOt5hElyJZpvRXPp+DaBewVJPo5cM2TqlN87ARrCC/KmZvaJS4= 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=I3BSPjCc; arc=fail smtp.client-ip=40.107.100.75 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="I3BSPjCc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LbJ/Oj84acB7SjgYeFKlO8rWu/DAGuxvfJ1GUdBf9A1G+xpbyWFhiFAvCrIGA3DYWglb8O3v14zLTo0jRrQEXcO4/y+CHW72I3sKCfLk0aOxtltZT93r+tsx5UXQNL2Px04R/0qkdwkDG8nbXDWqo8tA4m3wy+Eeo+TCW8ApzeSe4Unu3NiRQfDXmsVm+kjDRPsi649sGTbOnWANgbKw16sEJ8vIPUv835S20+Uz7QRA8vADhBKz8yzwVKx+M5ITW1jeiCQX6K/afk6Y2QJr9ZkRn7Bo/6Y/nQ3x1VpTafBSL4nwG5KESvVqxL1fqXmV45VJnqmcW9sUtArgOC/BSg== 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=CpP+8+J+86qUK9POCB3KSfm3Zjzt6p92edc6CL2tMVE=; b=N4c7Gu4Nfu2ReE1kIpJehcy3HMgIMRwb6ThlgLsy3YRhhUVdOqTR1Rw5eJMTlY5szf162KXq/CGC23zq3/+xDjgeQa5y1/nUhYksJ9jyZrmfXUEzZwerouhLAb2TVPtgbyMB+jie1M+nrXJysUEbs6qPdLOZA3TYWMIF6++dCQNYu3+R5cF6KhHQqKlAtkBfuzBC+scYxU9QiAHuj+bWDM2NYfRxb8mKUJ22h3bngM2Sma6OImZ1gx2XOusjaidUi0HrVySCv5VNZWEF8lU0BVOl3jkRWM8h8bxjmvUW498DlygGIiiU5N+ybJ92E5FuZJkFktVikYh8gS5Bt8zYSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.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=CpP+8+J+86qUK9POCB3KSfm3Zjzt6p92edc6CL2tMVE=; b=I3BSPjCcjAcZc+eSXYPJkARwTfGuFLEtIBx6QdbzzWdTc4jjZWgqfQEPrS5zyJStcPcEU2x4Ex1PMSxkNZjs6IjvDwev/dAIk/EqZjlVQrKawi3e7PkOrR4YsxQs1HJFmDO0mR8LNItiztdmq2lWMkg233akDb3TLR61393GOo0= Received: from MN0PR04CA0008.namprd04.prod.outlook.com (2603:10b6:208:52d::22) by DM4PR12MB6448.namprd12.prod.outlook.com (2603:10b6:8:8a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.29; Tue, 5 Nov 2024 15:33:36 +0000 Received: from BN2PEPF000055DF.namprd21.prod.outlook.com (2603:10b6:208:52d:cafe::40) by MN0PR04CA0008.outlook.office365.com (2603:10b6:208:52d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.31 via Frontend Transport; Tue, 5 Nov 2024 15:33:36 +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 BN2PEPF000055DF.mail.protection.outlook.com (10.167.245.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8158.0 via Frontend Transport; Tue, 5 Nov 2024 15:33:36 +0000 Received: from AUS-P9-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 5 Nov 2024 09:33:32 -0600 From: Mario Limonciello To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= CC: "Rafael J . Wysocki" , Len Brown , Maximilian Luz , Lee Chun-Yi , "Shyam Sundar S K" , Corentin Chary , "Luke D . Jones" , Ike Panhc , Henrique de Moraes Holschuh , "Alexis Belmonte" , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Ai Chao , Gergo Koteles , open list , "open list:ACPI" , "open list:MICROSOFT SURFACE PLATFORM PROFILE DRIVER" , "open list:THINKPAD ACPI EXTRAS DRIVER" , Mark Pearson , Matthew Schwartz , Mario Limonciello Subject: [PATCH v4 04/20] ACPI: platform_profile: Add platform handler argument to platform_profile_remove() Date: Tue, 5 Nov 2024 09:33:00 -0600 Message-ID: <20241105153316.378-5-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241105153316.378-1-mario.limonciello@amd.com> References: <20241105153316.378-1-mario.limonciello@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.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: BN2PEPF000055DF:EE_|DM4PR12MB6448:EE_ X-MS-Office365-Filtering-Correlation-Id: cce979da-cd70-45f5-c49c-08dcfdaf3720 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?q?FxmctzE1t88Y4GdpGZg3i6iYQp0OaZ5?= =?utf-8?q?fus3+YMicAY2jhnehyCzunG0qhak9l5y4Xo8UMc1sHKXeBuGSQhD/XAA1Lar1LcOS?= =?utf-8?q?SQden2a/NRhWKp18hcnlXuyzZ6KVxjfwVOkW4kfd+BxEiXhFY1fVKWK+BbnSwmOZw?= =?utf-8?q?Z1yIInD2w07TFoUU+8cV/vfTGMn3B4OZBLaQKek8e1qO4yp+pfoB3dLGGV9rPBGf4?= =?utf-8?q?nwnsLkXuYFLPOCD0u2EcF4bDmerPfZesdNz50X2XRwlRVkTsRXpjye2LRgPCQw44T?= =?utf-8?q?SvR9n7odpJUyzm6kWDvpoHRYmo7KEnv2C7oJgy/TgdVE3ygDb54QbnJxvIy2sFQbq?= =?utf-8?q?rmeXucDyeEr0/+OQmyPBE5WHgu39UlAr/SXMGMIogoSoibxIRwB+sm6RRlPkc4PpS?= =?utf-8?q?mHbqHYB2S2Oartvz8GYTQVtitpARgBaUGxzZDaR419DjjnJxd6abduhNep6xPGQYZ?= =?utf-8?q?709r2wYFSRbho/zVFqkzwlkVnpJAWzeglZKngg9RBM3Y6DUh4niJt3Csg1kMYjIP9?= =?utf-8?q?nJCYcM64rAgT3JeWy/o7V1YwU0tRvOW7UOUqzOzLgJb+wWJRhbhsL+Z2GchxDk+7K?= =?utf-8?q?ETxkvRvFNkzIoXKBtR//sQ4yg4y3YRYL2RdTwKwewfLrVxeWTdBss/G/dlX5oEJ3g?= =?utf-8?q?z0wp0VJv4q/OffASHcS+/aj7TBAQiC4GZGWgdCpv7C01J5XSyxTTqewiUJUNentxp?= =?utf-8?q?GcH5bQqEIIYIagF28D4mu1Bfw57M7I3jJFjEWR2IPuoVTJ64hmjaFD/wthqBHAn4L?= =?utf-8?q?yJ7jdZnwKJz6Tu0P17VSdj6l8KadoxCdZqV/Bi35hArnYeWTZ2zKIDxsbrM9nnpHX?= =?utf-8?q?mVxMjGG+YxM6lyy///hijTpxwfsS2VxK+w93yj7saSxm6AwpPFSSm3FhY+H8wz+1z?= =?utf-8?q?LWvIBuerZWLIi5QoZqQVfSm4RbCChS5bT/x++z31AcA1aZo0ee92r5uGHbbkWASJH?= =?utf-8?q?tO+pjFPGOmoGFSdaK2/g7SLa58dLFF4A7pRTxS8MndlVYSKVSxGSJp+b8OxQg05KN?= =?utf-8?q?VaNsPz8ZmsrznILkMhWUKCHIXeJE3k0lMAAko3Hqgki+Vd6aQ8rRHUbq2xtfhmZaA?= =?utf-8?q?E25CrsK9+dD78yd1SUkg7KFGqvI9MIJQJIABRapzFjzT+Elj2s6YExSfIlotbUzns?= =?utf-8?q?Y2p8b0WjJqZLs18F+X7gRTsxX097F9yZIIWyENrvFSlcAxOi/zlT3nleT8Nshcx7I?= =?utf-8?q?NJzsLeJOCC5WLOAgJHz1tvAVIamkRsbpe1ZQqe24BDjYuT63Wsd05UYFpCH918QxQ?= =?utf-8?q?/biE4FaHrx3O7z8tVbL1kb30CdRa9r0E00nf6d2LF0vh4BQ3ICEWE+t0ZJ+0bQJzu?= =?utf-8?q?w48R9216lRYQl6tsYhcLd9G/+AhPrFbCmg=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:(13230040)(7416014)(1800799024)(376014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2024 15:33:36.5141 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cce979da-cd70-45f5-c49c-08dcfdaf3720 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: BN2PEPF000055DF.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6448 To allow registering and unregistering multiple platform handlers calls to platform_profile_remove() will need to know which handler is to be removed. Add an argument for this. Tested-by: Matthew Schwartz Reviewed-by: Hans de Goede Reviewed-by: Mark Pearson Reviewed-by: Maximilian Luz Reviewed-by: Ilpo Järvinen Signed-off-by: Mario Limonciello Reviewed-by: Armin Wolf --- v4: * Add alienware-wmi too --- drivers/acpi/platform_profile.c | 2 +- drivers/platform/surface/surface_platform_profile.c | 6 +++++- drivers/platform/x86/acer-wmi.c | 4 ++-- drivers/platform/x86/amd/pmf/sps.c | 2 +- drivers/platform/x86/asus-wmi.c | 4 ++-- drivers/platform/x86/dell/alienware-wmi.c | 2 +- drivers/platform/x86/dell/dell-pc.c | 2 +- drivers/platform/x86/hp/hp-wmi.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 2 +- drivers/platform/x86/inspur_platform_profile.c | 5 ++++- drivers/platform/x86/thinkpad_acpi.c | 2 +- include/linux/platform_profile.h | 2 +- 12 files changed, 21 insertions(+), 14 deletions(-) diff --git a/drivers/acpi/platform_profile.c b/drivers/acpi/platform_profile.c index 5d9f3f7ba71c5..c76b8e3fdcde6 100644 --- a/drivers/acpi/platform_profile.c +++ b/drivers/acpi/platform_profile.c @@ -210,7 +210,7 @@ int platform_profile_register(struct platform_profile_handler *pprof) } EXPORT_SYMBOL_GPL(platform_profile_register); -int platform_profile_remove(void) +int platform_profile_remove(struct platform_profile_handler *pprof) { sysfs_remove_group(acpi_kobj, &platform_profile_group); diff --git a/drivers/platform/surface/surface_platform_profile.c b/drivers/platform/surface/surface_platform_profile.c index 5f45f8e8cd69b..b449c4c8b883c 100644 --- a/drivers/platform/surface/surface_platform_profile.c +++ b/drivers/platform/surface/surface_platform_profile.c @@ -210,6 +210,7 @@ static int surface_platform_profile_probe(struct ssam_device *sdev) return -ENOMEM; tpd->sdev = sdev; + ssam_device_set_drvdata(sdev, tpd); tpd->handler.name = "Surface Platform Profile"; tpd->handler.dev = &sdev->dev; @@ -228,7 +229,10 @@ static int surface_platform_profile_probe(struct ssam_device *sdev) static void surface_platform_profile_remove(struct ssam_device *sdev) { - platform_profile_remove(); + struct ssam_platform_profile_device *tpd; + + tpd = ssam_device_get_drvdata(sdev); + platform_profile_remove(&tpd->handler); } static const struct ssam_device_id ssam_platform_profile_match[] = { diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index aca4a5746bee1..b12965d9fcdb7 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -2547,7 +2547,7 @@ static int acer_platform_probe(struct platform_device *device) error_hwmon: if (platform_profile_support) - platform_profile_remove(); + platform_profile_remove(&platform_profile_handler); error_platform_profile: acer_rfkill_exit(); error_rfkill: @@ -2570,7 +2570,7 @@ static void acer_platform_remove(struct platform_device *device) acer_rfkill_exit(); if (platform_profile_support) - platform_profile_remove(); + platform_profile_remove(&platform_profile_handler); } #ifdef CONFIG_PM_SLEEP diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c index 1b94af7c0e0c4..bd2bd6cfc39a0 100644 --- a/drivers/platform/x86/amd/pmf/sps.c +++ b/drivers/platform/x86/amd/pmf/sps.c @@ -426,5 +426,5 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev) void amd_pmf_deinit_sps(struct amd_pmf_dev *dev) { - platform_profile_remove(); + platform_profile_remove(&dev->pprof); } diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 78621b2af0ddb..0750e2fe65325 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -4886,7 +4886,7 @@ static int asus_wmi_add(struct platform_device *pdev) fail_custom_fan_curve: fail_platform_profile_setup: if (asus->platform_profile_support) - platform_profile_remove(); + platform_profile_remove(&asus->platform_profile_handler); fail_fan_boost_mode: fail_platform: kfree(asus); @@ -4913,7 +4913,7 @@ static void asus_wmi_remove(struct platform_device *device) asus_wmi_battery_exit(asus); if (asus->platform_profile_support) - platform_profile_remove(); + platform_profile_remove(&asus->platform_profile_handler); kfree(asus); } diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c index c03b1aa7dfb5f..3cf6c371d4220 100644 --- a/drivers/platform/x86/dell/alienware-wmi.c +++ b/drivers/platform/x86/dell/alienware-wmi.c @@ -1065,7 +1065,7 @@ static int create_thermal_profile(struct platform_device *platform_device) static void remove_thermal_profile(void) { if (quirks->thermal) - platform_profile_remove(); + platform_profile_remove(&pp_handler); } static int __init alienware_wmi_init(void) diff --git a/drivers/platform/x86/dell/dell-pc.c b/drivers/platform/x86/dell/dell-pc.c index 730f97aab70cd..65989af2e4196 100644 --- a/drivers/platform/x86/dell/dell-pc.c +++ b/drivers/platform/x86/dell/dell-pc.c @@ -292,7 +292,7 @@ static int thermal_init(void) static void thermal_cleanup(void) { if (thermal_handler) - platform_profile_remove(); + platform_profile_remove(thermal_handler); platform_device_unregister(platform_device); } diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c index ffb09799142bc..6d6e13a0c6e2d 100644 --- a/drivers/platform/x86/hp/hp-wmi.c +++ b/drivers/platform/x86/hp/hp-wmi.c @@ -1693,7 +1693,7 @@ static void __exit hp_wmi_bios_remove(struct platform_device *device) } if (platform_profile_support) - platform_profile_remove(); + platform_profile_remove(&platform_profile_handler); } static int hp_wmi_resume_handler(struct device *device) diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index 24367c3590c99..80797c6ae8b0b 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -1136,7 +1136,7 @@ static void ideapad_dytc_profile_exit(struct ideapad_private *priv) if (!priv->dytc) return; - platform_profile_remove(); + platform_profile_remove(&priv->dytc->pprof); mutex_destroy(&priv->dytc->mutex); kfree(priv->dytc); diff --git a/drivers/platform/x86/inspur_platform_profile.c b/drivers/platform/x86/inspur_platform_profile.c index 5a53949bbbf5f..53af73a7fbf7b 100644 --- a/drivers/platform/x86/inspur_platform_profile.c +++ b/drivers/platform/x86/inspur_platform_profile.c @@ -191,7 +191,10 @@ static int inspur_wmi_probe(struct wmi_device *wdev, const void *context) static void inspur_wmi_remove(struct wmi_device *wdev) { - platform_profile_remove(); + struct inspur_wmi_priv *priv; + + priv = dev_get_drvdata(&wdev->dev); + platform_profile_remove(&priv->handler); } static const struct wmi_device_id inspur_wmi_id_table[] = { diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 222fba97d79a7..13798c6d5fcf3 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -10638,7 +10638,7 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm) static void dytc_profile_exit(void) { - platform_profile_remove(); + platform_profile_remove(&dytc_profile); } static struct ibm_struct dytc_profile_driver_data = { diff --git a/include/linux/platform_profile.h b/include/linux/platform_profile.h index daec6b9bad81f..bcaf3aa39160f 100644 --- a/include/linux/platform_profile.h +++ b/include/linux/platform_profile.h @@ -37,7 +37,7 @@ struct platform_profile_handler { }; int platform_profile_register(struct platform_profile_handler *pprof); -int platform_profile_remove(void); +int platform_profile_remove(struct platform_profile_handler *pprof); int platform_profile_cycle(void); void platform_profile_notify(void);