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

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

scsi: bfa: use dma_set_mask_and_coherent 



The driver currently uses pci_set_dma_mask despite otherwise using the
generic DMA API.  Switch it over to the better generic DMA API helper and
also ensure we set the coherent mask as well in the resume path.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b3b07762

drivers/scsi/bfa/bfad.c

+7 −11
Original line number Diff line number Diff line
@@ -739,15 +739,11 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) 


	pci_set_master(pdev);





	if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) ||

	    (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) != 0)) {

		if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) ||

		   (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)) != 0)) {

			printk(KERN_ERR "pci_set_dma_mask fail %p\n", pdev);

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

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

		printk(KERN_ERR "dma_set_mask_and_coherent fail %p\n", pdev);

		goto out_release_region;

	}

	}



	/* Enable PCIE Advanced Error Recovery (AER) if kernel supports */

	pci_enable_pcie_error_reporting(pdev);
@@ -1565,8 +1561,8 @@ bfad_pci_slot_reset(struct pci_dev *pdev) 
	pci_save_state(pdev);

	pci_set_master(pdev);



	if (pci_set_dma_mask(bfad->pcidev, DMA_BIT_MASK(64)) != 0)

		if (pci_set_dma_mask(bfad->pcidev, DMA_BIT_MASK(32)) != 0)

	if (dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(64)) ||

	    dma_set_mask_and_coherent(&bfad->pcidev->dev, DMA_BIT_MASK(32)))

		goto out_disable_device;



	if (restart_bfa(bfad) == -1)