Unverified Commit 5e8bb0cc authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

spi: cadence-quadspi: fix runtime pm and clock imbalance on unbind 



Make sure to balance the runtime PM usage count before returning on
probe failure (to allow the controller to suspend after a probe
deferral) and to only drop the usage count on driver unbind to avoid a
clock disable imbalance.

Also restore the autosuspend setting.

Fixes: 0578a6db ("spi: spi-cadence-quadspi: add runtime pm support")
Cc: stable@vger.kernel.org	# 6.7
Cc: Dhruva Gole <d-gole@ti.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260421125354.1534871-5-johan@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 233db2cb

drivers/spi/spi-cadence-quadspi.c

+10 −7
Original line number Diff line number Diff line
@@ -1860,10 +1860,6 @@ static int cqspi_probe(struct platform_device *pdev) 
	if (irq < 0)

		return -ENXIO;



	ret = pm_runtime_set_active(dev);

	if (ret)

		return ret;



	ret = clk_bulk_prepare_enable(CLK_QSPI_NUM, cqspi->clks);

	if (ret) {

		dev_err(dev, "Cannot enable QSPI clocks.\n");
@@ -1962,10 +1958,11 @@ static int cqspi_probe(struct platform_device *pdev) 
	cqspi->sclk = 0;



	if (!(ddata && (ddata->quirks & CQSPI_DISABLE_RUNTIME_PM))) {

		pm_runtime_enable(dev);

		pm_runtime_set_autosuspend_delay(dev, CQSPI_AUTOSUSPEND_TIMEOUT);

		pm_runtime_use_autosuspend(dev);

		pm_runtime_get_noresume(dev);

		pm_runtime_set_active(dev);

		pm_runtime_enable(dev);

	}



	host->num_chipselect = cqspi->num_chipselect;
@@ -1996,8 +1993,12 @@ static int cqspi_probe(struct platform_device *pdev) 
	if (cqspi->rx_chan)

		dma_release_channel(cqspi->rx_chan);

disable_rpm:

	if (!(ddata && (ddata->quirks & CQSPI_DISABLE_RUNTIME_PM)))

	if (!(ddata && (ddata->quirks & CQSPI_DISABLE_RUNTIME_PM))) {

		pm_runtime_disable(dev);

		pm_runtime_set_suspended(dev);

		pm_runtime_put_noidle(dev);

		pm_runtime_dont_use_autosuspend(dev);

	}

	cqspi_controller_enable(cqspi, 0);

disable_clks:

	clk_bulk_disable_unprepare(CLK_QSPI_NUM, cqspi->clks);
@@ -2033,8 +2034,10 @@ static void cqspi_remove(struct platform_device *pdev) 
	}



	if (!(ddata && (ddata->quirks & CQSPI_DISABLE_RUNTIME_PM))) {

		pm_runtime_put_sync(&pdev->dev);

		pm_runtime_disable(&pdev->dev);

		pm_runtime_set_suspended(&pdev->dev);

		pm_runtime_put_noidle(&pdev->dev);

		pm_runtime_dont_use_autosuspend(&pdev->dev);

	}

}