Skip to content

Commit 57d5af2

Browse files
r-vigneshbroonie
authored andcommitted
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: 078d62d ("spi: cadence-qspi: add system-wide suspend and resume callbacks") Signed-off-by: Vignesh Raghavendra <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 5d61841 commit 57d5af2

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

drivers/spi/spi-cadence-quadspi.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2000,13 +2000,25 @@ static int cqspi_runtime_resume(struct device *dev)
20002000
static int cqspi_suspend(struct device *dev)
20012001
{
20022002
struct cqspi_st *cqspi = dev_get_drvdata(dev);
2003+
int ret;
20032004

2004-
return spi_controller_suspend(cqspi->host);
2005+
ret = spi_controller_suspend(cqspi->host);
2006+
if (ret)
2007+
return ret;
2008+
2009+
return pm_runtime_force_suspend(dev);
20052010
}
20062011

20072012
static int cqspi_resume(struct device *dev)
20082013
{
20092014
struct cqspi_st *cqspi = dev_get_drvdata(dev);
2015+
int ret;
2016+
2017+
ret = pm_runtime_force_resume(dev);
2018+
if (ret) {
2019+
dev_err(dev, "pm_runtime_force_resume failed on resume\n");
2020+
return ret;
2021+
}
20102022

20112023
return spi_controller_resume(cqspi->host);
20122024
}

0 commit comments

Comments
 (0)