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

Commit b1d8865a authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Linus Torvalds
Browse files

[PATCH] IB/ipath: print better debug info when handling 32/64-bit DMA mask problems 



Signed-off-by: default avatarDave Olson <dave.olson@qlogic.com>
Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b35f004d

drivers/infiniband/hw/ipath/ipath_driver.c

+20 −3
Original line number Diff line number Diff line
@@ -425,12 +425,29 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, 
		 */

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

			dev_info(&pdev->dev,

				"Unable to set DMA mask for unit %u: %d\n",

				dd->ipath_unit, ret);

			goto bail_regions;

		}

		else

		else {

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

			ret = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);

			if (ret)

				dev_info(&pdev->dev,

					"Unable to set DMA consistent mask "

					"for unit %u: %d\n",

					dd->ipath_unit, ret);



		}

	}

	else {

		ret = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);

		if (ret)

			dev_info(&pdev->dev,

				"Unable to set DMA consistent mask "

				"for unit %u: %d\n",

				dd->ipath_unit, ret);

	}



	pci_set_master(pdev);