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

   1 From 3dc6e998d18bfba6e0dc979d3cc68eba98dfeef7 Mon Sep 17 00:00:00 2001
   2 From: Lorenzo Bianconi <lorenzo@kernel.org>
   3 Date: Fri, 4 Oct 2024 15:51:26 +0200
   4 Subject: [PATCH] net: airoha: Update tx cpu dma ring idx at the end of xmit
   5  loop
   6
   7 Move the tx cpu dma ring index update out of transmit loop of
   8 airoha_dev_xmit routine in order to not start transmitting the packet
   9 before it is fully DMA mapped (e.g. fragmented skbs).
  10
  11 Fixes: 23020f049327 ("net: airoha: Introduce ethernet support for EN7581 SoC")
  12 Reported-by: Felix Fietkau <nbd@nbd.name>
  13 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  14 Reviewed-by: Simon Horman <horms@kernel.org>
  15 Link: https://patch.msgid.link/20241004-airoha-eth-7581-mapping-fix-v1-1-8e4279ab1812@kernel.org
  16 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  17 ---
  18  drivers/net/ethernet/mediatek/airoha_eth.c | 9 +++++----
  19  1 file changed, 5 insertions(+), 4 deletions(-)
  20
  21 --- a/drivers/net/ethernet/mediatek/airoha_eth.c
  22 +++ b/drivers/net/ethernet/mediatek/airoha_eth.c
  23 @@ -2480,10 +2480,6 @@ static netdev_tx_t airoha_dev_xmit(struc
  24                 e->dma_addr = addr;
  25                 e->dma_len = len;
  26
  27 -               airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(qid),
  28 -                               TX_RING_CPU_IDX_MASK,
  29 -                               FIELD_PREP(TX_RING_CPU_IDX_MASK, index));
  30 -
  31                 data = skb_frag_address(frag);
  32                 len = skb_frag_size(frag);
  33         }
  34 @@ -2492,6 +2488,11 @@ static netdev_tx_t airoha_dev_xmit(struc
  35         q->queued += i;
  36
  37         skb_tx_timestamp(skb);
  38 +       if (!netdev_xmit_more())
  39 +               airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(qid),
  40 +                               TX_RING_CPU_IDX_MASK,
  41 +                               FIELD_PREP(TX_RING_CPU_IDX_MASK, q->head));
  42 +
  43         if (q->ndesc - q->queued < q->free_thr)
  44                 netif_tx_stop_queue(txq);
  45