| From 4f3598face613882e4bb3d66b5f0110486f6dbe8 Mon Sep 17 00:00:00 2001 |
| From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Date: Mon, 11 May 2020 15:21:58 +0900 |
| Subject: [PATCH] mmc: uniphier-sd: call devm_request_irq() after |
| tmio_mmc_host_probe() |
| |
| commit 5d1f42e14b135773c0cc1d82e904c5b223783a9d upstream. |
| |
| 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> |
| Cc: stable@vger.kernel.org |
| Link: https://lore.kernel.org/r/20200511062158.1790924-1-yamada.masahiro@socionext.com |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c |
| index 91a2be41edf6..a16d16f97190 100644 |
| --- a/drivers/mmc/host/uniphier-sd.c |
| +++ b/drivers/mmc/host/uniphier-sd.c |
| @@ -616,11 +616,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 |
| @@ -648,8 +643,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.27.0 |
| |
