Commit 4e63ac82 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Use dmam_alloc_coherent() 



This patch replaces the usage of dma_alloc_coherent() with the managed
version, dmam_alloc_coherent(), hereby reducing replicated code.

Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by; John Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 94583217

drivers/scsi/hisi_sas/hisi_sas_main.c

+20 −60
Original line number Diff line number Diff line
@@ -2045,15 +2045,17 @@ int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost) 


		/* Delivery queue */

		s = sizeof(struct hisi_sas_cmd_hdr) * HISI_SAS_QUEUE_SLOTS;

		hisi_hba->cmd_hdr[i] = dma_alloc_coherent(dev, s,

					&hisi_hba->cmd_hdr_dma[i], GFP_KERNEL);

		hisi_hba->cmd_hdr[i] = dmam_alloc_coherent(dev, s,

						&hisi_hba->cmd_hdr_dma[i],

						GFP_KERNEL);

		if (!hisi_hba->cmd_hdr[i])

			goto err_out;



		/* Completion queue */

		s = hisi_hba->hw->complete_hdr_size * HISI_SAS_QUEUE_SLOTS;

		hisi_hba->complete_hdr[i] = dma_alloc_coherent(dev, s,

				&hisi_hba->complete_hdr_dma[i], GFP_KERNEL);

		hisi_hba->complete_hdr[i] = dmam_alloc_coherent(dev, s,

						&hisi_hba->complete_hdr_dma[i],

						GFP_KERNEL);

		if (!hisi_hba->complete_hdr[i])

			goto err_out;

	}
@@ -2064,10 +2066,11 @@ int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost) 
		goto err_out;



	s = HISI_SAS_MAX_ITCT_ENTRIES * sizeof(struct hisi_sas_itct);

	hisi_hba->itct = dma_zalloc_coherent(dev, s, &hisi_hba->itct_dma,

	hisi_hba->itct = dmam_alloc_coherent(dev, s, &hisi_hba->itct_dma,

					     GFP_KERNEL);

	if (!hisi_hba->itct)

		goto err_out;

	memset(hisi_hba->itct, 0, s);



	hisi_hba->slot_info = devm_kcalloc(dev, max_command_entries,

					   sizeof(struct hisi_sas_slot),
@@ -2076,14 +2079,15 @@ int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost) 
		goto err_out;



	s = max_command_entries * sizeof(struct hisi_sas_iost);

	hisi_hba->iost = dma_alloc_coherent(dev, s, &hisi_hba->iost_dma,

	hisi_hba->iost = dmam_alloc_coherent(dev, s, &hisi_hba->iost_dma,

					     GFP_KERNEL);

	if (!hisi_hba->iost)

		goto err_out;



	s = max_command_entries * sizeof(struct hisi_sas_breakpoint);

	hisi_hba->breakpoint = dma_alloc_coherent(dev, s,

				&hisi_hba->breakpoint_dma, GFP_KERNEL);

	hisi_hba->breakpoint = dmam_alloc_coherent(dev, s,

						   &hisi_hba->breakpoint_dma,

						   GFP_KERNEL);

	if (!hisi_hba->breakpoint)

		goto err_out;
@@ -2094,14 +2098,16 @@ int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost) 
		goto err_out;



	s = sizeof(struct hisi_sas_initial_fis) * HISI_SAS_MAX_PHYS;

	hisi_hba->initial_fis = dma_alloc_coherent(dev, s,

				&hisi_hba->initial_fis_dma, GFP_KERNEL);

	hisi_hba->initial_fis = dmam_alloc_coherent(dev, s,

						    &hisi_hba->initial_fis_dma,

						    GFP_KERNEL);

	if (!hisi_hba->initial_fis)

		goto err_out;



	s = HISI_SAS_MAX_ITCT_ENTRIES * sizeof(struct hisi_sas_sata_breakpoint);

	hisi_hba->sata_breakpoint = dma_alloc_coherent(dev, s,

				&hisi_hba->sata_breakpoint_dma, GFP_KERNEL);

	hisi_hba->sata_breakpoint = dmam_alloc_coherent(dev, s,

					&hisi_hba->sata_breakpoint_dma,

					GFP_KERNEL);

	if (!hisi_hba->sata_breakpoint)

		goto err_out;

	hisi_sas_init_mem(hisi_hba);
@@ -2122,54 +2128,8 @@ EXPORT_SYMBOL_GPL(hisi_sas_alloc); 


void hisi_sas_free(struct hisi_hba *hisi_hba)

{

	struct device *dev = hisi_hba->dev;

	int i, s, max_command_entries = hisi_hba->hw->max_command_entries;



	for (i = 0; i < hisi_hba->queue_count; i++) {

		s = sizeof(struct hisi_sas_cmd_hdr) * HISI_SAS_QUEUE_SLOTS;

		if (hisi_hba->cmd_hdr[i])

			dma_free_coherent(dev, s,

					  hisi_hba->cmd_hdr[i],

					  hisi_hba->cmd_hdr_dma[i]);



		s = hisi_hba->hw->complete_hdr_size * HISI_SAS_QUEUE_SLOTS;

		if (hisi_hba->complete_hdr[i])

			dma_free_coherent(dev, s,

					  hisi_hba->complete_hdr[i],

					  hisi_hba->complete_hdr_dma[i]);

	}



	dma_pool_destroy(hisi_hba->buffer_pool);



	s = HISI_SAS_MAX_ITCT_ENTRIES * sizeof(struct hisi_sas_itct);

	if (hisi_hba->itct)

		dma_free_coherent(dev, s,

				  hisi_hba->itct, hisi_hba->itct_dma);



	s = max_command_entries * sizeof(struct hisi_sas_iost);

	if (hisi_hba->iost)

		dma_free_coherent(dev, s,

				  hisi_hba->iost, hisi_hba->iost_dma);



	s = max_command_entries * sizeof(struct hisi_sas_breakpoint);

	if (hisi_hba->breakpoint)

		dma_free_coherent(dev, s,

				  hisi_hba->breakpoint,

				  hisi_hba->breakpoint_dma);





	s = sizeof(struct hisi_sas_initial_fis) * HISI_SAS_MAX_PHYS;

	if (hisi_hba->initial_fis)

		dma_free_coherent(dev, s,

				  hisi_hba->initial_fis,

				  hisi_hba->initial_fis_dma);



	s = HISI_SAS_MAX_ITCT_ENTRIES * sizeof(struct hisi_sas_sata_breakpoint);

	if (hisi_hba->sata_breakpoint)

		dma_free_coherent(dev, s,

				  hisi_hba->sata_breakpoint,

				  hisi_hba->sata_breakpoint_dma);



	if (hisi_hba->wq)

		destroy_workqueue(hisi_hba->wq);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE