Skip to content

Commit 959043a

Browse files
tlebbroonie
authored andcommitted
spi: cadence-qspi: remove system-wide suspend helper calls from runtime PM hooks
The ->runtime_suspend() and ->runtime_resume() callbacks are not expected to call spi_controller_suspend() and spi_controller_resume(). Remove calls to those in the cadence-qspi driver. Those helpers have two roles currently: - They stop/start the queue, including dealing with the kworker. - They toggle the SPI controller SPI_CONTROLLER_SUSPENDED flag. It requires acquiring ctlr->bus_lock_mutex. Step one is irrelevant because cadence-qspi is not queued. Step two however has two implications: - A deadlock occurs, because ->runtime_resume() is called in a context where the lock is already taken (in the ->exec_op() callback, where the usage count is incremented). - It would disallow all operations once the device is auto-suspended. Here is a brief call tree highlighting the mutex deadlock: spi_mem_exec_op() ... spi_mem_access_start() mutex_lock(&ctlr->bus_lock_mutex) cqspi_exec_mem_op() pm_runtime_resume_and_get() cqspi_resume() spi_controller_resume() mutex_lock(&ctlr->bus_lock_mutex) ... spi_mem_access_end() mutex_unlock(&ctlr->bus_lock_mutex) ... Fixes: 0578a6d ("spi: spi-cadence-quadspi: add runtime pm support") Signed-off-by: Théo Lebrun <[email protected]> Link: https://msgid.link/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 32ce3bb commit 959043a

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

drivers/spi/spi-cadence-quadspi.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,14 +1930,10 @@ static void cqspi_remove(struct platform_device *pdev)
19301930
static int cqspi_suspend(struct device *dev)
19311931
{
19321932
struct cqspi_st *cqspi = dev_get_drvdata(dev);
1933-
int ret;
19341933

1935-
ret = spi_controller_suspend(cqspi->host);
19361934
cqspi_controller_enable(cqspi, 0);
1937-
19381935
clk_disable_unprepare(cqspi->clk);
1939-
1940-
return ret;
1936+
return 0;
19411937
}
19421938

19431939
static int cqspi_resume(struct device *dev)
@@ -1950,8 +1946,7 @@ static int cqspi_resume(struct device *dev)
19501946

19511947
cqspi->current_cs = -1;
19521948
cqspi->sclk = 0;
1953-
1954-
return spi_controller_resume(cqspi->host);
1949+
return 0;
19551950
}
19561951

19571952
static DEFINE_RUNTIME_DEV_PM_OPS(cqspi_dev_pm_ops, cqspi_suspend,

0 commit comments

Comments
 (0)