| Message ID | 1382348117-6666-1-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 21/10/13 11:35, Krzysztof Kozlowski wrote: > Fix doubled clock disable and unprepare during PM suspend which triggered > the warnings: [...] > The clocks are already disabled before suspending. > > Additionally add PM runtime get() and put() during resume so device > won't sleep for the time of s3c64xx_spi_hwinit(). > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > drivers/spi/spi-s3c64xx.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c > index a80376d..374be7d 100644 > --- a/drivers/spi/spi-s3c64xx.c > +++ b/drivers/spi/spi-s3c64xx.c > @@ -1482,10 +1482,6 @@ static int s3c64xx_spi_suspend(struct device *dev) > > spi_master_suspend(master); > > - /* Disable the clock */ > - clk_disable_unprepare(sdd->src_clk); > - clk_disable_unprepare(sdd->clk); > - > sdd->cur_speed = 0; /* Output Clock is stopped */ > > return 0; > @@ -1496,16 +1492,19 @@ static int s3c64xx_spi_resume(struct device *dev) > struct spi_master *master = dev_get_drvdata(dev); > struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); > struct s3c64xx_spi_info *sci = sdd->cntrlr_info; > + int ret; > > + ret = pm_runtime_get_sync(dev); pm_runtime_{get,put}* must not be called from drivers's system suspend/resume callbacks. Please use pm_runtime_suspended() to check device runtime PM status in s3c64xx_spi_{suspend,resume} callbacks and handle the clocks appropriately. Thanks, Sylwester -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2013-10-21 at 11:42 +0200, Sylwester Nawrocki wrote: > pm_runtime_{get,put}* must not be called from drivers's system suspend/resume > callbacks. Please use pm_runtime_suspended() to check device runtime PM status > in s3c64xx_spi_{suspend,resume} callbacks and handle the clocks appropriately. Thanks for review, I will send fixed patch. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index a80376d..374be7d 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1482,10 +1482,6 @@ static int s3c64xx_spi_suspend(struct device *dev) spi_master_suspend(master); - /* Disable the clock */ - clk_disable_unprepare(sdd->src_clk); - clk_disable_unprepare(sdd->clk); - sdd->cur_speed = 0; /* Output Clock is stopped */ return 0; @@ -1496,16 +1492,19 @@ static int s3c64xx_spi_resume(struct device *dev) struct spi_master *master = dev_get_drvdata(dev); struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_info *sci = sdd->cntrlr_info; + int ret; + ret = pm_runtime_get_sync(dev); + if (ret < 0) { + dev_err(dev, "pm runtime failed, e = %d\n", ret); + return ret; + } if (sci->cfg_gpio) sci->cfg_gpio(); - /* Enable the clock */ - clk_prepare_enable(sdd->src_clk); - clk_prepare_enable(sdd->clk); - s3c64xx_spi_hwinit(sdd, sdd->port_id); + pm_runtime_put(dev); spi_master_resume(master); return 0;