GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-26 09:01:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Blackfin: bfin_sdh: clean up send_cmd

Browse source 
Simplify the command setup and status checking steps, and add a proper
timeout to the status polling code to avoid possible infinite hangs.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2010-06-21 20:56:54 +00:00
parent 6f070e1867
commit 6815f540db
1 changed files with 15 additions and 10 deletions

25
drivers/mmc/bfin_sdh.c
View file

@ -58,27 +58,29 @@
static int static int
sdh_send_cmd(struct mmc *mmc, struct mmc_cmd *mmc_cmd) sdh_send_cmd(struct mmc *mmc, struct mmc_cmd *mmc_cmd)
{ {
unsigned int sdh_cmd; unsigned int status, timeout;
unsigned int status;
int cmd = mmc_cmd->cmdidx; int cmd = mmc_cmd->cmdidx;
int flags = mmc_cmd->resp_type; int flags = mmc_cmd->resp_type;
int arg = mmc_cmd->cmdarg; int arg = mmc_cmd->cmdarg;
int ret = 0; int ret;
sdh_cmd = 0; u16 sdh_cmd;
sdh_cmd |= cmd;
sdh_cmd = cmd | CMD_E;
if (flags & MMC_RSP_PRESENT) if (flags & MMC_RSP_PRESENT)
sdh_cmd |= CMD_RSP; sdh_cmd |= CMD_RSP;
if (flags & MMC_RSP_136) if (flags & MMC_RSP_136)
sdh_cmd |= CMD_L_RSP; sdh_cmd |= CMD_L_RSP;
bfin_write_SDH_ARGUMENT(arg); bfin_write_SDH_ARGUMENT(arg);
bfin_write_SDH_COMMAND(sdh_cmd | CMD_E); bfin_write_SDH_COMMAND(sdh_cmd);
/* wait for a while */ /* wait for a while */
timeout = 0;
do { do {
if (++timeout > 1000000) {
status = CMD_TIME_OUT;
break;
}
udelay(1); udelay(1);
status = bfin_read_SDH_STATUS(); status = bfin_read_SDH_STATUS();
} while (!(status & (CMD_SENT | CMD_RESP_END | CMD_TIME_OUT | } while (!(status & (CMD_SENT | CMD_RESP_END | CMD_TIME_OUT |
@ -94,12 +96,15 @@ sdh_send_cmd(struct mmc *mmc, struct mmc_cmd *mmc_cmd)
} }
if (status & CMD_TIME_OUT) if (status & CMD_TIME_OUT)
ret |= TIMEOUT; ret = TIMEOUT;
else if (status & CMD_CRC_FAIL && flags & MMC_RSP_CRC) else if (status & CMD_CRC_FAIL && flags & MMC_RSP_CRC)
ret |= COMM_ERR; ret = COMM_ERR;
else
ret = 0;
bfin_write_SDH_STATUS_CLR(CMD_SENT_STAT | CMD_RESP_END_STAT | bfin_write_SDH_STATUS_CLR(CMD_SENT_STAT | CMD_RESP_END_STAT |
CMD_TIMEOUT_STAT | CMD_CRC_FAIL_STAT); CMD_TIMEOUT_STAT | CMD_CRC_FAIL_STAT);
return ret; return ret;
} }