Commit 1acee84b authored Apr 29, 2014 by Alex Smith Committed by Chris Ball May 12, 2014

mmc: jz4740: don't wait for PRG_DONE after stop command with R1 response



As of commit bcc3e172 ("mmc: block: Use R1 responses for stop cmds for
read requests"), stop commands for reads do not have MMC_RSP_BUSY set.
In this case we should not wait for a PRG_DONE IRQ after sending the
stop command: it will not get raised when the busy flag is not set,
causing the request to fail with a timeout.

Signed-off-by: Alex Smith <alex.smith@imgtec.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Chris Ball <chris@printf.net>
Cc: James Hogan <james.hogan@imgtec.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>

parent c373eb48

drivers/mmc/host/jz4740_mmc.c

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -515,11 +515,14 @@ static irqreturn_t jz_mmc_irq_worker(int irq, void *devid)

	jz4740_mmc_send_command(host, req->stop);		jz4740_mmc_send_command(host, req->stop);

	timeout = jz4740_mmc_poll_irq(host, JZ_MMC_IRQ_PRG_DONE);		if (mmc_resp_type(req->stop) & MMC_RSP_BUSY) {
			timeout = jz4740_mmc_poll_irq(host,
			JZ_MMC_IRQ_PRG_DONE);
	if (timeout) {		if (timeout) {
	host->state = JZ4740_MMC_STATE_DONE;		host->state = JZ4740_MMC_STATE_DONE;
	break;		break;
	}		}
			}
	case JZ4740_MMC_STATE_DONE:		case JZ4740_MMC_STATE_DONE:
	break;		break;
	}		}