soc: mediatek: mtk-svs: Enable the IRQ later

BugLink: https://bugs.launchpad.net/bugs/2011430
[ Upstream commit b74952aba6c3f47e7f2c5165abaeefa44c377140 ]

If the system does not come from reset (like when is booted via
kexec()), the peripheral might triger an IRQ before the data structures
are initialised.

Fixes:

[    0.227710] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000f08
[    0.227913] Call trace:
[    0.227918]  svs_isr+0x8c/0x538

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Link: https://lore.kernel.org/r/20221127-mtk-svs-v2-0-145b07663ea8@chromium.org
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c
index 0469c9dfeb04ea86fb871c51b5fdd0fa711f8ac0..75b2f534aa9d05f36e2c41c2518bc4eadb826999 100644 (file)
--- a/drivers/soc/mediatek/mtk-svs.c
+++ b/drivers/soc/mediatek/mtk-svs.c
@@ -2385,14 +2385,6 @@ static int svs_probe(struct platform_device *pdev)
                goto svs_probe_free_resource;
        }
 
-       ret = devm_request_threaded_irq(svsp->dev, svsp_irq, NULL, svs_isr,
-                                       IRQF_ONESHOT, svsp->name, svsp);
-       if (ret) {
-               dev_err(svsp->dev, "register irq(%d) failed: %d\n",
-                       svsp_irq, ret);
-               goto svs_probe_free_resource;
-       }
-
        svsp->main_clk = devm_clk_get(svsp->dev, "main");
        if (IS_ERR(svsp->main_clk)) {
                dev_err(svsp->dev, "failed to get clock: %ld\n",
@@ -2414,6 +2406,14 @@ static int svs_probe(struct platform_device *pdev)
                goto svs_probe_clk_disable;
        }
 
+       ret = devm_request_threaded_irq(svsp->dev, svsp_irq, NULL, svs_isr,
+                                       IRQF_ONESHOT, svsp->name, svsp);
+       if (ret) {
+               dev_err(svsp->dev, "register irq(%d) failed: %d\n",
+                       svsp_irq, ret);
+               goto svs_probe_iounmap;
+       }
+
        ret = svs_start(svsp);
        if (ret) {
                dev_err(svsp->dev, "svs start fail: %d\n", ret);