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

Commit 8e68597d authored by Michael Reed's avatar Michael Reed Committed by James Bottomley
Browse files

[SCSI] lpfc: fix hang on SGI ia64 platform 



In testing 2.6.31 on one of our ia64 platforms I've encountered a hang
due to the driver using hardware ATEs which are a limited resource.
This is because the driver does not set the dma consistent mask to
64 bits.

Signed-off-by: default avatarMichael Reed <mdr@sgi.com>
Acked-by: default avatarJames Smart <James.Smart@Emulex.Com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 3067e02f

drivers/scsi/lpfc/lpfc_init.c

+12 −4
Original line number Diff line number Diff line
@@ -4506,9 +4506,13 @@ lpfc_sli_pci_mem_setup(struct lpfc_hba *phba) 
		pdev = phba->pcidev;



	/* Set the device DMA mask size */

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

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

	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) {

			return error;

		}

	}



	/* Get the bus address of Bar0 and Bar2 and the number of bytes

	 * required by each mapping.
@@ -6021,9 +6025,13 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba) 
		pdev = phba->pcidev;



	/* Set the device DMA mask size */

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

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

	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) {

			return error;

		}

	}



	/* Get the bus address of SLI4 device Bar0, Bar1, and Bar2 and the

	 * number of bytes required by each mapping. They are actually