Re: [RFC PATCH 1/2] net: macb: Free RX ring for all queues

From: Claudiu Beznea
Date: Wed Jul 04 2018 - 04:21:43 EST




On 29.06.2018 18:31, Harini Katakam wrote:
> rx ring is allocated for all queues in macb_alloc_consistent.
> Free the same for all queues instead of just Q0.
>
> Signed-off-by: Harini Katakam <harini.katakam@xxxxxxxxxx>

Reviewed-by: Claudiu Beznea <claudiu.beznea@xxxxxxxxxxxxx>

> ---
> drivers/net/ethernet/cadence/macb_main.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
> index 3e93df5..e56ffa9 100644
> --- a/drivers/net/ethernet/cadence/macb_main.c
> +++ b/drivers/net/ethernet/cadence/macb_main.c
> @@ -1812,13 +1812,7 @@ static void macb_free_consistent(struct macb *bp)
> struct macb_queue *queue;
> unsigned int q;
>
> - queue = &bp->queues[0];
> bp->macbgem_ops.mog_free_rx_buffers(bp);
> - if (queue->rx_ring) {
> - dma_free_coherent(&bp->pdev->dev, RX_RING_BYTES(bp),
> - queue->rx_ring, queue->rx_ring_dma);
> - queue->rx_ring = NULL;
> - }
>
> for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
> kfree(queue->tx_skb);
> @@ -1828,6 +1822,11 @@ static void macb_free_consistent(struct macb *bp)
> queue->tx_ring, queue->tx_ring_dma);
> queue->tx_ring = NULL;
> }
> + if (queue->rx_ring) {
> + dma_free_coherent(&bp->pdev->dev, RX_RING_BYTES(bp),
> + queue->rx_ring, queue->rx_ring_dma);
> + queue->rx_ring = NULL;
> + }
> }
> }
>
>