diff options
| author | Robin Murphy <robin.murphy@arm.com> | 2015-10-01 20:14:00 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-10-15 16:41:47 +0200 |
| commit | 876945dbf6497c7539ef958fee7ade970fbbe17a (patch) | |
| tree | 249ed5cde4c8ed71361a50f75f28091e3c281adf /arch/arm64/mm | |
| parent | 13b8629f651164d71f4d38b821925f93ba4236c8 (diff) | |
| download | linux-876945dbf6497c7539ef958fee7ade970fbbe17a.tar.gz linux-876945dbf6497c7539ef958fee7ade970fbbe17a.tar.bz2 linux-876945dbf6497c7539ef958fee7ade970fbbe17a.zip | |
arm64: Hook up IOMMU dma_ops
With iommu_dma_ops in place, hook them up to the configuration code, so
IOMMU-fronted devices will get them automatically.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 322404193044..6320361d8d4c 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -960,6 +960,19 @@ static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, } } +void arch_teardown_dma_ops(struct device *dev) +{ + struct iommu_domain *domain = iommu_get_domain_for_dev(dev); + + if (domain) { + iommu_detach_device(domain, dev); + if (domain->type & __IOMMU_DOMAIN_FAKE_DEFAULT) + iommu_domain_free(domain); + } + + dev->archdata.dma_ops = NULL; +} + #else static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, @@ -968,3 +981,12 @@ static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, #endif /* CONFIG_IOMMU_DMA */ +void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, + struct iommu_ops *iommu, bool coherent) +{ + if (!acpi_disabled && !dev->archdata.dma_ops) + dev->archdata.dma_ops = dma_ops; + + dev->archdata.dma_coherent = coherent; + __iommu_setup_dma_ops(dev, dma_base, size, iommu); +} |