From 47c32b2b7fcfa97f7224df222f439fc0ccf94ffe Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Mon, 29 Aug 2022 14:32:50 +0200 Subject: spi: stm32-qspi: Fix pm_runtime management in stm32_qspi_transfer_one_message() ctrl->auto_runtime_pm was wrongly set to true when adding transfer_one_message() callback. As explained in commit 6e6ccb3d4cdc ("spi: stm32-qspi: Add pm_runtime support") the expected behavior is to prevent runtime suspends between each transfer. Add needed pm_runtime API calls in stm32_qspi_transfer_one_message(). Fixes: a557fca630cc ("spi: stm32_qspi: Add transfer_one_message() spi callback") Signed-off-by: Patrice Chotard Link: https://lore.kernel.org/r/20220829123250.2170562-1-patrice.chotard@foss.st.com Signed-off-by: Mark Brown --- drivers/spi/spi-stm32-qspi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'drivers/spi') diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 679fd1c34f7e..227f450aa5f0 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -567,6 +567,10 @@ static int stm32_qspi_transfer_one_message(struct spi_controller *ctrl, if (!spi->cs_gpiod) return -EOPNOTSUPP; + ret = pm_runtime_resume_and_get(qspi->dev); + if (ret < 0) + return ret; + mutex_lock(&qspi->lock); gpiod_set_value_cansleep(spi->cs_gpiod, true); @@ -629,6 +633,9 @@ end_of_transfer: msg->status = ret; spi_finalize_current_message(ctrl); + pm_runtime_mark_last_busy(qspi->dev); + pm_runtime_put_autosuspend(qspi->dev); + return ret; } @@ -847,7 +854,6 @@ static int stm32_qspi_probe(struct platform_device *pdev) ctrl->mem_ops = &stm32_qspi_mem_ops; ctrl->use_gpio_descriptors = true; ctrl->transfer_one_message = stm32_qspi_transfer_one_message; - ctrl->auto_runtime_pm = true; ctrl->num_chipselect = STM32_QSPI_MAX_NORCHIP; ctrl->dev.of_node = dev->of_node; -- cgit v1.2.3