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

Commit f481973d authored by Mahesh Rajashekhara's avatar Mahesh Rajashekhara Committed by Martin K. Petersen
Browse files

scsi: aacraid: pci_alloc_consistent() failures on ARM64 



There were pci_alloc_consistent() failures on ARM64 platform.  Use
dma_alloc_coherent() with GFP_KERNEL flag DMA memory allocations.

Signed-off-by: default avatarMahesh Rajashekhara <mahesh.rajashekhara@microsemi.com>
[hch: tweaked indentation, removed memsets]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDave Carroll <david.carroll@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6cf16115

drivers/scsi/aacraid/aachba.c

+6 −7
Original line number Diff line number Diff line
@@ -1678,8 +1678,8 @@ int aac_issue_bmic_identify(struct aac_dev *dev, u32 bus, u32 target) 
			sizeof(struct sgentry) + sizeof(struct sgentry64);

	datasize = sizeof(struct aac_ciss_identify_pd);



	identify_resp =  pci_alloc_consistent(dev->pdev, datasize, &addr);



	identify_resp = dma_alloc_coherent(&dev->pdev->dev, datasize, &addr,

					   GFP_KERNEL);

	if (!identify_resp)

		goto fib_free_ptr;
@@ -1720,7 +1720,7 @@ int aac_issue_bmic_identify(struct aac_dev *dev, u32 bus, u32 target) 
		dev->hba_map[bus][target].qd_limit =

			identify_resp->current_queue_depth_limit;



	pci_free_consistent(dev->pdev, datasize, (void *)identify_resp, addr);

	dma_free_coherent(&dev->pdev->dev, datasize, identify_resp, addr);



	aac_fib_complete(fibptr);
@@ -1814,9 +1814,8 @@ int aac_report_phys_luns(struct aac_dev *dev, struct fib *fibptr, int rescan) 
	datasize = sizeof(struct aac_ciss_phys_luns_resp)

			+ (AAC_MAX_TARGETS - 1) * sizeof(struct _ciss_lun);



	phys_luns = (struct aac_ciss_phys_luns_resp *) pci_alloc_consistent(

			dev->pdev, datasize, &addr);



	phys_luns = dma_alloc_coherent(&dev->pdev->dev, datasize, &addr,

				       GFP_KERNEL);

	if (phys_luns == NULL) {

		rcode = -ENOMEM;

		goto err_out;
@@ -1861,7 +1860,7 @@ int aac_report_phys_luns(struct aac_dev *dev, struct fib *fibptr, int rescan) 
		aac_update_hba_map(dev, phys_luns, rescan);

	}



	pci_free_consistent(dev->pdev, datasize, (void *) phys_luns, addr);

	dma_free_coherent(&dev->pdev->dev, datasize, phys_luns, addr);

err_out:

	return rcode;

}

drivers/scsi/aacraid/commctrl.c

+4 −2
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg) 
			goto cleanup;

		}



		kfib = pci_alloc_consistent(dev->pdev, size, &daddr);

		kfib = dma_alloc_coherent(&dev->pdev->dev, size, &daddr,

					  GFP_KERNEL);

		if (!kfib) {

			retval = -ENOMEM;

			goto cleanup;
@@ -160,7 +161,8 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg) 
		retval = -EFAULT;

cleanup:

	if (hw_fib) {

		pci_free_consistent(dev->pdev, size, kfib, fibptr->hw_fib_pa);

		dma_free_coherent(&dev->pdev->dev, size, kfib,

				  fibptr->hw_fib_pa);

		fibptr->hw_fib_pa = hw_fib_pa;

		fibptr->hw_fib_va = hw_fib;

	}

drivers/scsi/aacraid/comminit.c

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co 
	size = fibsize + aac_init_size + commsize + commalign +

			printfbufsiz + host_rrq_size;



	base = pci_alloc_consistent(dev->pdev, size, &phys);



	base = dma_alloc_coherent(&dev->pdev->dev, size, &phys, GFP_KERNEL);

	if (base == NULL) {

		printk(KERN_ERR "aacraid: unable to create mapping.\n");

		return 0;

drivers/scsi/aacraid/commsup.c

+11 −9
Original line number Diff line number Diff line
@@ -73,13 +73,13 @@ static int fib_map_alloc(struct aac_dev *dev) 
	}



	dprintk((KERN_INFO

	  "allocate hardware fibs pci_alloc_consistent(%p, %d * (%d + %d), %p)\n",

	  dev->pdev, dev->max_cmd_size, dev->scsi_host_ptr->can_queue,

	  "allocate hardware fibs dma_alloc_coherent(%p, %d * (%d + %d), %p)\n",

	  &dev->pdev->dev, dev->max_cmd_size, dev->scsi_host_ptr->can_queue,

	  AAC_NUM_MGT_FIB, &dev->hw_fib_pa));

	dev->hw_fib_va = pci_alloc_consistent(dev->pdev,

	dev->hw_fib_va = dma_alloc_coherent(&dev->pdev->dev,

		(dev->max_cmd_size + sizeof(struct aac_fib_xporthdr))

		* (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB) + (ALIGN32 - 1),

		&dev->hw_fib_pa);

		&dev->hw_fib_pa, GFP_KERNEL);

	if (dev->hw_fib_va == NULL)

		return -ENOMEM;

	return 0;
@@ -106,7 +106,7 @@ void aac_fib_map_free(struct aac_dev *dev) 
	fib_size = dev->max_fib_size + sizeof(struct aac_fib_xporthdr);

	alloc_size = fib_size * num_fibs + ALIGN32 - 1;



	pci_free_consistent(dev->pdev, alloc_size, dev->hw_fib_va,

	dma_free_coherent(&dev->pdev->dev, alloc_size, dev->hw_fib_va,

			  dev->hw_fib_pa);



	dev->hw_fib_va = NULL;
@@ -1571,7 +1571,8 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 
	 * case.

	 */

	aac_fib_map_free(aac);

	pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys);

	dma_free_coherent(&aac->pdev->dev, aac->comm_size, aac->comm_addr,

			  aac->comm_phys);

	aac->comm_addr = NULL;

	aac->comm_phys = 0;

	kfree(aac->queues);
@@ -2320,7 +2321,8 @@ static int aac_send_wellness_command(struct aac_dev *dev, char *wellness_str, 
	if (!fibptr)

		goto out;



	dma_buf = pci_alloc_consistent(dev->pdev, datasize, &addr);

	dma_buf = dma_alloc_coherent(&dev->pdev->dev, datasize, &addr,

				     GFP_KERNEL);

	if (!dma_buf)

		goto fib_free_out;
@@ -2355,7 +2357,7 @@ static int aac_send_wellness_command(struct aac_dev *dev, char *wellness_str, 
	ret = aac_fib_send(ScsiPortCommand64, fibptr, sizeof(struct aac_srb),

				FsaNormal, 1, 1, NULL, NULL);



	pci_free_consistent(dev->pdev, datasize, (void *)dma_buf, addr);

	dma_free_coherent(&dev->pdev->dev, datasize, dma_buf, addr);



	/*

	 * Do not set XferState to zero unless

drivers/scsi/aacraid/linit.c

+4 −4
Original line number Diff line number Diff line
@@ -1592,8 +1592,8 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
 out_unmap:

	aac_fib_map_free(aac);

	if (aac->comm_addr)

		pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr,

		  aac->comm_phys);

		dma_free_coherent(&aac->pdev->dev, aac->comm_size,

				  aac->comm_addr, aac->comm_phys);

	kfree(aac->queues);

	aac_adapter_ioremap(aac, 0);

	kfree(aac->fibs);
@@ -1729,7 +1729,7 @@ static void aac_remove_one(struct pci_dev *pdev) 


	__aac_shutdown(aac);

	aac_fib_map_free(aac);

	pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr,

	dma_free_coherent(&aac->pdev->dev, aac->comm_size, aac->comm_addr,

			  aac->comm_phys);

	kfree(aac->queues);