Commit 3ecfb168 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: me: set dma mask using DMA mapping API 



ME device is 64bit DMA capable
We assume both coherent and consistent memory to match

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 479327fc

drivers/misc/mei/pci-me.c

+15 −0
Original line number Diff line number Diff line
@@ -144,6 +144,21 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		dev_err(&pdev->dev, "failed to get pci regions.\n");

		goto disable_device;

	}



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

	    dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {



		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (err)

			err = dma_set_coherent_mask(&pdev->dev,

						    DMA_BIT_MASK(32));

	}

	if (err) {

		dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");

		goto release_regions;

	}





	/* allocates and initializes the mei dev structure */

	dev = mei_me_dev_init(pdev);

	if (!dev) {