Commit 6e434627 authored by Iyappan Subramanian's avatar Iyappan Subramanian Committed by David S. Miller
Browse files

drivers: net: xgene: fix: Add dma_unmap_single 



In addition to xgene_enet_delete_bufpool() freeing skbs, their associated
dma memory should also be unmapped.

Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee0f9544

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+12 −2
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ static int xgene_enet_refill_bufpool(struct xgene_enet_desc_ring *buf_pool, 
		skb = netdev_alloc_skb_ip_align(ndev, len);

		if (unlikely(!skb))

			return -ENOMEM;

		buf_pool->rx_skb[tail] = skb;



		dma_addr = dma_map_single(dev, skb->data, len, DMA_FROM_DEVICE);

		if (dma_mapping_error(dev, dma_addr)) {
@@ -81,6 +80,8 @@ static int xgene_enet_refill_bufpool(struct xgene_enet_desc_ring *buf_pool, 
			return -EINVAL;

		}



		buf_pool->rx_skb[tail] = skb;



		raw_desc->m1 = cpu_to_le64(SET_VAL(DATAADDR, dma_addr) |

					   SET_VAL(BUFDATALEN, bufdatalen) |

					   SET_BIT(COHERENT));
@@ -102,12 +103,21 @@ static u8 xgene_enet_hdr_len(const void *data) 


static void xgene_enet_delete_bufpool(struct xgene_enet_desc_ring *buf_pool)

{

	struct device *dev = ndev_to_dev(buf_pool->ndev);

	struct xgene_enet_raw_desc16 *raw_desc;

	dma_addr_t dma_addr;

	int i;



	/* Free up the buffers held by hardware */

	for (i = 0; i < buf_pool->slots; i++) {

		if (buf_pool->rx_skb[i])

		if (buf_pool->rx_skb[i]) {

			dev_kfree_skb_any(buf_pool->rx_skb[i]);



			raw_desc = &buf_pool->raw_desc16[i];

			dma_addr = GET_VAL(DATAADDR, le64_to_cpu(raw_desc->m1));

			dma_unmap_single(dev, dma_addr, XGENE_ENET_MAX_MTU,

					 DMA_FROM_DEVICE);

		}

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE