1 From: Felix Fietkau <nbd@nbd.name>
2 Date: Thu, 27 Aug 2020 09:44:43 +0200
3 Subject: [PATCH] net: ethernet: mtk_eth_soc: unmap rx data before calling
6 Since build_skb accesses the data area (for initializing shinfo), dma unmap
7 needs to happen before that call
9 Signed-off-by: Felix Fietkau <nbd@nbd.name>
12 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
13 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
14 @@ -1297,17 +1297,18 @@ static int mtk_poll_rx(struct napi_struc
18 + dma_unmap_single(eth->dev, trxd.rxd1,
19 + ring->buf_size, DMA_FROM_DEVICE);
22 skb = build_skb(data, ring->frag_size);
24 - skb_free_frag(new_data);
25 + skb_free_frag(data);
26 netdev->stats.rx_dropped++;
30 skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);
32 - dma_unmap_single(eth->dev, trxd.rxd1,
33 - ring->buf_size, DMA_FROM_DEVICE);
34 pktlen = RX_DMA_GET_PLEN0(trxd.rxd2);
37 @@ -1325,6 +1326,7 @@ static int mtk_poll_rx(struct napi_struc
38 skb_record_rx_queue(skb, 0);
39 napi_gro_receive(napi, skb);
42 ring->data[idx] = new_data;
43 rxd->rxd1 = (unsigned int)dma_addr;