Merge "arm64: dma_mapping: Add support for .dma_mapping_error() ops" into msm-4.8 (a5cdcb1e) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/mm/dma-mapping.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1921,6 +1921,12 @@ static void arm_iommu_sync_single_for_device(struct device *dev,
		__dma_page_cpu_to_dev(page, offset, size, dir);
		}

		static int arm_iommu_mapping_error(struct device *dev,
		dma_addr_t dma_addr)
		{
		return dma_addr == DMA_ERROR_CODE;
		}

		const struct dma_map_ops iommu_ops = {
		.alloc = arm_iommu_alloc_attrs,
		.free = arm_iommu_free_attrs,
		@@ -1938,6 +1944,7 @@ const struct dma_map_ops iommu_ops = {
		.sync_sg_for_device = arm_iommu_sync_sg_for_device,

		.set_dma_mask = arm_dma_set_mask,
		.mapping_error = arm_iommu_mapping_error,
		};

		const struct dma_map_ops iommu_coherent_ops = {