ASoC: mediatek: mt8173: Enable IRQ when pdata is ready
authorRicardo Ribalda <ribalda@chromium.org>
Mon, 28 Nov 2022 10:49:16 +0000 (11:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:14:13 +0000 (13:14 +0100)
[ Upstream commit 4cbb264d4e9136acab2c8fd39e39ab1b1402b84b ]

If the device does not come straight from reset, we might receive an IRQ
before we are ready to handle it.

Fixes:

[    2.334737] Unable to handle kernel read from unreadable memory at virtual address 00000000000001e4
[    2.522601] Call trace:
[    2.525040]  regmap_read+0x1c/0x80
[    2.528434]  mt8173_afe_irq_handler+0x40/0xf0
...
[    2.598921]  start_kernel+0x338/0x42c

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Fixes: ee0bcaff109f ("ASoC: mediatek: Add AFE platform driver")
Link: https://lore.kernel.org/r/20221128-mt8173-afe-v1-0-70728221628f@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/mediatek/mt8173/mt8173-afe-pcm.c

index 3149493..8092506 100644 (file)
@@ -1072,16 +1072,6 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
 
        afe->dev = &pdev->dev;
 
-       irq_id = platform_get_irq(pdev, 0);
-       if (irq_id <= 0)
-               return irq_id < 0 ? irq_id : -ENXIO;
-       ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler,
-                              0, "Afe_ISR_Handle", (void *)afe);
-       if (ret) {
-               dev_err(afe->dev, "could not request_irq\n");
-               return ret;
-       }
-
        afe->base_addr = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(afe->base_addr))
                return PTR_ERR(afe->base_addr);
@@ -1187,6 +1177,16 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
        if (ret)
                goto err_cleanup_components;
 
+       irq_id = platform_get_irq(pdev, 0);
+       if (irq_id <= 0)
+               return irq_id < 0 ? irq_id : -ENXIO;
+       ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler,
+                              0, "Afe_ISR_Handle", (void *)afe);
+       if (ret) {
+               dev_err(afe->dev, "could not request_irq\n");
+               goto err_pm_disable;
+       }
+
        dev_info(&pdev->dev, "MT8173 AFE driver initialized.\n");
        return 0;