1 From: Felix Fietkau <nbd@openwrt.org>
2 Date: Sun, 12 Apr 2015 22:23:07 +0200
3 Subject: [PATCH] bgmac: simplify rx DMA error handling
5 Unmap the DMA buffer before checking it. If it is poisoned, map it again
6 and pass it back to the hardware.
8 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 --- a/drivers/net/ethernet/broadcom/bgmac.c
12 +++ b/drivers/net/ethernet/broadcom/bgmac.c
13 @@ -405,25 +405,20 @@ static int bgmac_dma_rx_read(struct bgma
16 /* Unmap buffer to make it accessible to the CPU */
17 - dma_sync_single_for_cpu(dma_dev, slot->dma_addr,
18 - BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
19 + dma_unmap_single(dma_dev, slot->dma_addr,
20 + BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
22 /* Get info from the header */
23 len = le16_to_cpu(rx->len);
24 flags = le16_to_cpu(rx->flags);
27 - dma_addr_t old_dma_addr = slot->dma_addr;
30 /* Check for poison and drop or pass the packet */
31 if (len == 0xdead && flags == 0xbeef) {
32 bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
34 - dma_sync_single_for_device(dma_dev,
41 @@ -436,18 +431,8 @@ static int bgmac_dma_rx_read(struct bgma
42 /* Poison the old skb */
43 rx->len = cpu_to_le16(0xdead);
44 rx->flags = cpu_to_le16(0xbeef);
46 - dma_sync_single_for_device(dma_dev,
52 - bgmac_dma_rx_setup_desc(bgmac, ring, ring->start);
54 - /* Unmap old skb, we'll pass it to the netfif */
55 - dma_unmap_single(dma_dev, old_dma_addr,
56 - BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
58 skb = build_skb(buf, BGMAC_RX_ALLOC_SIZE);
59 skb_put(skb, BGMAC_RX_FRAME_OFFSET +
60 @@ -461,6 +446,8 @@ static int bgmac_dma_rx_read(struct bgma
64 + bgmac_dma_rx_setup_desc(bgmac, ring, ring->start);
66 if (++ring->start >= BGMAC_RX_RING_SLOTS)