* [PATCH 0/2] thermal/drivers/imx: two fixes
@ 2026-04-11 19:03 Felix Gu
2026-04-11 19:03 ` [PATCH 1/2] thermal/drivers/imx: Fix thermal zone leak on probe error path Felix Gu
2026-04-11 19:03 ` [PATCH 2/2] thermal/drivers/imxl:Fix runtime PM handling on early returns Felix Gu
0 siblings, 2 replies; 6+ messages in thread
From: Felix Gu @ 2026-04-11 19:03 UTC (permalink / raw)
To: Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Lukasz Luba,
Frank Li, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
Oleksij Rempel
Cc: linux-pm, imx, linux-arm-kernel, linux-kernel, Felix Gu
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
---
Felix Gu (2):
thermal/drivers/imx: Fix thermal zone leak on probe error path
thermal/drivers/imxl:Fix runtime PM handling on early returns
drivers/thermal/imx_thermal.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
---
base-commit: 66672af7a095d89f082c5327f3b15bc2f93d558e
change-id: 20260411-imx-b022791ea1b9
Best regards,
--
Felix Gu <ustc.gu@gmail.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] thermal/drivers/imx: Fix thermal zone leak on probe error path 2026-04-11 19:03 [PATCH 0/2] thermal/drivers/imx: two fixes Felix Gu @ 2026-04-11 19:03 ` Felix Gu 2026-04-12 0:58 ` Frank Li 2026-04-11 19:03 ` [PATCH 2/2] thermal/drivers/imxl:Fix runtime PM handling on early returns Felix Gu 1 sibling, 1 reply; 6+ messages in thread From: Felix Gu @ 2026-04-11 19:03 UTC (permalink / raw) To: Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Lukasz Luba, Frank Li, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Oleksij Rempel Cc: linux-pm, imx, linux-arm-kernel, linux-kernel, Felix Gu If pm_runtime_resume_and_get() fails after the thermal zone has been registered, the probe error path cleans up runtime PM but skips thermal_zone_device_unregister(), leaking the thermal zone device. Move thermal_zone_device_unregister() into disable_runtime_pm so all failures after thermal zone registration unwind the probe path correctly. Fixes: 4cf2ddf16e17 ("thermal/drivers/imx: Implement runtime PM support") Signed-off-by: Felix Gu <ustc.gu@gmail.com> --- drivers/thermal/imx_thermal.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 38c993d1bcb3..68f9ce41a670 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -727,25 +727,24 @@ static int imx_thermal_probe(struct platform_device *pdev) data->irq_enabled = true; ret = thermal_zone_device_enable(data->tz); if (ret) - goto thermal_zone_unregister; + goto disable_runtime_pm; ret = devm_request_threaded_irq(dev, data->irq, imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread, 0, "imx_thermal", data); if (ret < 0) { dev_err(dev, "failed to request alarm irq: %d\n", ret); - goto thermal_zone_unregister; + goto disable_runtime_pm; } pm_runtime_put(data->dev); return 0; -thermal_zone_unregister: - thermal_zone_device_unregister(data->tz); disable_runtime_pm: pm_runtime_put_noidle(data->dev); pm_runtime_disable(data->dev); + thermal_zone_device_unregister(data->tz); clk_disable: clk_disable_unprepare(data->thermal_clk); legacy_cleanup: -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] thermal/drivers/imx: Fix thermal zone leak on probe error path 2026-04-11 19:03 ` [PATCH 1/2] thermal/drivers/imx: Fix thermal zone leak on probe error path Felix Gu @ 2026-04-12 0:58 ` Frank Li 2026-04-12 9:35 ` Daniel Lezcano 0 siblings, 1 reply; 6+ messages in thread From: Frank Li @ 2026-04-12 0:58 UTC (permalink / raw) To: Felix Gu Cc: Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Lukasz Luba, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Oleksij Rempel, linux-pm, imx, linux-arm-kernel, linux-kernel On Sun, Apr 12, 2026 at 03:03:03AM +0800, Felix Gu wrote: > If pm_runtime_resume_and_get() fails after the thermal zone has been > registered, the probe error path cleans up runtime PM but skips > thermal_zone_device_unregister(), leaking the thermal zone device. > > Move thermal_zone_device_unregister() into disable_runtime_pm so all Use devm_thermal_of_zone_register() to fix this problem Frank ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] thermal/drivers/imx: Fix thermal zone leak on probe error path 2026-04-12 0:58 ` Frank Li @ 2026-04-12 9:35 ` Daniel Lezcano 0 siblings, 0 replies; 6+ messages in thread From: Daniel Lezcano @ 2026-04-12 9:35 UTC (permalink / raw) To: Frank Li, Felix Gu Cc: Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Lukasz Luba, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Oleksij Rempel, linux-pm, imx, linux-arm-kernel, linux-kernel On 4/12/26 02:58, Frank Li wrote: > On Sun, Apr 12, 2026 at 03:03:03AM +0800, Felix Gu wrote: >> If pm_runtime_resume_and_get() fails after the thermal zone has been >> registered, the probe error path cleans up runtime PM but skips >> thermal_zone_device_unregister(), leaking the thermal zone device. >> >> Move thermal_zone_device_unregister() into disable_runtime_pm so all > > Use devm_thermal_of_zone_register() to fix this problem +1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] thermal/drivers/imxl:Fix runtime PM handling on early returns 2026-04-11 19:03 [PATCH 0/2] thermal/drivers/imx: two fixes Felix Gu 2026-04-11 19:03 ` [PATCH 1/2] thermal/drivers/imx: Fix thermal zone leak on probe error path Felix Gu @ 2026-04-11 19:03 ` Felix Gu 2026-04-12 1:00 ` Frank Li 1 sibling, 1 reply; 6+ messages in thread From: Felix Gu @ 2026-04-11 19:03 UTC (permalink / raw) To: Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Lukasz Luba, Frank Li, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Oleksij Rempel Cc: linux-pm, imx, linux-arm-kernel, linux-kernel, Felix Gu Use PM_RUNTIME_ACQUIRE() in imx_get_temp() and imx_set_trip_temp() so runtime PM references are released correctly even when the functions return early on errors. Fixes: 4cf2ddf16e17 ("thermal/drivers/imx: Implement runtime PM support") Signed-off-by: Felix Gu <ustc.gu@gmail.com> --- drivers/thermal/imx_thermal.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 68f9ce41a670..9d9ae7871068 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -260,8 +260,9 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) u32 val; int ret; - ret = pm_runtime_resume_and_get(data->dev); - if (ret < 0) + PM_RUNTIME_ACQUIRE(data->dev, pm); + ret = PM_RUNTIME_ACQUIRE_ERR(&pm); + if (ret) return ret; regmap_read(map, soc_data->temp_data, &val); @@ -302,8 +303,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) enable_irq(data->irq); } - pm_runtime_put(data->dev); - return 0; } @@ -337,8 +336,9 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, struct imx_thermal_data *data = thermal_zone_device_priv(tz); int ret; - ret = pm_runtime_resume_and_get(data->dev); - if (ret < 0) + PM_RUNTIME_ACQUIRE(data->dev, pm); + ret = PM_RUNTIME_ACQUIRE_ERR(&pm); + if (ret) return ret; /* do not allow passive to be set higher than critical */ @@ -348,8 +348,6 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, imx_set_alarm_temp(data, temp); trips[IMX_TRIP_PASSIVE].temperature = temp; - pm_runtime_put(data->dev); - return 0; } -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] thermal/drivers/imxl:Fix runtime PM handling on early returns 2026-04-11 19:03 ` [PATCH 2/2] thermal/drivers/imxl:Fix runtime PM handling on early returns Felix Gu @ 2026-04-12 1:00 ` Frank Li 0 siblings, 0 replies; 6+ messages in thread From: Frank Li @ 2026-04-12 1:00 UTC (permalink / raw) To: Felix Gu Cc: Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Lukasz Luba, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, Oleksij Rempel, linux-pm, imx, linux-arm-kernel, linux-kernel On Sun, Apr 12, 2026 at 03:03:04AM +0800, Felix Gu wrote: > Use PM_RUNTIME_ACQUIRE() in imx_get_temp() and imx_set_trip_temp() so > runtime PM references are released correctly even when the functions > return early on errors. > > Fixes: 4cf2ddf16e17 ("thermal/drivers/imx: Implement runtime PM support") > Signed-off-by: Felix Gu <ustc.gu@gmail.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> > --- > drivers/thermal/imx_thermal.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c > index 68f9ce41a670..9d9ae7871068 100644 > --- a/drivers/thermal/imx_thermal.c > +++ b/drivers/thermal/imx_thermal.c > @@ -260,8 +260,9 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) > u32 val; > int ret; > > - ret = pm_runtime_resume_and_get(data->dev); > - if (ret < 0) > + PM_RUNTIME_ACQUIRE(data->dev, pm); > + ret = PM_RUNTIME_ACQUIRE_ERR(&pm); > + if (ret) > return ret; > > regmap_read(map, soc_data->temp_data, &val); > @@ -302,8 +303,6 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) > enable_irq(data->irq); > } > > - pm_runtime_put(data->dev); > - > return 0; > } > > @@ -337,8 +336,9 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, > struct imx_thermal_data *data = thermal_zone_device_priv(tz); > int ret; > > - ret = pm_runtime_resume_and_get(data->dev); > - if (ret < 0) > + PM_RUNTIME_ACQUIRE(data->dev, pm); > + ret = PM_RUNTIME_ACQUIRE_ERR(&pm); > + if (ret) > return ret; > > /* do not allow passive to be set higher than critical */ > @@ -348,8 +348,6 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, > imx_set_alarm_temp(data, temp); > trips[IMX_TRIP_PASSIVE].temperature = temp; > > - pm_runtime_put(data->dev); > - > return 0; > } > > > -- > 2.43.0 > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-04-12 9:35 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-04-11 19:03 [PATCH 0/2] thermal/drivers/imx: two fixes Felix Gu 2026-04-11 19:03 ` [PATCH 1/2] thermal/drivers/imx: Fix thermal zone leak on probe error path Felix Gu 2026-04-12 0:58 ` Frank Li 2026-04-12 9:35 ` Daniel Lezcano 2026-04-11 19:03 ` [PATCH 2/2] thermal/drivers/imxl:Fix runtime PM handling on early returns Felix Gu 2026-04-12 1:00 ` Frank Li
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox