Commit 102e9d19 authored by Christophe Kerello's avatar Christophe Kerello Committed by Mark Brown

spi: stm32-qspi: fix pm_runtime usage_count counter

pm_runtime usage_count counter is not well managed.
pm_runtime_put_autosuspend callback drops the usage_counter but this
one has never been increased. Add pm_runtime_get_sync callback to bump up
the usage counter. It is also needed to use pm_runtime_force_suspend and
pm_runtime_force_resume APIs to handle properly the clock.

Fixes: 9d282c17 ("spi: stm32-qspi: Add pm_runtime support")
Signed-off-by: default avatarChristophe Kerello <christophe.kerello@foss.st.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210419121541.11617-2-patrice.chotard@foss.st.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 126bdb60
...@@ -727,21 +727,31 @@ static int __maybe_unused stm32_qspi_suspend(struct device *dev) ...@@ -727,21 +727,31 @@ static int __maybe_unused stm32_qspi_suspend(struct device *dev)
{ {
pinctrl_pm_select_sleep_state(dev); pinctrl_pm_select_sleep_state(dev);
return 0; return pm_runtime_force_suspend(dev);
} }
static int __maybe_unused stm32_qspi_resume(struct device *dev) static int __maybe_unused stm32_qspi_resume(struct device *dev)
{ {
struct stm32_qspi *qspi = dev_get_drvdata(dev); struct stm32_qspi *qspi = dev_get_drvdata(dev);
int ret;
ret = pm_runtime_force_resume(dev);
if (ret < 0)
return ret;
pinctrl_pm_select_default_state(dev); pinctrl_pm_select_default_state(dev);
clk_prepare_enable(qspi->clk);
ret = pm_runtime_get_sync(dev);
if (ret < 0) {
pm_runtime_put_noidle(dev);
return ret;
}
writel_relaxed(qspi->cr_reg, qspi->io_base + QSPI_CR); writel_relaxed(qspi->cr_reg, qspi->io_base + QSPI_CR);
writel_relaxed(qspi->dcr_reg, qspi->io_base + QSPI_DCR); writel_relaxed(qspi->dcr_reg, qspi->io_base + QSPI_DCR);
pm_runtime_mark_last_busy(qspi->dev); pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(qspi->dev); pm_runtime_put_autosuspend(dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment