d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always wait 'command done' interrupt status bit before proceeding next command.

Browse Source 
Sponsored by:	DARPA, AFRL
This commit is contained in:
Ruslan Bukin 2014-10-08 08:51:05 +00:00
parent 4799d48568
commit fdbf76c383
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/mmc/host/dwmmc.c
View File

@ -348,9 +348,10 @@ dwmmc_tasklet(struct dwmmc_softc *sc)
if (cmd == NULL) if (cmd == NULL)
return; return;
if (cmd->error != MMC_ERR_NONE) { if (!sc->cmd_done)
dwmmc_next_operation(sc); return;
} else if (!cmd->data && sc->cmd_done) {
if (cmd->error != MMC_ERR_NONE || !cmd->data) {
dwmmc_next_operation(sc); dwmmc_next_operation(sc);
} else if (cmd->data && sc->dto_rcvd) { } else if (cmd->data && sc->dto_rcvd) {
if ((cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK || if ((cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK ||
@ -394,11 +395,8 @@ dwmmc_intr(void *arg)
dprintf("data err 0x%08x cmd 0x%08x\n", dprintf("data err 0x%08x cmd 0x%08x\n",
reg, cmd->opcode); reg, cmd->opcode);
cmd->error = MMC_ERR_FAILED; cmd->error = MMC_ERR_FAILED;
dma_done(sc, cmd); dma_done(sc, cmd);
dma_stop(sc); dma_stop(sc);
DWMMC_UNLOCK(sc);
return;
} }
if (reg & SDMMC_INTMASK_CMD_DONE) { if (reg & SDMMC_INTMASK_CMD_DONE) {