On Thu, 11 Apr 2019 at 00:29, Niklas Söderlund
<[email protected]> wrote:
>
> Both the Renesas and Uniphier implementations perform actions which
> affect runtime PM before calling into the core tmio_mmc_host_probe()
> which enabled runtime PM. Move pm_runtime_enable() from the core and
> tmio_mmc_host_probe() into each drivers probe() so it can be called
> before any clocks or other resources are switched on.
>
> Reported-by: Geert Uytterhoeven <[email protected]>
> Signed-off-by: Niklas Söderlund <[email protected]>
Niklas, Wolfram,
Can I apply this for next?
Kind regards
Uffe
> ---
> drivers/mmc/host/renesas_sdhi_core.c | 6 ++++++
> drivers/mmc/host/tmio_mmc.c | 5 +++++
> drivers/mmc/host/tmio_mmc_core.c | 11 +++++++++--
> drivers/mmc/host/uniphier-sd.c | 3 +++
> 4 files changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/renesas_sdhi_core.c
> b/drivers/mmc/host/renesas_sdhi_core.c
> index 5e9e36ed2107a01c..db73f9f1b186f0ff 100644
> --- a/drivers/mmc/host/renesas_sdhi_core.c
> +++ b/drivers/mmc/host/renesas_sdhi_core.c
> @@ -770,6 +770,8 @@ int renesas_sdhi_probe(struct platform_device *pdev,
> /* All SDHI have SDIO status bits which must be 1 */
> mmc_data->flags |= TMIO_MMC_SDIO_STATUS_SETBITS;
>
> + pm_runtime_enable(&pdev->dev);
> +
> ret = renesas_sdhi_clk_enable(host);
> if (ret)
> goto efree;
> @@ -850,6 +852,8 @@ int renesas_sdhi_probe(struct platform_device *pdev,
> efree:
> tmio_mmc_host_free(host);
>
> + pm_runtime_disable(&pdev->dev);
> +
> return ret;
> }
> EXPORT_SYMBOL_GPL(renesas_sdhi_probe);
> @@ -861,6 +865,8 @@ int renesas_sdhi_remove(struct platform_device *pdev)
> tmio_mmc_host_remove(host);
> renesas_sdhi_clk_disable(host);
>
> + pm_runtime_disable(&pdev->dev);
> +
> return 0;
> }
> EXPORT_SYMBOL_GPL(renesas_sdhi_remove);
> diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
> index 93e83ad25976e756..8539e10784b40961 100644
> --- a/drivers/mmc/host/tmio_mmc.c
> +++ b/drivers/mmc/host/tmio_mmc.c
> @@ -172,6 +172,8 @@ static int tmio_mmc_probe(struct platform_device *pdev)
> host->mmc->f_max = pdata->hclk;
> host->mmc->f_min = pdata->hclk / 512;
>
> + pm_runtime_enable(&pdev->dev);
> +
> ret = tmio_mmc_host_probe(host);
> if (ret)
> goto host_free;
> @@ -191,6 +193,7 @@ static int tmio_mmc_probe(struct platform_device *pdev)
> tmio_mmc_host_remove(host);
> host_free:
> tmio_mmc_host_free(host);
> + pm_runtime_disable(&pdev->dev);
> cell_disable:
> if (cell->disable)
> cell->disable(pdev);
> @@ -207,6 +210,8 @@ static int tmio_mmc_remove(struct platform_device *pdev)
> if (cell->disable)
> cell->disable(pdev);
>
> + pm_runtime_disable(&pdev->dev);
> +
> return 0;
> }
>
> diff --git a/drivers/mmc/host/tmio_mmc_core.c
> b/drivers/mmc/host/tmio_mmc_core.c
> index 130b91cb0f8a3fd1..26c148d3c8a2e655 100644
> --- a/drivers/mmc/host/tmio_mmc_core.c
> +++ b/drivers/mmc/host/tmio_mmc_core.c
> @@ -1152,6 +1152,15 @@ void tmio_mmc_host_free(struct tmio_mmc_host *host)
> }
> EXPORT_SYMBOL_GPL(tmio_mmc_host_free);
>
> +/**
> + * tmio_mmc_host_probe() - Common probe for all implementations
> + * @_host: Host to probe
> + *
> + * Perform tasks common to all implementations probe functions.
> + *
> + * The caller should have called pm_runtime_enable() prior to calling
> + * the common probe function.
> + */
> int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
> {
> struct platform_device *pdev = _host->pdev;
> @@ -1260,7 +1269,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
> pm_runtime_set_active(&pdev->dev);
> pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
> pm_runtime_use_autosuspend(&pdev->dev);
> - pm_runtime_enable(&pdev->dev);
>
> ret = mmc_add_host(mmc);
> if (ret)
> @@ -1296,7 +1304,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
>
> pm_runtime_dont_use_autosuspend(&pdev->dev);
> pm_runtime_put_sync(&pdev->dev);
> - pm_runtime_disable(&pdev->dev);
> }
> EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
>
> diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c
> index 91a2be41edf6196b..49aad9a79c18d24a 100644
> --- a/drivers/mmc/host/uniphier-sd.c
> +++ b/drivers/mmc/host/uniphier-sd.c
> @@ -631,6 +631,7 @@ static int uniphier_sd_probe(struct platform_device *pdev)
> host->clk_disable = uniphier_sd_clk_disable;
> host->set_clock = uniphier_sd_set_clock;
>
> + pm_runtime_enable(&pdev->dev);
> ret = uniphier_sd_clk_enable(host);
> if (ret)
> goto free_host;
> @@ -652,6 +653,7 @@ static int uniphier_sd_probe(struct platform_device *pdev)
>
> free_host:
> tmio_mmc_host_free(host);
> + pm_runtime_disable(&pdev->dev);
>
> return ret;
> }
> @@ -662,6 +664,7 @@ static int uniphier_sd_remove(struct platform_device
> *pdev)
>
> tmio_mmc_host_remove(host);
> uniphier_sd_clk_disable(host);
> + pm_runtime_disable(&pdev->dev);
>
> return 0;
> }
> --
> 2.21.0
>
