spi: microchip-core: fix the issues in the isr

It is possible for the TXDONE interrupt be raised if the tx FIFO becomes
temporarily empty while transmitting, resulting in recursive calls to
mchp_corespi_write_fifo() and therefore a garbage message might be
transmitted depending on when the interrupt is triggered. Moving all of
the tx FIFO writes out of the TXDONE portion of the interrupt handler
avoids this problem.

Most of rest of the TXDONE portion of the handler is problematic too.
Only reading the rx FIFO (and finalising the transfer) when the TXDONE
interrupt is raised can cause the transfer to stall, if the final bytes
of rx data are not available in the rx FIFO when the final TXDONE
interrupt is raised. The transfer should be finalised regardless of
which interrupt is raised, provided that all tx data has been set and
all rx data received.

The first issue was encountered "in the wild", the second is
theoretical.

Fixes: 9ac8d17694b6 ("spi: add support for microchip fpga spi controllers")
Signed-off-by: Naga Sureshkumar Relli <nagasuresh.relli@microchip.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://patch.msgid.link/20240715-candied-deforest-585685ef3c8a@wendy
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c
index 6246254e1dff8978424659c16058f41fe4a14924..c8076333d179383176f741cc7ac899474ba6c1eb 100644 (file)
--- a/drivers/spi/spi-microchip-core.c
+++ b/drivers/spi/spi-microchip-core.c
@@ -383,21 +383,18 @@ static irqreturn_t mchp_corespi_interrupt(int irq, void *dev_id)
        if (intfield == 0)
                return IRQ_NONE;
 
-       if (intfield & INT_TXDONE) {
+       if (intfield & INT_TXDONE)
                mchp_corespi_write(spi, REG_INT_CLEAR, INT_TXDONE);
 
+       if (intfield & INT_RXRDY) {
+               mchp_corespi_write(spi, REG_INT_CLEAR, INT_RXRDY);
+
                if (spi->rx_len)
                        mchp_corespi_read_fifo(spi);
-
-               if (spi->tx_len)
-                       mchp_corespi_write_fifo(spi);
-
-               if (!spi->rx_len)
-                       finalise = true;
        }
 
-       if (intfield & INT_RXRDY)
-               mchp_corespi_write(spi, REG_INT_CLEAR, INT_RXRDY);
+       if (!spi->rx_len && !spi->tx_len)
+               finalise = true;
 
        if (intfield & INT_RX_CHANNEL_OVERFLOW) {
                mchp_corespi_write(spi, REG_INT_CLEAR, INT_RX_CHANNEL_OVERFLOW);
@@ -482,8 +479,9 @@ static int mchp_corespi_transfer_one(struct spi_controller *host,
        mchp_corespi_set_xfer_size(spi, (spi->tx_len > FIFO_DEPTH)
                                   ? FIFO_DEPTH : spi->tx_len);
 
-       if (spi->tx_len)
+       while (spi->tx_len)
                mchp_corespi_write_fifo(spi);
+
        return 1;
 }