target/linux/ath79/patches-5.10/403-v5.17-spi-ar934x-fix-transfer-size.patch

   1 From ebe33e5a98dcf14a9630845f3f10c193584ac054 Mon Sep 17 00:00:00 2001
   2 From: Oskari Lemmela <oskari@lemmela.net>
   3 Date: Wed, 22 Dec 2021 07:59:57 +0200
   4 Subject: [PATCH] spi: ar934x: fix transfer size
   5
   6 If bits_per_word is configured, transfer only word amount
   7 of data per iteration.
   8
   9 Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
  10 Link: https://lore.kernel.org/r/20211222055958.1383233-2-oskari@lemmela.net
  11 Signed-off-by: Mark Brown <broonie@kernel.org>
  12 ---
  13  drivers/spi/spi-ar934x.c | 16 +++++++++++-----
  14  1 file changed, 11 insertions(+), 5 deletions(-)
  15
  16 --- a/drivers/spi/spi-ar934x.c
  17 +++ b/drivers/spi/spi-ar934x.c
  18 @@ -82,7 +82,7 @@ static int ar934x_spi_transfer_one_messa
  19         struct spi_device *spi = m->spi;
  20         unsigned long trx_done, trx_cur;
  21         int stat = 0;
  22 -       u8 term = 0;
  23 +       u8 bpw, term = 0;
  24         int div, i;
  25         u32 reg;
  26         const u8 *tx_buf;
  27 @@ -90,6 +90,11 @@ static int ar934x_spi_transfer_one_messa
  28
  29         m->actual_length = 0;
  30         list_for_each_entry(t, &m->transfers, transfer_list) {
  31 +               if (t->bits_per_word >= 8 && t->bits_per_word < 32)
  32 +                       bpw = t->bits_per_word >> 3;
  33 +               else
  34 +                       bpw = 4;
  35 +
  36                 if (t->speed_hz)
  37                         div = ar934x_spi_clk_div(sp, t->speed_hz);
  38                 else
  39 @@ -105,10 +110,10 @@ static int ar934x_spi_transfer_one_messa
  40                 iowrite32(reg, sp->base + AR934X_SPI_REG_CTRL);
  41                 iowrite32(0, sp->base + AR934X_SPI_DATAOUT);
  42
  43 -               for (trx_done = 0; trx_done < t->len; trx_done += 4) {
  44 +               for (trx_done = 0; trx_done < t->len; trx_done += bpw) {
  45                         trx_cur = t->len - trx_done;
  46 -                       if (trx_cur > 4)
  47 -                               trx_cur = 4;
  48 +                       if (trx_cur > bpw)
  49 +                               trx_cur = bpw;
  50                         else if (list_is_last(&t->transfer_list, &m->transfers))
  51                                 term = 1;
  52
  53 @@ -193,7 +198,8 @@ static int ar934x_spi_probe(struct platf
  54         ctlr->mode_bits = SPI_LSB_FIRST;
  55         ctlr->setup = ar934x_spi_setup;
  56         ctlr->transfer_one_message = ar934x_spi_transfer_one_message;
  57 -       ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
  58 +       ctlr->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(24) |
  59 +                                  SPI_BPW_MASK(16) | SPI_BPW_MASK(8);
  60         ctlr->dev.of_node = pdev->dev.of_node;
  61         ctlr->num_chipselect = 3;
  62