Patch "spi: spi-cadence-quadspi: Fix OSPI NOR failures during system resume" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

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

to the 6.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     spi-spi-cadence-quadspi-fix-ospi-nor-failures-during.patch
and it can be found in the queue-6.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit e85e394d4232677c13e5d5fde6ed488e29fabe95
Author: Vignesh Raghavendra <vigneshr@xxxxxx>
Date:   Wed Aug 14 20:42:37 2024 +0530

    spi: spi-cadence-quadspi: Fix OSPI NOR failures during system resume
    
    [ Upstream commit 57d5af2660e9443b081eeaf1c373b3ce48477828 ]
    
    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@xxxxxx>
    Link: https://patch.msgid.link/20240814151237.3856184-1-vigneshr@xxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 05ebb03d319fc..d4607cb89c484 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);
 }