| Message ID | 1524721631-5983-1-git-send-email-eyalr@ti.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 60f36637bbbdeea199d644eda284dba5144d2377 |
| Delegated to: | Kalle Valo |
| Headers | show |
Eyal Reizer <eyalreizer@gmail.com> writes: > pm_runtime handles sdio power on and power off transitions. > An old workaround for trying to control the power explicitly from the > driver was in fact causing failures on suspend/resume as the mmc layer > already power the module on resume. > > In case of resume pm_runtime_get sync returns a positive device's usage > count causing the driver to try an re-initialize an already initialized > device. This was causing sdio bus failure on resume. > > Remove this manual power on/off sequence as it is in-fact not needed. > > Signed-off-by: Eyal Reizer <eyalr@ti.com> > Acked-by: Tony Lindgren <tony@atomide.com> No changelog. https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#changelog_missing No need to resubmit because of this, I guess you just fixed the title and added Tony's Acked-by?
> > > pm_runtime handles sdio power on and power off transitions. > > An old workaround for trying to control the power explicitly from the > > driver was in fact causing failures on suspend/resume as the mmc layer > > already power the module on resume. > > > > In case of resume pm_runtime_get sync returns a positive device's usage > > count causing the driver to try an re-initialize an already initialized > > device. This was causing sdio bus failure on resume. > > > > Remove this manual power on/off sequence as it is in-fact not needed. > > > > Signed-off-by: Eyal Reizer <eyalr@ti.com> > > Acked-by: Tony Lindgren <tony@atomide.com> > > No changelog. > > https://wireless.wiki.kernel.org/en/developers/documentation/submittingp > atches#changelog_missing > > No need to resubmit because of this, I guess you just fixed the title > and added Tony's Acked-by? Yes, this is correct. No change in the actual patch hence there was no change Log. Best Regards, Eyal
"Reizer, Eyal" <eyalr@ti.com> writes: >> >> > pm_runtime handles sdio power on and power off transitions. >> > An old workaround for trying to control the power explicitly from the >> > driver was in fact causing failures on suspend/resume as the mmc layer >> > already power the module on resume. >> > >> > In case of resume pm_runtime_get sync returns a positive device's usage >> > count causing the driver to try an re-initialize an already initialized >> > device. This was causing sdio bus failure on resume. >> > >> > Remove this manual power on/off sequence as it is in-fact not needed. >> > >> > Signed-off-by: Eyal Reizer <eyalr@ti.com> >> > Acked-by: Tony Lindgren <tony@atomide.com> >> >> No changelog. >> >> https://wireless.wiki.kernel.org/en/developers/documentation/submittingp >> atches#changelog_missing >> >> No need to resubmit because of this, I guess you just fixed the title >> and added Tony's Acked-by? > > Yes, this is correct. No change in the actual patch hence there was no change > Log. _Always_ include a change log, even if you didn't actually change anything. Otherwise the maintainer has no clue what has changed and why a new version was submitted.
> > >> > >> > pm_runtime handles sdio power on and power off transitions. > >> > An old workaround for trying to control the power explicitly from the > >> > driver was in fact causing failures on suspend/resume as the mmc layer > >> > already power the module on resume. > >> > > >> > In case of resume pm_runtime_get sync returns a positive device's > usage > >> > count causing the driver to try an re-initialize an already initialized > >> > device. This was causing sdio bus failure on resume. > >> > > >> > Remove this manual power on/off sequence as it is in-fact not needed. > >> > > >> > Signed-off-by: Eyal Reizer <eyalr@ti.com> > >> > Acked-by: Tony Lindgren <tony@atomide.com> > >> > >> No changelog. > >> > >> > https://wireless.wiki.kernel.org/en/developers/documentation/submittingp > >> atches#changelog_missing > >> > >> No need to resubmit because of this, I guess you just fixed the title > >> and added Tony's Acked-by? > > > > Yes, this is correct. No change in the actual patch hence there was no > change > > Log. > > _Always_ include a change log, even if you didn't actually change > anything. Otherwise the maintainer has no clue what has changed and why > a new version was submitted. > Understood. Thanks! BR, Eyal
Eyal Reizer <eyalreizer@gmail.com> wrote: > pm_runtime handles sdio power on and power off transitions. > An old workaround for trying to control the power explicitly from the > driver was in fact causing failures on suspend/resume as the mmc layer > already power the module on resume. > > In case of resume pm_runtime_get sync returns a positive device's usage > count causing the driver to try an re-initialize an already initialized > device. This was causing sdio bus failure on resume. > > Remove this manual power on/off sequence as it is in-fact not needed. > > Signed-off-by: Eyal Reizer <eyalr@ti.com> > Acked-by: Tony Lindgren <tony@atomide.com> Patch applied to wireless-drivers-next.git, thanks. 60f36637bbbd wlcore: sdio: allow pm to handle sdio power
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c index 1f727ba..6dbe61d 100644 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c @@ -155,17 +155,11 @@ static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue) struct mmc_card *card = func->card; ret = pm_runtime_get_sync(&card->dev); - if (ret) { - /* - * Runtime PM might be temporarily disabled, or the device - * might have a positive reference counter. Make sure it is - * really powered on. - */ - ret = mmc_power_restore_host(card->host); - if (ret < 0) { - pm_runtime_put_sync(&card->dev); - goto out; - } + if (ret < 0) { + pm_runtime_put_noidle(&card->dev); + dev_err(glue->dev, "%s: failed to get_sync(%d)\n", + __func__, ret); + goto out; } sdio_claim_host(func); @@ -178,7 +172,6 @@ static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue) static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue) { - int ret; struct sdio_func *func = dev_to_sdio_func(glue->dev); struct mmc_card *card = func->card; @@ -186,16 +179,8 @@ static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue) sdio_disable_func(func); sdio_release_host(func); - /* Power off the card manually in case it wasn't powered off above */ - ret = mmc_power_save_host(card->host); - if (ret < 0) - goto out; - /* Let runtime PM know the card is powered off */ - pm_runtime_put_sync(&card->dev); - -out: - return ret; + return pm_runtime_put_sync(&card->dev); } static int wl12xx_sdio_set_power(struct device *child, bool enable)