Commit 7ff21319 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Ulf Hansson
Browse files

mmc: tmio: move runtime PM enablement to the driver implementations 



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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent fdc4e755

drivers/mmc/host/renesas_sdhi_core.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -770,6 +770,8 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
	/* All SDHI have SDIO status bits which must be 1 */

	/* All SDHI have SDIO status bits which must be 1 */

	mmc_data->flags |= TMIO_MMC_SDIO_STATUS_SETBITS;

	mmc_data->flags |= TMIO_MMC_SDIO_STATUS_SETBITS;





	pm_runtime_enable(&pdev->dev);



	ret = renesas_sdhi_clk_enable(host);

	ret = renesas_sdhi_clk_enable(host);

	if (ret)

	if (ret)

		goto efree;

		goto efree;
@@ -850,6 +852,8 @@ edisclk: 
efree:

efree:

	tmio_mmc_host_free(host);

	tmio_mmc_host_free(host);





	pm_runtime_disable(&pdev->dev);



	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(renesas_sdhi_probe);

EXPORT_SYMBOL_GPL(renesas_sdhi_probe);
@@ -861,6 +865,8 @@ int renesas_sdhi_remove(struct platform_device *pdev) 
	tmio_mmc_host_remove(host);

	tmio_mmc_host_remove(host);

	renesas_sdhi_clk_disable(host);

	renesas_sdhi_clk_disable(host);





	pm_runtime_disable(&pdev->dev);



	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(renesas_sdhi_remove);

EXPORT_SYMBOL_GPL(renesas_sdhi_remove);

drivers/mmc/host/tmio_mmc.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -172,6 +172,8 @@ static int tmio_mmc_probe(struct platform_device *pdev) 
	host->mmc->f_max = pdata->hclk;

	host->mmc->f_max = pdata->hclk;

	host->mmc->f_min = pdata->hclk / 512;

	host->mmc->f_min = pdata->hclk / 512;





	pm_runtime_enable(&pdev->dev);



	ret = tmio_mmc_host_probe(host);

	ret = tmio_mmc_host_probe(host);

	if (ret)

	if (ret)

		goto host_free;

		goto host_free;
@@ -191,6 +193,7 @@ host_remove: 
	tmio_mmc_host_remove(host);

	tmio_mmc_host_remove(host);

host_free:

host_free:

	tmio_mmc_host_free(host);

	tmio_mmc_host_free(host);

	pm_runtime_disable(&pdev->dev);

cell_disable:

cell_disable:

	if (cell->disable)

	if (cell->disable)

		cell->disable(pdev);

		cell->disable(pdev);
@@ -207,6 +210,8 @@ static int tmio_mmc_remove(struct platform_device *pdev) 
	if (cell->disable)

	if (cell->disable)

		cell->disable(pdev);

		cell->disable(pdev);





	pm_runtime_disable(&pdev->dev);



	return 0;

	return 0;

}

}

drivers/mmc/host/tmio_mmc_core.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -1153,6 +1153,15 @@ void tmio_mmc_host_free(struct tmio_mmc_host *host) 
}

}

EXPORT_SYMBOL_GPL(tmio_mmc_host_free);

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)

int tmio_mmc_host_probe(struct tmio_mmc_host *_host)

{

{

	struct platform_device *pdev = _host->pdev;

	struct platform_device *pdev = _host->pdev;
@@ -1261,7 +1270,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) 
	pm_runtime_set_active(&pdev->dev);

	pm_runtime_set_active(&pdev->dev);

	pm_runtime_set_autosuspend_delay(&pdev->dev, 50);

	pm_runtime_set_autosuspend_delay(&pdev->dev, 50);

	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_enable(&pdev->dev);





	ret = mmc_add_host(mmc);

	ret = mmc_add_host(mmc);

	if (ret)

	if (ret)
@@ -1297,7 +1305,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) 




	pm_runtime_dont_use_autosuspend(&pdev->dev);

	pm_runtime_dont_use_autosuspend(&pdev->dev);

	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

}

}

EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);

EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);

drivers/mmc/host/uniphier-sd.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -631,6 +631,7 @@ static int uniphier_sd_probe(struct platform_device *pdev) 
	host->clk_disable = uniphier_sd_clk_disable;

	host->clk_disable = uniphier_sd_clk_disable;

	host->set_clock = uniphier_sd_set_clock;

	host->set_clock = uniphier_sd_set_clock;





	pm_runtime_enable(&pdev->dev);

	ret = uniphier_sd_clk_enable(host);

	ret = uniphier_sd_clk_enable(host);

	if (ret)

	if (ret)

		goto free_host;

		goto free_host;
@@ -652,6 +653,7 @@ static int uniphier_sd_probe(struct platform_device *pdev) 




free_host:

free_host:

	tmio_mmc_host_free(host);

	tmio_mmc_host_free(host);

	pm_runtime_disable(&pdev->dev);





	return ret;

	return ret;

}

}
@@ -662,6 +664,7 @@ static int uniphier_sd_remove(struct platform_device *pdev) 




	tmio_mmc_host_remove(host);

	tmio_mmc_host_remove(host);

	uniphier_sd_clk_disable(host);

	uniphier_sd_clk_disable(host);

	pm_runtime_disable(&pdev->dev);





	return 0;

	return 0;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE