[v2,1/1] ARM: mxc: fix card interrupt losing issue on freescale eSDHC

Commit Message

Tony Lin July 28, 2011, 7:16 a.m. UTC

apply workaround for imx eSDHC controller to avoid missing
the card interrupt so that SDIO function is workable

Signed-off-by: Tony Lin <[e-mail]>
---
 drivers/mmc/host/sdhci-esdhc-imx.c |   44 +++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 10 deletions(-)

Comments

Chris Ball Aug. 3, 2011, 12:16 a.m. UTC | #1

Hi Tony,

On Thu, Jul 28 2011, Tony Lin wrote:
> apply workaround for imx eSDHC controller to avoid missing
> the card interrupt so that SDIO function is workable
>
> Signed-off-by: Tony Lin <[e-mail]>

Thanks, pushed to mmc-next for 3.1.

- Chris.

Lin Tony-B19295 Aug. 3, 2011, 2:06 a.m. UTC | #2

Thanks, Chris!

BR
Tony

> -----Original Message-----
> From: Chris Ball [mailto:[e-mail]]
> Sent: Wednesday, August 03, 2011 8:16 AM
> To: Lin Tony-B19295
> Cc: [e-mail]; [e-mail]
> Subject: Re: [PATCH v2 1/1] ARM: mxc: fix card interrupt losing issue on
> freescale eSDHC
> 
> Hi Tony,
> 
> On Thu, Jul 28 2011, Tony Lin wrote:
> > apply workaround for imx eSDHC controller to avoid missing the card
> > interrupt so that SDIO function is workable
> >
> > Signed-off-by: Tony Lin <[e-mail]>
> 
> Thanks, pushed to mmc-next for 3.1.
> 
> - Chris.
> --
> Chris Ball   <[e-mail]>   <http://printf.net/>
> One Laptop Per Child

Patch

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 710b706..e62d33f 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -25,6 +25,7 @@ 
 #include "sdhci-pltfm.h"
 #include "sdhci-esdhc.h"
 
+#define	SDHCI_CTRL_D3CD			0x08
 /* VENDOR SPEC register */
 #define SDHCI_VENDOR_SPEC		0xC0
 #define  SDHCI_VENDOR_SPEC_SDIO_QUIRK	0x00000002
@@ -85,14 +86,35 @@  static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
 {
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
 	struct pltfm_imx_data *imx_data = pltfm_host->priv;
-
-	if (unlikely((reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)
-			&& (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD)))
-		/*
-		 * these interrupts won't work with a custom card_detect gpio
-		 * (only applied to mx25/35)
-		 */
-		val &= ~(SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT);
+	u32 data;
+
+	if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) {
+		if (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD)
+			/*
+			 * these interrupts won't work with a
+			 * custom card_detect gpio
+			 * (only applied to mx25/35)
+			 */
+			val &= ~(SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT);
+
+		if (val & SDHCI_INT_CARD_INT) {
+			/*
+			 * clear D3CD bit and set D3CD bit to avoid
+			 * missing the card interrupt
+			 * this is a eSDHC controller problem so that
+			 * we need to apply the following workaround
+			 * clear and set D3CD bit will make eSDHC
+			 * re-sample the card interrupt, In case
+			 * a card interrupt was lost, re-sample it by
+			 * the following steps.
+			 */
+			data = readl(host->ioaddr + SDHCI_HOST_CONTROL);
+			data &= ~SDHCI_CTRL_D3CD;
+			writel(data, host->ioaddr + SDHCI_HOST_CONTROL);
+			data |= SDHCI_CTRL_D3CD;
+			writel(data, host->ioaddr + SDHCI_HOST_CONTROL);
+		}
+	}
 
 	if (unlikely((imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT)
 				&& (reg == SDHCI_INT_STATUS)
@@ -162,8 +184,10 @@  static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg)
 		 */
 		return;
 	case SDHCI_HOST_CONTROL:
-		/* FSL messed up here, so we can just keep those two */
-		new_val = val & (SDHCI_CTRL_LED | SDHCI_CTRL_4BITBUS);
+		/* FSL messed up here, so we can just keep those three */
+		new_val = val & (SDHCI_CTRL_LED | \
+				SDHCI_CTRL_4BITBUS | \
+				SDHCI_CTRL_D3CD);
 		/* ensure the endianess */
 		new_val |= ESDHC_HOST_CONTROL_LE;
 		/* DMA mode bits are shifted */