linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] i2c: designware: Keep pm_runtime_enable/_disable calls in sync
@ 2015-12-10 11:48 Jarkko Nikula
  2015-12-10 11:48 ` [PATCH 2/2] i2c: designware: Allow build Baytrail semaphore support when IOSF_MBI=m Jarkko Nikula
  2015-12-12 17:06 ` [PATCH 1/2] i2c: designware: Keep pm_runtime_enable/_disable calls in sync Wolfram Sang
  0 siblings, 2 replies; 10+ messages in thread
From: Jarkko Nikula @ 2015-12-10 11:48 UTC (permalink / raw)
  To: linux-i2c
  Cc: Wolfram Sang, Andy Shevchenko, Mika Westerberg, David Box,
	Jarkko Nikula

On an hardware shared I2C bus (certain Intel Baytrail SoC platforms) the
runtime PM disable depth keeps increasing over repeated modprobe/rmmod
cycle because pm_runtime_disable() is called without checking should it
be disabled already because of bus sharing.

This hasn't made any other harm than dev->power.disable_depth keeps
increasing but keep it sync by calling pm_runtime_disable() only when
runtime PM is not disabled.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 drivers/i2c/busses/i2c-designware-platdrv.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 809579ecb5a4..1308666b054b 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -240,12 +240,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
 	}
 
 	r = i2c_dw_probe(dev);
-	if (r) {
+	if (r && !dev->pm_runtime_disabled)
 		pm_runtime_disable(&pdev->dev);
-		return r;
-	}
 
-	return 0;
+	return r;
 }
 
 static int dw_i2c_plat_remove(struct platform_device *pdev)
@@ -260,7 +258,8 @@ static int dw_i2c_plat_remove(struct platform_device *pdev)
 
 	pm_runtime_dont_use_autosuspend(&pdev->dev);
 	pm_runtime_put_sync(&pdev->dev);
-	pm_runtime_disable(&pdev->dev);
+	if (!dev->pm_runtime_disabled)
+		pm_runtime_disable(&pdev->dev);
 
 	return 0;
 }
-- 
2.6.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2016-06-19 17:31 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-10 11:48 [PATCH 1/2] i2c: designware: Keep pm_runtime_enable/_disable calls in sync Jarkko Nikula
2015-12-10 11:48 ` [PATCH 2/2] i2c: designware: Allow build Baytrail semaphore support when IOSF_MBI=m Jarkko Nikula
2015-12-10 12:59   ` Andy Shevchenko
2015-12-10 13:56     ` Jarkko Nikula
2016-01-04 19:51       ` Wolfram Sang
2016-01-05 22:21   ` David E. Box
2016-04-12 21:27     ` Wolfram Sang
2016-04-12 21:46   ` David E. Box
2016-06-19 17:31   ` Wolfram Sang
2015-12-12 17:06 ` [PATCH 1/2] i2c: designware: Keep pm_runtime_enable/_disable calls in sync Wolfram Sang

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).