diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 10:23:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 10:23:17 -0800 |
| commit | 8c2c8ed8b85d4012d26caf1c221c291c687d89f0 (patch) | |
| tree | c28ac6bfc83c198b2a61515694d05ad22f2cc25a /include | |
| parent | 304362a8bce1a5b7f9491be5a0643cd14a52364d (diff) | |
| parent | 69369f52d28a34c84acb6f2a8a585e743441566a (diff) | |
| download | linux-8c2c8ed8b85d4012d26caf1c221c291c687d89f0.tar.gz linux-8c2c8ed8b85d4012d26caf1c221c291c687d89f0.tar.bz2 linux-8c2c8ed8b85d4012d26caf1c221c291c687d89f0.zip | |
Merge branch 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb updates from Konrad Rzeszutek Wilk:
"Two tiny implementations of the DMA API for callback in ARM (for Xen)"
* 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
swiotlb-xen: implement xen_swiotlb_get_sgtable callback
swiotlb-xen: implement xen_swiotlb_dma_mmap callback
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/swiotlb-xen.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h index a0083be5d529..1f6d78f044b6 100644 --- a/include/xen/swiotlb-xen.h +++ b/include/xen/swiotlb-xen.h @@ -2,6 +2,7 @@ #define __LINUX_SWIOTLB_XEN_H #include <linux/dma-direction.h> +#include <linux/scatterlist.h> #include <linux/swiotlb.h> extern int xen_swiotlb_init(int verbose, bool early); @@ -55,4 +56,14 @@ 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); + +extern int +xen_swiotlb_get_sgtable(struct device *dev, struct sg_table *sgt, + void *cpu_addr, dma_addr_t handle, size_t size, + unsigned long attrs); #endif /* __LINUX_SWIOTLB_XEN_H */ |