KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jz_mmc: Fix timeout timer. Annotate timeout checks as unlikely()

Browse source 
SVN-Revision: 20349
This commit is contained in:
Lars-Peter Clausen 2010-03-21 15:46:49 +00:00
parent 3c2943b45a
commit 28e68dd8c7
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
target/linux/xburst/files-2.6.32/drivers/mmc/host/jz_mmc.c
View file

@ -101,6 +101,8 @@
#define JZ_MMC_CLK_RATE 24000000 #define JZ_MMC_CLK_RATE 24000000
#define JZ4740_MMC_MAX_TIMEOUT 10000000
struct jz4740_mmc_host { struct jz4740_mmc_host {
struct mmc_host *mmc; struct mmc_host *mmc;
struct platform_device *pdev; struct platform_device *pdev;
@ -212,11 +214,11 @@ static void jz4740_mmc_write_data(struct jz4740_mmc_host *host, struct mmc_data
j = i >> 3; j = i >> 3;
i = i & 0x7; i = i & 0x7;
while (j) { while (j) {
timeout = 100000; timeout = JZ4740_MMC_MAX_TIMEOUT;
do { do {
status = readw(host->base + JZ_REG_MMC_IREG); status = readw(host->base + JZ_REG_MMC_IREG);
} while (!(status & JZ_MMC_IRQ_TXFIFO_WR_REQ) && --timeout); } while (!(status & JZ_MMC_IRQ_TXFIFO_WR_REQ) && --timeout);
if (timeout == 0) if (unlikely(timeout == 0))
goto err_timeout; goto err_timeout;
writew(JZ_MMC_IRQ_TXFIFO_WR_REQ, host->base + JZ_REG_MMC_IREG); writew(JZ_MMC_IRQ_TXFIFO_WR_REQ, host->base + JZ_REG_MMC_IREG);
@ -233,11 +235,11 @@ static void jz4740_mmc_write_data(struct jz4740_mmc_host *host, struct mmc_data
--j; --j;
} }
if (i) { if (i) {
timeout = 100000; timeout = JZ4740_MMC_MAX_TIMEOUT;
do { do {
status = readw(host->base + JZ_REG_MMC_IREG); status = readw(host->base + JZ_REG_MMC_IREG);
} while (!(status & JZ_MMC_IRQ_TXFIFO_WR_REQ) && --timeout); } while (!(status & JZ_MMC_IRQ_TXFIFO_WR_REQ) && --timeout);
if (timeout == 0) if (unlikely(timeout == 0))
goto err_timeout; goto err_timeout;
writew(JZ_MMC_IRQ_TXFIFO_WR_REQ, host->base + JZ_REG_MMC_IREG); writew(JZ_MMC_IRQ_TXFIFO_WR_REQ, host->base + JZ_REG_MMC_IREG);
@ -256,11 +258,12 @@ static void jz4740_mmc_write_data(struct jz4740_mmc_host *host, struct mmc_data
goto err; goto err;
writew(JZ_MMC_IRQ_TXFIFO_WR_REQ, host->base + JZ_REG_MMC_IREG); writew(JZ_MMC_IRQ_TXFIFO_WR_REQ, host->base + JZ_REG_MMC_IREG);
timeout = 100000; timeout = JZ4740_MMC_MAX_TIMEOUT;
do { do {
status = readl(host->base + JZ_REG_MMC_STATUS); status = readl(host->base + JZ_REG_MMC_STATUS);
} while ((status & JZ_MMC_STATUS_DATA_TRAN_DONE) == 0 && --timeout); } while ((status & JZ_MMC_STATUS_DATA_TRAN_DONE) == 0 && --timeout);
if (timeout == 0)
if (unlikely(timeout == 0))
goto err_timeout; goto err_timeout;
writew(JZ_MMC_IRQ_DATA_TRAN_DONE, host->base + JZ_REG_MMC_IREG); writew(JZ_MMC_IRQ_DATA_TRAN_DONE, host->base + JZ_REG_MMC_IREG);
@ -312,7 +315,7 @@ static void jz4740_mmc_read_data(struct jz4740_mmc_host *host, struct mmc_data *
j = i >> 5; j = i >> 5;
i = i & 0x1f; i = i & 0x1f;
while (j) { while (j) {
timeout = 100000; timeout = JZ4740_MMC_MAX_TIMEOUT;
do { do {
status = readw(host->base + JZ_REG_MMC_IREG); status = readw(host->base + JZ_REG_MMC_IREG);
} while (!(status & JZ_MMC_IRQ_RXFIFO_RD_REQ) && --timeout); } while (!(status & JZ_MMC_IRQ_RXFIFO_RD_REQ) && --timeout);
@ -336,7 +339,7 @@ static void jz4740_mmc_read_data(struct jz4740_mmc_host *host, struct mmc_data *
} }
while (i >= 4) { while (i >= 4) {
timeout = 100000; timeout = JZ4740_MMC_MAX_TIMEOUT;
do { do {
status = readl(host->base + JZ_REG_MMC_STATUS); status = readl(host->base + JZ_REG_MMC_STATUS);
} while ((status & JZ_MMC_STATUS_DATA_FIFO_EMPTY) && --timeout); } while ((status & JZ_MMC_STATUS_DATA_FIFO_EMPTY) && --timeout);
@ -416,6 +419,7 @@ static irqreturn_t jz_mmc_irq(int irq, void *devid)
writew(tmp & ~irq_reg, host->base + JZ_REG_MMC_IREG); writew(tmp & ~irq_reg, host->base + JZ_REG_MMC_IREG);
} }
if (irq_reg & JZ_MMC_IRQ_SDIO) { if (irq_reg & JZ_MMC_IRQ_SDIO) {
writew(JZ_MMC_IRQ_SDIO, host->base + JZ_REG_MMC_IREG); writew(JZ_MMC_IRQ_SDIO, host->base + JZ_REG_MMC_IREG);
mmc_signal_sdio_irq(host->mmc); mmc_signal_sdio_irq(host->mmc);
@ -466,14 +470,17 @@ handled:
static int jz4740_mmc_set_clock_rate(struct jz4740_mmc_host *host, int rate) { static int jz4740_mmc_set_clock_rate(struct jz4740_mmc_host *host, int rate) {
int div = 0; int div = 0;
int real_rate = host->max_clock; int real_rate;
jz4740_mmc_clock_disable(host);
while ((real_rate >> 1) >= rate && div < 7) { jz4740_mmc_clock_disable(host);
clk_set_rate(host->clk, JZ_MMC_CLK_RATE);
real_rate = clk_get_rate(host->clk);
while (real_rate > rate && div < 7) {
++div; ++div;
real_rate >>= 1; real_rate >>= 1;
} }
clk_set_rate(host->clk, JZ_MMC_CLK_RATE);
writew(div, host->base + JZ_REG_MMC_CLKRT); writew(div, host->base + JZ_REG_MMC_CLKRT);
return real_rate; return real_rate;
@ -543,7 +550,7 @@ static void jz4740_mmc_send_command(struct jz4740_mmc_host *host, struct mmc_com
host->waiting = 1; host->waiting = 1;
jz4740_mmc_clock_enable(host, 1); jz4740_mmc_clock_enable(host, 1);
mod_timer(&host->timeout_timer, 4*HZ); mod_timer(&host->timeout_timer, jiffies + 5*HZ);
} }
static void jz4740_mmc_cmd_done(struct jz4740_mmc_host *host) static void jz4740_mmc_cmd_done(struct jz4740_mmc_host *host)
@ -551,8 +558,7 @@ static void jz4740_mmc_cmd_done(struct jz4740_mmc_host *host)
uint32_t status; uint32_t status;
struct mmc_command *cmd = host->req->cmd; struct mmc_command *cmd = host->req->cmd;
struct mmc_request *req = host->req; struct mmc_request *req = host->req;
unsigned int timeout = 100000; unsigned int timeout = JZ4740_MMC_MAX_TIMEOUT;
status = readl(host->base + JZ_REG_MMC_STATUS);
if (cmd->flags & MMC_RSP_PRESENT) if (cmd->flags & MMC_RSP_PRESENT)
jz4740_mmc_read_response(host, cmd); jz4740_mmc_read_response(host, cmd);
@ -567,12 +573,12 @@ static void jz4740_mmc_cmd_done(struct jz4740_mmc_host *host)
if (req->stop) { if (req->stop) {
jz4740_mmc_send_command(host, req->stop); jz4740_mmc_send_command(host, req->stop);
do { do {
status = readl(host->base + JZ_REG_MMC_STATUS); status = readw(host->base + JZ_REG_MMC_IREG);
} while ((status & JZ_MMC_STATUS_PRG_DONE) == 0 && --timeout); } while ((status & JZ_MMC_IRQ_PRG_DONE) == 0 && --timeout);
writew(JZ_MMC_IRQ_PRG_DONE, host->base + JZ_REG_MMC_IREG); writew(JZ_MMC_IRQ_PRG_DONE, host->base + JZ_REG_MMC_IREG);
} }
if (timeout == 0) if (unlikely(timeout == 0))
req->stop->error = -ETIMEDOUT; req->stop->error = -ETIMEDOUT;
jz4740_mmc_request_done(host); jz4740_mmc_request_done(host);