i2c: qcom-cci: drop custom suspend/resume and rely on runtime PM helpers
Subsystems (4)
PATCH 1/1 i2c: qcom-cci: drop custom suspend/resume and rely on runtime PM helpers
cci_resume() unconditionally calls cci_resume_runtime() regardless of the runtime PM state.
If the device is already runtime-suspended before system suspend, the clock is re-enabled while runtime_status remains RPM_SUSPENDED. As a result, pm_request_autosuspend() does not arm the timer, leaving the clock permanently enabled.
--- drivers/i2c/busses/i2c-qcom-cci.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)
drivers/i2c/busses/i2c-qcom-cci.c +1 -17
@@ -492,24 +492,8 @@ static int __maybe_unused cci_resume_runtime(struct device *dev)return 0 ; } -static int __maybe_unused cci_suspend (struct device *dev) -{ -if (!pm_runtime_suspended (dev)) -return cci_suspend_runtime (dev); - -return 0 ; -} - -static int __maybe_unused cci_resume (struct device *dev) -{ -cci_resume_runtime (dev); -pm_request_autosuspend (dev); - -return 0 ; -} -static const struct dev_pm_ops qcom_cci_pm = { - SET_SYSTEM_SLEEP_PM_OPS(cci_suspend, cci_resume) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)SET_RUNTIME_PM_OPS (cci_suspend_runtime, cci_resume_runtime,NULL ) };
---
base-commit: 4e5dfb7c84012007c3c7061126491bbc92d71bf1
change-id: 20260625-cci-3eedf766d43b
Best regards,
Signature · 1 line
Wenmeng Liu <[email protected]>
Quoted 4 lines · Wenmeng Liu
cci_resume()unconditionally callscci_resume_runtime()regardless of the runtime PM state.
Quoted 8 lines
If the device is already runtime-suspended before system suspend, the clock is re-enabled while
runtime_statusremainsRPM_SUSPENDED. As a result,pm_request_autosuspend()does not arm the timer, leaving the clock permanently enabled.Fixes e517526195de ("i2c: Add Qualcomm CCI I2C driver")Signed-off-by Wenmeng Liu <[email protected]>
Quoted 43 lines
--- drivers/i2c/busses/i2c-qcom-cci.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)drivers/i2c/busses/i2c-qcom-cci.c +1
-18@@ -492,24 +492,8 @@ static int __maybe_unused cci_resume_runtime(struct device *dev)return 0 ; } -static int __maybe_unused cci_suspend (struct device *dev) -{ -if (!pm_runtime_suspended (dev)) -return cci_suspend_runtime (dev); - -return 0 ; -} - -static int __maybe_unused cci_resume (struct device *dev) -{ -cci_resume_runtime (dev); -pm_request_autosuspend (dev); - -return 0 ; -} -static const struct dev_pm_ops qcom_cci_pm = { - SET_SYSTEM_SLEEP_PM_OPS(cci_suspend, cci_resume) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)SET_RUNTIME_PM_OPS (cci_suspend_runtime, cci_resume_runtime,NULL ) }; ---base-commit:
4e5dfb7c84012007c3c7061126491bbc92d71bf1
change-id: 20260625-cci-3eedf766d43bBest regards,
--
Wenmeng Liu <[email protected]>
Quoted 8 lines · Wenmeng Liu
cci_resume()unconditionally callscci_resume_runtime()regardless of the runtime PM state.If the device is already runtime-suspended before system suspend, the clock is re-enabled while
runtime_statusremainsRPM_SUSPENDED. As a result,pm_request_autosuspend()does not arm the timer, leaving the clock permanently enabled.
Quoted 4 lines
Fixes e517526195de ("i2c: Add Qualcomm CCI I2C driver")Signed-off-by Wenmeng Liu <[email protected]>---
Konrad
Quoted 35 lines · Wenmeng Liu
cci_resume()unconditionally callscci_resume_runtime()regardless of the runtime PM state.If the device is already runtime-suspended before system suspend, the clock is re-enabled while
runtime_statusremainsRPM_SUSPENDED. As a result,pm_request_autosuspend()does not arm the timer, leaving the clock permanently enabled.Fixes e517526195de ("i2c: Add Qualcomm CCI I2C driver")Signed-off-by Wenmeng Liu <[email protected]>--- drivers/i2c/busses/i2c-qcom-cci.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)drivers/i2c/busses/i2c-qcom-cci.c +0
-12@@ -492,24 +492,8 @@ static int __maybe_unused cci_resume_runtime(struct device *dev)return 0 ; } -static int __maybe_unused cci_suspend (struct device *dev) -{ -if (!pm_runtime_suspended (dev)) -return cci_suspend_runtime (dev); - -return 0 ; -} - -static int __maybe_unused cci_resume (struct device *dev) -{ -cci_resume_runtime (dev); -pm_request_autosuspend (dev);
drivers/i2c/busses/i2c-qcom-cci.c static int __maybe_unused cci_resume_runtime(struct device *dev) · line 499
Quoted 10 lines
drivers/i2c/busses/i2c-qcom-cci.c +1
-5- -return 0 ; -} -static const struct dev_pm_ops qcom_cci_pm = { - SET_SYSTEM_SLEEP_PM_OPS(cci_suspend, cci_resume) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)SET_RUNTIME_PM_OPS (cci_suspend_runtime, cci_resume_runtime,NULL ) };
Signature · 2 lines
Best wishes, Vladimir
Hi Wenmeng,
Quoted 11 lines · Wenmeng Liu
cci_resume()unconditionally callscci_resume_runtime()regardless of the runtime PM state.If the device is already runtime-suspended before system suspend, the clock is re-enabled while
runtime_statusremainsRPM_SUSPENDED. As a result,pm_request_autosuspend()does not arm the timer, leaving the clock permanently enabled.Fixes e517526195de ("i2c: Add Qualcomm CCI I2C driver")Signed-off-by Wenmeng Liu <[email protected]>
merged to i2c/i2c-fixes.
Thanks,
Andi