Commit 1c2048bd authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: switch to generic DMA API 



Switch from the legacy PCI DMA API to the generic DMA API.

Also simplify setting the DMA mask a bit.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 60ee6529

drivers/scsi/mpt3sas/mpt3sas_base.c

+33 −34
Original line number Diff line number Diff line
@@ -2259,7 +2259,7 @@ _base_build_sg_scmd(struct MPT3SAS_ADAPTER *ioc, 
	sges_left = scsi_dma_map(scmd);

	if (sges_left < 0) {

		sdev_printk(KERN_ERR, scmd->device,

		 "pci_map_sg failed: request for %d bytes!\n",

		 "scsi_dma_map failed: request for %d bytes!\n",

		 scsi_bufflen(scmd));

		return -ENOMEM;

	}
@@ -2407,7 +2407,7 @@ _base_build_sg_scmd_ieee(struct MPT3SAS_ADAPTER *ioc, 
	sges_left = scsi_dma_map(scmd);

	if (sges_left < 0) {

		sdev_printk(KERN_ERR, scmd->device,

			"pci_map_sg failed: request for %d bytes!\n",

			"scsi_dma_map failed: request for %d bytes!\n",

			scsi_bufflen(scmd));

		return -ENOMEM;

	}
@@ -2552,39 +2552,37 @@ _base_build_sg_ieee(struct MPT3SAS_ADAPTER *ioc, void *psge, 
static int

_base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev)

{

	u64 required_mask, coherent_mask;

	struct sysinfo s;

	u64 consistent_dma_mask;



	if (ioc->is_mcpu_endpoint)

		goto try_32bit;



	required_mask = dma_get_required_mask(&pdev->dev);

	if (sizeof(dma_addr_t) == 4 || required_mask == 32)

		goto try_32bit;



	if (ioc->dma_mask)

		consistent_dma_mask = DMA_BIT_MASK(64);

		coherent_mask = DMA_BIT_MASK(64);

	else

		consistent_dma_mask = DMA_BIT_MASK(32);



	if (sizeof(dma_addr_t) > 4) {

		const uint64_t required_mask =

		    dma_get_required_mask(&pdev->dev);

		if ((required_mask > DMA_BIT_MASK(32)) &&

		    !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&

		    !pci_set_consistent_dma_mask(pdev, consistent_dma_mask)) {

		coherent_mask = DMA_BIT_MASK(32);



	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) ||

	    dma_set_coherent_mask(&pdev->dev, coherent_mask))

		goto try_32bit;



	ioc->base_add_sg_single = &_base_add_sg_single_64;

	ioc->sge_size = sizeof(Mpi2SGESimple64_t);

	ioc->dma_mask = 64;

	goto out;

		}

	}



 try_32bit:

	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))

	    && !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {

	if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))

		return -ENODEV;



	ioc->base_add_sg_single = &_base_add_sg_single_32;

	ioc->sge_size = sizeof(Mpi2SGESimple32_t);

	ioc->dma_mask = 32;

	} else

		return -ENODEV;



 out:

	si_meminfo(&s);

	ioc_info(ioc, "%d BIT PCI BUS DMA ADDRESSING SUPPORTED, total mem (%ld kB)\n",
@@ -3777,8 +3775,8 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc) 
	}



	data_length = sizeof(Mpi2FWImageHeader_t);

	fwpkg_data = pci_alloc_consistent(ioc->pdev, data_length,

			&fwpkg_data_dma);

	fwpkg_data = dma_alloc_coherent(&ioc->pdev->dev, data_length,

			&fwpkg_data_dma, GFP_KERNEL);

	if (!fwpkg_data) {

		ioc_err(ioc, "failure at %s:%d/%s()!\n",

			__FILE__, __LINE__, __func__);
@@ -3837,7 +3835,7 @@ _base_display_fwpkg_version(struct MPT3SAS_ADAPTER *ioc) 
	ioc->base_cmds.status = MPT3_CMD_NOT_USED;

out:

	if (fwpkg_data)

		pci_free_consistent(ioc->pdev, data_length, fwpkg_data,

		dma_free_coherent(&ioc->pdev->dev, data_length, fwpkg_data,

				fwpkg_data_dma);

	return r;

}
@@ -4146,7 +4144,7 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) 
	dexitprintk(ioc, ioc_info(ioc, "%s\n", __func__));



	if (ioc->request) {

		pci_free_consistent(ioc->pdev, ioc->request_dma_sz,

		dma_free_coherent(&ioc->pdev->dev, ioc->request_dma_sz,

		    ioc->request,  ioc->request_dma);

		dexitprintk(ioc,

			    ioc_info(ioc, "request_pool(0x%p): free\n",
@@ -4223,7 +4221,7 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) 
		dexitprintk(ioc,

			    ioc_info(ioc, "config_page(0x%p): free\n",

				     ioc->config_page));

		pci_free_consistent(ioc->pdev, ioc->config_page_sz,

		dma_free_coherent(&ioc->pdev->dev, ioc->config_page_sz,

		    ioc->config_page, ioc->config_page_dma);

	}
@@ -4514,9 +4512,10 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) 
	sz += (ioc->internal_depth * ioc->request_sz);



	ioc->request_dma_sz = sz;

	ioc->request = pci_alloc_consistent(ioc->pdev, sz, &ioc->request_dma);

	ioc->request = dma_alloc_coherent(&ioc->pdev->dev, sz,

			&ioc->request_dma, GFP_KERNEL);

	if (!ioc->request) {

		ioc_err(ioc, "request pool: pci_alloc_consistent failed: hba_depth(%d), chains_per_io(%d), frame_sz(%d), total(%d kB)\n",

		ioc_err(ioc, "request pool: dma_alloc_coherent failed: hba_depth(%d), chains_per_io(%d), frame_sz(%d), total(%d kB)\n",

			ioc->hba_queue_depth, ioc->chains_needed_per_io,

			ioc->request_sz, sz / 1024);

		if (ioc->scsiio_depth < MPT3SAS_SAS_QUEUE_DEPTH)
@@ -4528,7 +4527,7 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) 
	}



	if (retry_sz)

		ioc_err(ioc, "request pool: pci_alloc_consistent succeed: hba_depth(%d), chains_per_io(%d), frame_sz(%d), total(%d kb)\n",

		ioc_err(ioc, "request pool: dma_alloc_coherent succeed: hba_depth(%d), chains_per_io(%d), frame_sz(%d), total(%d kb)\n",

			ioc->hba_queue_depth, ioc->chains_needed_per_io,

			ioc->request_sz, sz / 1024);
@@ -4816,8 +4815,8 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) 
		}

	}

	ioc->config_page_sz = 512;

	ioc->config_page = pci_alloc_consistent(ioc->pdev,

	    ioc->config_page_sz, &ioc->config_page_dma);

	ioc->config_page = dma_alloc_coherent(&ioc->pdev->dev,

			ioc->config_page_sz, &ioc->config_page_dma, GFP_KERNEL);

	if (!ioc->config_page) {

		ioc_err(ioc, "config page: dma_pool_alloc failed\n");

		goto out;

drivers/scsi/mpt3sas/mpt3sas_ctl.c

+18 −16
Original line number Diff line number Diff line
@@ -744,8 +744,8 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg, 


	/* obtain dma-able memory for data transfer */

	if (data_out_sz) /* WRITE */ {

		data_out = pci_alloc_consistent(ioc->pdev, data_out_sz,

		    &data_out_dma);

		data_out = dma_alloc_coherent(&ioc->pdev->dev, data_out_sz,

				&data_out_dma, GFP_KERNEL);

		if (!data_out) {

			pr_err("failure at %s:%d/%s()!\n", __FILE__,

			    __LINE__, __func__);
@@ -764,8 +764,8 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg, 
	}



	if (data_in_sz) /* READ */ {

		data_in = pci_alloc_consistent(ioc->pdev, data_in_sz,

		    &data_in_dma);

		data_in = dma_alloc_coherent(&ioc->pdev->dev, data_in_sz,

				&data_in_dma, GFP_KERNEL);

		if (!data_in) {

			pr_err("failure at %s:%d/%s()!\n", __FILE__,

			    __LINE__, __func__);
@@ -1083,11 +1083,11 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg, 


	/* free memory associated with sg buffers */

	if (data_in)

		pci_free_consistent(ioc->pdev, data_in_sz, data_in,

		dma_free_coherent(&ioc->pdev->dev, data_in_sz, data_in,

		    data_in_dma);



	if (data_out)

		pci_free_consistent(ioc->pdev, data_out_sz, data_out,

		dma_free_coherent(&ioc->pdev->dev, data_out_sz, data_out,

		    data_out_dma);



	kfree(mpi_request);
@@ -1549,7 +1549,7 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc, 
	if (request_data) {

		request_data_dma = ioc->diag_buffer_dma[buffer_type];

		if (request_data_sz != ioc->diag_buffer_sz[buffer_type]) {

			pci_free_consistent(ioc->pdev,

			dma_free_coherent(&ioc->pdev->dev,

					ioc->diag_buffer_sz[buffer_type],

					request_data, request_data_dma);

			request_data = NULL;
@@ -1559,8 +1559,8 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc, 
	if (request_data == NULL) {

		ioc->diag_buffer_sz[buffer_type] = 0;

		ioc->diag_buffer_dma[buffer_type] = 0;

		request_data = pci_alloc_consistent(

			ioc->pdev, request_data_sz, &request_data_dma);

		request_data = dma_alloc_coherent(&ioc->pdev->dev,

				request_data_sz, &request_data_dma, GFP_KERNEL);

		if (request_data == NULL) {

			ioc_err(ioc, "%s: failed allocating memory for diag buffers, requested size(%d)\n",

				__func__, request_data_sz);
@@ -1631,7 +1631,7 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc, 
 out:



	if (rc && request_data)

		pci_free_consistent(ioc->pdev, request_data_sz,

		dma_free_coherent(&ioc->pdev->dev, request_data_sz,

		    request_data, request_data_dma);



	ioc->ctl_cmds.status = MPT3_CMD_NOT_USED;
@@ -1768,7 +1768,7 @@ _ctl_diag_unregister(struct MPT3SAS_ADAPTER *ioc, void __user *arg) 


	request_data_sz = ioc->diag_buffer_sz[buffer_type];

	request_data_dma = ioc->diag_buffer_dma[buffer_type];

	pci_free_consistent(ioc->pdev, request_data_sz,

	dma_free_coherent(&ioc->pdev->dev, request_data_sz,

			request_data, request_data_dma);

	ioc->diag_buffer[buffer_type] = NULL;

	ioc->diag_buffer_status[buffer_type] = 0;
@@ -3581,8 +3581,10 @@ mpt3sas_ctl_exit(ushort hbas_to_enumerate) 
			if ((ioc->diag_buffer_status[i] &

			    MPT3_DIAG_BUFFER_IS_RELEASED))

				continue;

			pci_free_consistent(ioc->pdev, ioc->diag_buffer_sz[i],

			ioc->diag_buffer[i], ioc->diag_buffer_dma[i]);

			dma_free_coherent(&ioc->pdev->dev,

					  ioc->diag_buffer_sz[i],

					  ioc->diag_buffer[i],

					  ioc->diag_buffer_dma[i]);

			ioc->diag_buffer[i] = NULL;

			ioc->diag_buffer_status[i] = 0;

		}

drivers/scsi/mpt3sas/mpt3sas_transport.c

+10 −8
Original line number Diff line number Diff line
@@ -350,9 +350,8 @@ _transport_expander_report_manufacture(struct MPT3SAS_ADAPTER *ioc, 


	data_out_sz = sizeof(struct rep_manu_request);

	data_in_sz = sizeof(struct rep_manu_reply);

	data_out = pci_alloc_consistent(ioc->pdev, data_out_sz + data_in_sz,

	    &data_out_dma);



	data_out = dma_alloc_coherent(&ioc->pdev->dev, data_out_sz + data_in_sz,

			&data_out_dma, GFP_KERNEL);

	if (!data_out) {

		pr_err("failure at %s:%d/%s()!\n", __FILE__,

		    __LINE__, __func__);
@@ -437,7 +436,7 @@ _transport_expander_report_manufacture(struct MPT3SAS_ADAPTER *ioc, 
 out:

	ioc->transport_cmds.status = MPT3_CMD_NOT_USED;

	if (data_out)

		pci_free_consistent(ioc->pdev, data_out_sz + data_in_sz,

		dma_free_coherent(&ioc->pdev->dev, data_out_sz + data_in_sz,

		    data_out, data_out_dma);



	mutex_unlock(&ioc->transport_cmds.mutex);
@@ -1128,7 +1127,8 @@ _transport_get_expander_phy_error_log(struct MPT3SAS_ADAPTER *ioc, 


	sz = sizeof(struct phy_error_log_request) +

	    sizeof(struct phy_error_log_reply);

	data_out = pci_alloc_consistent(ioc->pdev, sz, &data_out_dma);

	data_out = dma_alloc_coherent(&ioc->pdev->dev, sz, &data_out_dma,

			GFP_KERNEL);

	if (!data_out) {

		pr_err("failure at %s:%d/%s()!\n", __FILE__,

		    __LINE__, __func__);
@@ -1218,7 +1218,7 @@ _transport_get_expander_phy_error_log(struct MPT3SAS_ADAPTER *ioc, 
 out:

	ioc->transport_cmds.status = MPT3_CMD_NOT_USED;

	if (data_out)

		pci_free_consistent(ioc->pdev, sz, data_out, data_out_dma);

		dma_free_coherent(&ioc->pdev->dev, sz, data_out, data_out_dma);



	mutex_unlock(&ioc->transport_cmds.mutex);

	return rc;
@@ -1432,7 +1432,8 @@ _transport_expander_phy_control(struct MPT3SAS_ADAPTER *ioc, 


	sz = sizeof(struct phy_control_request) +

	    sizeof(struct phy_control_reply);

	data_out = pci_alloc_consistent(ioc->pdev, sz, &data_out_dma);

	data_out = dma_alloc_coherent(&ioc->pdev->dev, sz, &data_out_dma,

			GFP_KERNEL);

	if (!data_out) {

		pr_err("failure at %s:%d/%s()!\n", __FILE__,

		    __LINE__, __func__);
@@ -1519,7 +1520,8 @@ _transport_expander_phy_control(struct MPT3SAS_ADAPTER *ioc, 
 out:

	ioc->transport_cmds.status = MPT3_CMD_NOT_USED;

	if (data_out)

		pci_free_consistent(ioc->pdev, sz, data_out, data_out_dma);

		dma_free_coherent(&ioc->pdev->dev, sz, data_out,

				data_out_dma);



	mutex_unlock(&ioc->transport_cmds.mutex);

	return rc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE