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

spi: cadence: fix unclocked access on unbind 

Make sure that the controller is runtime resumed before disabling it
during driver unbind to avoid unclocked register access and unbalanced
clock disable.

Also restore the autosuspend setting.

This issue was flagged by Sashiko when reviewing a controller
deregistration fix.

Fixes: d36ccd9f ("spi: cadence: Runtime pm adaptation")
Cc: stable@vger.kernel.org	# 4.7
Cc: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Link: https://sashiko.dev/#/patchset/20260414134319.978196-1-johan%40kernel.org?part=1


Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260421123615.1533617-2-johan@kernel.org


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

drivers/spi/spi-cadence.c

+8 −1
Original line number Diff line number Diff line
@@ -776,16 +776,23 @@ static void cdns_spi_remove(struct platform_device *pdev) 
{

	struct spi_controller *ctlr = platform_get_drvdata(pdev);

	struct cdns_spi *xspi = spi_controller_get_devdata(ctlr);

	int ret = 0;



	if (!spi_controller_is_target(ctlr))

		ret = pm_runtime_get_sync(&pdev->dev);



	spi_controller_get(ctlr);



	spi_unregister_controller(ctlr);



	if (ret >= 0)

		cdns_spi_write(xspi, CDNS_SPI_ER, CDNS_SPI_ER_DISABLE);



	if (!spi_controller_is_target(ctlr)) {

		pm_runtime_disable(&pdev->dev);

		pm_runtime_set_suspended(&pdev->dev);

		pm_runtime_put_noidle(&pdev->dev);

		pm_runtime_dont_use_autosuspend(&pdev->dev);

	}



	spi_controller_put(ctlr);