6.6-stable patches

added patches:
	revert-spi-cadence-quadspi-fix-cleanup-of-rx_chan-on-failure-paths.patch
	revert-spi-spi-cadence-quadspi-fix-pm-runtime-unbalance.patch

diff --git a/queue-6.6/revert-spi-cadence-quadspi-fix-cleanup-of-rx_chan-on-failure-paths.patch b/queue-6.6/revert-spi-cadence-quadspi-fix-cleanup-of-rx_chan-on-failure-paths.patch
new file mode 100644 (file)
index 0000000..a533cee
--- /dev/null
+++ b/queue-6.6/revert-spi-cadence-quadspi-fix-cleanup-of-rx_chan-on-failure-paths.patch
@@ -0,0 +1,73 @@
+From stable+bounces-177575-greg=kroah.com@vger.kernel.org Wed Sep  3 09:59:39 2025
+From: <jinfeng.wang.cn@windriver.com>
+Date: Wed, 3 Sep 2025 15:58:14 +0800
+Subject: Revert "spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"
+To: <gregkh@linuxfoundation.org>, <d-gole@ti.com>, <ronald.wahl@legrand.com>
+Cc: <broonie@kernel.org>, <matthew.gerlach@altera.com>, <khairul.anuar.romli@altera.com>, <stable@vger.kernel.org>
+Message-ID: <20250903075815.1034962-1-jinfeng.wang.cn@windriver.com>
+
+From: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
+
+This reverts commit 1af6d1696ca40b2d22889b4b8bbea616f94aaa84 which is
+commit 04a8ff1bc3514808481ddebd454342ad902a3f60 upstream.
+
+There is cadence-qspi ff8d2000.spi: Unbalanced pm_runtime_enable! error
+without this revert.
+
+After reverting commit cdfb20e4b34a ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 1af6d1696ca4 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"),
+Unbalanced pm_runtime_enable! error does not appear.
+
+These two commits are backported from upstream commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths").
+
+The commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths")
+fix commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance").
+
+The commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance") fix
+commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings").
+
+The commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings") fix
+commit 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support").
+
+6.6.y only backport commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"),
+but does not backport commit 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support")
+and commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings").
+And the backport of commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+differs with the original patch. So there is Unbalanced pm_runtime_enable error.
+
+If revert the backport for commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"), there is no error.
+If backport commit 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support") and
+commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings"), there
+is hang during booting. I didn't find the cause of the hang.
+
+Since commit 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support") and
+commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings") are
+not backported, commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths") are not needed.
+So revert commits commit cdfb20e4b34a ("spi: spi-cadence-quadspi: Fix pm runtime unbalance") and
+commit 1af6d1696ca4 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths").
+
+Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/spi/spi-cadence-quadspi.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/spi/spi-cadence-quadspi.c
++++ b/drivers/spi/spi-cadence-quadspi.c
+@@ -1870,6 +1870,11 @@ static int cqspi_probe(struct platform_d
+ 
+       pm_runtime_enable(dev);
+ 
++      if (cqspi->rx_chan) {
++              dma_release_channel(cqspi->rx_chan);
++              goto probe_setup_failed;
++      }
++
+       ret = spi_register_controller(host);
+       if (ret) {
+               dev_err(&pdev->dev, "failed to register SPI ctlr %d\n", ret);

diff --git a/queue-6.6/revert-spi-spi-cadence-quadspi-fix-pm-runtime-unbalance.patch b/queue-6.6/revert-spi-spi-cadence-quadspi-fix-pm-runtime-unbalance.patch
new file mode 100644 (file)
index 0000000..1bdb370
--- /dev/null
+++ b/queue-6.6/revert-spi-spi-cadence-quadspi-fix-pm-runtime-unbalance.patch
@@ -0,0 +1,93 @@
+From stable+bounces-177576-greg=kroah.com@vger.kernel.org Wed Sep  3 09:59:47 2025
+From: <jinfeng.wang.cn@windriver.com>
+Date: Wed, 3 Sep 2025 15:58:15 +0800
+Subject: Revert "spi: spi-cadence-quadspi: Fix pm runtime unbalance"
+To: <gregkh@linuxfoundation.org>, <d-gole@ti.com>, <ronald.wahl@legrand.com>
+Cc: <broonie@kernel.org>, <matthew.gerlach@altera.com>, <khairul.anuar.romli@altera.com>, <stable@vger.kernel.org>
+Message-ID: <20250903075815.1034962-2-jinfeng.wang.cn@windriver.com>
+
+From: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
+
+This reverts commit cdfb20e4b34ad99b3fe122aafb4f8ee7b9856e1f which is
+commit b07f349d1864abe29436f45e3047da2bdd476462 upstream.
+
+There is cadence-qspi ff8d2000.spi: Unbalanced pm_runtime_enable! error
+without this revert.
+
+After reverting commit cdfb20e4b34a ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 1af6d1696ca4 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"),
+Unbalanced pm_runtime_enable! error does not appear.
+
+These two commits are backported from upstream commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths").
+
+The commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths")
+fix commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance").
+
+The commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance") fix
+commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings").
+
+The commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings") fix
+commit 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support").
+
+6.6.y only backport commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"),
+but does not backport commit 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support")
+and commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings").
+And the backport of commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+differs with the original patch. So there is Unbalanced pm_runtime_enable error.
+
+If revert the backport for commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"), there is no error.
+If backport commit 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support") and
+commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings"), there
+is hang during booting. I didn't find the cause of the hang.
+
+Since commit 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support") and
+commit 86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings") are
+not backported, commit b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
+and commit 04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths") are not needed.
+So revert commits commit cdfb20e4b34a ("spi: spi-cadence-quadspi: Fix pm runtime unbalance") and
+commit 1af6d1696ca4 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths").
+
+Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/spi/spi-cadence-quadspi.c |   11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+--- a/drivers/spi/spi-cadence-quadspi.c
++++ b/drivers/spi/spi-cadence-quadspi.c
+@@ -1868,13 +1868,6 @@ static int cqspi_probe(struct platform_d
+                       goto probe_setup_failed;
+       }
+ 
+-      pm_runtime_enable(dev);
+-
+-      if (cqspi->rx_chan) {
+-              dma_release_channel(cqspi->rx_chan);
+-              goto probe_setup_failed;
+-      }
+-
+       ret = spi_register_controller(host);
+       if (ret) {
+               dev_err(&pdev->dev, "failed to register SPI ctlr %d\n", ret);
+@@ -1884,7 +1877,6 @@ static int cqspi_probe(struct platform_d
+       return 0;
+ probe_setup_failed:
+       cqspi_controller_enable(cqspi, 0);
+-      pm_runtime_disable(dev);
+ probe_reset_failed:
+       if (cqspi->is_jh7110)
+               cqspi_jh7110_disable_clk(pdev, cqspi);
+@@ -1906,8 +1898,7 @@ static void cqspi_remove(struct platform
+       if (cqspi->rx_chan)
+               dma_release_channel(cqspi->rx_chan);
+ 
+-      if (pm_runtime_get_sync(&pdev->dev) >= 0)
+-              clk_disable(cqspi->clk);
++      clk_disable_unprepare(cqspi->clk);
+ 
+       if (cqspi->is_jh7110)
+               cqspi_jh7110_disable_clk(pdev, cqspi);

diff --git a/queue-6.6/series b/queue-6.6/series
index fe9ee7045912bbcd82b4885f813dd59b42156be5..d9f698545913d101d2a212b181ef7c66c319c1fd 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -67,3 +67,5 @@ batman-adv-fix-oob-read-write-in-network-coding-decode.patch
 cifs-prevent-null-pointer-dereference-in-utf16-conversion.patch
 e1000e-fix-heap-overflow-in-e1000_set_eeprom.patch
 net-pcs-rzn1-miic-correct-modctrl-register-offset.patch
+revert-spi-cadence-quadspi-fix-cleanup-of-rx_chan-on-failure-paths.patch
+revert-spi-spi-cadence-quadspi-fix-pm-runtime-unbalance.patch