From 5613b079a2e3243037d1612672b5bdf37db86991 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 25 Dec 2022 18:17:38 -0500 Subject: [PATCH] Drop spi-mediatek-enable-irq-when-pdata-is-ready.patch Signed-off-by: Sasha Levin --- queue-6.0/series | 1 - ...iatek-enable-irq-when-pdata-is-ready.patch | 62 ------------------- queue-6.1/series | 1 - ...iatek-enable-irq-when-pdata-is-ready.patch | 62 ------------------- 4 files changed, 126 deletions(-) delete mode 100644 queue-6.0/spi-mediatek-enable-irq-when-pdata-is-ready.patch delete mode 100644 queue-6.1/spi-mediatek-enable-irq-when-pdata-is-ready.patch diff --git a/queue-6.0/series b/queue-6.0/series index f18c7ce8c7e..6534dd611f9 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -415,7 +415,6 @@ wifi-plfxlc-fix-potential-memory-leak-in-__lf_x_usb_.patch wifi-rtl8xxxu-fix-use-after-rcu_read_unlock-in-rtl8x.patch wifi-iwlwifi-mvm-fix-double-free-on-tx-path.patch spi-mt65xx-add-dma-max-segment-size-declaration.patch -spi-mediatek-enable-irq-when-pdata-is-ready.patch asoc-mediatek-mt8173-enable-irq-when-pdata-is-ready.patch clk-mediatek-fix-dependency-of-mt7986-adc-clocks.patch drm-amd-pm-smu11-baco-is-supported-when-it-s-in-baco.patch diff --git a/queue-6.0/spi-mediatek-enable-irq-when-pdata-is-ready.patch b/queue-6.0/spi-mediatek-enable-irq-when-pdata-is-ready.patch deleted file mode 100644 index d77131b6fb6..00000000000 --- a/queue-6.0/spi-mediatek-enable-irq-when-pdata-is-ready.patch +++ /dev/null @@ -1,62 +0,0 @@ -From a1fa8e2ce87195e5d8d8941eecda98ab5ea0af10 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 28 Nov 2022 12:00:01 +0100 -Subject: spi: mediatek: Enable irq when pdata is ready - -From: Ricardo Ribalda - -[ Upstream commit c6f7874687f7027d7c4b2f53ff6e4d22850f915d ] - -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 -Reviewed-by: AngeloGioacchino Del Regno -Link: https://lore.kernel.org/r/20221128-spi-mt65xx-v1-0-509266830665@chromium.org -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-mt65xx.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c -index d6aff909fc36..6de8360e5c2a 100644 ---- a/drivers/spi/spi-mt65xx.c -+++ b/drivers/spi/spi-mt65xx.c -@@ -1192,11 +1192,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), -@@ -1266,6 +1261,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; - } - --- -2.35.1 - diff --git a/queue-6.1/series b/queue-6.1/series index 5ff8b096a10..337da514e6d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -430,7 +430,6 @@ alsa-asihpi-fix-missing-pci_disable_device.patch wifi-plfxlc-fix-potential-memory-leak-in-__lf_x_usb_.patch wifi-rtl8xxxu-fix-use-after-rcu_read_unlock-in-rtl8x.patch wifi-iwlwifi-mvm-fix-double-free-on-tx-path.patch -spi-mediatek-enable-irq-when-pdata-is-ready.patch asoc-mediatek-mt8173-enable-irq-when-pdata-is-ready.patch clk-mediatek-fix-dependency-of-mt7986-adc-clocks.patch drm-amd-pm-smu11-baco-is-supported-when-it-s-in-baco.patch diff --git a/queue-6.1/spi-mediatek-enable-irq-when-pdata-is-ready.patch b/queue-6.1/spi-mediatek-enable-irq-when-pdata-is-ready.patch deleted file mode 100644 index 36219ff661a..00000000000 --- a/queue-6.1/spi-mediatek-enable-irq-when-pdata-is-ready.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 9ab78dd656d6996abba66bbd23f5000e455c52a7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 28 Nov 2022 12:00:01 +0100 -Subject: spi: mediatek: Enable irq when pdata is ready - -From: Ricardo Ribalda - -[ Upstream commit c6f7874687f7027d7c4b2f53ff6e4d22850f915d ] - -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 -Reviewed-by: AngeloGioacchino Del Regno -Link: https://lore.kernel.org/r/20221128-spi-mt65xx-v1-0-509266830665@chromium.org -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-mt65xx.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c -index d6aff909fc36..6de8360e5c2a 100644 ---- a/drivers/spi/spi-mt65xx.c -+++ b/drivers/spi/spi-mt65xx.c -@@ -1192,11 +1192,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), -@@ -1266,6 +1261,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; - } - --- -2.35.1 - -- 2.47.3