Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1874619a authored by Thierry Reding's avatar Thierry Reding Committed by Ben Skeggs
Browse files

ARM: dma-mapping: Set proper DMA ops in arm_iommu_detach_device() 



Instead of setting the DMA ops pointer to NULL, set the correct,
non-IOMMU ops depending on the device's coherency setting.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0d466901

arch/arm/mm/dma-mapping.c

+6 −6
Original line number Diff line number Diff line
@@ -1151,6 +1151,11 @@ int arm_dma_supported(struct device *dev, u64 mask) 
	return __dma_supported(dev, mask, false);

}



static const struct dma_map_ops *arm_get_dma_map_ops(bool coherent)

{

	return coherent ? &arm_coherent_dma_ops : &arm_dma_ops;

}



#ifdef CONFIG_ARM_DMA_USE_IOMMU



static int __dma_info_to_prot(enum dma_data_direction dir, unsigned long attrs)
@@ -2296,7 +2301,7 @@ void arm_iommu_detach_device(struct device *dev) 
	iommu_detach_device(mapping->domain, dev);

	kref_put(&mapping->kref, release_iommu_mapping);

	to_dma_iommu_mapping(dev) = NULL;

	set_dma_ops(dev, NULL);

	set_dma_ops(dev, arm_get_dma_map_ops(dev->archdata.dma_coherent));



	pr_debug("Detached IOMMU controller from %s device.\n", dev_name(dev));

}
@@ -2357,11 +2362,6 @@ static void arm_teardown_iommu_dma_ops(struct device *dev) { } 


#endif	/* CONFIG_ARM_DMA_USE_IOMMU */



static const struct dma_map_ops *arm_get_dma_map_ops(bool coherent)

{

	return coherent ? &arm_coherent_dma_ops : &arm_dma_ops;

}



void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			const struct iommu_ops *iommu, bool coherent)

{