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

cris: Provide dma_mmap_coherent() and dma_get_sgtable()

cris/allmodconfig:

drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_mmap’:
drivers/media/v4l2-core/videobuf2-dma-contig.c:204: error: implicit declaration of function ‘dma_mmap_coherent’
drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_get_base_sgt’:
drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit declaration of function ‘dma_get_sgtable’

For architectures using dma_map_ops, dma_mmap_coherent() and
dma_get_sgtable() are provided in <asm-generic/dma-mapping-common.h>.

Cris does not use dma_map_ops, hence it should implement them as inline
stubs using dma_common_mmap() and dma_common_get_sgtable().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: linux-cris-kernel@axis.com
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

authored by

Geert Uytterhoeven and committed by
Marek Szyprowski
063aceba 18180651

+10
+10
arch/cris/include/asm/dma-mapping.h
··· 158 158 { 159 159 } 160 160 161 + /* drivers/base/dma-mapping.c */ 162 + extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, 163 + void *cpu_addr, dma_addr_t dma_addr, size_t size); 164 + extern int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, 165 + void *cpu_addr, dma_addr_t dma_addr, 166 + size_t size); 167 + 168 + #define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s) 169 + #define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s) 170 + 161 171 162 172 #endif