* [PATCH 0/3] Add thermal management support for STi platform
@ 2024-05-18 12:12 Raphael Gallais-Pou
2024-05-18 12:12 ` [PATCH 1/3] thermal: st: switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Raphael Gallais-Pou @ 2024-05-18 12:12 UTC (permalink / raw)
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, linux-kernel, linux-stm32, linux-arm-kernel, devicetree
This patch series enhances the st_thermal driver in order to enable
support for thermal zones. The changes include:
1. Replace deprecated PM runtime macros with their updated counterparts.
2. Implementing devm_* based thermal of zone functions within the driver.
3. Updating the stih418 device-tree.
The device-tree patch depends on an earlier patch sent to the mailing
list [1].
As it is currently implemented, an alert threshold of 85°C is set to
trigger the CPU throttling, and when the temperature exceeds the
critical threshold of 95°C, the system shuts down. There is for now no
active cooling device on the platform, which explains the use of the
cpufreq framework.
[1] https://lore.kernel.org/lkml/20240320-thermal-v3-2-700296694c4a@gmail.com
To: Rafael J. Wysocki <rafael@kernel.org>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Zhang Rui <rui.zhang@intel.com>
To: Lukasz Luba <lukasz.luba@arm.com>
To: Maxime Coquelin <mcoquelin.stm32@gmail.com>
To: Alexandre Torgue <alexandre.torgue@foss.st.com>
To: Patrice Chotard <patrice.chotard@foss.st.com>
To: Rob Herring <robh@kernel.org>
To: Krzysztof Kozlowski <krzk+dt@kernel.org>
To: Conor Dooley <conor+dt@kernel.org>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
Raphael Gallais-Pou (3):
thermal: st: switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
thermal: sti: depend on THERMAL_OF subsystem
ARM: dts: sti: add thermal-zones support on stih418
arch/arm/boot/dts/st/stih407-family.dtsi | 6 +++--
arch/arm/boot/dts/st/stih418.dtsi | 41 +++++++++++++++++++++++++++++---
drivers/thermal/st/Kconfig | 1 +
drivers/thermal/st/st_thermal.c | 24 +++++++++----------
drivers/thermal/st/st_thermal_memmap.c | 2 +-
drivers/thermal/st/stm_thermal.c | 8 +++----
6 files changed, 58 insertions(+), 24 deletions(-)
---
base-commit: c75962170e49f24399141276ae119e6a879f36dc
change-id: 20240518-thermal-8f625428acf9
Best regards,
--
Raphael Gallais-Pou <rgallaispou@gmail.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] thermal: st: switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-05-18 12:12 [PATCH 0/3] Add thermal management support for STi platform Raphael Gallais-Pou
@ 2024-05-18 12:12 ` Raphael Gallais-Pou
2024-06-25 6:17 ` Patrice CHOTARD
2024-05-18 12:12 ` [PATCH 2/3] thermal: sti: depend on THERMAL_OF subsystem Raphael Gallais-Pou
2024-05-18 12:12 ` [PATCH 3/3] ARM: dts: sti: add thermal-zones support on stih418 Raphael Gallais-Pou
2 siblings, 1 reply; 7+ messages in thread
From: Raphael Gallais-Pou @ 2024-05-18 12:12 UTC (permalink / raw)
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, linux-kernel, linux-stm32, linux-arm-kernel, devicetree
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.
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
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 <ajitpal.singh@st.com>");
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,
--
2.45.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] thermal: sti: depend on THERMAL_OF subsystem
2024-05-18 12:12 [PATCH 0/3] Add thermal management support for STi platform Raphael Gallais-Pou
2024-05-18 12:12 ` [PATCH 1/3] thermal: st: switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
@ 2024-05-18 12:12 ` Raphael Gallais-Pou
2024-06-25 6:39 ` Patrice CHOTARD
2024-05-18 12:12 ` [PATCH 3/3] ARM: dts: sti: add thermal-zones support on stih418 Raphael Gallais-Pou
2 siblings, 1 reply; 7+ messages in thread
From: Raphael Gallais-Pou @ 2024-05-18 12:12 UTC (permalink / raw)
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, linux-kernel, linux-stm32, linux-arm-kernel, devicetree
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 <rgallaispou@gmail.com>
---
drivers/thermal/st/Kconfig | 1 +
drivers/thermal/st/st_thermal.c | 20 ++++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/thermal/st/Kconfig b/drivers/thermal/st/Kconfig
index ecbdf4ef00f4..2d08147876ee 100644
--- a/drivers/thermal/st/Kconfig
+++ b/drivers/thermal/st/Kconfig
@@ -5,6 +5,7 @@
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.
diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c
index 5f33543a3a54..60e70de724d4 100644
--- a/drivers/thermal/st/st_thermal.c
+++ b/drivers/thermal/st/st_thermal.c
@@ -12,6 +12,7 @@
#include <linux/of_device.h>
#include "st_thermal.h"
+#include "../thermal_hwmon.h"
/* The Thermal Framework expects millidegrees */
#define mcelsius(temp) ((temp) * 1000)
@@ -203,23 +204,21 @@ int st_thermal_register(struct platform_device *pdev,
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 +231,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);
--
2.45.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] ARM: dts: sti: add thermal-zones support on stih418
2024-05-18 12:12 [PATCH 0/3] Add thermal management support for STi platform Raphael Gallais-Pou
2024-05-18 12:12 ` [PATCH 1/3] thermal: st: switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
2024-05-18 12:12 ` [PATCH 2/3] thermal: sti: depend on THERMAL_OF subsystem Raphael Gallais-Pou
@ 2024-05-18 12:12 ` Raphael Gallais-Pou
2024-06-25 7:00 ` Patrice CHOTARD
2 siblings, 1 reply; 7+ messages in thread
From: Raphael Gallais-Pou @ 2024-05-18 12:12 UTC (permalink / raw)
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, linux-kernel, linux-stm32, linux-arm-kernel, devicetree
Add a 'thermal-zones' node for stih418.
A thermal-zone needs three components:
- thermal sensors, described in an earlier commit[1]
- cooling devices, specified for each CPU
- a thermal zone, describing the overall behavior.
The thermal zone needs references to both CPUs and thermal sensors,
which phandle are also added. The thermal management will then be
achieved on CPUs using the cpufreq framework.
[1] https://lore.kernel.org/lkml/20240320-thermal-v3-2-700296694c4a@gmail.com/
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
arch/arm/boot/dts/st/stih407-family.dtsi | 6 +++--
arch/arm/boot/dts/st/stih418.dtsi | 41 +++++++++++++++++++++++++++++---
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/st/stih407-family.dtsi b/arch/arm/boot/dts/st/stih407-family.dtsi
index 29302e74aa1d..35a55aef7f4b 100644
--- a/arch/arm/boot/dts/st/stih407-family.dtsi
+++ b/arch/arm/boot/dts/st/stih407-family.dtsi
@@ -33,7 +33,7 @@ delta_reserved: rproc@44000000 {
cpus {
#address-cells = <1>;
#size-cells = <0>;
- cpu@0 {
+ cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <0>;
@@ -52,8 +52,9 @@ cpu@0 {
clock-latency = <100000>;
cpu0-supply = <&pwm_regulator>;
st,syscfg = <&syscfg_core 0x8e0>;
+ #cooling-cells = <2>;
};
- cpu@1 {
+ cpu1: cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <1>;
@@ -66,6 +67,7 @@ cpu@1 {
1200000 0
800000 0
500000 0>;
+ #cooling-cells = <2>;
};
};
diff --git a/arch/arm/boot/dts/st/stih418.dtsi b/arch/arm/boot/dts/st/stih418.dtsi
index b35b9b7a7ccc..6622ffa8ecfa 100644
--- a/arch/arm/boot/dts/st/stih418.dtsi
+++ b/arch/arm/boot/dts/st/stih418.dtsi
@@ -6,23 +6,26 @@
#include "stih418-clock.dtsi"
#include "stih407-family.dtsi"
#include "stih410-pinctrl.dtsi"
+#include <dt-bindings/thermal/thermal.h>
/ {
cpus {
#address-cells = <1>;
#size-cells = <0>;
- cpu@2 {
+ cpu2: cpu@2 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <2>;
/* u-boot puts hpen in SBC dmem at 0xa4 offset */
cpu-release-addr = <0x94100A4>;
+ #cooling-cells = <2>;
};
- cpu@3 {
+ cpu3: cpu@3 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <3>;
/* u-boot puts hpen in SBC dmem at 0xa4 offset */
cpu-release-addr = <0x94100A4>;
+ #cooling-cells = <2>;
};
};
@@ -44,6 +47,38 @@ usb2_picophy2: phy3 {
reset-names = "global", "port";
};
+ thermal-zones {
+ cpu_thermal: cpu-thermal {
+ polling-delay-passive = <250>; /* 250ms */
+ polling-delay = <1000>; /* 1000ms */
+
+ thermal-sensors = <&thermal>;
+
+ trips {
+ cpu_crit: cpu-crit {
+ temperature = <95000>; /* 95C */
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ cpu_alert: cpu-alert {
+ temperature = <85000>; /* 85C */
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ };
+
+ cooling-maps {
+ map {
+ trip = <&cpu_alert>;
+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+ };
+ };
+ };
+ };
+
soc {
rng11: rng@8a8a000 {
status = "disabled";
@@ -107,7 +142,7 @@ mmc0: sdhci@9060000 {
assigned-clock-rates = <200000000>;
};
- thermal@91a0000 {
+ thermal: thermal@91a0000 {
compatible = "st,stih407-thermal";
reg = <0x91a0000 0x28>;
clock-names = "thermal";
--
2.45.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] thermal: st: switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-05-18 12:12 ` [PATCH 1/3] thermal: st: switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
@ 2024-06-25 6:17 ` Patrice CHOTARD
0 siblings, 0 replies; 7+ messages in thread
From: Patrice CHOTARD @ 2024-06-25 6:17 UTC (permalink / raw)
To: Raphael Gallais-Pou, Rafael J. Wysocki, Daniel Lezcano, Zhang Rui,
Lukasz Luba, Maxime Coquelin, Alexandre Torgue, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-pm, linux-kernel, linux-stm32, linux-arm-kernel, devicetree
On 5/18/24 14:12, Raphael Gallais-Pou wrote:
> 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.
>
> Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
> ---
> 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 <ajitpal.singh@st.com>");
> 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,
>
Hi Raphael
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Thanks
Patrice
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] thermal: sti: depend on THERMAL_OF subsystem
2024-05-18 12:12 ` [PATCH 2/3] thermal: sti: depend on THERMAL_OF subsystem Raphael Gallais-Pou
@ 2024-06-25 6:39 ` Patrice CHOTARD
0 siblings, 0 replies; 7+ messages in thread
From: Patrice CHOTARD @ 2024-06-25 6:39 UTC (permalink / raw)
To: Raphael Gallais-Pou, Rafael J. Wysocki, Daniel Lezcano, Zhang Rui,
Lukasz Luba, Maxime Coquelin, Alexandre Torgue, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-pm, linux-kernel, linux-stm32, linux-arm-kernel, devicetree
On 5/18/24 14:12, Raphael Gallais-Pou wrote:
> 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 <rgallaispou@gmail.com>
> ---
> drivers/thermal/st/Kconfig | 1 +
> drivers/thermal/st/st_thermal.c | 20 ++++++++++----------
> 2 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/thermal/st/Kconfig b/drivers/thermal/st/Kconfig
> index ecbdf4ef00f4..2d08147876ee 100644
> --- a/drivers/thermal/st/Kconfig
> +++ b/drivers/thermal/st/Kconfig
> @@ -5,6 +5,7 @@
>
> 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.
>
> diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c
> index 5f33543a3a54..60e70de724d4 100644
> --- a/drivers/thermal/st/st_thermal.c
> +++ b/drivers/thermal/st/st_thermal.c
> @@ -12,6 +12,7 @@
> #include <linux/of_device.h>
>
> #include "st_thermal.h"
> +#include "../thermal_hwmon.h"
>
> /* The Thermal Framework expects millidegrees */
> #define mcelsius(temp) ((temp) * 1000)
> @@ -203,23 +204,21 @@ int st_thermal_register(struct platform_device *pdev,
> 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);
The struct trip becomes no more used, it can be removed.
> 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 +231,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);
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] ARM: dts: sti: add thermal-zones support on stih418
2024-05-18 12:12 ` [PATCH 3/3] ARM: dts: sti: add thermal-zones support on stih418 Raphael Gallais-Pou
@ 2024-06-25 7:00 ` Patrice CHOTARD
0 siblings, 0 replies; 7+ messages in thread
From: Patrice CHOTARD @ 2024-06-25 7:00 UTC (permalink / raw)
To: Raphael Gallais-Pou, Rafael J. Wysocki, Daniel Lezcano, Zhang Rui,
Lukasz Luba, Maxime Coquelin, Alexandre Torgue, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-pm, linux-kernel, linux-stm32, linux-arm-kernel, devicetree
On 5/18/24 14:12, Raphael Gallais-Pou wrote:
> Add a 'thermal-zones' node for stih418.
>
> A thermal-zone needs three components:
> - thermal sensors, described in an earlier commit[1]
> - cooling devices, specified for each CPU
> - a thermal zone, describing the overall behavior.
>
> The thermal zone needs references to both CPUs and thermal sensors,
> which phandle are also added. The thermal management will then be
> achieved on CPUs using the cpufreq framework.
>
> [1] https://lore.kernel.org/lkml/20240320-thermal-v3-2-700296694c4a@gmail.com/
>
> Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
> ---
> arch/arm/boot/dts/st/stih407-family.dtsi | 6 +++--
> arch/arm/boot/dts/st/stih418.dtsi | 41 +++++++++++++++++++++++++++++---
> 2 files changed, 42 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/st/stih407-family.dtsi b/arch/arm/boot/dts/st/stih407-family.dtsi
> index 29302e74aa1d..35a55aef7f4b 100644
> --- a/arch/arm/boot/dts/st/stih407-family.dtsi
> +++ b/arch/arm/boot/dts/st/stih407-family.dtsi
> @@ -33,7 +33,7 @@ delta_reserved: rproc@44000000 {
> cpus {
> #address-cells = <1>;
> #size-cells = <0>;
> - cpu@0 {
> + cpu0: cpu@0 {
> device_type = "cpu";
> compatible = "arm,cortex-a9";
> reg = <0>;
> @@ -52,8 +52,9 @@ cpu@0 {
> clock-latency = <100000>;
> cpu0-supply = <&pwm_regulator>;
> st,syscfg = <&syscfg_core 0x8e0>;
> + #cooling-cells = <2>;
> };
> - cpu@1 {
> + cpu1: cpu@1 {
> device_type = "cpu";
> compatible = "arm,cortex-a9";
> reg = <1>;
> @@ -66,6 +67,7 @@ cpu@1 {
> 1200000 0
> 800000 0
> 500000 0>;
> + #cooling-cells = <2>;
> };
> };
>
> diff --git a/arch/arm/boot/dts/st/stih418.dtsi b/arch/arm/boot/dts/st/stih418.dtsi
> index b35b9b7a7ccc..6622ffa8ecfa 100644
> --- a/arch/arm/boot/dts/st/stih418.dtsi
> +++ b/arch/arm/boot/dts/st/stih418.dtsi
> @@ -6,23 +6,26 @@
> #include "stih418-clock.dtsi"
> #include "stih407-family.dtsi"
> #include "stih410-pinctrl.dtsi"
> +#include <dt-bindings/thermal/thermal.h>
> / {
> cpus {
> #address-cells = <1>;
> #size-cells = <0>;
> - cpu@2 {
> + cpu2: cpu@2 {
> device_type = "cpu";
> compatible = "arm,cortex-a9";
> reg = <2>;
> /* u-boot puts hpen in SBC dmem at 0xa4 offset */
> cpu-release-addr = <0x94100A4>;
> + #cooling-cells = <2>;
> };
> - cpu@3 {
> + cpu3: cpu@3 {
> device_type = "cpu";
> compatible = "arm,cortex-a9";
> reg = <3>;
> /* u-boot puts hpen in SBC dmem at 0xa4 offset */
> cpu-release-addr = <0x94100A4>;
> + #cooling-cells = <2>;
> };
> };
>
> @@ -44,6 +47,38 @@ usb2_picophy2: phy3 {
> reset-names = "global", "port";
> };
>
> + thermal-zones {
> + cpu_thermal: cpu-thermal {
> + polling-delay-passive = <250>; /* 250ms */
> + polling-delay = <1000>; /* 1000ms */
> +
> + thermal-sensors = <&thermal>;
> +
> + trips {
> + cpu_crit: cpu-crit {
> + temperature = <95000>; /* 95C */
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + cpu_alert: cpu-alert {
> + temperature = <85000>; /* 85C */
> + hysteresis = <2000>;
> + type = "passive";
> + };
> + };
> +
> + cooling-maps {
> + map {
> + trip = <&cpu_alert>;
> + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> + };
> + };
> + };
> + };
> +
> soc {
> rng11: rng@8a8a000 {
> status = "disabled";
> @@ -107,7 +142,7 @@ mmc0: sdhci@9060000 {
> assigned-clock-rates = <200000000>;
> };
>
> - thermal@91a0000 {
> + thermal: thermal@91a0000 {
> compatible = "st,stih407-thermal";
> reg = <0x91a0000 0x28>;
> clock-names = "thermal";
>
Hi Raphael
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Thanks
Patrice
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-06-25 7:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-18 12:12 [PATCH 0/3] Add thermal management support for STi platform Raphael Gallais-Pou
2024-05-18 12:12 ` [PATCH 1/3] thermal: st: switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
2024-06-25 6:17 ` Patrice CHOTARD
2024-05-18 12:12 ` [PATCH 2/3] thermal: sti: depend on THERMAL_OF subsystem Raphael Gallais-Pou
2024-06-25 6:39 ` Patrice CHOTARD
2024-05-18 12:12 ` [PATCH 3/3] ARM: dts: sti: add thermal-zones support on stih418 Raphael Gallais-Pou
2024-06-25 7:00 ` Patrice CHOTARD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).