UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tifm_sd: alter order of the states in the command handler 

Previously, stop command was issued right after BRS (block received/sent)
event. Stop command completion event could interfere with the card busy
event, causing miscount of the written blocks.
This patch ensures that stop command issued as last action for a
particular command, after DMA sompletion event and written block
count verification.

Signed-off-by: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Alex Dubov 2006-12-08 16:50:47 +11:00 committed by Pierre Ossman
parent fba68bd2da
commit 1289335a2a
1 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/mmc/tifm_sd.c
View File

@ -17,7 +17,7 @@
#include <asm/io.h> #include <asm/io.h>
#define DRIVER_NAME "tifm_sd" #define DRIVER_NAME "tifm_sd"
#define DRIVER_VERSION "0.6" #define DRIVER_VERSION "0.7"
static int no_dma = 0; static int no_dma = 0;
static int fixed_timeout = 0; static int fixed_timeout = 0;
@ -239,50 +239,65 @@ change_state:
tifm_sd_fetch_resp(cmd, sock); tifm_sd_fetch_resp(cmd, sock);
if (cmd->data) { if (cmd->data) {
host->state = BRS; host->state = BRS;
} else } else {
host->state = READY; host->state = READY;
}
goto change_state; goto change_state;
} }
break; break;
case BRS: case BRS:
if (tifm_sd_transfer_data(sock, host, host_status)) { if (tifm_sd_transfer_data(sock, host, host_status)) {
if (!host->req->stop) { if (cmd->data->flags & MMC_DATA_WRITE) {
if (cmd->data->flags & MMC_DATA_WRITE) { host->state = CARD;
host->state = CARD; } else {
if (no_dma) {
if (host->req->stop) {
tifm_sd_exec(host, host->req->stop);
host->state = SCMD;
} else {
host->state = READY;
}
} else { } else {
host->state = host->state = FIFO;
host->buffer ? READY : FIFO;
} }
goto change_state;
} }
tifm_sd_exec(host, host->req->stop); goto change_state;
host->state = SCMD;
} }
break; break;
case SCMD: case SCMD:
if (host_status & TIFM_MMCSD_EOC) { if (host_status & TIFM_MMCSD_EOC) {
tifm_sd_fetch_resp(host->req->stop, sock); tifm_sd_fetch_resp(host->req->stop, sock);
if (cmd->error) { host->state = READY;
host->state = READY;
} else if (cmd->data->flags & MMC_DATA_WRITE) {
host->state = CARD;
} else {
host->state = host->buffer ? READY : FIFO;
}
goto change_state; goto change_state;
} }
break; break;
case CARD: case CARD:
dev_dbg(&sock->dev, "waiting for CARD, have %zd blocks\n",
host->written_blocks);
if (!(host->flags & CARD_BUSY) if (!(host->flags & CARD_BUSY)
&& (host->written_blocks == cmd->data->blocks)) { && (host->written_blocks == cmd->data->blocks)) {
host->state = host->buffer ? READY : FIFO; if (no_dma) {
if (host->req->stop) {
tifm_sd_exec(host, host->req->stop);
host->state = SCMD;
} else {
host->state = READY;
}
} else {
host->state = FIFO;
}
goto change_state; goto change_state;
} }
break; break;
case FIFO: case FIFO:
if (host->flags & FIFO_RDY) { if (host->flags & FIFO_RDY) {
host->state = READY;
host->flags &= ~FIFO_RDY; host->flags &= ~FIFO_RDY;
if (host->req->stop) {
tifm_sd_exec(host, host->req->stop);
host->state = SCMD;
} else {
host->state = READY;
}
goto change_state; goto change_state;
} }
break; break;
@ -340,7 +355,9 @@ static unsigned int tifm_sd_signal_irq(struct tifm_dev *sock,
if (host->req->stop) { if (host->req->stop) {
if (host->state == SCMD) { if (host->state == SCMD) {
host->req->stop->error = error_code; host->req->stop->error = error_code;
} else if(host->state == BRS) { } else if (host->state == BRS
|| host->state == CARD
|| host->state == FIFO) {
host->req->cmd->error = error_code; host->req->cmd->error = error_code;
tifm_sd_exec(host, host->req->stop); tifm_sd_exec(host, host->req->stop);
queue_delayed_work(sock->wq, queue_delayed_work(sock->wq,