MMC: OMAP: Abort stuck commands.

PATCH In review Carlos Aguiar 2 participants 3 messages Aug 17, 2007 – Aug 31, 2007

Subsystems (2)

MMC, SD and SDIO OMAP MMC support

lore

Share & tools

lore

Carlos Aguiar

author

2007-08-17 19:01 UTC #0 lore raw

PATCH 7/17 MMC: OMAP: Abort stuck commands.

From: Jarkko Lavinen <[email protected]>

When a card is removed while it is being accessed, a command can get stuck so that no timeout or end of command interrupt ever occurs. The command getting stuck is almost always CDM12, but also the other commands can get stuck. Catch a stuck command with a timer and try sending the initiliazation stream until the controller starts running again and responds with the end of command status.

Signed-off-by Jarkko Lavinen <[email protected]>

drivers/mmc/host/omap.c +83 ~~-10~~

Index: linux-omap/drivers/mmc/host/omap.c
===================================================================
@@ -136,6 +136,9 @@ struct mmc_omap_host {
 	unsigned char		bus_mode;
 	unsigned char		hw_bus_mode;
 
+	struct work_struct	cmd_abort;
+	struct timer_list	cmd_timer;
+
 	unsigned int		sg_len;
 	int			sg_idx;
 	u16 *			buffer;

@@ -326,6 +329,8 @@ mmc_omap_start_command(struct mmc_omap_h
 	if (host->data && !(host->data->flags & MMC_DATA_WRITE))
 		cmdreg |= 1 << 15;
 
+	mod_timer(&host->cmd_timer, jiffies + HZ/2);
+
 	OMAP_MMC_WRITE(host, CTO, 200);
 	OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff);
 	OMAP_MMC_WRITE(host, ARGH, cmd->arg >> 16);

@@ -385,9 +390,37 @@ mmc_omap_xfer_done(struct mmc_omap_host 
 }
 
 static void
+mmc_omap_send_abort(struct mmc_omap_host *host)
+{
+	struct mmc_omap_slot *slot = host->current_slot;
+	unsigned int restarts, passes, timeout;
+	u16 stat = 0;
+
+	/* Sending abort takes 80 clocks. Have some extra and round up */
+	timeout = (120*1000000 + slot->fclk_freq - 1)/slot->fclk_freq;
+	restarts = 0;
+	while(restarts < 10000) {
+		OMAP_MMC_WRITE(host, STAT, 0xFFFF);
+		OMAP_MMC_WRITE(host, CMD, (3 << 12) | (1 << 7));
+
+		passes = 0;
+		while (passes < timeout) {
+			stat = OMAP_MMC_READ(host, STAT);
+			if (stat & OMAP_MMC_STAT_END_OF_CMD)
+				goto out;
+			udelay(1);
+			passes ++;
+		}
+
+		restarts++;
+	}
+out:
+	OMAP_MMC_WRITE(host, STAT, stat);
+}
+
+static void
 mmc_omap_abort_xfer(struct mmc_omap_host *host, struct mmc_data *data)
 {
-	int loops;
 	u16 ie;
 
 	if (host->dma_in_use)

@@ -398,16 +431,8 @@ mmc_omap_abort_xfer(struct mmc_omap_host
 
 	ie = OMAP_MMC_READ(host, IE);
 	OMAP_MMC_WRITE(host, IE, 0);
-	OMAP_MMC_WRITE(host, CMD, 1 << 7);
-	loops = 0;
-	while (!(OMAP_MMC_READ(host, STAT) & OMAP_MMC_STAT_END_OF_CMD)) {
-		udelay(1);
-		loops++;
-		if (loops == 100000)
-			break;
-	}
-	OMAP_MMC_WRITE(host, STAT, OMAP_MMC_STAT_END_OF_CMD);
 	OMAP_MMC_WRITE(host, IE, ie);
+	mmc_omap_send_abort(host);
 }
 
 static void

@@ -463,6 +488,8 @@ mmc_omap_cmd_done(struct mmc_omap_host *
 {
 	host->cmd = NULL;
 
+	del_timer(&host->cmd_timer);
+
 	if (cmd->flags & MMC_RSP_PRESENT) {
 		if (cmd->flags & MMC_RSP_136) {
 			/* response type 2 */

@@ -498,6 +525,47 @@ mmc_omap_cmd_done(struct mmc_omap_host *
 	}
 }
 
+/*
+ * Abort stuck command. Can occur when card is removed while it is being
+ * read.
+ */
+static void mmc_omap_abort_command(struct work_struct *work)
+{
+	struct mmc_omap_host *host = container_of(work, struct mmc_omap_host,
+						  cmd_abort);
+	u16 ie;
+
+	ie = OMAP_MMC_READ(host, IE);
+	OMAP_MMC_WRITE(host, IE, 0);
+
+	if (!host->cmd) {
+		OMAP_MMC_WRITE(host, IE, ie);
+		return;
+	}
+
+	dev_dbg(mmc_dev(host->mmc), "Aborting stuck command CMD%d\n",
+		host->cmd->opcode);
+
+	if (host->data && host->dma_in_use)
+		mmc_omap_release_dma(host, host->data, 1);
+
+	host->data = NULL;
+	host->sg_len = 0;
+
+	mmc_omap_send_abort(host);
+	host->cmd->error = MMC_ERR_TIMEOUT;
+	mmc_omap_cmd_done(host, host->cmd);
+	OMAP_MMC_WRITE(host, IE, ie);
+}
+
+static void
+mmc_omap_cmd_timer(unsigned long data)
+{
+	struct mmc_omap_host *host = (struct mmc_omap_host *) data;
+
+	schedule_work(&host->cmd_abort);
+}
+
 /* PIO only */
 static void
 mmc_omap_sg_to_buf(struct mmc_omap_host *host)

@@ -1263,6 +1331,11 @@ static int __init mmc_omap_probe(struct 
 		goto err_free_mem_region;
 	}
 
+	INIT_WORK(&host->cmd_abort, mmc_omap_abort_command);
+	init_timer(&host->cmd_timer);
+	host->cmd_timer.function = mmc_omap_cmd_timer;
+	host->cmd_timer.data = (unsigned long) host;
+
 	spin_lock_init(&host->dma_lock);
 	init_timer(&host->dma_timer);
 	spin_lock_init(&host->slot_lock);

Trilok Soni

2007-08-18 08:47 UTC #1 lore raw

Hi Carlos,

Quoted 47 lines · Carlos Aguiar

From: Jarkko Lavinen <[email protected]>
When a card is removed while it is being accessed, a command can get stuck so that no timeout or end of command interrupt ever occurs. The command getting stuck is almost always CDM12, but also the other commands can get stuck. Catch a stuck command with a timer and try sending the initiliazation stream until the controller starts running again and responds with the end of command status.
Signed-off-by Jarkko Lavinen <[email protected]>
When a card is removed while it is being accessed, a command can get stuck so that no timeout or end of command interrupt ever occurs. The command getting stuck is almost always CDM12, but also the other commands can get stuck. Catch a stuck command with a timer and try sending the initiliazation stream until the controller starts running again and responds with the end of command status.
Signed-off-by Jarkko Lavinen <[email protected]>
Index: linux-omap/drivers/mmc/host/omap.c
===================================================================
drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +5 -0
@@ -136,6 +136,9 @@ struct mmc_omap_host {
        unsigned char           bus_mode;
        unsigned char           hw_bus_mode;
 
+       struct work_struct      cmd_abort;
+       struct timer_list       cmd_timer;
+
        unsigned int            sg_len;
        int                     sg_idx;
        u16 *                   buffer;
@@ -326,6 +329,8 @@ mmc_omap_start_command(struct mmc_omap_h
        if (host->data && !(host->data->flags & MMC_DATA_WRITE))
                cmdreg |= 1 << 15;
 
+       mod_timer(&host->cmd_timer, jiffies + HZ/2);
+
        OMAP_MMC_WRITE(host, CTO, 200);
        OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff);
        OMAP_MMC_WRITE(host, ARGH, cmd->arg >> 16);
@@ -385,9 +390,37 @@ mmc_omap_xfer_done(struct mmc_omap_host
 }
 
 static void

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 mmc_omap_xfer_done(struct mmc_omap_host · line 402

Quoted 10 lines

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +10 -0

+mmc_omap_send_abort(struct mmc_omap_host *host)
+{
+       struct mmc_omap_slot *slot = host->current_slot;
+       unsigned int restarts, passes, timeout;
+       u16 stat = 0;
+
+       /* Sending abort takes 80 clocks. Have some extra and round up */
+       timeout = (120*1000000 + slot->fclk_freq - 1)/slot->fclk_freq;
+       restarts = 0;
+       while(restarts < 10000) {

space before "(" please. I think this patch series is not checked against "checkpatch" script. Please do it and then re-post the patches.

Quoted 101 lines

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +63 ~~-10~~

+               OMAP_MMC_WRITE(host, STAT, 0xFFFF);
+               OMAP_MMC_WRITE(host, CMD, (3 << 12) | (1 << 7));
+
+               passes = 0;
+               while (passes < timeout) {
+                       stat = OMAP_MMC_READ(host, STAT);
+                       if (stat & OMAP_MMC_STAT_END_OF_CMD)
+                               goto out;
+                       udelay(1);
+                       passes ++;
+               }
+
+               restarts++;
+       }
+out:
+       OMAP_MMC_WRITE(host, STAT, stat);
+}
+
+static void
 mmc_omap_abort_xfer(struct mmc_omap_host *host, struct mmc_data *data)
 {
-       int loops;
        u16 ie;
 
        if (host->dma_in_use)

@@ -398,16 +431,8 @@ mmc_omap_abort_xfer(struct mmc_omap_host
 
        ie = OMAP_MMC_READ(host, IE);
        OMAP_MMC_WRITE(host, IE, 0);
-       OMAP_MMC_WRITE(host, CMD, 1 << 7);
-       loops = 0;
-       while (!(OMAP_MMC_READ(host, STAT) & OMAP_MMC_STAT_END_OF_CMD)) {
-               udelay(1);
-               loops++;
-               if (loops == 100000)
-                       break;
-       }
-       OMAP_MMC_WRITE(host, STAT, OMAP_MMC_STAT_END_OF_CMD);
        OMAP_MMC_WRITE(host, IE, ie);
+       mmc_omap_send_abort(host);
 }
 
 static void

@@ -463,6 +488,8 @@ mmc_omap_cmd_done(struct mmc_omap_host *
 {
        host->cmd = NULL;
 
+       del_timer(&host->cmd_timer);
+
        if (cmd->flags & MMC_RSP_PRESENT) {
                if (cmd->flags & MMC_RSP_136) {
                        /* response type 2 */

@@ -498,6 +525,47 @@ mmc_omap_cmd_done(struct mmc_omap_host *
        }
 }
 
+/*
+ * Abort stuck command. Can occur when card is removed while it is being
+ * read.
+ */
+static void mmc_omap_abort_command(struct work_struct *work)
+{
+       struct mmc_omap_host *host = container_of(work, struct mmc_omap_host,
+                                                 cmd_abort);
+       u16 ie;
+
+       ie = OMAP_MMC_READ(host, IE);
+       OMAP_MMC_WRITE(host, IE, 0);
+
+       if (!host->cmd) {
+               OMAP_MMC_WRITE(host, IE, ie);
+               return;
+       }
+
+       dev_dbg(mmc_dev(host->mmc), "Aborting stuck command CMD%d\n",
+               host->cmd->opcode);
+
+       if (host->data && host->dma_in_use)
+               mmc_omap_release_dma(host, host->data, 1);
+
+       host->data = NULL;
+       host->sg_len = 0;
+
+       mmc_omap_send_abort(host);
+       host->cmd->error = MMC_ERR_TIMEOUT;
+       mmc_omap_cmd_done(host, host->cmd);
+       OMAP_MMC_WRITE(host, IE, ie);
+}
+
+static void
+mmc_omap_cmd_timer(unsigned long data)
+{
+       struct mmc_omap_host *host = (struct mmc_omap_host *) data;
+
+       schedule_work(&host->cmd_abort);
+}
+
 /* PIO only */
 static void
 mmc_omap_sg_to_buf(struct mmc_omap_host *host)

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 static int __init mmc_omap_probe(struct · line 1337

Quoted 7 lines

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +4 -0

@@ -1263,6 +1331,11 @@ static int __init mmc_omap_probe(struct
                goto err_free_mem_region;
        }
 
+       INIT_WORK(&host->cmd_abort, mmc_omap_abort_command);
+       init_timer(&host->cmd_timer);
+       host->cmd_timer.function = mmc_omap_cmd_timer;
+       host->cmd_timer.data = (unsigned long) host;

Use setup_timer above.

Quoted 11 lines

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +1 -0
+
        spin_lock_init(&host->dma_lock);
        init_timer(&host->dma_timer);
        spin_lock_init(&host->slot_lock);
_______________________________________________
Linux-omap-open-source mailing list
[email protected]
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

Signature · 1 line

--Trilok Soni

Carlos Aguiar

author

2007-08-31 15:44 UTC #2 lore raw

Quoted 2 lines · ext Trilok Soni

Hi Carlos,

Hi Trilok,

Quoted 48 lines · Carlos Aguiar

Quoted 47 lines
From: Jarkko Lavinen <[email protected]>
When a card is removed while it is being accessed, a command can get stuck so that no timeout or end of command interrupt ever occurs. The command getting stuck is almost always CDM12, but also the other commands can get stuck. Catch a stuck command with a timer and try sending the initiliazation stream until the controller starts running again and responds with the end of command status.
Signed-off-by Jarkko Lavinen <[email protected]>
When a card is removed while it is being accessed, a command can get stuck so that no timeout or end of command interrupt ever occurs. The command getting stuck is almost always CDM12, but also the other commands can get stuck. Catch a stuck command with a timer and try sending the initiliazation stream until the controller starts running again and responds with the end of command status.
Signed-off-by Jarkko Lavinen <[email protected]>
Index: linux-omap/drivers/mmc/host/omap.c
===================================================================
drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +5 -0
@@ -136,6 +136,9 @@ struct mmc_omap_host {
        unsigned char           bus_mode;
        unsigned char           hw_bus_mode;
 
+       struct work_struct      cmd_abort;
+       struct timer_list       cmd_timer;
+
        unsigned int            sg_len;
        int                     sg_idx;
        u16 *                   buffer;
@@ -326,6 +329,8 @@ mmc_omap_start_command(struct mmc_omap_h
        if (host->data && !(host->data->flags & MMC_DATA_WRITE))
                cmdreg |= 1 << 15;
 
+       mod_timer(&host->cmd_timer, jiffies + HZ/2);
+
        OMAP_MMC_WRITE(host, CTO, 200);
        OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff);
        OMAP_MMC_WRITE(host, ARGH, cmd->arg >> 16);
@@ -385,9 +390,37 @@ mmc_omap_xfer_done(struct mmc_omap_host
 }
 

Quoted 17 lines

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 mmc_omap_xfer_done(struct mmc_omap_host · line 403
Quoted 12 lines
drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +10 -0
 static void
+mmc_omap_send_abort(struct mmc_omap_host *host)
+{
+       struct mmc_omap_slot *slot = host->current_slot;
+       unsigned int restarts, passes, timeout;
+       u16 stat = 0;
+
+       /* Sending abort takes 80 clocks. Have some extra and round up */
+       timeout = (120*1000000 + slot->fclk_freq - 1)/slot->fclk_freq;
+       restarts = 0;
+       while(restarts < 10000) {
 
space before "(" please. I think this patch series is not checked against "checkpatch" script. Please do it and then re-post the patches.

Yeap, my bad! I'm now using checkpatch script that's very good. I found some others corrections beyond this you mentioned. I'll report the series with such improvements.

Quoted 105 lines

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +19 -1

+               OMAP_MMC_WRITE(host, STAT, 0xFFFF);
+               OMAP_MMC_WRITE(host, CMD, (3 << 12) | (1 << 7));
+
+               passes = 0;
+               while (passes < timeout) {
+                       stat = OMAP_MMC_READ(host, STAT);
+                       if (stat & OMAP_MMC_STAT_END_OF_CMD)
+                               goto out;
+                       udelay(1);
+                       passes ++;
+               }
+
+               restarts++;
+       }
+out:
+       OMAP_MMC_WRITE(host, STAT, stat);
+}
+
+static void
 mmc_omap_abort_xfer(struct mmc_omap_host *host, struct mmc_data *data)
 {
-       int loops;
        u16 ie;

        if (host->dma_in_use)

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +44 -9

@@ -398,16 +431,8 @@ mmc_omap_abort_xfer(struct mmc_omap_host
 
        ie = OMAP_MMC_READ(host, IE);
        OMAP_MMC_WRITE(host, IE, 0);
-       OMAP_MMC_WRITE(host, CMD, 1 << 7);
-       loops = 0;
-       while (!(OMAP_MMC_READ(host, STAT) & OMAP_MMC_STAT_END_OF_CMD)) {
-               udelay(1);
-               loops++;
-               if (loops == 100000)
-                       break;
-       }
-       OMAP_MMC_WRITE(host, STAT, OMAP_MMC_STAT_END_OF_CMD);
        OMAP_MMC_WRITE(host, IE, ie);
+       mmc_omap_send_abort(host);
 }
 
 static void

@@ -463,6 +488,8 @@ mmc_omap_cmd_done(struct mmc_omap_host *
 {
        host->cmd = NULL;
 
+       del_timer(&host->cmd_timer);
+
        if (cmd->flags & MMC_RSP_PRESENT) {
                if (cmd->flags & MMC_RSP_136) {
                        /* response type 2 */

@@ -498,6 +525,47 @@ mmc_omap_cmd_done(struct mmc_omap_host *
        }
 }
 
+/*
+ * Abort stuck command. Can occur when card is removed while it is being
+ * read.
+ */
+static void mmc_omap_abort_command(struct work_struct *work)
+{
+       struct mmc_omap_host *host = container_of(work, struct mmc_omap_host,
+                                                 cmd_abort);
+       u16 ie;
+
+       ie = OMAP_MMC_READ(host, IE);
+       OMAP_MMC_WRITE(host, IE, 0);
+
+       if (!host->cmd) {
+               OMAP_MMC_WRITE(host, IE, ie);
+               return;
+       }
+
+       dev_dbg(mmc_dev(host->mmc), "Aborting stuck command CMD%d\n",
+               host->cmd->opcode);
+
+       if (host->data && host->dma_in_use)
+               mmc_omap_release_dma(host, host->data, 1);
+
+       host->data = NULL;
+       host->sg_len = 0;
+
+       mmc_omap_send_abort(host);
+       host->cmd->error = MMC_ERR_TIMEOUT;
+       mmc_omap_cmd_done(host, host->cmd);
+       OMAP_MMC_WRITE(host, IE, ie);
+}
+
+static void
+mmc_omap_cmd_timer(unsigned long data)
+{
+       struct mmc_omap_host *host = (struct mmc_omap_host *) data;
+
+       schedule_work(&host->cmd_abort);
+}
+
 /* PIO only */
 static void
 mmc_omap_sg_to_buf(struct mmc_omap_host *host)

@@ -1263,6 +1331,11 @@ static int __init mmc_omap_probe(struct
                goto err_free_mem_region;
        }

Quoted 8 lines

drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 static int __init mmc_omap_probe(struct · line 1338
Quoted 5 lines
drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +4 -0
+       INIT_WORK(&host->cmd_abort, mmc_omap_abort_command);
+       init_timer(&host->cmd_timer);
+       host->cmd_timer.function = mmc_omap_cmd_timer;
+       host->cmd_timer.data = (unsigned long) host;
 
Use setup_timer above.

You're completely right! Beyond this occurrence there are more two init_timer() on omap.c file and I replace with setup_timer. I've tested it on N800 and looks fine.

Quoted 6 lines

Quoted 6 lines
drivers/mmc/host/omap.c 2007-08-16 16:03:01.000000000 -0400 renamed from drivers/mmc/host/omap.c 2007-08-16 16:02:55.000000000 -0400 +1 -0
+
        spin_lock_init(&host->dma_lock);
        init_timer(&host->dma_timer);
        spin_lock_init(&host->slot_lock);

Quoted 9 lines

Quoted 7 lines
_______________________________________________
Linux-omap-open-source mailing list
[email protected]
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

Thanks for the very useful hints ;)

BR,

Carlos.

Signature · 7 lines

Carlos Eduardo Aguiar
Nokia Institute of Technology - INdT
Open Source Mobile Research Center - OSMRC - Manaus
Core Team
Phone: +55 92 2126-1079
Mobile: +55 92 8127-1797
E-mail: [email protected]