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

Commit 6c57625b authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files

[SCSI] be2iscsi : Fix DMA Out of SW-IOMMU space error 



Setting DMA bit mask 64 and roll back to 32 if not supported.

Signed-off-by: default avatarMinh Tran <minhduc.tran@emulex.com>
Signed-off-by: default avatarJayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent da334977

drivers/scsi/be2iscsi/be_main.c

+13 −2
Original line number Diff line number Diff line
@@ -679,8 +679,19 @@ static int beiscsi_enable_pci(struct pci_dev *pcidev) 
	}



	pci_set_master(pcidev);

	if (pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(64))) {

		ret = pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(32));

	ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(64));

	if (ret) {

		ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32));

		if (ret) {

			dev_err(&pcidev->dev, "Could not set PCI DMA Mask\n");

			pci_disable_device(pcidev);

			return ret;

		} else {

			ret = pci_set_consistent_dma_mask(pcidev,

							  DMA_BIT_MASK(32));

		}

	} else {

		ret = pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(64));

		if (ret) {

			dev_err(&pcidev->dev, "Could not set PCI DMA Mask\n");

			pci_disable_device(pcidev);