forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: omap_hsmmc: consolidate error report handling of HSMMC IRQ

Browse source 
Consolidate the duplicated code around the handling of CMD_TIMEOUT,
CMD_CRC, DATA_TIMEOUT, DATA_CRC and CARD_ERR handling into a single
function.

This generally shrinks code bloat, but is also required for implementing
software based guard timers.

Signed-off-by: Venkatraman S <svenkatr@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Venkatraman S 2012-08-09 20:36:07 +05:30 • committed by Chris Ball
commit ae4bf788ee
1 changed files with 20 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

57
drivers/mmc/host/omap_hsmmc.c
View file

@ -964,6 +964,18 @@ static inline void omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host *host,
__func__); __func__);
} }
static void hsmmc_command_incomplete(struct omap_hsmmc_host *host, int err)
{
omap_hsmmc_reset_controller_fsm(host, SRC);
host->cmd->error = err;
if (host->data) {
omap_hsmmc_reset_controller_fsm(host, SRD);
omap_hsmmc_dma_cleanup(host, err);
}
}
static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status) static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status)
{ {
struct mmc_data *data; struct mmc_data *data;
@ -974,48 +986,15 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status)
if (status & ERR) { if (status & ERR) {
omap_hsmmc_dbg_report_irq(host, status); omap_hsmmc_dbg_report_irq(host, status);
if ((status & CMD_TIMEOUT) || if (status & (CMD_TIMEOUT | DATA_TIMEOUT))
(status & CMD_CRC)) { hsmmc_command_incomplete(host, -ETIMEDOUT);
if (host->cmd) { else if (status & (CMD_CRC | DATA_CRC))
if (status & CMD_TIMEOUT) { hsmmc_command_incomplete(host, -EILSEQ);
omap_hsmmc_reset_controller_fsm(host,
SRC);
host->cmd->error = -ETIMEDOUT;
} else {
host->cmd->error = -EILSEQ;
}
end_cmd = 1;
}
if (host->data || host->response_busy) {
if (host->data)
omap_hsmmc_dma_cleanup(host,
-ETIMEDOUT);
host->response_busy = 0;
omap_hsmmc_reset_controller_fsm(host, SRD);
}
}
if ((status & DATA_TIMEOUT) ||
(status & DATA_CRC)) {
if (host->data || host->response_busy) {
int err = (status & DATA_TIMEOUT) ?
-ETIMEDOUT : -EILSEQ;
if (host->data)
omap_hsmmc_dma_cleanup(host, err);
else
host->mrq->cmd->error = err;
host->response_busy = 0;
omap_hsmmc_reset_controller_fsm(host, SRD);
end_trans = 1;
}
}
if (status & CARD_ERR) {
dev_dbg(mmc_dev(host->mmc),
"Ignoring card err CMD%d\n", host->cmd->opcode);
if (host->cmd)
end_cmd = 1; end_cmd = 1;
if (host->data) if (host->data || host->response_busy) {
end_trans = 1; end_trans = 1;
host->response_busy = 0;
} }
} }