Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31b54953 authored by James Hogan's avatar James Hogan Committed by Greg Kroah-Hartman
Browse files

mmc: dw_mmc: avoid write to CDTHRCTL on older versions 



commit 66dfd10173159cafa9cb0d39936b8daeaab8e3e0 upstream.

Commit f1d2736c (mmc: dw_mmc: control card read threshold) added
dw_mci_ctrl_rd_thld() with an unconditional write to the CDTHRCTL
register at offset 0x100. However before version 240a, the FIFO region
started at 0x100, so the write messes with the FIFO and completely
breaks the driver.

If the version id < 240A, return early from dw_mci_ctl_rd_thld() so as
not to hit this problem.

Fixes: f1d2736c (mmc: dw_mmc: control card read threshold)
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39a67594

drivers/mmc/host/dw_mmc.c

+7 −0
Original line number Diff line number Diff line
@@ -626,6 +626,13 @@ static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) 


	WARN_ON(!(data->flags & MMC_DATA_READ));



	/*

	 * CDTHRCTL doesn't exist prior to 240A (in fact that register offset is

	 * in the FIFO region, so we really shouldn't access it).

	 */

	if (host->verid < DW_MMC_240A)

		return;



	if (host->timing != MMC_TIMING_MMC_HS200 &&

	    host->timing != MMC_TIMING_UHS_SDR104)

		goto disable;