Skip to content

Commit 08356ef

Browse files
pelwellpopcornmix
authored andcommitted
spi: bcm2835: Workaround/fix for zero-length transfers
A relatively recent commit ([1]) contained optimisation for the PIO SPI FIFO-filling functions. The commit message includes the phrase "[t]he blind and counted loops are always called with nonzero count". This is technically true, but it is still possible for count to become zero before the loop is entered - if tfr->len is zero. Moving the loop exit condition to the end of the loop saves a few cycles, but results in a near-infinite loop should the revised count be zero on entry. Strangely, zero-lengthed transfers aren't filtered by the SPI framework and, even more strangely, the Python3 spidev library is triggering them for no obvious reason. Avoid the problem completely by bailing out of the main transfer function early if trf->len is zero, although there may be a case for moving the mitigation into the framework. See: #4100 Signed-off-by: Phil Elwell <[email protected]> [1] 26751de ("spi: bcm2835: Micro-optimise FIFO loops")
1 parent bb8b1e8 commit 08356ef

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

drivers/spi/spi-bcm2835.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,6 +1059,16 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr,
10591059
unsigned long hz_per_byte, byte_limit;
10601060
u32 cs = target->prepare_cs;
10611061

1062+
if (unlikely(!tfr->len)) {
1063+
static int warned;
1064+
1065+
if (!warned)
1066+
dev_warn(&spi->dev,
1067+
"zero-length SPI transfer ignored\n");
1068+
warned = 1;
1069+
return 0;
1070+
}
1071+
10621072
/* set clock */
10631073
spi_hz = tfr->speed_hz;
10641074

0 commit comments

Comments
 (0)