public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] HSMMC driver fix for core ret
@ 2008-07-25 10:32 Madhusudhan Chikkature
  2008-08-05 14:05 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: Madhusudhan Chikkature @ 2008-07-25 10:32 UTC (permalink / raw)
  To: tony; +Cc: linux-omap

From: Madhusudhan Chikkature<madhu.cr@ti.com>

ARM: OMAP3: HSMMC fix for core ret.

The core ret seem to be prevented by HSMMC CTO errors. This patch provides a
fix for the same.

Signed-off-by: Madhusudhan Chikkature<madhu.cr@ti.com>
---
 drivers/mmc/host/omap_hsmmc.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

Index: linux-omap-ti.git-07142008/drivers/mmc/host/omap_hsmmc.c
===================================================================
--- linux-omap-ti.git-07142008.orig/drivers/mmc/host/omap_hsmmc.c	2008-07-10
14:59:37.000000000 +0530
+++ linux-omap-ti.git-07142008/drivers/mmc/host/omap_hsmmc.c	2008-07-17
15:08:29.000000000 +0530
@@ -84,6 +84,7 @@
 #define STAT_CLEAR		0xFFFFFFFF
 #define INIT_STREAM_CMD		0x00000000
 #define DUAL_VOLT_OCR_BIT	7
+#define SRC			(1 << 25)

 #define OMAP_MMC1_DEVID		1
 #define OMAP_MMC2_DEVID		2
@@ -315,10 +316,16 @@ static irqreturn_t mmc_omap_irq(int irq,
 		if ((status & CMD_TIMEOUT) ||
 			(status & CMD_CRC)) {
 			if (host->cmd) {
-				if (status & CMD_TIMEOUT)
+				if (status & CMD_TIMEOUT) {
+					OMAP_HSMMC_WRITE(host->base, SYSCTL,
+						OMAP_HSMMC_READ(host->base,
+								SYSCTL) | SRC);
+					while (OMAP_HSMMC_READ(host->base,
+								SYSCTL) & SRC) ;
 					host->cmd->error = -ETIMEDOUT;
-				else
+				} else {
 					host->cmd->error = -EILSEQ;
+				}
 				end_cmd = 1;
 			}
 			if (host->data)



^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/3] HSMMC driver fix for core ret
  2008-07-25 10:32 [PATCH 1/3] HSMMC driver fix for core ret Madhusudhan Chikkature
@ 2008-08-05 14:05 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2008-08-05 14:05 UTC (permalink / raw)
  To: Madhusudhan Chikkature; +Cc: linux-omap

* Madhusudhan Chikkature <madhu.cr@ti.com> [080725 13:32]:
> From: Madhusudhan Chikkature<madhu.cr@ti.com>
> 
> ARM: OMAP3: HSMMC fix for core ret.
> 
> The core ret seem to be prevented by HSMMC CTO errors. This patch provides a
> fix for the same.

Pushing today.

Tony


> Signed-off-by: Madhusudhan Chikkature<madhu.cr@ti.com>
> ---
>  drivers/mmc/host/omap_hsmmc.c |   11 +++++++++--
>  1 files changed, 9 insertions(+), 2 deletions(-)
> 
> Index: linux-omap-ti.git-07142008/drivers/mmc/host/omap_hsmmc.c
> ===================================================================
> --- linux-omap-ti.git-07142008.orig/drivers/mmc/host/omap_hsmmc.c	2008-07-10
> 14:59:37.000000000 +0530
> +++ linux-omap-ti.git-07142008/drivers/mmc/host/omap_hsmmc.c	2008-07-17
> 15:08:29.000000000 +0530
> @@ -84,6 +84,7 @@
>  #define STAT_CLEAR		0xFFFFFFFF
>  #define INIT_STREAM_CMD		0x00000000
>  #define DUAL_VOLT_OCR_BIT	7
> +#define SRC			(1 << 25)
> 
>  #define OMAP_MMC1_DEVID		1
>  #define OMAP_MMC2_DEVID		2
> @@ -315,10 +316,16 @@ static irqreturn_t mmc_omap_irq(int irq,
>  		if ((status & CMD_TIMEOUT) ||
>  			(status & CMD_CRC)) {
>  			if (host->cmd) {
> -				if (status & CMD_TIMEOUT)
> +				if (status & CMD_TIMEOUT) {
> +					OMAP_HSMMC_WRITE(host->base, SYSCTL,
> +						OMAP_HSMMC_READ(host->base,
> +								SYSCTL) | SRC);
> +					while (OMAP_HSMMC_READ(host->base,
> +								SYSCTL) & SRC) ;
>  					host->cmd->error = -ETIMEDOUT;
> -				else
> +				} else {
>  					host->cmd->error = -EILSEQ;
> +				}
>  				end_cmd = 1;
>  			}
>  			if (host->data)
> 
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-08-05 14:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-25 10:32 [PATCH 1/3] HSMMC driver fix for core ret Madhusudhan Chikkature
2008-08-05 14:05 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox