averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-08-09 06:14:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "spi: spi-cadence-quadspi: Fix pm runtime unbalance"

Browse Source 
This reverts commit cdfb20e4b3 which is
commit b07f349d18 upstream.

There is cadence-qspi ff8d2000.spi: Unbalanced pm_runtime_enable! error
without this revert.

After reverting commit cdfb20e4b3 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit 1af6d1696c ("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 b07f349d18 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit 04a8ff1bc3 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths").

The commit 04a8ff1bc3 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths")
fix commit b07f349d18 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance").

The commit b07f349d18 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance") fix
commit 86401132d7 ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings").

The commit 86401132d7 ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings") fix
commit 0578a6dbfe ("spi: spi-cadence-quadspi: add runtime pm support").

6.6.y only backport commit b07f349d18 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit 04a8ff1bc3 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"),
but does not backport commit 0578a6dbfe ("spi: spi-cadence-quadspi: add runtime pm support")
and commit 86401132d7 ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings").
And the backport of commit b07f349d18 ("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 b07f349d18 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit 04a8ff1bc3 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"), there is no error.
If backport commit 0578a6dbfe ("spi: spi-cadence-quadspi: add runtime pm support") and
commit 86401132d7 ("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 0578a6dbfe ("spi: spi-cadence-quadspi: add runtime pm support") and
commit 86401132d7 ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings") are
not backported, commit b07f349d18 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit 04a8ff1bc3 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths") are not needed.
So revert commits commit cdfb20e4b3 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance") and
commit 1af6d1696c ("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>
This commit is contained in:
Jinfeng Wang
2025-09-09 18:56:28 +02:00
committed by Greg Kroah-Hartman
parent 94f7d90703
commit de6b545bcd
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/spi/spi-cadence-quadspi.c
+1 -10
View File
@@ -1868,13 +1868,6 @@ static int cqspi_probe(struct platform_device *pdev)
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_device *pdev)
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_device *pdev)
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);