git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From 1f038d5897fe6b439039fc28420842abcc0d126b Mon Sep 17 00:00:00 2001
   2 From: Lorenzo Bianconi <lorenzo@kernel.org>
   3 Date: Wed, 17 Jul 2024 10:15:46 +0200
   4 Subject: [PATCH] net: airoha: fix error branch in airoha_dev_xmit and
   5  airoha_set_gdm_ports
   6
   7 Fix error case management in airoha_dev_xmit routine since we need to
   8 DMA unmap pending buffers starting from q->head.
   9 Moreover fix a typo in error case branch in airoha_set_gdm_ports
  10 routine.
  11
  12 Fixes: 23020f049327 ("net: airoha: Introduce ethernet support for EN7581 SoC")
  13 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  14 Reviewed-by: Simon Horman <horms@kernel.org>
  15 Link: https://patch.msgid.link/b628871bc8ae4861b5e2ab4db90aaf373cbb7cee.1721203880.git.lorenzo@kernel.org
  16 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  17 ---
  18  drivers/net/ethernet/mediatek/airoha_eth.c | 10 ++++++----
  19  1 file changed, 6 insertions(+), 4 deletions(-)
  20
  21 --- a/drivers/net/ethernet/mediatek/airoha_eth.c
  22 +++ b/drivers/net/ethernet/mediatek/airoha_eth.c
  23 @@ -977,7 +977,7 @@ static int airoha_set_gdm_ports(struct a
  24         return 0;
  25
  26  error:
  27 -       for (i--; i >= 0; i++)
  28 +       for (i--; i >= 0; i--)
  29                 airoha_set_gdm_port(eth, port_list[i], false);
  30
  31         return err;
  32 @@ -2432,9 +2432,11 @@ static netdev_tx_t airoha_dev_xmit(struc
  33         return NETDEV_TX_OK;
  34
  35  error_unmap:
  36 -       for (i--; i >= 0; i++)
  37 -               dma_unmap_single(dev->dev.parent, q->entry[i].dma_addr,
  38 -                                q->entry[i].dma_len, DMA_TO_DEVICE);
  39 +       for (i--; i >= 0; i--) {
  40 +               index = (q->head + i) % q->ndesc;
  41 +               dma_unmap_single(dev->dev.parent, q->entry[index].dma_addr,
  42 +                                q->entry[index].dma_len, DMA_TO_DEVICE);
  43 +       }
  44
  45         spin_unlock_bh(&q->lock);
  46  error: