From: Ulf Hansson <ulf.hansson@linaro.org> To: Tony Lindgren <tony@atomide.com> Cc: linux-omap <linux-omap@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, linux-mmc <linux-mmc@vger.kernel.org>, Alan Stern <stern@rowland.harvard.edu>, Kevin Hilman <khilman@baylibre.com>, Nishanth Menon <nm@ti.com>, "Rafael J . Wysocki" <rafael@kernel.org>, Tero Kristo <t-kristo@ti.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "linux-i2c@vger.kernel.org" <linux-i2c@vger.kernel.org>, linux-serial@vger.kernel.org, "linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>, Mark Brown <broonie@kernel.org>, Peter Hurley <peter@hurleysoftware.com>, Wolfram Sang <wsa@the-dreams.de> Subject: Re: [PATCH 1/7] mmc: omap_hsmmc: Fix PM regression with deferred probe for pm_runtime_reinit Date: Thu, 11 Feb 2016 11:18:34 +0100 [thread overview] Message-ID: <CAPDyKFpAcsfLgtu93P45fTEg11MjdGwREcyeGSS7vt6GWbNu_w@mail.gmail.com> (raw) In-Reply-To: <1455145370-20301-2-git-send-email-tony@atomide.com> On 11 February 2016 at 00:02, Tony Lindgren <tony@atomide.com> wrote: > Commit 5de85b9d57ab ("PM / runtime: Re-init runtime PM states at probe > error and driver unbind") introduced pm_runtime_reinit() that is used > to reinitialize PM runtime after -EPROBE_DEFER. This allows shutting > down the device after a failed probe. > > However, for drivers using pm_runtime_use_autosuspend() this can cause > a state where suspend callback is never called after -EPROBE_DEFER. > On the following device driver probe, hardware state is different from > the PM runtime state causing omap_device to produce the following > error: > > omap_device_enable() called from invalid state 1 > > And with omap_device and omap hardware being picky for PM, this will > block any deeper idle states in hardware. > > The solution is to fix the drivers to follow the PM runtime documentation: > > 1. For sections of code that needs the device disabled, use > pm_runtime_put_sync_suspend() if pm_runtime_set_autosuspend() has > been set. > > 2. For driver exit code, use pm_runtime_dont_use_autosuspend() before > pm_runtime_put_sync() if pm_runtime_use_autosuspend() has been > set. > > Fixes: 5de85b9d57ab ("PM / runtime: Re-init runtime PM states at probe > error and driver unbind") > Cc: linux-mmc@vger.kernel.org > Cc: Alan Stern <stern@rowland.harvard.edu> > Cc: Kevin Hilman <khilman@baylibre.com> > Cc: Nishanth Menon <nm@ti.com> > Cc: Rafael J. Wysocki <rafael@kernel.org> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Tero Kristo <t-kristo@ti.com> > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > > Ulf, I'd like to merge this along with other related fixes via the > ARM SoC tree if no objections, please review and ack if this look OK > to you. I have some other omap_hsmmc patches queued for 4.6, so I prefer to send this via my mmc tree. I guess that's okay as well!? > > --- > drivers/mmc/host/omap_hsmmc.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index b6639ea..32bc112 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -1247,7 +1247,7 @@ static int omap_hsmmc_switch_opcond(struct omap_hsmmc_host *host, int vdd) > int ret; > > /* Disable the clocks */ > - pm_runtime_put_sync(host->dev); > + pm_runtime_put_sync_suspend(host->dev); This has no effect. The mmc core holds a runtime PM usage count for the device anyway, so the clock won't be disabled. Please remove this change from the patch. > if (host->dbclk) > clk_disable_unprepare(host->dbclk); > > @@ -2232,6 +2232,7 @@ err_irq: > dma_release_channel(host->tx_chan); > if (host->rx_chan) > dma_release_channel(host->rx_chan); > + pm_runtime_dont_use_autosuspend(host->dev); > pm_runtime_put_sync(host->dev); > pm_runtime_disable(host->dev); > if (host->dbclk) > @@ -2253,6 +2254,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev) > dma_release_channel(host->tx_chan); > dma_release_channel(host->rx_chan); > > + pm_runtime_dont_use_autosuspend(host->dev); > pm_runtime_put_sync(host->dev); > pm_runtime_disable(host->dev); > device_init_wakeup(&pdev->dev, false); > @@ -2285,7 +2287,7 @@ static int omap_hsmmc_suspend(struct device *dev) > if (host->dbclk) > clk_disable_unprepare(host->dbclk); > > - pm_runtime_put_sync(host->dev); > + pm_runtime_put_sync_suspend(host->dev); This has no effect, as the PM core prevents runtime suspend during the system PM phase. It does so, by increasing the runtime PM usage count (pm_runtime_get_noresume()). Please remove this change from patch. > return 0; > } > > -- > 2.7.0 > Kind regards Uffe
WARNING: multiple messages have this Message-ID (diff)
From: ulf.hansson@linaro.org (Ulf Hansson) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/7] mmc: omap_hsmmc: Fix PM regression with deferred probe for pm_runtime_reinit Date: Thu, 11 Feb 2016 11:18:34 +0100 [thread overview] Message-ID: <CAPDyKFpAcsfLgtu93P45fTEg11MjdGwREcyeGSS7vt6GWbNu_w@mail.gmail.com> (raw) In-Reply-To: <1455145370-20301-2-git-send-email-tony@atomide.com> On 11 February 2016 at 00:02, Tony Lindgren <tony@atomide.com> wrote: > Commit 5de85b9d57ab ("PM / runtime: Re-init runtime PM states at probe > error and driver unbind") introduced pm_runtime_reinit() that is used > to reinitialize PM runtime after -EPROBE_DEFER. This allows shutting > down the device after a failed probe. > > However, for drivers using pm_runtime_use_autosuspend() this can cause > a state where suspend callback is never called after -EPROBE_DEFER. > On the following device driver probe, hardware state is different from > the PM runtime state causing omap_device to produce the following > error: > > omap_device_enable() called from invalid state 1 > > And with omap_device and omap hardware being picky for PM, this will > block any deeper idle states in hardware. > > The solution is to fix the drivers to follow the PM runtime documentation: > > 1. For sections of code that needs the device disabled, use > pm_runtime_put_sync_suspend() if pm_runtime_set_autosuspend() has > been set. > > 2. For driver exit code, use pm_runtime_dont_use_autosuspend() before > pm_runtime_put_sync() if pm_runtime_use_autosuspend() has been > set. > > Fixes: 5de85b9d57ab ("PM / runtime: Re-init runtime PM states at probe > error and driver unbind") > Cc: linux-mmc at vger.kernel.org > Cc: Alan Stern <stern@rowland.harvard.edu> > Cc: Kevin Hilman <khilman@baylibre.com> > Cc: Nishanth Menon <nm@ti.com> > Cc: Rafael J. Wysocki <rafael@kernel.org> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Tero Kristo <t-kristo@ti.com> > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > > Ulf, I'd like to merge this along with other related fixes via the > ARM SoC tree if no objections, please review and ack if this look OK > to you. I have some other omap_hsmmc patches queued for 4.6, so I prefer to send this via my mmc tree. I guess that's okay as well!? > > --- > drivers/mmc/host/omap_hsmmc.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index b6639ea..32bc112 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -1247,7 +1247,7 @@ static int omap_hsmmc_switch_opcond(struct omap_hsmmc_host *host, int vdd) > int ret; > > /* Disable the clocks */ > - pm_runtime_put_sync(host->dev); > + pm_runtime_put_sync_suspend(host->dev); This has no effect. The mmc core holds a runtime PM usage count for the device anyway, so the clock won't be disabled. Please remove this change from the patch. > if (host->dbclk) > clk_disable_unprepare(host->dbclk); > > @@ -2232,6 +2232,7 @@ err_irq: > dma_release_channel(host->tx_chan); > if (host->rx_chan) > dma_release_channel(host->rx_chan); > + pm_runtime_dont_use_autosuspend(host->dev); > pm_runtime_put_sync(host->dev); > pm_runtime_disable(host->dev); > if (host->dbclk) > @@ -2253,6 +2254,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev) > dma_release_channel(host->tx_chan); > dma_release_channel(host->rx_chan); > > + pm_runtime_dont_use_autosuspend(host->dev); > pm_runtime_put_sync(host->dev); > pm_runtime_disable(host->dev); > device_init_wakeup(&pdev->dev, false); > @@ -2285,7 +2287,7 @@ static int omap_hsmmc_suspend(struct device *dev) > if (host->dbclk) > clk_disable_unprepare(host->dbclk); > > - pm_runtime_put_sync(host->dev); > + pm_runtime_put_sync_suspend(host->dev); This has no effect, as the PM core prevents runtime suspend during the system PM phase. It does so, by increasing the runtime PM usage count (pm_runtime_get_noresume()). Please remove this change from patch. > return 0; > } > > -- > 2.7.0 > Kind regards Uffe
next prev parent reply other threads:[~2016-02-11 10:18 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-10 23:02 [PATCH 0/7] PM runtime regression fixes for omaps Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-10 23:02 ` [PATCH 1/7] mmc: omap_hsmmc: Fix PM regression with deferred probe for pm_runtime_reinit Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-11 10:18 ` Ulf Hansson [this message] 2016-02-11 10:18 ` Ulf Hansson 2016-02-11 15:02 ` Tony Lindgren 2016-02-11 15:02 ` Tony Lindgren [not found] ` <20160211150240.GR19432-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2016-02-11 15:13 ` Ulf Hansson 2016-02-11 15:13 ` Ulf Hansson 2016-02-11 17:26 ` Tony Lindgren 2016-02-11 17:26 ` Tony Lindgren 2016-02-12 12:59 ` Ulf Hansson 2016-02-12 12:59 ` Ulf Hansson 2016-02-22 17:54 ` Tony Lindgren 2016-02-22 17:54 ` Tony Lindgren 2016-02-10 23:02 ` [PATCH 2/7] i2c: omap: " Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren [not found] ` <1455145370-20301-3-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2016-02-11 17:34 ` Wolfram Sang 2016-02-11 17:34 ` Wolfram Sang 2016-02-11 17:56 ` Tony Lindgren 2016-02-11 17:56 ` Tony Lindgren 2016-02-12 12:50 ` Ulf Hansson 2016-02-12 12:50 ` Ulf Hansson 2016-02-12 18:43 ` Wolfram Sang 2016-02-12 18:43 ` Wolfram Sang 2016-02-10 23:02 ` [PATCH 3/7] spi: omap2-mcspi: " Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-11 11:51 ` Mark Brown 2016-02-11 11:51 ` Mark Brown [not found] ` <20160211115128.GF13270-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> 2016-02-11 15:08 ` Tony Lindgren 2016-02-11 15:08 ` Tony Lindgren 2016-02-11 15:52 ` Mark Brown 2016-02-11 15:52 ` Mark Brown [not found] ` <20160211155255.GA1953-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> 2016-02-11 17:36 ` Tony Lindgren 2016-02-11 17:36 ` Tony Lindgren 2016-02-11 18:36 ` Mark Brown 2016-02-11 18:36 ` Mark Brown 2016-02-11 18:52 ` Tony Lindgren 2016-02-11 18:52 ` Tony Lindgren 2016-02-12 12:51 ` Ulf Hansson 2016-02-12 12:51 ` Ulf Hansson 2016-02-10 23:02 ` [PATCH 4/7] serial: 8250_omap: " Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-12 3:17 ` Greg Kroah-Hartman 2016-02-12 3:17 ` Greg Kroah-Hartman 2016-02-12 12:52 ` Ulf Hansson 2016-02-12 12:52 ` Ulf Hansson 2016-02-10 23:02 ` [PATCH 5/7] serial: omap: " Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-12 12:52 ` Ulf Hansson 2016-02-12 12:52 ` Ulf Hansson [not found] ` <1455145370-20301-1-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2016-02-10 23:02 ` [PATCH 6/7] ARM: OMAP2+: Improve omap_device error for driver writers Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-12 1:13 ` Kevin Hilman 2016-02-12 1:13 ` Kevin Hilman [not found] ` <1455145370-20301-7-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2016-02-12 12:53 ` Ulf Hansson 2016-02-12 12:53 ` Ulf Hansson 2016-02-10 23:02 ` [PATCH 7/7] ARM: OMAP2+: Fix omap_device for module reload on PM runtime forbid Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-12 1:13 ` Kevin Hilman 2016-02-12 1:13 ` Kevin Hilman 2016-02-12 12:54 ` Ulf Hansson 2016-02-12 12:54 ` Ulf Hansson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAPDyKFpAcsfLgtu93P45fTEg11MjdGwREcyeGSS7vt6GWbNu_w@mail.gmail.com \ --to=ulf.hansson@linaro.org \ --cc=broonie@kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=khilman@baylibre.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=nm@ti.com \ --cc=peter@hurleysoftware.com \ --cc=rafael@kernel.org \ --cc=stern@rowland.harvard.edu \ --cc=t-kristo@ti.com \ --cc=tony@atomide.com \ --cc=wsa@the-dreams.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.