summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVignesh Raghavendra <vigneshr@ti.com>2024-08-14 20:42:37 +0530
committerMark Brown <broonie@kernel.org>2024-08-14 18:26:29 +0100
commit57d5af2660e9443b081eeaf1c373b3ce48477828 (patch)
treec9e3c89f0341441d05ccc1748e8a830cba43cb43
parent5d61841c74db8b5bbbf9403f1bd4879f614617d2 (diff)
downloadlinux-stable-57d5af2660e9443b081eeaf1c373b3ce48477828.tar.gz
linux-stable-57d5af2660e9443b081eeaf1c373b3ce48477828.tar.bz2
linux-stable-57d5af2660e9443b081eeaf1c373b3ce48477828.zip
spi: spi-cadence-quadspi: Fix OSPI NOR failures during system resume
Its necessary to call pm_runtime_force_*() hooks as part of system suspend/resume calls so that the runtime_pm hooks get called. This ensures latest state of the IP is cached and restored during system sleep. This is especially true if runtime autosuspend is enabled as runtime suspend hooks may not be called at all before system sleeps. Without this patch, OSPI NOR enumeration (READ_ID) fails during resume as context saved during suspend path is inconsistent. Fixes: 078d62de433b ("spi: cadence-qspi: add system-wide suspend and resume callbacks") Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> Link: https://patch.msgid.link/20240814151237.3856184-1-vigneshr@ti.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-cadence-quadspi.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 05ebb03d319f..d4607cb89c48 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -2000,13 +2000,25 @@ static int cqspi_runtime_resume(struct device *dev)
static int cqspi_suspend(struct device *dev)
{
struct cqspi_st *cqspi = dev_get_drvdata(dev);
+ int ret;
- return spi_controller_suspend(cqspi->host);
+ ret = spi_controller_suspend(cqspi->host);
+ if (ret)
+ return ret;
+
+ return pm_runtime_force_suspend(dev);
}
static int cqspi_resume(struct device *dev)
{
struct cqspi_st *cqspi = dev_get_drvdata(dev);
+ int ret;
+
+ ret = pm_runtime_force_resume(dev);
+ if (ret) {
+ dev_err(dev, "pm_runtime_force_resume failed on resume\n");
+ return ret;
+ }
return spi_controller_resume(cqspi->host);
}