From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753316AbdAZXhs (ORCPT ); Thu, 26 Jan 2017 18:37:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60080 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752495AbdAZXhn (ORCPT ); Thu, 26 Jan 2017 18:37:43 -0500 From: Gerd Hoffmann To: linux-rpi-kernel@lists.infradead.org Cc: Stefan Wahren , Eric Anholt , Ulf Hansson , linux-mmc@vger.kernel.org, Gerd Hoffmann , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Stephen Warren , Lee Jones , linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2835 ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 02/13] mmc: bcm2835: use bcm2835_read_wait_sdcmd in bcm2835_send_command Date: Fri, 27 Jan 2017 00:37:15 +0100 Message-Id: <1485473846-24537-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1485473846-24537-1-git-send-email-kraxel@redhat.com> References: <1485473846-24537-1-git-send-email-kraxel@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 26 Jan 2017 23:37:32 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Gerd Hoffmann --- 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