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

Commit 8ddbe594 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: move dma_cache_sync out of line 



This isn't exactly a slow path routine, but it is not super critical
either, and moving it out of line will help to keep the include chain
clean for the following DMA indirection bypass work.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Tested-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Tested-by: default avatarTony Luck <tony.luck@intel.com>
parent 7249c1a5

include/linux/dma-mapping.h

+2 −10
Original line number Diff line number Diff line
@@ -411,16 +411,8 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, 
#define dma_map_page(d, p, o, s, r) dma_map_page_attrs(d, p, o, s, r, 0)

#define dma_unmap_page(d, a, s, r) dma_unmap_page_attrs(d, a, s, r, 0)



static inline void

dma_cache_sync(struct device *dev, void *vaddr, size_t size,

		enum dma_data_direction dir)

{

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->cache_sync)

		ops->cache_sync(dev, vaddr, size, dir);

}

void dma_cache_sync(struct device *dev, void *vaddr, size_t size,

		enum dma_data_direction dir);



extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,

		void *cpu_addr, dma_addr_t dma_addr, size_t size,

kernel/dma/mapping.c

+11 −0
Original line number Diff line number Diff line
@@ -430,3 +430,14 @@ int dma_set_coherent_mask(struct device *dev, u64 mask) 
}

EXPORT_SYMBOL(dma_set_coherent_mask);

#endif



void dma_cache_sync(struct device *dev, void *vaddr, size_t size,

		enum dma_data_direction dir)

{

	const struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->cache_sync)

		ops->cache_sync(dev, vaddr, size, dir);

}

EXPORT_SYMBOL(dma_cache_sync);