[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200214074340.2286170-1-vkoul@kernel.org>
Date: Fri, 14 Feb 2020 13:13:40 +0530
From: Vinod Koul <vkoul@...nel.org>
To: Mark Brown <broonie@...nel.org>
Cc: linux-arm-msm@...r.kernel.org,
Bjorn Andersson <bjorn.andersson@...aro.org>,
Yuji Sasaki <sasakiy@...omium.org>,
Andy Gross <agross@...nel.org>, linux-spi@...r.kernel.org,
linux-kernel@...r.kernel.org, Vinod Koul <vkoul@...nel.org>
Subject: [PATCH] spi: qup: call spi_qup_pm_resume_runtime before suspending
From: Yuji Sasaki <sasakiy@...omium.org>
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@...omium.org>
Signed-off-by: Vinod Koul <vkoul@...nel.org>
---
drivers/spi/spi-qup.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index dd3434a407ea..a364b99497e2 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -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);
- }
+ clk_disable_unprepare(controller->cclk);
+ clk_disable_unprepare(controller->iclk);
return 0;
}
--
2.24.1
Powered by blists - more mailing lists