1 From 3d0b72654b0c8304424503e7560ee8635dd56340 Mon Sep 17 00:00:00 2001
2 From: Sieng Piaw Liew <liew.s.piaw@gmail.com>
3 Date: Wed, 6 Jan 2021 22:42:06 +0800
4 Subject: [PATCH 5/7] bcm63xx_enet: consolidate rx SKB ring cleanup code
6 The rx SKB ring use the same code for cleanup at various points.
7 Combine them into a function to reduce lines of code.
9 Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com>
10 Acked-by: Florian Fainelli <f.fainelli@gmail.com>
11 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
13 drivers/net/ethernet/broadcom/bcm63xx_enet.c | 72 ++++++--------------
14 1 file changed, 22 insertions(+), 50 deletions(-)
16 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
17 +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
18 @@ -860,6 +860,24 @@ static void bcm_enet_adjust_link(struct
19 priv->pause_tx ? "tx" : "off");
22 +static void bcm_enet_free_rx_skb_ring(struct device *kdev, struct bcm_enet_priv *priv)
26 + for (i = 0; i < priv->rx_ring_size; i++) {
27 + struct bcm_enet_desc *desc;
29 + if (!priv->rx_skb[i])
32 + desc = &priv->rx_desc_cpu[i];
33 + dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
35 + kfree_skb(priv->rx_skb[i]);
37 + kfree(priv->rx_skb);
41 * open callback, allocate dma rings & buffers and start rx operation
43 @@ -1084,18 +1102,7 @@ static int bcm_enet_open(struct net_devi
47 - for (i = 0; i < priv->rx_ring_size; i++) {
48 - struct bcm_enet_desc *desc;
50 - if (!priv->rx_skb[i])
53 - desc = &priv->rx_desc_cpu[i];
54 - dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
56 - kfree_skb(priv->rx_skb[i]);
58 - kfree(priv->rx_skb);
59 + bcm_enet_free_rx_skb_ring(kdev, priv);
63 @@ -1174,7 +1181,6 @@ static int bcm_enet_stop(struct net_devi
65 struct bcm_enet_priv *priv;
69 priv = netdev_priv(dev);
70 kdev = &priv->pdev->dev;
71 @@ -1203,20 +1209,9 @@ static int bcm_enet_stop(struct net_devi
72 bcm_enet_tx_reclaim(dev, 1);
74 /* free the rx skb ring */
75 - for (i = 0; i < priv->rx_ring_size; i++) {
76 - struct bcm_enet_desc *desc;
78 - if (!priv->rx_skb[i])
81 - desc = &priv->rx_desc_cpu[i];
82 - dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
84 - kfree_skb(priv->rx_skb[i]);
86 + bcm_enet_free_rx_skb_ring(kdev, priv);
88 /* free remaining allocated memory */
89 - kfree(priv->rx_skb);
91 dma_free_coherent(kdev, priv->rx_desc_alloc_size,
92 priv->rx_desc_cpu, priv->rx_desc_dma);
93 @@ -2303,18 +2298,7 @@ static int bcm_enetsw_open(struct net_de
97 - for (i = 0; i < priv->rx_ring_size; i++) {
98 - struct bcm_enet_desc *desc;
100 - if (!priv->rx_skb[i])
103 - desc = &priv->rx_desc_cpu[i];
104 - dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
106 - kfree_skb(priv->rx_skb[i]);
108 - kfree(priv->rx_skb);
109 + bcm_enet_free_rx_skb_ring(kdev, priv);
113 @@ -2343,7 +2327,6 @@ static int bcm_enetsw_stop(struct net_de
115 struct bcm_enet_priv *priv;
119 priv = netdev_priv(dev);
120 kdev = &priv->pdev->dev;
121 @@ -2366,20 +2349,9 @@ static int bcm_enetsw_stop(struct net_de
122 bcm_enet_tx_reclaim(dev, 1);
124 /* free the rx skb ring */
125 - for (i = 0; i < priv->rx_ring_size; i++) {
126 - struct bcm_enet_desc *desc;
128 - if (!priv->rx_skb[i])
131 - desc = &priv->rx_desc_cpu[i];
132 - dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
134 - kfree_skb(priv->rx_skb[i]);
136 + bcm_enet_free_rx_skb_ring(kdev, priv);
138 /* free remaining allocated memory */
139 - kfree(priv->rx_skb);
141 dma_free_coherent(kdev, priv->rx_desc_alloc_size,
142 priv->rx_desc_cpu, priv->rx_desc_dma);