[PATCH] spi: spi-cadence-quadspi: Fix OSPI NOR failures during system resume

[PATCH] spi: spi-cadence-quadspi: Fix OSPI NOR failures during system resume

[Vignesh Raghavendra]

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: 6d35eef2f868 ("spi: cadence-qspi: add system-wide suspend and resume callbacks")
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
---
 drivers/spi/spi-cadence-quadspi.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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);
 }
-- 
2.46.0

Re: [PATCH] spi: spi-cadence-quadspi: Fix OSPI NOR failures during system resume

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

On Wed, Aug 14, 2024 at 08:42:37PM +0530, Vignesh Raghavendra wrote:

> Without this patch, OSPI NOR enumeration (READ_ID) fails during resume
> as context saved during suspend path is inconsistent.
> 
> Fixes: 6d35eef2f868 ("spi: cadence-qspi: add system-wide suspend and resume callbacks")
> Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

This commit isn't in mainline or my tree...

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] spi: spi-cadence-quadspi: Fix OSPI NOR failures during system resume

[Mark Brown]

On Wed, 14 Aug 2024 20:42:37 +0530, Vignesh Raghavendra wrote:
> 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.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: spi-cadence-quadspi: Fix OSPI NOR failures during system resume
      commit: 57d5af2660e9443b081eeaf1c373b3ce48477828

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark