lkml.org 
[lkml]   [2017]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 02/13] mmc: bcm2835: use bcm2835_read_wait_sdcmd in bcm2835_send_command
Date
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/mmc/host/bcm2835.c | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index ceee4cf..ffb9140 100644
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -645,7 +645,6 @@ bool bcm2835_send_command(struct bcm2835_host *host,
struct device *dev = &host->pdev->dev;
u32 sdcmd, sdhsts;
unsigned long timeout;
- int delay;

WARN_ON(host->cmd);

@@ -660,26 +659,13 @@ bool bcm2835_send_command(struct bcm2835_host *host,
cmd->opcode, cmd->arg, cmd->flags);
}

- /* Wait max 100 ms */
- timeout = 10000;
-
- while (readl(host->ioaddr + SDCMD) & SDCMD_NEW_FLAG) {
- if (timeout == 0) {
- dev_err(dev, "previous command never completed.\n");
- bcm2835_dumpregs(host);
- cmd->error = -EILSEQ;
- tasklet_schedule(&host->finish_tasklet);
- return false;
- }
- timeout--;
- udelay(10);
- }
-
- delay = (10000 - timeout) / 100;
- if (delay > host->max_delay) {
- host->max_delay = delay;
- dev_warn(dev, "controller hung for %d ms\n",
- host->max_delay);
+ sdcmd = bcm2835_read_wait_sdcmd(host, 100, false);
+ if (sdcmd & SDCMD_NEW_FLAG) {
+ dev_err(dev, "previous command never completed.\n");
+ bcm2835_dumpregs(host);
+ cmd->error = -EILSEQ;
+ tasklet_schedule(&host->finish_tasklet);
+ return false;
}

timeout = jiffies;
--
1.8.3.1
\
 
 \ /
  Last update: 2017-01-27 00:39    [W:0.035 / U:0.324 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site