github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

thermal/drivers/rzg3e: Propagate reset assertion failure from suspend

Browse Source 
rzg3e_thermal_suspend() powers off an active sensor and then ignores
failure to assert its reset. System sleep can therefore continue without
the clean reset state expected by resume.

Return the reset error and, when the sensor had been active, try to
restore power before failing suspend. This is best-effort recovery:
reset assertion failure may leave partial hardware state, so restoring
power is not guaranteed to succeed. Preserve the original reset error.

The issue was found by our static-analysis tool and manually reviewed.

Fixes: dc67521c20 ("thermal/drivers/renesas/rzg3e: Fix add thermal driver for the Renesas RZ/G3E SoC")
Assisted-by: gpt 5
Signed-off-by: Pengpeng Hou <hppiscas@163.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@kernel.org>
Reviewed-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://patch.msgid.link/20261014031814.7230-1-hppiscas@163.com
This commit is contained in:
Pengpeng Hou 2026-10-14 11:18:14 +08:00 committed by Daniel Lezcano
parent 82bb005cd9
commit 2dc1f296b5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/thermal/renesas/rzg3e_thermal.c
View File

@ -512,15 +512,19 @@ static int rzg3e_thermal_runtime_resume(struct device *dev)
static int rzg3e_thermal_suspend(struct device *dev)
{
struct rzg3e_thermal_priv *priv = dev_get_drvdata(dev);
bool active = pm_runtime_active(dev);
int ret;
/* If device is active, power it off */
if (pm_runtime_active(dev))
if (active)
rzg3e_thermal_power_off(priv);
/* Assert reset to ensure clean state after resume */
reset_control_assert(priv->rstc);
ret = reset_control_assert(priv->rstc);
if (ret && active)
rzg3e_thermal_power_on(priv);
return 0;
return ret;
}
static int rzg3e_thermal_resume(struct device *dev)