Re: [ 14/62] mmc: unbreak sdhci-esdhc-imx on i.MX25

Jonathan Nieder
2012-04-27T22:31:24Z

Hi,

Greg KH wrote:

> 3.3-stable review patch.
[...]
> commit b89152824f993a9572b47eb31f4579feadeac34c upstream.
>
> This was broken by me in 37865fe91582582a6f6c00652f6a2b1ff71f8a78
> ("mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhci") where more
> extensive tests would have shown that read or write of data to the
> card were failing (even if the partition table was correctly read).

37865fe91582 is v2.6.37-rc4~24^2~7 so it sounds like this patch
should also be applied to 3.0.y.

Here's a straightforward backport to account for the lack of
v3.1-rc1~321^2~77 ("mmc: sdhci: make sdhci-pltfm device drivers self
registered") and v3.1-rc1~125^2^2~5 ("mmc: sdhci-esdhc-imx: get rid of
the uses of cpu_is_mx"). Sensible?

-- >8 --
From: Eric Bénard <eric@eukrea.com>
Date: Wed, 18 Apr 2012 02:30:20 +0200

commit b89152824f993a9572b47eb31f4579feadeac34c upstream.

This was broken by me in 37865fe91582582a6f6c00652f6a2b1ff71f8a78
("mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhci") where more
extensive tests would have shown that read or write of data to the
card were failing (even if the partition table was correctly read).

Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Thanks,
Jonathan

drivers/mmc/host/sdhci-esdhc-imx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 92e543701836..6fe8cede4179 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -245,8 +245,7 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd
}
pltfm_host->priv = imx_data;

- if (!cpu_is_mx25())
- host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
+ host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;

if (cpu_is_mx25() || cpu_is_mx35()) {
/* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */
--
1.7.10