Commit b2718e6f authored by Ioana Radulescu's avatar Ioana Radulescu Committed by Greg Kroah-Hartman
Browse files

staging: fsl-dpaa2/eth: Cleanup TX frame freeing code 



Cleanup code in free_tx_fd() that deals with S/G frames:
- remove local variables that aren't really needed
- in the frame sw annotation area, store the actual SG table
buffer size, which is needed on free, rather then recompute
it based on number of S/G entries

Signed-off-by: default avatarIoana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e018f1fd

drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c

+5 −12
Original line number Original line Diff line number Diff line
@@ -406,7 +406,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv, 
	swa->skb = skb;

	swa->skb = skb;

	swa->scl = scl;

	swa->scl = scl;

	swa->num_sg = num_sg;

	swa->num_sg = num_sg;

	swa->num_dma_bufs = num_dma_bufs;

	swa->sgt_size = sgt_buf_size;





	/* Separately map the SGT buffer */

	/* Separately map the SGT buffer */

	addr = dma_map_single(dev, sgt_buf, sgt_buf_size, DMA_BIDIRECTIONAL);

	addr = dma_map_single(dev, sgt_buf, sgt_buf_size, DMA_BIDIRECTIONAL);
@@ -489,9 +489,6 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv, 
	dma_addr_t fd_addr;

	dma_addr_t fd_addr;

	struct sk_buff **skbh, *skb;

	struct sk_buff **skbh, *skb;

	unsigned char *buffer_start;

	unsigned char *buffer_start;

	int unmap_size;

	struct scatterlist *scl;

	int num_sg, num_dma_bufs;

	struct dpaa2_eth_swa *swa;

	struct dpaa2_eth_swa *swa;

	u8 fd_format = dpaa2_fd_get_format(fd);

	u8 fd_format = dpaa2_fd_get_format(fd);
@@ -510,18 +507,14 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv, 
	} else if (fd_format == dpaa2_fd_sg) {

	} else if (fd_format == dpaa2_fd_sg) {

		swa = (struct dpaa2_eth_swa *)skbh;

		swa = (struct dpaa2_eth_swa *)skbh;

		skb = swa->skb;

		skb = swa->skb;

		scl = swa->scl;

		num_sg = swa->num_sg;

		num_dma_bufs = swa->num_dma_bufs;





		/* Unmap the scatterlist */

		/* Unmap the scatterlist */

		dma_unmap_sg(dev, scl, num_sg, DMA_BIDIRECTIONAL);

		dma_unmap_sg(dev, swa->scl, swa->num_sg, DMA_BIDIRECTIONAL);

		kfree(scl);

		kfree(swa->scl);





		/* Unmap the SGT buffer */

		/* Unmap the SGT buffer */

		unmap_size = priv->tx_data_offset +

		dma_unmap_single(dev, fd_addr, swa->sgt_size,

		       sizeof(struct dpaa2_sg_entry) * (1 + num_dma_bufs);

				 DMA_BIDIRECTIONAL);

		dma_unmap_single(dev, fd_addr, unmap_size, DMA_BIDIRECTIONAL);

	} else {

	} else {

		netdev_dbg(priv->net_dev, "Invalid FD format\n");

		netdev_dbg(priv->net_dev, "Invalid FD format\n");

		return;

		return;

drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ struct dpaa2_eth_swa { 
	struct sk_buff *skb;

	struct sk_buff *skb;

	struct scatterlist *scl;

	struct scatterlist *scl;

	int num_sg;

	int num_sg;

	int num_dma_bufs;

	int sgt_size;

};

};





/* Annotation valid bits in FD FRC */

/* Annotation valid bits in FD FRC */

CRA Git | Maintained and supported by SUSTech CRA and CCSE