Commit c681d0ba authored May 28, 2011 by Mike Travis Committed by David Woodhouse Jun 01, 2011

intel-iommu: Use coherent DMA mask when requested



The __intel_map_single function is not honoring the passed in DMA mask.
This results in not using the coherent DMA mask when called from
intel_alloc_coherent().

Signed-off-by: Mike Travis <travis@sgi.com>
Acked-by: Chris Wright <chrisw@sous-sol.org>
Reviewed-by: Mike Habeck <habeck@sgi.com>
Cc: stable@kernel.org
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

parent 1c9fc3d1

drivers/pci/intel-iommu.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2732,8 +2732,7 @@ static dma_addr_t __intel_map_single(struct device *hwdev, phys_addr_t paddr,
	iommu = domain_get_iommu(domain);		iommu = domain_get_iommu(domain);
	size = aligned_nrpages(paddr, size);		size = aligned_nrpages(paddr, size);

	iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size),		iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size), dma_mask);
	pdev->dma_mask);
	if (!iova)		if (!iova)
	goto error;		goto error;