| From ba1f16686a7fd7e0147c989a913c183a21ccb89e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 14 Feb 2020 13:13:40 +0530 |
| Subject: spi: qup: call spi_qup_pm_resume_runtime before suspending |
| |
| From: Yuji Sasaki <sasakiy@chromium.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@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> |
| Signed-off-by: Sasha Levin <sashal@kernel.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 |
| |
