Commit 478c60ce authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

Revert "mmc: tmio: remove workaround for NON_REMOVABLE" 



This reverts commit 7a7dab23. We found
out that there is still a race with RuntimePM. This can lead to a hang
when accessing the eMMC in some situations. Revert this change until the
RPM issue is fixed.

Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1696d968

drivers/mmc/host/tmio_mmc_core.c

+9 −0
Original line number Diff line number Diff line
@@ -1208,6 +1208,15 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) 
	if (!_host->reset)

		_host->reset = tmio_mmc_reset;



	/*

	 * On Gen2+, eMMC with NONREMOVABLE currently fails because native

	 * hotplug gets disabled. It seems RuntimePM related yet we need further

	 * research. Since we are planning a PM overhaul anyway, let's enforce

	 * for now the device being active by enabling native hotplug always.

	 */

	if (pdata->flags & TMIO_MMC_MIN_RCAR2)

		_host->native_hotplug = true;



	/*

	 * While using internal tmio hardware logic for card detection, we need

	 * to ensure it stays powered for it to work.

CRA Git | Maintained and supported by SUSTech CRA and CCSE