Commit 5c27ff5d authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Ulf Hansson

mmc: tmio_mmc_core: don't claim spurious interrupts

I have encountered an interrupt storm during the eMMC chip probing (and
the chip finally didn't get detected).  It turned out that U-Boot left
the DMAC interrupts enabled while the Linux driver  didn't use those.
The SDHI driver's interrupt handler somehow assumes that, even if an
SDIO interrupt didn't happen, it should return IRQ_HANDLED.  I think
that if none of the enabled interrupts happened and got handled, we
should return IRQ_NONE -- that way the kernel IRQ code recoginizes
a spurious interrupt and masks it off pretty quickly...

Fixes: 7729c7a2 ("mmc: tmio: Provide separate interrupt handlers")
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent c9bd505d
...@@ -629,7 +629,7 @@ static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host, int ireg, ...@@ -629,7 +629,7 @@ static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host, int ireg,
return false; return false;
} }
static void __tmio_mmc_sdio_irq(struct tmio_mmc_host *host) static bool __tmio_mmc_sdio_irq(struct tmio_mmc_host *host)
{ {
struct mmc_host *mmc = host->mmc; struct mmc_host *mmc = host->mmc;
struct tmio_mmc_data *pdata = host->pdata; struct tmio_mmc_data *pdata = host->pdata;
...@@ -637,7 +637,7 @@ static void __tmio_mmc_sdio_irq(struct tmio_mmc_host *host) ...@@ -637,7 +637,7 @@ static void __tmio_mmc_sdio_irq(struct tmio_mmc_host *host)
unsigned int sdio_status; unsigned int sdio_status;
if (!(pdata->flags & TMIO_MMC_SDIO_IRQ)) if (!(pdata->flags & TMIO_MMC_SDIO_IRQ))
return; return false;
status = sd_ctrl_read16(host, CTL_SDIO_STATUS); status = sd_ctrl_read16(host, CTL_SDIO_STATUS);
ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask; ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask;
...@@ -650,6 +650,8 @@ static void __tmio_mmc_sdio_irq(struct tmio_mmc_host *host) ...@@ -650,6 +650,8 @@ static void __tmio_mmc_sdio_irq(struct tmio_mmc_host *host)
if (mmc->caps & MMC_CAP_SDIO_IRQ && ireg & TMIO_SDIO_STAT_IOIRQ) if (mmc->caps & MMC_CAP_SDIO_IRQ && ireg & TMIO_SDIO_STAT_IOIRQ)
mmc_signal_sdio_irq(mmc); mmc_signal_sdio_irq(mmc);
return ireg;
} }
irqreturn_t tmio_mmc_irq(int irq, void *devid) irqreturn_t tmio_mmc_irq(int irq, void *devid)
...@@ -668,9 +670,10 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid) ...@@ -668,9 +670,10 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid)
if (__tmio_mmc_sdcard_irq(host, ireg, status)) if (__tmio_mmc_sdcard_irq(host, ireg, status))
return IRQ_HANDLED; return IRQ_HANDLED;
__tmio_mmc_sdio_irq(host); if (__tmio_mmc_sdio_irq(host))
return IRQ_HANDLED; return IRQ_HANDLED;
return IRQ_NONE;
} }
EXPORT_SYMBOL_GPL(tmio_mmc_irq); EXPORT_SYMBOL_GPL(tmio_mmc_irq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment