diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-12-03 11:43:54 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-12-13 21:06:17 +0100 |
| commit | 55897af63091ebc2c3f239c6a6666f748113ac50 (patch) | |
| tree | 49340a30e15ae65d71fc5f453559340672064d70 /arch/arm64/mm/dma-mapping.c | |
| parent | dma-direct: use dma_direct_map_page to implement dma_direct_map_sg (diff) | |
| download | linux-55897af63091ebc2c3f239c6a6666f748113ac50.tar.xz linux-55897af63091ebc2c3f239c6a6666f748113ac50.zip | |
dma-direct: merge swiotlb_dma_ops into the dma_direct code
While the dma-direct code is (relatively) clean and simple we actually
have to use the swiotlb ops for the mapping on many architectures due
to devices with addressing limits. Instead of keeping two
implementations around this commit allows the dma-direct
implementation to call the swiotlb bounce buffering functions and
thus share the guts of the mapping implementation. This also
simplified the dma-mapping setup on a few architectures where we
don't have to differenciate which implementation to use.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/arm64/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 6ff6ec8806c1..ab1e417204d0 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -463,7 +463,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, const struct iommu_ops *iommu, bool coherent) { if (!dev->dma_ops) - dev->dma_ops = &swiotlb_dma_ops; + dev->dma_ops = &dma_direct_ops; dev->dma_coherent = coherent; __iommu_setup_dma_ops(dev, dma_base, size, iommu); |