Commit bf1782d7 authored by David Wei's avatar David Wei Committed by Jakub Kicinski
Browse files

bnxt_en: refactor bnxt_alloc_rx_rings() to call bnxt_alloc_rx_agg_bmap() 



Refactor bnxt_alloc_rx_rings() to call bnxt_alloc_rx_agg_bmap() for
allocating rx_agg_bmap.

Reviewed-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: default avatarDavid Wei <dw@davidwei.uk>
Reviewed-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20241204041022.56512-3-dw@davidwei.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5883a3e0

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+16 −20
Original line number Diff line number Diff line
@@ -3764,6 +3764,19 @@ static int bnxt_alloc_rx_page_pool(struct bnxt *bp, 
	return PTR_ERR(pool);

}



static int bnxt_alloc_rx_agg_bmap(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)

{

	u16 mem_size;



	rxr->rx_agg_bmap_size = bp->rx_agg_ring_mask + 1;

	mem_size = rxr->rx_agg_bmap_size / 8;

	rxr->rx_agg_bmap = kzalloc(mem_size, GFP_KERNEL);

	if (!rxr->rx_agg_bmap)

		return -ENOMEM;



	return 0;

}



static int bnxt_alloc_rx_rings(struct bnxt *bp)

{

	int numa_node = dev_to_node(&bp->pdev->dev);
@@ -3808,19 +3821,15 @@ static int bnxt_alloc_rx_rings(struct bnxt *bp) 


		ring->grp_idx = i;

		if (agg_rings) {

			u16 mem_size;



			ring = &rxr->rx_agg_ring_struct;

			rc = bnxt_alloc_ring(bp, &ring->ring_mem);

			if (rc)

				return rc;



			ring->grp_idx = i;

			rxr->rx_agg_bmap_size = bp->rx_agg_ring_mask + 1;

			mem_size = rxr->rx_agg_bmap_size / 8;

			rxr->rx_agg_bmap = kzalloc(mem_size, GFP_KERNEL);

			if (!rxr->rx_agg_bmap)

				return -ENOMEM;

			rc = bnxt_alloc_rx_agg_bmap(bp, rxr);

			if (rc)

				return rc;

		}

	}

	if (bp->flags & BNXT_FLAG_TPA)
@@ -15331,19 +15340,6 @@ static const struct netdev_stat_ops bnxt_stat_ops = { 
	.get_base_stats		= bnxt_get_base_stats,

};



static int bnxt_alloc_rx_agg_bmap(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)

{

	u16 mem_size;



	rxr->rx_agg_bmap_size = bp->rx_agg_ring_mask + 1;

	mem_size = rxr->rx_agg_bmap_size / 8;

	rxr->rx_agg_bmap = kzalloc(mem_size, GFP_KERNEL);

	if (!rxr->rx_agg_bmap)

		return -ENOMEM;



	return 0;

}



static int bnxt_queue_mem_alloc(struct net_device *dev, void *qmem, int idx)

{

	struct bnxt_rx_ring_info *rxr, *clone;