Patch "spi: mediatek: Enable irq before the spi registration" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    spi: mediatek: Enable irq before the spi registration

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     spi-mediatek-enable-irq-before-the-spi-registration.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit a3e79533df60a5597832037e09c84132b8c8d7bd
Author: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
Date:   Sun Dec 25 09:37:12 2022 +0100

    spi: mediatek: Enable irq before the spi registration
    
    [ Upstream commit b24cded8c065d7cef8690b2c7b82b828cce57708 ]
    
    If the irq is enabled after the spi si registered, there can be a race
    with the initialization of the devices on the spi bus.
    
    Eg:
    mtk-spi 1100a000.spi: spi-mem transfer timeout
    spi-nor: probe of spi0.0 failed with error -110
    Unable to handle kernel NULL pointer dereference at virtual address
    0000000000000010
    ...
    Call trace:
     mtk_spi_can_dma+0x0/0x2c
    
    Fixes: c6f7874687f7 ("spi: mediatek: Enable irq when pdata is ready")
    Reported-by: Daniel Golle <daniel@xxxxxxxxxxxxxx>
    Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
    Tested-by: Daniel Golle <daniel@xxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20221225-mtk-spi-fixes-v1-0-bb6c14c232f8@xxxxxxxxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index 6de8360e5c2a9..9eab6c20dbc56 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -1253,6 +1253,11 @@ static int mtk_spi_probe(struct platform_device *pdev)
 		dev_notice(dev, "SPI dma_set_mask(%d) failed, ret:%d\n",
 			   addr_bits, ret);
 
+	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");
+
 	pm_runtime_enable(dev);
 
 	ret = devm_spi_register_master(dev, master);
@@ -1261,13 +1266,6 @@ 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;
 }