Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f31f994 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[BNX2]: Combine small mem allocations 



Combine two small (56 byte and 320 byte) pci consistent memory
allocations into one allocation. Jeff Garzik suggested to store
the combined size in the bp structure for later use when freeing
the memory.

Use kzalloc() instead of kmalloc() + memset().

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf5295bb

drivers/net/bnx2.c

+15 −19
Original line number Diff line number Diff line
@@ -359,15 +359,11 @@ bnx2_free_mem(struct bnx2 *bp) 
{

	int i;



	if (bp->stats_blk) {

		pci_free_consistent(bp->pdev, sizeof(struct statistics_block),

				    bp->stats_blk, bp->stats_blk_mapping);

		bp->stats_blk = NULL;

	}

	if (bp->status_blk) {

		pci_free_consistent(bp->pdev, sizeof(struct status_block),

		pci_free_consistent(bp->pdev, bp->status_stats_size,

				    bp->status_blk, bp->status_blk_mapping);

		bp->status_blk = NULL;

		bp->stats_blk = NULL;

	}

	if (bp->tx_desc_ring) {

		pci_free_consistent(bp->pdev,
@@ -392,14 +388,13 @@ bnx2_free_mem(struct bnx2 *bp) 
static int

bnx2_alloc_mem(struct bnx2 *bp)

{

	int i;

	int i, status_blk_size;



	bp->tx_buf_ring = kmalloc(sizeof(struct sw_bd) * TX_DESC_CNT,

	bp->tx_buf_ring = kzalloc(sizeof(struct sw_bd) * TX_DESC_CNT,

				  GFP_KERNEL);

	if (bp->tx_buf_ring == NULL)

		return -ENOMEM;



	memset(bp->tx_buf_ring, 0, sizeof(struct sw_bd) * TX_DESC_CNT);

	bp->tx_desc_ring = pci_alloc_consistent(bp->pdev,

					        sizeof(struct tx_bd) *

						TX_DESC_CNT,
@@ -425,21 +420,22 @@ bnx2_alloc_mem(struct bnx2 *bp) 


	}



	bp->status_blk = pci_alloc_consistent(bp->pdev,

					      sizeof(struct status_block),

	/* Combine status and statistics blocks into one allocation. */

	status_blk_size = L1_CACHE_ALIGN(sizeof(struct status_block));

	bp->status_stats_size = status_blk_size +

				sizeof(struct statistics_block);



	bp->status_blk = pci_alloc_consistent(bp->pdev, bp->status_stats_size,

					      &bp->status_blk_mapping);

	if (bp->status_blk == NULL)

		goto alloc_mem_err;



	memset(bp->status_blk, 0, sizeof(struct status_block));

	memset(bp->status_blk, 0, bp->status_stats_size);



	bp->stats_blk = pci_alloc_consistent(bp->pdev,

					     sizeof(struct statistics_block),

					     &bp->stats_blk_mapping);

	if (bp->stats_blk == NULL)

		goto alloc_mem_err;

	bp->stats_blk = (void *) ((unsigned long) bp->status_blk +

				  status_blk_size);



	memset(bp->stats_blk, 0, sizeof(struct statistics_block));

	bp->stats_blk_mapping = bp->status_blk_mapping + status_blk_size;



	return 0;

drivers/net/bnx2.h

+2 −0
Original line number Diff line number Diff line
@@ -4083,6 +4083,8 @@ struct bnx2 { 


	struct flash_spec	*flash_info;

	u32			flash_size;



	int			status_stats_size;

};



static u32 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset);