iommu/dma-iommu: Use the dev->coherent_dma_mask (6e235020) · Commits · 戴 / test

drivers/iommu/dma-iommu.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -478,7 +478,7 @@ static void __iommu_dma_unmap(struct device *dev, dma_addr_t dma_addr,
		}

		static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,
		size_t size, int prot)
		size_t size, int prot, dma_addr_t dma_mask)
		{
		struct iommu_domain *domain = iommu_get_dma_domain(dev);
		struct iommu_dma_cookie *cookie = domain->iova_cookie;
		@@ -491,7 +491,7 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,

		size = iova_align(iovad, size + iova_off);

		iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev);
		iova = iommu_dma_alloc_iova(domain, size, dma_mask, dev);
		if (!iova)
		return DMA_MAPPING_ERROR;

		@@ -733,7 +733,7 @@ static dma_addr_t iommu_dma_map_page(struct device dev, struct page page,
		int prot = dma_info_to_prot(dir, coherent, attrs);
		dma_addr_t dma_handle;

		dma_handle = __iommu_dma_map(dev, phys, size, prot);
		dma_handle = __iommu_dma_map(dev, phys, size, prot, dma_get_mask(dev));
		if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
		dma_handle != DMA_MAPPING_ERROR)
		arch_sync_dma_for_device(dev, phys, size, dir);
		@@ -936,7 +936,8 @@ static dma_addr_t iommu_dma_map_resource(struct device *dev, phys_addr_t phys,
		size_t size, enum dma_data_direction dir, unsigned long attrs)
		{
		return __iommu_dma_map(dev, phys, size,
		dma_info_to_prot(dir, false, attrs) \| IOMMU_MMIO);
		dma_info_to_prot(dir, false, attrs) \| IOMMU_MMIO,
		dma_get_mask(dev));
		}

		static void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,
		@@ -1042,7 +1043,8 @@ static void iommu_dma_alloc(struct device dev, size_t size,
		if (!cpu_addr)
		return NULL;

		*handle = __iommu_dma_map(dev, page_to_phys(page), size, ioprot);
		*handle = __iommu_dma_map(dev, page_to_phys(page), size, ioprot,
		dev->coherent_dma_mask);
		if (*handle == DMA_MAPPING_ERROR) {
		__iommu_dma_free(dev, size, cpu_addr);
		return NULL;

Admin message