2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------ From: Mike Travis <[email protected]> commit c681d0ba1252954208220ad32248a3e8e2fc98e4 upstream. 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 <[email protected]> Acked-by: Chris Wright <[email protected]> Reviewed-by: Mike Habeck <[email protected]> Signed-off-by: David Woodhouse <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/pci/intel-iommu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c @@ -2606,8 +2606,7 @@ static dma_addr_t __intel_map_single(str iommu = domain_get_iommu(domain); size = aligned_nrpages(paddr, size); - iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size), - pdev->dma_mask); + iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size), dma_mask); if (!iova) goto error; _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
