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

Commit 68dd43a1 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Roland Dreier
Browse files

IB/ipath: set up 32-bit DMA mask if 64-bit setup fails 



Some systems do not set up 64-bit maps on systems with 2GB or less of
memory installed, so we have to fall back to trying a 32-bit setup.

Signed-off-by: default avatarBryan O'Sullivan <bos@pathscale.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 755e4ca4

drivers/infiniband/hw/ipath/ipath_driver.c

+13 −3
Original line number Diff line number Diff line
@@ -417,11 +417,21 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, 
	}



	ret = pci_set_dma_mask(pdev, DMA_64BIT_MASK);

	if (ret) {

		/*

		 * if the 64 bit setup fails, try 32 bit.  Some systems

		 * do not setup 64 bit maps on systems with 2GB or less

		 * memory installed.

		 */

		ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);

		if (ret) {

			dev_info(&pdev->dev, "pci_set_dma_mask unit %u "

				 "fails: %d\n", dd->ipath_unit, ret);

			goto bail_regions;

		}

		else

			ipath_dbg("No 64bit DMA mask, used 32 bit mask\n");

	}



	pci_set_master(pdev);