target/linux/mvebu/patches-5.4/010-net-mvneta-fix-build-skb-for-bm-capable-devices.patch

   1 From b37fa92e20ef28aada852cbf03b368d29a20478c Mon Sep 17 00:00:00 2001
   2 From: Lorenzo Bianconi <lorenzo@kernel.org>
   3 Date: Thu, 14 Nov 2019 01:25:55 +0200
   4 Subject: [PATCH] net: mvneta: fix build skb for bm capable devices
   5
   6 Fix build_skb for bm capable devices when they fall-back using swbm path
   7 (e.g. when bm properties are configured in device tree but
   8 CONFIG_MVNETA_BM_ENABLE is not set). In this case rx_offset_correction is
   9 overwritten so we need to use it building skb instead of
  10 MVNETA_SKB_HEADROOM directly
  11
  12 Fixes: 8dc9a0888f4c ("net: mvneta: rely on build_skb in mvneta_rx_swbm poll routine")
  13 Fixes: 0db51da7a8e9 ("net: mvneta: add basic XDP support")
  14 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  15 Reported-by: Andrew Lunn <andrew@lunn.ch>
  16 Tested-by: Andrew Lunn <andrew@lunn.ch>
  17 Signed-off-by: David S. Miller <davem@davemloft.net>
  18 ---
  19  drivers/net/ethernet/marvell/mvneta.c | 4 ++--
  20  1 file changed, 2 insertions(+), 2 deletions(-)
  21
  22 --- a/drivers/net/ethernet/marvell/mvneta.c
  23 +++ b/drivers/net/ethernet/marvell/mvneta.c
  24 @@ -2167,7 +2167,7 @@ mvneta_swbm_rx_frame(struct mvneta_port
  25         prefetch(data);
  26
  27         xdp->data_hard_start = data;
  28 -       xdp->data = data + MVNETA_SKB_HEADROOM + MVNETA_MH_SIZE;
  29 +       xdp->data = data + pp->rx_offset_correction + MVNETA_MH_SIZE;
  30         xdp->data_end = xdp->data + data_len;
  31         xdp_set_data_meta_invalid(xdp);
  32
  33 @@ -2232,7 +2232,7 @@ mvneta_swbm_add_rx_fragment(struct mvnet
  34                 /* refill descriptor with new buffer later */
  35                 skb_add_rx_frag(rxq->skb,
  36                                 skb_shinfo(rxq->skb)->nr_frags,
  37 -                               page, MVNETA_SKB_HEADROOM, data_len,
  38 +                               page, pp->rx_offset_correction, data_len,
  39                                 PAGE_SIZE);
  40         }
  41         page_pool_release_page(rxq->page_pool, page);