spi: stm32-qspi: Always check SR_TCF flags in stm32_qspi_wait_cmd()
authorPatrice Chotard <patrice.chotard@foss.st.com>
Wed, 11 May 2022 07:46:43 +0000 (09:46 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 11 May 2022 16:40:09 +0000 (17:40 +0100)
Currently, SR_TCF flag is checked in case there is data, this criteria
is not correct.

SR_TCF flags is set when programmed number of bytes has been transferred
to the memory device ("bytes" comprised command and data send to the
SPI device).
So even if there is no data, we must check SR_TCF flag.

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Link: https://lore.kernel.org/r/20220511074644.558874-3-patrice.chotard@foss.st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-stm32-qspi.c

index dd38cb8..f2b67c8 100644 (file)
@@ -305,9 +305,6 @@ static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi,
        u32 cr, sr;
        int err = 0;
 
-       if (!op->data.nbytes)
-               goto wait_nobusy;
-
        if ((readl_relaxed(qspi->io_base + QSPI_SR) & SR_TCF) ||
            qspi->fmode == CCR_FMODE_APM)
                goto out;
@@ -328,7 +325,6 @@ static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi,
 out:
        /* clear flags */
        writel_relaxed(FCR_CTCF | FCR_CTEF, qspi->io_base + QSPI_FCR);
-wait_nobusy:
        if (!err)
                err = stm32_qspi_wait_nobusy(qspi);