Path: csiph.com!1.us.feeder.erje.net!2.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!newsreader4.netcologne.de!news.netcologne.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Gerd Hoffmann Newsgroups: linux.kernel Subject: [PATCH 05/13] mmc: bcm2835: call bcm2835_block_irq from irqthread Date: Fri, 27 Jan 2017 00:40:02 +0100 Message-ID: References: X-Original-To: linux-rpi-kernel@lists.infradead.org X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 26 Jan 2017 23:37:33 +0000 (UTC) Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 75 Organization: linux.* mail to news gateway X-Original-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) X-Original-Date: Fri, 27 Jan 2017 00:37:18 +0100 X-Original-Message-ID: <1485473846-24537-6-git-send-email-kraxel@redhat.com> X-Original-References: <1485473846-24537-1-git-send-email-kraxel@redhat.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1567813 Signed-off-by: Gerd Hoffmann --- drivers/mmc/host/bcm2835.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index d25b85a..8270c76 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -168,6 +168,9 @@ struct bcm2835_host { bool use_busy:1; /* Wait for busy interrupt */ bool use_sbc:1; /* Send CMD23 */ + /* for threaded irq handler */ + bool irq_block; + /* DMA part */ struct dma_chan *dma_chan_rx; struct dma_chan *dma_chan_tx; @@ -1035,18 +1038,13 @@ static void bcm2835_data_irq(struct bcm2835_host *host, u32 intmask) } } -static void bcm2835_block_irq(struct bcm2835_host *host, u32 intmask) +static void bcm2835_block_irq(struct bcm2835_host *host) { - if (!host->data) { - dev_err(&host->pdev->dev, - "got block interrupt 0x%08x even though no data operation was in progress.\n", - (unsigned int)intmask); + if (WARN_ON(!host->data)) { bcm2835_dumpregs(host); return; } - bcm2835_check_data_error(host, intmask); - if (!host->dma_desc) { WARN_ON(!host->blocks); if (host->data->error || (--host->blocks == 0)) @@ -1075,8 +1073,9 @@ static irqreturn_t bcm2835_irq(int irq, void *dev_id) host->ioaddr + SDHSTS); if (intmask & SDHSTS_BLOCK_IRPT) { - bcm2835_block_irq(host, intmask); - result = IRQ_HANDLED; + bcm2835_check_data_error(host, intmask); + host->irq_block = true; + result = IRQ_WAKE_THREAD; } if (intmask & SDHSTS_BUSY_IRPT) { @@ -1101,6 +1100,20 @@ static irqreturn_t bcm2835_irq(int irq, void *dev_id) static irqreturn_t bcm2835_threaded_irq(int irq, void *dev_id) { + struct bcm2835_host *host = dev_id; + unsigned long flags; + bool block; + + spin_lock_irqsave(&host->lock, flags); + + block = host->irq_block; + host->irq_block = false; + + if (block) + bcm2835_block_irq(host); + + spin_unlock_irqrestore(&host->lock, flags); + return IRQ_HANDLED; } -- 1.8.3.1