Unverified Commit 136b5cd2 authored Feb 14, 2020 by Yuji Sasaki Committed by Mark Brown Feb 21, 2020

spi: qup: call spi_qup_pm_resume_runtime before suspending



spi_qup_suspend() will cause synchronous external abort when
runtime suspend is enabled and applied, as it tries to
access SPI controller register while clock is already disabled
in spi_qup_pm_suspend_runtime().

Signed-off-by: Yuji sasaki <sasakiy@chromium.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20200214074340.2286170-1-vkoul@kernel.org


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 32f2fc5d

drivers/spi/spi-qup.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -1217,6 +1217,11 @@ static int spi_qup_suspend(struct device *device)
		struct spi_qup *controller = spi_master_get_devdata(master);
		int ret;

		if (pm_runtime_suspended(device)) {
		ret = spi_qup_pm_resume_runtime(device);
		if (ret)
		return ret;
		}
		ret = spi_master_suspend(master);
		if (ret)
		return ret;
		@@ -1225,10 +1230,8 @@ static int spi_qup_suspend(struct device *device)
		if (ret)
		return ret;

		if (!pm_runtime_suspended(device)) {
		clk_disable_unprepare(controller->cclk);
		clk_disable_unprepare(controller->iclk);
		}
		return 0;
		}

Admin message