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

Commit df13283e authored by Stefano Stabellini's avatar Stefano Stabellini Committed by Greg Kroah-Hartman
Browse files

swiotlb-xen: implement xen_swiotlb_dma_mmap callback 



commit 7e91c7df29b5e196de3dc6f086c8937973bd0b88 upstream.

This function creates userspace mapping for the DMA-coherent memory.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarOleksandr Dmytryshyn <oleksandr.dmytryshyn@globallogic.com>
Signed-off-by: default avatarAndrii Anisov <andrii_anisov@epam.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64afde6f

arch/arm/xen/mm.c

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { 
	.unmap_page = xen_swiotlb_unmap_page,

	.dma_supported = xen_swiotlb_dma_supported,

	.set_dma_mask = xen_swiotlb_set_dma_mask,

	.mmap = xen_swiotlb_dma_mmap,

};



int __init xen_mm_init(void)

drivers/xen/swiotlb-xen.c

+19 −0
Original line number Diff line number Diff line
@@ -680,3 +680,22 @@ xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask) 
	return 0;

}

EXPORT_SYMBOL_GPL(xen_swiotlb_set_dma_mask);



/*

 * Create userspace mapping for the DMA-coherent memory.

 * This function should be called with the pages from the current domain only,

 * passing pages mapped from other domains would lead to memory corruption.

 */

int

xen_swiotlb_dma_mmap(struct device *dev, struct vm_area_struct *vma,

		     void *cpu_addr, dma_addr_t dma_addr, size_t size,

		     unsigned long attrs)

{

#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)

	if (__generic_dma_ops(dev)->mmap)

		return __generic_dma_ops(dev)->mmap(dev, vma, cpu_addr,

						    dma_addr, size, attrs);

#endif

	return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size);

}

EXPORT_SYMBOL_GPL(xen_swiotlb_dma_mmap);

include/xen/swiotlb-xen.h

+5 −0
Original line number Diff line number Diff line
@@ -58,4 +58,9 @@ xen_swiotlb_dma_supported(struct device *hwdev, u64 mask); 


extern int

xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask);



extern int

xen_swiotlb_dma_mmap(struct device *dev, struct vm_area_struct *vma,

		     void *cpu_addr, dma_addr_t dma_addr, size_t size,

		     unsigned long attrs);

#endif /* __LINUX_SWIOTLB_XEN_H */