From patchwork Thu Jan 26 23:37:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9540391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A099560429 for ; Thu, 26 Jan 2017 23:41:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9698728305 for ; Thu, 26 Jan 2017 23:41:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B7432830A; Thu, 26 Jan 2017 23:41:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00 autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 554EA28305 for ; Thu, 26 Jan 2017 23:41:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cWtfE-00086q-5l; Thu, 26 Jan 2017 23:41:12 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cWtca-0003s7-2J for linux-arm-kernel@bombadil.infradead.org; Thu, 26 Jan 2017 23:38:28 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cWtcU-0001h2-CM for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2017 23:38:26 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79AA7C030704; Thu, 26 Jan 2017 23:37:33 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-57.ams2.redhat.com [10.36.116.57]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0QNbW3x007490; Thu, 26 Jan 2017 18:37:33 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 3AA5C81640; Fri, 27 Jan 2017 00:37:30 +0100 (CET) From: Gerd Hoffmann To: linux-rpi-kernel@lists.infradead.org Subject: [PATCH 07/13] mmc: bcm2835: call bcm2835_busy_irq from irqthread Date: Fri, 27 Jan 2017 00:37:20 +0100 Message-Id: <1485473846-24537-8-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-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 26 Jan 2017 23:37:33 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170126_233822_808549_2414FCA8 X-CRM114-Status: GOOD ( 17.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , Ulf Hansson , Florian Fainelli , Scott Branden , Stephen Warren , Ray Jui , Lee Jones , linux-mmc@vger.kernel.org, open list , Eric Anholt , "maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..." , Gerd Hoffmann , "moderated list:BROADCOM BCM2835 ARM ARCHITECTURE" MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Gerd Hoffmann --- drivers/mmc/host/bcm2835.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index 33eaebd..814812b 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -170,6 +170,7 @@ struct bcm2835_host { /* for threaded irq handler */ bool irq_block; + bool irq_busy; /* DMA part */ struct dma_chan *dma_chan_rx; @@ -996,28 +997,19 @@ static void bcm2835_check_data_error(struct bcm2835_host *host, u32 intmask) host->data->error = -ETIMEDOUT; } -static void bcm2835_busy_irq(struct bcm2835_host *host, u32 intmask) +static void bcm2835_busy_irq(struct bcm2835_host *host) { - struct device *dev = &host->pdev->dev; - - if (!host->cmd) { - dev_err(dev, "got command busy interrupt 0x%08x even though no command operation was in progress.\n", - (unsigned int)intmask); + if (WARN_ON(!host->cmd)) { bcm2835_dumpregs(host); return; } - if (!host->use_busy) { - dev_err(dev, "got command busy interrupt 0x%08x even though not expecting one.\n", - (unsigned int)intmask); + if (WARN_ON(!host->use_busy)) { bcm2835_dumpregs(host); return; } host->use_busy = false; - if (bcm2835_check_cmd_error(host, intmask)) - return; - bcm2835_finish_command(host, NULL); } @@ -1091,8 +1083,12 @@ static irqreturn_t bcm2835_irq(int irq, void *dev_id) } if (intmask & SDHSTS_BUSY_IRPT) { - bcm2835_busy_irq(host, intmask); - result = IRQ_HANDLED; + if (!bcm2835_check_cmd_error(host, intmask)) { + host->irq_busy = true; + result = IRQ_WAKE_THREAD; + } else { + result = IRQ_HANDLED; + } } /* There is no true data interrupt status bit, so it is @@ -1114,15 +1110,19 @@ static irqreturn_t bcm2835_threaded_irq(int irq, void *dev_id) { struct bcm2835_host *host = dev_id; unsigned long flags; - bool block; + bool block, busy; spin_lock_irqsave(&host->lock, flags); block = host->irq_block; + busy = host->irq_busy; host->irq_block = false; + host->irq_busy = false; if (block) bcm2835_block_irq(host); + if (busy) + bcm2835_busy_irq(host); spin_unlock_irqrestore(&host->lock, flags);