* [PATCH] mmc: uniphier-sd: call devm_request_irq() after tmio_mmc_host_probe()
@ 2020-05-11 6:21 Masahiro Yamada
2020-05-15 7:09 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Masahiro Yamada @ 2020-05-11 6:21 UTC (permalink / raw)
To: linux-mmc, Ulf Hansson, Wolfram Sang
Cc: Masahiro Yamada, linux-arm-kernel, linux-kernel
Currently, tmio_mmc_irq() handler is registered before the host is
fully initialized by tmio_mmc_host_probe(). I did not previously notice
this problem.
The boot ROM of a new Socionext SoC unmasks interrupts (CTL_IRQ_MASK)
somehow. The handler is invoked before tmio_mmc_host_probe(), then
emits noisy call trace.
Move devm_request_irq() below tmio_mmc_host_probe().
Fixes: 3fd784f745dd ("mmc: uniphier-sd: add UniPhier SD/eMMC controller driver")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/mmc/host/uniphier-sd.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c
index a1683c49cb90..f82baf99fd69 100644
--- a/drivers/mmc/host/uniphier-sd.c
+++ b/drivers/mmc/host/uniphier-sd.c
@@ -610,11 +610,6 @@ static int uniphier_sd_probe(struct platform_device *pdev)
}
}
- ret = devm_request_irq(dev, irq, tmio_mmc_irq, IRQF_SHARED,
- dev_name(dev), host);
- if (ret)
- goto free_host;
-
if (priv->caps & UNIPHIER_SD_CAP_EXTENDED_IP)
host->dma_ops = &uniphier_sd_internal_dma_ops;
else
@@ -642,8 +637,15 @@ static int uniphier_sd_probe(struct platform_device *pdev)
if (ret)
goto free_host;
+ ret = devm_request_irq(dev, irq, tmio_mmc_irq, IRQF_SHARED,
+ dev_name(dev), host);
+ if (ret)
+ goto remove_host;
+
return 0;
+remove_host:
+ tmio_mmc_host_remove(host);
free_host:
tmio_mmc_host_free(host);
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mmc: uniphier-sd: call devm_request_irq() after tmio_mmc_host_probe()
2020-05-11 6:21 [PATCH] mmc: uniphier-sd: call devm_request_irq() after tmio_mmc_host_probe() Masahiro Yamada
@ 2020-05-15 7:09 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2020-05-15 7:09 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-mmc, Wolfram Sang, Linux ARM, Linux Kernel Mailing List
On Mon, 11 May 2020 at 08:22, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> Currently, tmio_mmc_irq() handler is registered before the host is
> fully initialized by tmio_mmc_host_probe(). I did not previously notice
> this problem.
>
> The boot ROM of a new Socionext SoC unmasks interrupts (CTL_IRQ_MASK)
> somehow. The handler is invoked before tmio_mmc_host_probe(), then
> emits noisy call trace.
>
> Move devm_request_irq() below tmio_mmc_host_probe().
>
> Fixes: 3fd784f745dd ("mmc: uniphier-sd: add UniPhier SD/eMMC controller driver")
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Applied for next, and by adding a stable tag, thanks!
Kind regards
Uffe
> ---
>
> drivers/mmc/host/uniphier-sd.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c
> index a1683c49cb90..f82baf99fd69 100644
> --- a/drivers/mmc/host/uniphier-sd.c
> +++ b/drivers/mmc/host/uniphier-sd.c
> @@ -610,11 +610,6 @@ static int uniphier_sd_probe(struct platform_device *pdev)
> }
> }
>
> - ret = devm_request_irq(dev, irq, tmio_mmc_irq, IRQF_SHARED,
> - dev_name(dev), host);
> - if (ret)
> - goto free_host;
> -
> if (priv->caps & UNIPHIER_SD_CAP_EXTENDED_IP)
> host->dma_ops = &uniphier_sd_internal_dma_ops;
> else
> @@ -642,8 +637,15 @@ static int uniphier_sd_probe(struct platform_device *pdev)
> if (ret)
> goto free_host;
>
> + ret = devm_request_irq(dev, irq, tmio_mmc_irq, IRQF_SHARED,
> + dev_name(dev), host);
> + if (ret)
> + goto remove_host;
> +
> return 0;
>
> +remove_host:
> + tmio_mmc_host_remove(host);
> free_host:
> tmio_mmc_host_free(host);
>
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-15 7:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-11 6:21 [PATCH] mmc: uniphier-sd: call devm_request_irq() after tmio_mmc_host_probe() Masahiro Yamada
2020-05-15 7:09 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).