spi: stm32-qspi: Fix wait_cmd timeout in APM mode

[ Upstream commit d83d89ea68b4726700fa87b22db075e4217e691c ]

In APM mode, TCF and TEF flags are not set. To avoid timeout in
stm32_qspi_wait_cmd(), don't check if TCF/TEF are set.

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Reported-by: eberhard.stoll@kontron.de
Link: https://lore.kernel.org/r/20220511074644.558874-2-patrice.chotard@foss.st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c
index ffdc55f87e8210bb36da18e9658214eba006b6c5..dd38cb8ffbc20b62af396d40143334304993acad 100644 (file)
--- a/drivers/spi/spi-stm32-qspi.c
+++ b/drivers/spi/spi-stm32-qspi.c
@@ -308,7 +308,8 @@ static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi,
        if (!op->data.nbytes)
                goto wait_nobusy;
 
-       if (readl_relaxed(qspi->io_base + QSPI_SR) & SR_TCF)
+       if ((readl_relaxed(qspi->io_base + QSPI_SR) & SR_TCF) ||
+           qspi->fmode == CCR_FMODE_APM)
                goto out;
 
        reinit_completion(&qspi->data_completion);