Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xen/arm64: do not call the swiotlb functions twice

On arm64 the dma_map_ops implementation is based on the swiotlb.
swiotlb-xen, used by default in dom0 on Xen, is also based on the
swiotlb.

Avoid calling into the default arm64 dma_map_ops functions from
xen_dma_map_page, xen_dma_unmap_page, xen_dma_sync_single_for_cpu, and
xen_dma_sync_single_for_device otherwise we end up calling into the
swiotlb twice.

When arm64 gets a non-swiotlb based implementation of dma_map_ops, we'll
probably have to reintroduce dma_map_ops calls in page-coherent.h.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: catalin.marinas@arm.com
CC: Will.Deacon@arm.com
CC: Ian.Campbell@citrix.com

-4
-4
arch/arm64/include/asm/xen/page-coherent.h
··· 23 23 unsigned long offset, size_t size, enum dma_data_direction dir, 24 24 struct dma_attrs *attrs) 25 25 { 26 - __generic_dma_ops(hwdev)->map_page(hwdev, page, offset, size, dir, attrs); 27 26 } 28 27 29 28 static inline void xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle, 30 29 size_t size, enum dma_data_direction dir, 31 30 struct dma_attrs *attrs) 32 31 { 33 - __generic_dma_ops(hwdev)->unmap_page(hwdev, handle, size, dir, attrs); 34 32 } 35 33 36 34 static inline void xen_dma_sync_single_for_cpu(struct device *hwdev, 37 35 dma_addr_t handle, size_t size, enum dma_data_direction dir) 38 36 { 39 - __generic_dma_ops(hwdev)->sync_single_for_cpu(hwdev, handle, size, dir); 40 37 } 41 38 42 39 static inline void xen_dma_sync_single_for_device(struct device *hwdev, 43 40 dma_addr_t handle, size_t size, enum dma_data_direction dir) 44 41 { 45 - __generic_dma_ops(hwdev)->sync_single_for_device(hwdev, handle, size, dir); 46 42 } 47 43 #endif /* _ASM_ARM64_XEN_PAGE_COHERENT_H */