i2c: s3c2410: Don't enable PM runtime on the adapter device
Subsystems (2)
PATCH 1/1 i2c: s3c2410: Don't enable PM runtime on the adapter device
Commit 523c5b89640e ("i2c: Remove support for legacy PM") removed the PM ops from the bus type, which causes the pm operations on the s3c2410 adapter device to fail (-ENOSUPP in rpm_callback). The adapter device doesn't get bound to a driver and as such can't have its own pm_runtime callbacks. Previously this was fine as the bus callbacks would have been used, but now this can cause devices which use PM runtime and are attached over I2C to fail to resume.
This commit fixes this issue by just doing the PM operations directly on the I2C device, rather than the adapter device in the driver and adding some stub callbacks for runtime suspend and resume.
--- drivers/i2c/busses/i2c-s3c2410.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-)
drivers/i2c/busses/i2c-s3c2410.c +16 -5
@@ -784,7 +784,7 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap,int retry;int ret; -pm_runtime_get_sync (&adap->dev); +pm_runtime_get_sync (i2c->dev); ret =clk_enable (i2c->clk);if (ret)return ret;
@@ -795,7 +795,7 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap,if (ret != -EAGAIN ) {clk_disable (i2c->clk); -pm_runtime_put (&adap->dev); +pm_runtime_put (i2c->dev);return ret; }
@@ -805,7 +805,7 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, }clk_disable (i2c->clk); -pm_runtime_put (&adap->dev); +pm_runtime_put (i2c->dev);return -EREMOTEIO ; }
@@ -1253,7 +1253,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)platform_set_drvdata (pdev, i2c);pm_runtime_enable (&pdev->dev); -pm_runtime_enable (&i2c->adap.dev);dev_info (&pdev->dev,"%s: S3C I2C adapter\n" ,dev_name (&i2c->adap.dev));return 0 ;
@@ -1270,7 +1269,6 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)clk_unprepare (i2c->clk); -pm_runtime_disable (&i2c->adap.dev);pm_runtime_disable (&pdev->dev);s3c24xx_i2c_deregister_cpufreq (i2c);
@@ -1318,6 +1316,16 @@ static int s3c24xx_i2c_resume_noirq(struct device *dev)#endif #ifdef CONFIG_PM +static int s3c24xx_runtime_resume (struct device *dev) +{ +return 0 ; +} + +static int s3c24xx_runtime_suspend (struct device *dev) +{ +return 0 ; +} +static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { #ifdef CONFIG_PM_SLEEP .suspend_noirq = s3c24xx_i2c_suspend_noirq,
@@ -1327,6 +1335,9 @@ static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { .poweroff_noirq = s3c24xx_i2c_suspend_noirq, .restore_noirq = s3c24xx_i2c_resume_noirq,#endif +SET_RUNTIME_PM_OPS (s3c24xx_runtime_suspend, + s3c24xx_runtime_resume, + NULL) };#define S3C24XX_DEV_PM_OPS (&s3c24xx_i2c_dev_pm_ops)
Signature · 1 line
1.7.2.5
Quoted 18 lines · Charles Keepax
Commit
523c5b89640e("i2c: Remove support for legacy PM") removed the PM ops from the bus type, which causes the pm operations on the s3c2410 adapter device to fail (-ENOSUPPinrpm_callback). The adapter device doesn't get bound to a driver and as such can't have its ownpm_runtimecallbacks. Previously this was fine as the bus callbacks would have been used, but now this can cause devices which use PM runtime and are attached over I2C to fail to resume.This commit fixes this issue by just doing the PM operations directly on the I2C device, rather than the adapter device in the driver and adding some stub callbacks for runtime suspend and resume.
Signed-off-by Charles Keepax <[email protected]>--- drivers/i2c/busses/i2c-s3c2410.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-)
drivers/i2c/busses/i2c-s3c2410.c static int s3c24xx_i2c_probe(struct platform_device *pdev) · line 1254
Quoted 2 lines
drivers/i2c/busses/i2c-s3c2410.c +0
-0@@ -1253,7 +1253,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)platform_set_drvdata (pdev, i2c);
Wouldn't adding
pm_runtime_no_callbacks(&pdev->dev);
here let us avoid the runtime resume/suspend stubs?
Quoted 16 lines
drivers/i2c/busses/i2c-s3c2410.c +0
-2pm_runtime_enable (&pdev->dev); -pm_runtime_enable (&i2c->adap.dev);dev_info (&pdev->dev,"%s: S3C I2C adapter\n" ,dev_name (&i2c->adap.dev));return 0 ;@@ -1270,7 +1269,6 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)clk_unprepare (i2c->clk); -pm_runtime_disable (&i2c->adap.dev);pm_runtime_disable (&pdev->dev);s3c24xx_i2c_deregister_cpufreq (i2c);@@ -1318,6 +1316,16 @@ static int s3c24xx_i2c_resume_noirq(struct device *dev)#endif
drivers/i2c/busses/i2c-s3c2410.c static int s3c24xx_i2c_resume_noirq(struct device *dev) · line 1327
Quoted 10 lines
drivers/i2c/busses/i2c-s3c2410.c +9
-0#ifdef CONFIG_PM +static int s3c24xx_runtime_resume (struct device *dev) +{ +return 0 ; +} + +static int s3c24xx_runtime_suspend (struct device *dev) +{ +return 0 ; +}
--
Thanks,
Sylwester
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 24 lines · Sylwester Nawrocki
Quoted 18 lines · Charles Keepax
Commit
523c5b89640e("i2c: Remove support for legacy PM") removed the PM ops from the bus type, which causes the pm operations on the s3c2410 adapter device to fail (-ENOSUPPinrpm_callback). The adapter device doesn't get bound to a driver and as such can't have its ownpm_runtimecallbacks. Previously this was fine as the bus callbacks would have been used, but now this can cause devices which use PM runtime and are attached over I2C to fail to resume.This commit fixes this issue by just doing the PM operations directly on the I2C device, rather than the adapter device in the driver and adding some stub callbacks for runtime suspend and resume.
--- drivers/i2c/busses/i2c-s3c2410.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-)drivers/i2c/busses/i2c-s3c2410.c static int s3c24xx_i2c_probe(struct platform_device *pdev) · line 1254
Quoted 2 lines
drivers/i2c/busses/i2c-s3c2410.c +0
-0@@ -1253,7 +1253,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)platform_set_drvdata (pdev, i2c);Wouldn't adding
Quoted 3 lines
pm_runtime_no_callbacks(&pdev->dev);here let us avoid the runtime resume/suspend stubs?
Or just do pm_runtime_no_callbacks on the adapter device. Preferably in the I2C core. That should solve the issue without requiring any other changes.
- Lars
A message that is not in the archive (sent off-list or not yet received): 552F916F.6070700-Qo5EllUWu/[email protected]
Quoted 27 lines · Lars-Peter Clausen
Quoted 26 lines · Sylwester Nawrocki
Quoted 18 lines · Charles Keepax
Commit
523c5b89640e("i2c: Remove support for legacy PM") removed the PM ops from the bus type, which causes the pm operations on the s3c2410 adapter device to fail (-ENOSUPPinrpm_callback). The adapter device doesn't get bound to a driver and as such can't have its ownpm_runtimecallbacks. Previously this was fine as the bus callbacks would have been used, but now this can cause devices which use PM runtime and are attached over I2C to fail to resume.This commit fixes this issue by just doing the PM operations directly on the I2C device, rather than the adapter device in the driver and adding some stub callbacks for runtime suspend and resume.
--- drivers/i2c/busses/i2c-s3c2410.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-)drivers/i2c/busses/i2c-s3c2410.c static int s3c24xx_i2c_probe(struct platform_device *pdev) · line 1254
Quoted 2 lines
drivers/i2c/busses/i2c-s3c2410.c +0
-0@@ -1253,7 +1253,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)platform_set_drvdata (pdev, i2c);Wouldn't adding
pm_runtime_no_callbacks(&pdev->dev);
Quoted 7 lines
Quoted 1 line
here let us avoid the runtime resume/suspend stubs?
Or just do
pm_runtime_no_callbackson the adapter device. Preferably in the I2C core. That should solve the issue without requiring any other changes.- Lars
Ooops... missed that function, yeah that looks like a much better option.
Thanks,
Charles