[v3] mmc: tmio_mmc_core: don't claim spurious interrupts
diff mbox series

Message ID 7e293159-0ae3-82fb-2723-04e91d652906@cogentembedded.com
State Accepted
Delegated to: Geert Uytterhoeven
Headers show
Series
  • [v3] mmc: tmio_mmc_core: don't claim spurious interrupts
Related show

Commit Message

Sergei Shtylyov Feb. 18, 2019, 5:45 p.m. UTC
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: 7729c7a232a9 ("mmc: tmio: Provide separate interrupt handlers")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
The patch is against Ulf Hansson's 'mmc.git' repo's 'fixes' branch.

Changes in version 3:
- simplified the final *return* statement in __tmio_mmc_sdio_irq();
- added the "Fixes:" tag;
- cleaned up the whitespace in the patch description.

Changes in version 2:
- refreshed the patch;
- fixed an article and whitespace in the patch description.

 drivers/mmc/host/tmio_mmc_core.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Comments

Wolfram Sang Feb. 19, 2019, 5:06 p.m. UTC | #1
On Mon, Feb 18, 2019 at 08:45:40PM +0300, Sergei Shtylyov wrote:
> 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: 7729c7a232a9 ("mmc: tmio: Provide separate interrupt handlers")
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Tested on a Lager board (R-Car H2, microSD card) -> no regressions
Also, Salvator-XS (R-Car M3N, SDR50 SDIO WIFI card)
  -> could still be detected

Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Simon Horman Feb. 25, 2019, 9:51 a.m. UTC | #2
On Tue, Feb 19, 2019 at 06:06:55PM +0100, Wolfram Sang wrote:
> On Mon, Feb 18, 2019 at 08:45:40PM +0300, Sergei Shtylyov wrote:
> > 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: 7729c7a232a9 ("mmc: tmio: Provide separate interrupt handlers")
> > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> Tested on a Lager board (R-Car H2, microSD card) -> no regressions
> Also, Salvator-XS (R-Car M3N, SDR50 SDIO WIFI card)
>   -> could still be detected
> 
> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson Feb. 26, 2019, 8:18 a.m. UTC | #3
On Mon, 18 Feb 2019 at 18:45, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
>
> 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: 7729c7a232a9 ("mmc: tmio: Provide separate interrupt handlers")
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe


>
> ---
> The patch is against Ulf Hansson's 'mmc.git' repo's 'fixes' branch.
>
> Changes in version 3:
> - simplified the final *return* statement in __tmio_mmc_sdio_irq();
> - added the "Fixes:" tag;
> - cleaned up the whitespace in the patch description.
>
> Changes in version 2:
> - refreshed the patch;
> - fixed an article and whitespace in the patch description.
>
>  drivers/mmc/host/tmio_mmc_core.c |   11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> Index: mmc/drivers/mmc/host/tmio_mmc_core.c
> ===================================================================
> --- mmc.orig/drivers/mmc/host/tmio_mmc_core.c
> +++ mmc/drivers/mmc/host/tmio_mmc_core.c
> @@ -629,7 +629,7 @@ static bool __tmio_mmc_sdcard_irq(struct
>         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 tmio_mmc_data *pdata = host->pdata;
> @@ -637,7 +637,7 @@ static void __tmio_mmc_sdio_irq(struct t
>         unsigned int sdio_status;
>
>         if (!(pdata->flags & TMIO_MMC_SDIO_IRQ))
> -               return;
> +               return false;
>
>         status = sd_ctrl_read16(host, CTL_SDIO_STATUS);
>         ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask;
> @@ -650,6 +650,8 @@ static void __tmio_mmc_sdio_irq(struct t
>
>         if (mmc->caps & MMC_CAP_SDIO_IRQ && ireg & TMIO_SDIO_STAT_IOIRQ)
>                 mmc_signal_sdio_irq(mmc);
> +
> +       return ireg;
>  }
>
>  irqreturn_t tmio_mmc_irq(int irq, void *devid)
> @@ -668,9 +670,10 @@ irqreturn_t tmio_mmc_irq(int irq, void *
>         if (__tmio_mmc_sdcard_irq(host, ireg, status))
>                 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);
>

Patch
diff mbox series

Index: mmc/drivers/mmc/host/tmio_mmc_core.c
===================================================================
--- mmc.orig/drivers/mmc/host/tmio_mmc_core.c
+++ mmc/drivers/mmc/host/tmio_mmc_core.c
@@ -629,7 +629,7 @@  static bool __tmio_mmc_sdcard_irq(struct
 	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 tmio_mmc_data *pdata = host->pdata;
@@ -637,7 +637,7 @@  static void __tmio_mmc_sdio_irq(struct t
 	unsigned int sdio_status;
 
 	if (!(pdata->flags & TMIO_MMC_SDIO_IRQ))
-		return;
+		return false;
 
 	status = sd_ctrl_read16(host, CTL_SDIO_STATUS);
 	ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask;
@@ -650,6 +650,8 @@  static void __tmio_mmc_sdio_irq(struct t
 
 	if (mmc->caps & MMC_CAP_SDIO_IRQ && ireg & TMIO_SDIO_STAT_IOIRQ)
 		mmc_signal_sdio_irq(mmc);
+
+	return ireg;
 }
 
 irqreturn_t tmio_mmc_irq(int irq, void *devid)
@@ -668,9 +670,10 @@  irqreturn_t tmio_mmc_irq(int irq, void *
 	if (__tmio_mmc_sdcard_irq(host, ireg, status))
 		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);