diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-08-17 17:34:03 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-09-11 09:14:43 +0200 |
| commit | 5ceda74093a5c1c3f42a02b894df031f3bbc9af1 (patch) | |
| tree | d16c05bab2364724baff7d1e28a71e535628250a /drivers | |
| parent | 7bc5c428a660d4d1bc95ba54bf4cb6bccf8c3029 (diff) | |
| download | linux-5ceda74093a5c1c3f42a02b894df031f3bbc9af1.tar.gz linux-5ceda74093a5c1c3f42a02b894df031f3bbc9af1.tar.bz2 linux-5ceda74093a5c1c3f42a02b894df031f3bbc9af1.zip | |
dma-direct: rename and cleanup __phys_to_dma
The __phys_to_dma vs phys_to_dma distinction isn't exactly obvious. Try
to improve the situation by renaming __phys_to_dma to
phys_to_dma_unencryped, and not forcing architectures that want to
override phys_to_dma to actually provide __phys_to_dma.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iommu/intel/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index f8177c59d229..7983c13b9eef 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -3736,7 +3736,7 @@ bounce_map_single(struct device *dev, phys_addr_t paddr, size_t size, */ if (!IS_ALIGNED(paddr | size, VTD_PAGE_SIZE)) { tlb_addr = swiotlb_tbl_map_single(dev, - __phys_to_dma(dev, io_tlb_start), + phys_to_dma_unencrypted(dev, io_tlb_start), paddr, size, aligned_size, dir, attrs); if (tlb_addr == DMA_MAPPING_ERROR) { goto swiotlb_error; |