spi: mediatek: Enable irq when pdata is ready
authorRicardo Ribalda <ribalda@chromium.org>
Mon, 28 Nov 2022 11:00:01 +0000 (12:00 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 28 Nov 2022 16:26:17 +0000 (16:26 +0000)
If the device does not come straight from reset, we might receive an IRQ
before we are ready to handle it.

Fixes:

[    0.832328] Unable to handle kernel read from unreadable memory at virtual address 0000000000000010
[    1.040343] Call trace:
[    1.040347]  mtk_spi_can_dma+0xc/0x40
...
[    1.262265]  start_kernel+0x338/0x42c

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20221128-spi-mt65xx-v1-0-509266830665@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mt65xx.c

index 11aeae7fe7fc9fd59e7e40e0f1e3e162a1b54914..f011b5ff682180133be3d36c7f2621909272a03d 100644 (file)
@@ -1189,11 +1189,6 @@ static int mtk_spi_probe(struct platform_device *pdev)
        else
                dma_set_max_seg_size(dev, SZ_256K);
 
-       ret = devm_request_irq(dev, irq, mtk_spi_interrupt,
-                              IRQF_TRIGGER_NONE, dev_name(dev), master);
-       if (ret)
-               return dev_err_probe(dev, ret, "failed to register irq\n");
-
        mdata->parent_clk = devm_clk_get(dev, "parent-clk");
        if (IS_ERR(mdata->parent_clk))
                return dev_err_probe(dev, PTR_ERR(mdata->parent_clk),
@@ -1263,6 +1258,13 @@ static int mtk_spi_probe(struct platform_device *pdev)
                return dev_err_probe(dev, ret, "failed to register master\n");
        }
 
+       ret = devm_request_irq(dev, irq, mtk_spi_interrupt,
+                              IRQF_TRIGGER_NONE, dev_name(dev), master);
+       if (ret) {
+               pm_runtime_disable(dev);
+               return dev_err_probe(dev, ret, "failed to register irq\n");
+       }
+
        return 0;
 }