diff mbox series

mmc: omap_hsmmc: fix wakeirq handling on removal

Message ID 20180902073058.17053-1-andreas@kemnade.info (mailing list archive)
State New, archived
Headers show
Series mmc: omap_hsmmc: fix wakeirq handling on removal | expand

Commit Message

Andreas Kemnade Sept. 2, 2018, 7:30 a.m. UTC
after unbinding mmc I get things like this:
[  185.294067] mmc1: card 0001 removed
[  185.305206] omap_hsmmc 480b4000.mmc: wake IRQ with no resume: -13

The wakeirq stays in /proc-interrupts

rebinding shows this:
[  289.795959] genirq: Flags mismatch irq 112. 0000200a (480b4000.mmc:wakeup) vs. 0000200a (480b4000.mmc:wakeup)
[  289.808959] omap_hsmmc 480b4000.mmc: Unable to request wake IRQ
[  289.815338] omap_hsmmc 480b4000.mmc: no SDIO IRQ support, falling back to polling

That bug seems to be introduced by switching from devm_request_irq()
to generic wakeirq handling.

So let us cleanup at removal.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Fixes: 5b83b2234be6 ("mmc: omap_hsmmc: Change wake-up interrupt to use generic wakeirq")
---
 drivers/mmc/host/omap_hsmmc.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Ulf Hansson Sept. 4, 2018, 2:34 p.m. UTC | #1
On 2 September 2018 at 09:30, Andreas Kemnade <andreas@kemnade.info> wrote:
> after unbinding mmc I get things like this:
> [  185.294067] mmc1: card 0001 removed
> [  185.305206] omap_hsmmc 480b4000.mmc: wake IRQ with no resume: -13
>
> The wakeirq stays in /proc-interrupts
>
> rebinding shows this:
> [  289.795959] genirq: Flags mismatch irq 112. 0000200a (480b4000.mmc:wakeup) vs. 0000200a (480b4000.mmc:wakeup)
> [  289.808959] omap_hsmmc 480b4000.mmc: Unable to request wake IRQ
> [  289.815338] omap_hsmmc 480b4000.mmc: no SDIO IRQ support, falling back to polling
>
> That bug seems to be introduced by switching from devm_request_irq()
> to generic wakeirq handling.
>
> So let us cleanup at removal.
>
> Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
> Fixes: 5b83b2234be6 ("mmc: omap_hsmmc: Change wake-up interrupt to use generic wakeirq")

Applied for fixes, and added a stable tag, thanks!

Kind regards
Uffe

> ---
>  drivers/mmc/host/omap_hsmmc.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 071693ebfe18..68760d4a5d3d 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -2177,6 +2177,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
>         dma_release_channel(host->tx_chan);
>         dma_release_channel(host->rx_chan);
>
> +       dev_pm_clear_wake_irq(host->dev);
>         pm_runtime_dont_use_autosuspend(host->dev);
>         pm_runtime_put_sync(host->dev);
>         pm_runtime_disable(host->dev);
> --
> 2.11.0
>
Tony Lindgren Sept. 4, 2018, 3:38 p.m. UTC | #2
* Ulf Hansson <ulf.hansson@linaro.org> [180904 14:39]:
> On 2 September 2018 at 09:30, Andreas Kemnade <andreas@kemnade.info> wrote:
> > after unbinding mmc I get things like this:
> > [  185.294067] mmc1: card 0001 removed
> > [  185.305206] omap_hsmmc 480b4000.mmc: wake IRQ with no resume: -13
> >
> > The wakeirq stays in /proc-interrupts
> >
> > rebinding shows this:
> > [  289.795959] genirq: Flags mismatch irq 112. 0000200a (480b4000.mmc:wakeup) vs. 0000200a (480b4000.mmc:wakeup)
> > [  289.808959] omap_hsmmc 480b4000.mmc: Unable to request wake IRQ
> > [  289.815338] omap_hsmmc 480b4000.mmc: no SDIO IRQ support, falling back to polling
> >
> > That bug seems to be introduced by switching from devm_request_irq()
> > to generic wakeirq handling.
> >
> > So let us cleanup at removal.
> >
> > Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
> > Fixes: 5b83b2234be6 ("mmc: omap_hsmmc: Change wake-up interrupt to use generic wakeirq")

Ooops sorry about that.

> Applied for fixes, and added a stable tag, thanks!

OK and thanks for fixing this Andreas!

Regards,

Tony
Andreas Kemnade Sept. 4, 2018, 8:11 p.m. UTC | #3
Hi,

On Tue, 4 Sep 2018 16:34:56 +0200
Ulf Hansson <ulf.hansson@linaro.org> wrote:

> On 2 September 2018 at 09:30, Andreas Kemnade <andreas@kemnade.info> wrote:
> > after unbinding mmc I get things like this:
> > [  185.294067] mmc1: card 0001 removed
> > [  185.305206] omap_hsmmc 480b4000.mmc: wake IRQ with no resume: -13
> >
> > The wakeirq stays in /proc-interrupts
> >
> > rebinding shows this:
> > [  289.795959] genirq: Flags mismatch irq 112. 0000200a (480b4000.mmc:wakeup) vs. 0000200a (480b4000.mmc:wakeup)
> > [  289.808959] omap_hsmmc 480b4000.mmc: Unable to request wake IRQ
> > [  289.815338] omap_hsmmc 480b4000.mmc: no SDIO IRQ support, falling back to polling
> >
> > That bug seems to be introduced by switching from devm_request_irq()
> > to generic wakeirq handling.
> >
> > So let us cleanup at removal.
> >
> > Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
> > Fixes: 5b83b2234be6 ("mmc: omap_hsmmc: Change wake-up interrupt to use generic wakeirq")  
> 
> Applied for fixes, and added a stable tag, thanks!
> 
What also might be critical (still analyzing) of that patch I am fixing
is:
It keeps the wakeup irq also enabled when the sdio irq is disabled.

Regards,
Andreas
diff mbox series

Patch

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 071693ebfe18..68760d4a5d3d 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2177,6 +2177,7 @@  static int omap_hsmmc_remove(struct platform_device *pdev)
 	dma_release_channel(host->tx_chan);
 	dma_release_channel(host->rx_chan);
 
+	dev_pm_clear_wake_irq(host->dev);
 	pm_runtime_dont_use_autosuspend(host->dev);
 	pm_runtime_put_sync(host->dev);
 	pm_runtime_disable(host->dev);