]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: tegra210-quad: Protect curr_xfer assignment in tegra_qspi_setup_transfer_one
authorBreno Leitao <leitao@debian.org>
Mon, 26 Jan 2026 17:50:28 +0000 (09:50 -0800)
committerMark Brown <broonie@kernel.org>
Fri, 30 Jan 2026 13:53:14 +0000 (13:53 +0000)
When the timeout handler processes a completed transfer and signals
completion, the transfer thread can immediately set up the next transfer
and assign curr_xfer to point to it.

If a delayed ISR from the previous transfer then runs, it checks if
(!tqspi->curr_xfer) (currently without the lock also -- to be fixed
soon) to detect stale interrupts, but this check passes because
curr_xfer now points to the new transfer. The ISR then incorrectly
processes the new transfer's context.

Protect the curr_xfer assignment with the spinlock to ensure the ISR
either sees NULL (and bails out) or sees the new value only after the
assignment is complete.

Fixes: 921fc1838fb0 ("spi: tegra210-quad: Add support for Tegra210 QSPI controller")
Signed-off-by: Breno Leitao <leitao@debian.org>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://patch.msgid.link/20260126-tegra_xfer-v2-3-6d2115e4f387@debian.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-tegra210-quad.c

index ee291b9e9e9c094728dc3d606d7a106ac0c33b54..15c110c00aca5b4a6de11d8213f832b02da0e405 100644 (file)
@@ -839,6 +839,7 @@ static u32 tegra_qspi_setup_transfer_one(struct spi_device *spi, struct spi_tran
        u32 command1, command2, speed = t->speed_hz;
        u8 bits_per_word = t->bits_per_word;
        u32 tx_tap = 0, rx_tap = 0;
+       unsigned long flags;
        int req_mode;
 
        if (!has_acpi_companion(tqspi->dev) && speed != tqspi->cur_speed) {
@@ -846,10 +847,12 @@ static u32 tegra_qspi_setup_transfer_one(struct spi_device *spi, struct spi_tran
                tqspi->cur_speed = speed;
        }
 
+       spin_lock_irqsave(&tqspi->lock, flags);
        tqspi->cur_pos = 0;
        tqspi->cur_rx_pos = 0;
        tqspi->cur_tx_pos = 0;
        tqspi->curr_xfer = t;
+       spin_unlock_irqrestore(&tqspi->lock, flags);
 
        if (is_first_of_msg) {
                tegra_qspi_mask_clear_irq(tqspi);