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

Commit 1fb7c98a authored by Robert Elliott's avatar Robert Elliott Committed by James Bottomley
Browse files

hpsa: refactor freeing of resources into more logical functions 



refactor freeing of resources into more logical functions

Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@Suse.de>
Signed-off-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 195f2c65

drivers/scsi/hpsa.c

+56 −48
Original line number Diff line number Diff line
@@ -235,6 +235,8 @@ static void check_ioctl_unit_attention(struct ctlr_info *h, 
static void calc_bucket_map(int *bucket, int num_buckets,

	int nsgs, int min_blocks, u32 *bucket_map);

static void hpsa_put_ctlr_into_performant_mode(struct ctlr_info *h);

static void hpsa_free_ioaccel1_cmd_and_bft(struct ctlr_info *h);

static void hpsa_free_ioaccel2_cmd_and_bft(struct ctlr_info *h);

static inline u32 next_command(struct ctlr_info *h, u8 q);

static int hpsa_find_cfg_addrs(struct pci_dev *pdev, void __iomem *vaddr,

			       u32 *cfg_base_addr, u64 *cfg_base_addr_index,
@@ -6873,6 +6875,21 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev, u32 board_id) 
	return rc;

}



static void hpsa_free_cmd_pool(struct ctlr_info *h)

{

	kfree(h->cmd_pool_bits);

	if (h->cmd_pool)

		pci_free_consistent(h->pdev,

				h->nr_cmds * sizeof(struct CommandList),

				h->cmd_pool,

				h->cmd_pool_dhandle);

	if (h->errinfo_pool)

		pci_free_consistent(h->pdev,

				h->nr_cmds * sizeof(struct ErrorInfo),

				h->errinfo_pool,

				h->errinfo_pool_dhandle);

}



static int hpsa_alloc_cmd_pool(struct ctlr_info *h)

{

	h->cmd_pool_bits = kzalloc(
@@ -6897,28 +6914,6 @@ static int hpsa_alloc_cmd_pool(struct ctlr_info *h) 
	return -ENOMEM;

}



static void hpsa_free_cmd_pool(struct ctlr_info *h)

{

	kfree(h->cmd_pool_bits);

	if (h->cmd_pool)

		pci_free_consistent(h->pdev,

			    h->nr_cmds * sizeof(struct CommandList),

			    h->cmd_pool, h->cmd_pool_dhandle);

	if (h->ioaccel2_cmd_pool)

		pci_free_consistent(h->pdev,

			h->nr_cmds * sizeof(*h->ioaccel2_cmd_pool),

			h->ioaccel2_cmd_pool, h->ioaccel2_cmd_pool_dhandle);

	if (h->errinfo_pool)

		pci_free_consistent(h->pdev,

			    h->nr_cmds * sizeof(struct ErrorInfo),

			    h->errinfo_pool,

			    h->errinfo_pool_dhandle);

	if (h->ioaccel_cmd_pool)

		pci_free_consistent(h->pdev,

			h->nr_cmds * sizeof(struct io_accel1_cmd),

			h->ioaccel_cmd_pool, h->ioaccel_cmd_pool_dhandle);

}



static void hpsa_irq_affinity_hints(struct ctlr_info *h)

{

	int i, cpu;
@@ -7039,8 +7034,10 @@ static void hpsa_free_reply_queues(struct ctlr_info *h) 
	for (i = 0; i < h->nreply_queues; i++) {

		if (!h->reply_queue[i].head)

			continue;

		pci_free_consistent(h->pdev, h->reply_queue_size,

			h->reply_queue[i].head, h->reply_queue[i].busaddr);

		pci_free_consistent(h->pdev,

					h->reply_queue_size,

					h->reply_queue[i].head,

					h->reply_queue[i].busaddr);

		h->reply_queue[i].head = NULL;

		h->reply_queue[i].busaddr = 0;

	}
@@ -7051,9 +7048,10 @@ static void hpsa_undo_allocations_after_kdump_soft_reset(struct ctlr_info *h) 
	hpsa_free_irqs(h);

	hpsa_free_sg_chain_blocks(h);

	hpsa_free_cmd_pool(h);

	kfree(h->ioaccel1_blockFetchTable);

	kfree(h->blockFetchTable);

	hpsa_free_reply_queues(h);

	kfree(h->blockFetchTable);		/* perf 2 */

	hpsa_free_reply_queues(h);		/* perf 1 */

	hpsa_free_ioaccel1_cmd_and_bft(h);	/* perf 1 */

	hpsa_free_ioaccel2_cmd_and_bft(h);	/* perf 1 */

	hpsa_free_cfgtables(h);			/* pci_init 4 */

	iounmap(h->vaddr);			/* pci_init 3 */

	hpsa_disable_interrupt_mode(h);		/* pci_init 2 */
@@ -7490,6 +7488,8 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
clean4:

	hpsa_free_sg_chain_blocks(h);

	hpsa_free_cmd_pool(h);

	hpsa_free_ioaccel1_cmd_and_bft(h);

	hpsa_free_ioaccel2_cmd_and_bft(h);

clean2_and_free_irqs:

	hpsa_free_irqs(h);

clean2:
@@ -7591,17 +7591,11 @@ static void hpsa_remove_one(struct pci_dev *pdev) 


	hpsa_free_device_info(h);

	hpsa_free_sg_chain_blocks(h);

	pci_free_consistent(h->pdev,

		h->nr_cmds * sizeof(struct CommandList),

		h->cmd_pool, h->cmd_pool_dhandle);

	pci_free_consistent(h->pdev,

		h->nr_cmds * sizeof(struct ErrorInfo),

		h->errinfo_pool, h->errinfo_pool_dhandle);

	hpsa_free_reply_queues(h);

	kfree(h->cmd_pool_bits);

	kfree(h->blockFetchTable);

	kfree(h->ioaccel1_blockFetchTable);

	kfree(h->ioaccel2_blockFetchTable);

	kfree(h->blockFetchTable);		/* perf 2 */

	hpsa_free_reply_queues(h);		/* perf 1 */

	hpsa_free_ioaccel1_cmd_and_bft(h);	/* perf 1 */

	hpsa_free_ioaccel2_cmd_and_bft(h);	/* perf 1 */

	hpsa_free_cmd_pool(h);			/* init_one 5 */

	kfree(h->hba_inquiry_data);



	/* includes hpsa_disable_interrupt_mode - pci_init 2 */
@@ -7848,6 +7842,17 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support) 
	return 0;

}



/* Free ioaccel1 mode command blocks and block fetch table */

static void hpsa_free_ioaccel1_cmd_and_bft(struct ctlr_info *h)

{

	if (h->ioaccel_cmd_pool)

		pci_free_consistent(h->pdev,

			h->nr_cmds * sizeof(*h->ioaccel_cmd_pool),

			h->ioaccel_cmd_pool,

			h->ioaccel_cmd_pool_dhandle);

	kfree(h->ioaccel1_blockFetchTable);

}



/* Allocate ioaccel1 mode command blocks and block fetch table */

static int hpsa_alloc_ioaccel1_cmd_and_bft(struct ctlr_info *h)

{
@@ -7880,14 +7885,21 @@ static int hpsa_alloc_ioaccel1_cmd_and_bft(struct ctlr_info *h) 
	return 0;



clean_up:

	if (h->ioaccel_cmd_pool)

		pci_free_consistent(h->pdev,

			h->nr_cmds * sizeof(*h->ioaccel_cmd_pool),

			h->ioaccel_cmd_pool, h->ioaccel_cmd_pool_dhandle);

	kfree(h->ioaccel1_blockFetchTable);

	hpsa_free_ioaccel1_cmd_and_bft(h);

	return 1;

}



/* Free ioaccel2 mode command blocks and block fetch table */

static void hpsa_free_ioaccel2_cmd_and_bft(struct ctlr_info *h)

{

	if (h->ioaccel2_cmd_pool)

		pci_free_consistent(h->pdev,

			h->nr_cmds * sizeof(*h->ioaccel2_cmd_pool),

			h->ioaccel2_cmd_pool,

			h->ioaccel2_cmd_pool_dhandle);

	kfree(h->ioaccel2_blockFetchTable);

}



/* Allocate ioaccel2 mode command blocks and block fetch table */

static int hpsa_alloc_ioaccel2_cmd_and_bft(struct ctlr_info *h)

{
@@ -7918,11 +7930,7 @@ static int hpsa_alloc_ioaccel2_cmd_and_bft(struct ctlr_info *h) 
	return 0;



clean_up:

	if (h->ioaccel2_cmd_pool)

		pci_free_consistent(h->pdev,

			h->nr_cmds * sizeof(*h->ioaccel2_cmd_pool),

			h->ioaccel2_cmd_pool, h->ioaccel2_cmd_pool_dhandle);

	kfree(h->ioaccel2_blockFetchTable);

	hpsa_free_ioaccel2_cmd_and_bft(h);

	return 1;

}