From patchwork Sun Jul 14 11:42:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Rapha=C3=ABl_Gallais-Pou?= X-Patchwork-Id: 812587 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D06B49635; Sun, 14 Jul 2024 11:43:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720957397; cv=none; b=k37xBD8Uw/77pL7gKZN86oNkSEiC78kJMSt+YRKigD16Tj59Gao7IIuX7crTHDcmOeFDm871qEUJ6apLkmaOgu92YR6vCZfk+NPUMZxIaPSwrVKGLcNQRotHkR01lNt4tzPHXtNi8YsD02W9q2YjpFaP3mY7nTaIzEF+hYPARCU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720957397; c=relaxed/simple; bh=vF378iF9/szJSAJWna+ftEYzp+8iuC0Xg1MQKdgKe6k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MMtkskv4xcVgkeuI/bQMN4ozOdpn2p2T6l/G7LExSJO6sfQRn3VTxiYrkwivPNVIv6+lxDgYLecEbL5wj6qTjTPtBemDBj8qaRVvnZ+XxNNmU4gdrZnWmyR6hn2njd5FhH6Cug5ksNHx7ph1HaduPxZmX2/U830uhyUuGl+STIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=S68MqULs; arc=none smtp.client-ip=209.85.167.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="S68MqULs" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52ea79e6979so3823138e87.2; Sun, 14 Jul 2024 04:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720957394; x=1721562194; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=wOp5UqGNK/+aHc+mtLWt/FVtlNV3iPD/WbMrczGg2CE=; b=S68MqULsZzjFaHX22+LtECvyX1QlYLh/lxiZoqeaOvJUfKrRu2Wn3XvUFKqR7bGX1V SSIAn4sSwPFrPh4HqGRr6J44+N4+1yJOiXuuvupW0hJtrWTeGNIpCdqVSJgckFVJyIx7 PMLRVCNqaMpynE9txoJbOmOMGPRvtcEBHdgvXheeGbKg2HVSSz7U9zmBUkKQO24UTvga oa0DisQrP6eQQqTZMDEW7g2hSnmd5tqySUsXHxp7Rkg2Yk290X24R/OsL3RIm0ia4M7O W5i/zpL04v0LwjqydNERHIo2U1MoVOMsToNBFOEen3q9LyXSdkrAfZBWN08tlCYouf2g eMbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720957394; x=1721562194; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wOp5UqGNK/+aHc+mtLWt/FVtlNV3iPD/WbMrczGg2CE=; b=CHn1NdmP2XuZ80s6CWKTsQY4P2i6Ynrz7D0ALU+abwkuiF/snf8WZAwfWp4+7OX6u9 OaBaOLbVQ2cXv79Bbeq1AVbc1Xxb+fWzG/WNNM7T0Wi9Ox89IhdSVz/N0UOzxt8zkba2 pw72zLPnB4eNC6lDiXqptfC2FA+2t8h4zIupH81DKXnGTwwh034LFtSADONFyjvPiLLe D32iYF+xU8PXxRD7duC1TxNXHYxXfC3qwQ8cZcreLs925Ep/NK6rx1CYb39s/etUS94R 6P31KeR+DJIWMI7jVpLgWhCQxsuFG8RSQwGcbbly4HkBpYlhBTbbfnHJGw6KXyisXjzZ 9QcQ== X-Forwarded-Encrypted: i=1; AJvYcCW2Yd7mMrpmUsjPoW7mLSRmA0QN3cAQIkOEUNj2Tmph7bb89JZMkh8f2njQHRGgk6GCrLwuSPNh5xR32g1/eNUo6Mma+Dvf+R8TLIoowrYHOhkmMHsXDtcNLPL0vS/J1rn/8A8OCmblKA== X-Gm-Message-State: AOJu0YxuxgZrfBJ+zt0kAyCqcw7IvGvQNieDBMbrFbfN42JEumbzsbrW VVycOkkdKTXrJCIrLgr7q8f5v6TBnR3ejriBezNF+mwc2FVLCUvKntdGTQ== X-Google-Smtp-Source: AGHT+IGzQSl96QOLEDaGbFjBPAymg5u1VSljhpz6IWeZ7P97LOYVU2MHyNNINrbBaBgAgukwbohIfw== X-Received: by 2002:a05:6512:39ce:b0:52e:96d7:2f3a with SMTP id 2adb3069b0e04-52eb99da148mr12221457e87.58.1720957393616; Sun, 14 Jul 2024 04:43:13 -0700 (PDT) Received: from localhost ([2001:861:3385:e20:6384:4cf:52c5:3194]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680dab3f2esm3650922f8f.18.2024.07.14.04.43.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jul 2024 04:43:13 -0700 (PDT) From: Raphael Gallais-Pou Date: Sun, 14 Jul 2024 13:42:45 +0200 Subject: [PATCH v3 1/2] thermal: st: switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240714-thermal-v3-1-88f2489ef7d5@gmail.com> References: <20240714-thermal-v3-0-88f2489ef7d5@gmail.com> In-Reply-To: <20240714-thermal-v3-0-88f2489ef7d5@gmail.com> To: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Maxime Coquelin , Alexandre Torgue , Patrice Chotard , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org X-Mailer: b4 0.14.0 Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards. Remove those guards on every ST thermal related drivers. Reviewed-by: Patrice Chotard Signed-off-by: Raphael Gallais-Pou --- drivers/thermal/st/st_thermal.c | 4 +--- drivers/thermal/st/st_thermal_memmap.c | 2 +- drivers/thermal/st/stm_thermal.c | 8 +++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c index 2a105409864e..5f33543a3a54 100644 --- a/drivers/thermal/st/st_thermal.c +++ b/drivers/thermal/st/st_thermal.c @@ -236,7 +236,6 @@ void st_thermal_unregister(struct platform_device *pdev) } EXPORT_SYMBOL_GPL(st_thermal_unregister); -#ifdef CONFIG_PM_SLEEP static int st_thermal_suspend(struct device *dev) { struct st_thermal_sensor *sensor = dev_get_drvdata(dev); @@ -265,9 +264,8 @@ static int st_thermal_resume(struct device *dev) return 0; } -#endif -SIMPLE_DEV_PM_OPS(st_thermal_pm_ops, st_thermal_suspend, st_thermal_resume); +DEFINE_SIMPLE_DEV_PM_OPS(st_thermal_pm_ops, st_thermal_suspend, st_thermal_resume); EXPORT_SYMBOL_GPL(st_thermal_pm_ops); MODULE_AUTHOR("STMicroelectronics (R&D) Limited "); diff --git a/drivers/thermal/st/st_thermal_memmap.c b/drivers/thermal/st/st_thermal_memmap.c index 29c2269b0fb3..28b380013956 100644 --- a/drivers/thermal/st/st_thermal_memmap.c +++ b/drivers/thermal/st/st_thermal_memmap.c @@ -180,7 +180,7 @@ static void st_mmap_remove(struct platform_device *pdev) static struct platform_driver st_mmap_thermal_driver = { .driver = { .name = "st_thermal_mmap", - .pm = &st_thermal_pm_ops, + .pm = pm_sleep_ptr(&st_thermal_pm_ops), .of_match_table = st_mmap_thermal_of_match, }, .probe = st_mmap_probe, diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c index 34785b9276fc..ffd988600ed6 100644 --- a/drivers/thermal/st/stm_thermal.c +++ b/drivers/thermal/st/stm_thermal.c @@ -440,7 +440,6 @@ static int stm_thermal_prepare(struct stm_thermal_sensor *sensor) return ret; } -#ifdef CONFIG_PM_SLEEP static int stm_thermal_suspend(struct device *dev) { struct stm_thermal_sensor *sensor = dev_get_drvdata(dev); @@ -466,10 +465,9 @@ static int stm_thermal_resume(struct device *dev) return 0; } -#endif /* CONFIG_PM_SLEEP */ -static SIMPLE_DEV_PM_OPS(stm_thermal_pm_ops, - stm_thermal_suspend, stm_thermal_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(stm_thermal_pm_ops, + stm_thermal_suspend, stm_thermal_resume); static const struct thermal_zone_device_ops stm_tz_ops = { .get_temp = stm_thermal_get_temp, @@ -580,7 +578,7 @@ static void stm_thermal_remove(struct platform_device *pdev) static struct platform_driver stm_thermal_driver = { .driver = { .name = "stm_thermal", - .pm = &stm_thermal_pm_ops, + .pm = pm_sleep_ptr(&stm_thermal_pm_ops), .of_match_table = stm_thermal_of_match, }, .probe = stm_thermal_probe, From patchwork Sun Jul 14 11:42:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Rapha=C3=ABl_Gallais-Pou?= X-Patchwork-Id: 812721 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B87D749659; Sun, 14 Jul 2024 11:43:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720957398; cv=none; b=Hnrrxi2TnUUH4DIxNvZMFXzKpll/76gth0CJGcgbk0qysIvo2QtYWzzmmWHiX4TdWKPsCzT7kk+pb3wVdIalc1k14ps9rkA5ZIrKphbStRBfVRmQd2kwO+k8Mts5qqnlmrng4oN7JMIe9LMSXZhZlmqCzTwAY7oOCsFLLsFlpSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720957398; c=relaxed/simple; bh=HuwYDUb5SQOgo/cDQX5AI/oFUdtLP4Rc4FBtLd0C2zs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kp635Zdd2HRKXgz2bt2HzHWuFU+UU0vqp4sb3TOOPLKMM0oz1HUWB3wBZprrA4F9NwbUqFk8xygFOsZd1zeKA3lDI2Bz3ibWJTFEOb3D9UkvkrPajVGbus4NeTPZPsN5V03HwgyAdAPU1GjSctS1A1VM1JK9FsNbMwzmyq8+U2Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nfZ7auB8; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nfZ7auB8" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-36805befd01so1062300f8f.2; Sun, 14 Jul 2024 04:43:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720957395; x=1721562195; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=voezqBRIqgR1xMbzJXPZuwUUHTRBRdZ/+JwyhtZNvfc=; b=nfZ7auB8iWwOITJFoU7hhAZqLv9NzZP+oN6qDhUGCKS5cEX6Fb9aordsptq+l9nv8X 8Xd/51xcMB6PO3XjxLro2XCbT5BICDLXZo/l0EL1LhqQdXVpVqqgyWOuivb40VjeKeA+ aSa9Y5R3HR2ssd2YDhuQ+kYUXLGY7+MFAS9pluu21t1omQz4GFaWoKtVO/JUpKlz0v0c 7laY5QUpv4ZJyXppKd3SUqZhuscewm0I6VYmmexm79itmlqeTC+PEgeugBC9Dw2uLCVa op6jIRUv1R+QAiHD0bpcleAml43gXyTZpiDWtwELZPsFj2Ldv6LfI5qVuNN09TurSQpO 96lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720957395; x=1721562195; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=voezqBRIqgR1xMbzJXPZuwUUHTRBRdZ/+JwyhtZNvfc=; b=DonLM+EgUrVKJbPASGsApPL/REaeksw7cG3X72sMwLgt/pJfJuOmjO7DNCz2IetZuJ FCK4ulBE5lP6Z0D/8+F5en3EEO0dW6IsI/0L42DrUlyW7wYWuRTOQ9DuxFa+1qbYj5nW OkBsPXYU/R+ezFWnhbSlPpTPTMgpn89W6gMxLETjisNZU6f6Zb+6cRytTAH14WjJnhWx mlywiQ7j52Hg2JHwwGRz7vBRPePNrvJfJludaAZ/uB1W6XeB/VCdQJNen35sZXdXl+kQ GhNhli0mMw+9CLG8WDrurOUs+TKnO2hzbxVbCNWb0sWMX3VAuIwly9xM4gKcHdSOLIPW Jb0A== X-Forwarded-Encrypted: i=1; AJvYcCXLSS1OCPj+1zZJcL7OD9dwYHUt4cqk0Nu2CCGvzG6aP5afIn9tLkTx3N2kpIGG+zW38Wo4MJTJOBXME43Qafrf7y2axLDngmsZpVvM87JvsHGckJAYCFQ2eKqfwGs08jlpGz+2NHAbNQ== X-Gm-Message-State: AOJu0YzjSYtmAJpAukhEr8cDaDQwp/dLdyQxvEguu8grKgNwBXoeZmm9 E/QdzD4egsi0G8BuZra26EG+n8MK8gunAj+GSFEbMp/caoNeViHj X-Google-Smtp-Source: AGHT+IHznxvk3jGNuxACzlPePqJZsFU4Gm7h8xaiwzJni80Kfh+rpr363DBOkzF8Q4inWF6XdCSGjw== X-Received: by 2002:a05:6000:1814:b0:364:d2b6:4520 with SMTP id ffacd0b85a97d-367ce5df304mr10897937f8f.0.1720957394652; Sun, 14 Jul 2024 04:43:14 -0700 (PDT) Received: from localhost ([2001:861:3385:e20:6384:4cf:52c5:3194]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680db0492asm3624096f8f.103.2024.07.14.04.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jul 2024 04:43:14 -0700 (PDT) From: Raphael Gallais-Pou Date: Sun, 14 Jul 2024 13:42:46 +0200 Subject: [PATCH v3 2/2] thermal: sti: depend on THERMAL_OF subsystem Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240714-thermal-v3-2-88f2489ef7d5@gmail.com> References: <20240714-thermal-v3-0-88f2489ef7d5@gmail.com> In-Reply-To: <20240714-thermal-v3-0-88f2489ef7d5@gmail.com> To: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Maxime Coquelin , Alexandre Torgue , Patrice Chotard , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org X-Mailer: b4 0.14.0 Switch to thermal_of_zone to handle thermal-zones. Replace thermal_zone_device_register() by devm_thermal_of_zone_register() and remove ops st_thermal_get_trip_type, st_thermal_get_trip_temp. Signed-off-by: Raphael Gallais-Pou --- Changes in v3: - Fix unmet dependency when building with ARM64 compiler https://lore.kernel.org/lkml/202406270605.qodaWd4n-lkp@intel.com/ - Remove no more used polling_delay variable detected by kernel robot https://lore.kernel.org/lkml/202406270530.kN5wIswi-lkp@intel.com/ Changes in v2: - Remove unused struct thermal_trip trip --- drivers/thermal/st/Kconfig | 2 ++ drivers/thermal/st/st_thermal.c | 28 ++++++++++------------------ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/thermal/st/Kconfig b/drivers/thermal/st/Kconfig index ecbdf4ef00f4..95a634709a99 100644 --- a/drivers/thermal/st/Kconfig +++ b/drivers/thermal/st/Kconfig @@ -5,12 +5,14 @@ config ST_THERMAL tristate "Thermal sensors on STMicroelectronics STi series of SoCs" + depends on THERMAL_OF help Support for thermal sensors on STMicroelectronics STi series of SoCs. config ST_THERMAL_MEMMAP select ST_THERMAL tristate "STi series memory mapped access based thermal sensors" + depends on THERMAL_OF config STM32_THERMAL tristate "Thermal framework support on STMicroelectronics STM32 series of SoCs" diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c index 5f33543a3a54..23597819ce84 100644 --- a/drivers/thermal/st/st_thermal.c +++ b/drivers/thermal/st/st_thermal.c @@ -12,6 +12,7 @@ #include #include "st_thermal.h" +#include "../thermal_hwmon.h" /* The Thermal Framework expects millidegrees */ #define mcelsius(temp) ((temp) * 1000) @@ -135,8 +136,6 @@ static struct thermal_zone_device_ops st_tz_ops = { .get_temp = st_thermal_get_temp, }; -static struct thermal_trip trip; - int st_thermal_register(struct platform_device *pdev, const struct of_device_id *st_thermal_of_match) { @@ -145,7 +144,6 @@ int st_thermal_register(struct platform_device *pdev, struct device_node *np = dev->of_node; const struct of_device_id *match; - int polling_delay; int ret; if (!np) { @@ -197,29 +195,22 @@ int st_thermal_register(struct platform_device *pdev, if (ret) goto sensor_off; - polling_delay = sensor->ops->register_enable_irq ? 0 : 1000; - - trip.temperature = sensor->cdata->crit_temp; - trip.type = THERMAL_TRIP_CRITICAL; - sensor->thermal_dev = - thermal_zone_device_register_with_trips(dev_name(dev), &trip, 1, sensor, - &st_tz_ops, NULL, 0, polling_delay); + devm_thermal_of_zone_register(dev, 0, sensor, &st_tz_ops); if (IS_ERR(sensor->thermal_dev)) { - dev_err(dev, "failed to register thermal zone device\n"); + dev_err(dev, "failed to register thermal of zone\n"); ret = PTR_ERR(sensor->thermal_dev); goto sensor_off; } - ret = thermal_zone_device_enable(sensor->thermal_dev); - if (ret) - goto tzd_unregister; platform_set_drvdata(pdev, sensor); - return 0; + /* + * devm_thermal_of_zone_register() doesn't enable hwmon by default + * Enable it here + */ + return devm_thermal_add_hwmon_sysfs(dev, sensor->thermal_dev); -tzd_unregister: - thermal_zone_device_unregister(sensor->thermal_dev); sensor_off: st_thermal_sensor_off(sensor); @@ -232,7 +223,8 @@ void st_thermal_unregister(struct platform_device *pdev) struct st_thermal_sensor *sensor = platform_get_drvdata(pdev); st_thermal_sensor_off(sensor); - thermal_zone_device_unregister(sensor->thermal_dev); + thermal_remove_hwmon_sysfs(sensor->thermal_dev); + devm_thermal_of_zone_unregister(sensor->dev, sensor->thermal_dev); } EXPORT_SYMBOL_GPL(st_thermal_unregister);