Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spi: ar934x: fix transfer size

If bits_per_word is configured, transfer only word amount
of data per iteration.

Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Link: https://lore.kernel.org/r/20211222055958.1383233-2-oskari@lemmela.net
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Oskari Lemmela and committed by
Mark Brown
ebe33e5a 12baee68

+11 -5
+11 -5
drivers/spi/spi-ar934x.c
··· 82 82 struct spi_device *spi = m->spi; 83 83 unsigned long trx_done, trx_cur; 84 84 int stat = 0; 85 - u8 term = 0; 85 + u8 bpw, term = 0; 86 86 int div, i; 87 87 u32 reg; 88 88 const u8 *tx_buf; ··· 90 90 91 91 m->actual_length = 0; 92 92 list_for_each_entry(t, &m->transfers, transfer_list) { 93 + if (t->bits_per_word >= 8 && t->bits_per_word < 32) 94 + bpw = t->bits_per_word >> 3; 95 + else 96 + bpw = 4; 97 + 93 98 if (t->speed_hz) 94 99 div = ar934x_spi_clk_div(sp, t->speed_hz); 95 100 else ··· 110 105 iowrite32(reg, sp->base + AR934X_SPI_REG_CTRL); 111 106 iowrite32(0, sp->base + AR934X_SPI_DATAOUT); 112 107 113 - for (trx_done = 0; trx_done < t->len; trx_done += 4) { 108 + for (trx_done = 0; trx_done < t->len; trx_done += bpw) { 114 109 trx_cur = t->len - trx_done; 115 - if (trx_cur > 4) 116 - trx_cur = 4; 110 + if (trx_cur > bpw) 111 + trx_cur = bpw; 117 112 else if (list_is_last(&t->transfer_list, &m->transfers)) 118 113 term = 1; 119 114 ··· 198 193 ctlr->mode_bits = SPI_LSB_FIRST; 199 194 ctlr->setup = ar934x_spi_setup; 200 195 ctlr->transfer_one_message = ar934x_spi_transfer_one_message; 201 - ctlr->bits_per_word_mask = SPI_BPW_MASK(8); 196 + ctlr->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(24) | 197 + SPI_BPW_MASK(16) | SPI_BPW_MASK(8); 202 198 ctlr->dev.of_node = pdev->dev.of_node; 203 199 ctlr->num_chipselect = 3; 204 200