[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200316023548.2347-1-sashal@kernel.org>
Date: Sun, 15 Mar 2020 22:35:41 -0400
From: Sasha Levin <sashal@...nel.org>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: Yuji Sasaki <sasakiy@...omium.org>, Vinod Koul <vkoul@...nel.org>,
Mark Brown <broonie@...nel.org>,
Sasha Levin <sashal@...nel.org>, linux-arm-msm@...r.kernel.org,
linux-spi@...r.kernel.org
Subject: [PATCH AUTOSEL 4.4 1/7] spi: qup: call spi_qup_pm_resume_runtime before suspending
From: Yuji Sasaki <sasakiy@...omium.org>
[ Upstream commit 136b5cd2e2f97581ae560cff0db2a3b5369112da ]
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>
Link: https://lore.kernel.org/r/20200214074340.2286170-1-vkoul@kernel.org
Signed-off-by: Mark Brown <broonie@...nel.org>
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
drivers/spi/spi-qup.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 810a7fae34798..2487a91c4cfdb 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -961,6 +961,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;
--
2.20.1
Powered by blists - more mailing lists