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

Commit 64ccc9c0 authored by Marek Szyprowski's avatar Marek Szyprowski
Browse files

common: dma-mapping: add support for generic dma_mmap_* calls 



Commit 9adc5374 ('common: dma-mapping: introduce mmap method') added a
generic method for implementing mmap user call to dma_map_ops structure.

This patch converts ARM and PowerPC architectures (the only providers of
dma_mmap_coherent/dma_mmap_writecombine calls) to use this generic
dma_map_ops based call and adds a generic cross architecture
definition for dma_mmap_attrs, dma_mmap_coherent, dma_mmap_writecombine
functions.

The generic mmap virt_to_page-based fallback implementation is provided for
architectures which don't provide their own implementation for mmap method.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
parent 9fa8af91

arch/arm/include/asm/dma-mapping.h

+0 −19
Original line number Diff line number Diff line
@@ -186,17 +186,6 @@ extern int arm_dma_mmap(struct device *dev, struct vm_area_struct *vma, 
			void *cpu_addr, dma_addr_t dma_addr, size_t size,

			struct dma_attrs *attrs);



#define dma_mmap_coherent(d, v, c, h, s) dma_mmap_attrs(d, v, c, h, s, NULL)



static inline int dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma,

				  void *cpu_addr, dma_addr_t dma_addr,

				  size_t size, struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	BUG_ON(!ops);

	return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);

}



static inline void *dma_alloc_writecombine(struct device *dev, size_t size,

				       dma_addr_t *dma_handle, gfp_t flag)

{
@@ -213,14 +202,6 @@ static inline void dma_free_writecombine(struct device *dev, size_t size, 
	return dma_free_attrs(dev, size, cpu_addr, dma_handle, &attrs);

}



static inline int dma_mmap_writecombine(struct device *dev, struct vm_area_struct *vma,

		      void *cpu_addr, dma_addr_t dma_addr, size_t size)

{

	DEFINE_DMA_ATTRS(attrs);

	dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);

	return dma_mmap_attrs(dev, vma, cpu_addr, dma_addr, size, &attrs);

}



/*

 * This can be called during boot to increase the size of the consistent

 * DMA region above it's default value of 2MB. It must be called before the

arch/powerpc/include/asm/dma-mapping.h

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ extern void *dma_direct_alloc_coherent(struct device *dev, size_t size, 
extern void dma_direct_free_coherent(struct device *dev, size_t size,

				     void *vaddr, dma_addr_t dma_handle,

				     struct dma_attrs *attrs);



extern int dma_direct_mmap_coherent(struct device *dev,

				    struct vm_area_struct *vma,

				    void *cpu_addr, dma_addr_t handle,

				    size_t size, struct dma_attrs *attrs);



#ifdef CONFIG_NOT_COHERENT_CACHE

/*
@@ -207,11 +210,8 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr) 
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



extern int dma_mmap_coherent(struct device *, struct vm_area_struct *,

			     void *, dma_addr_t, size_t);

#define ARCH_HAS_DMA_MMAP_COHERENT





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

		enum dma_data_direction direction)

{

arch/powerpc/kernel/dma-iommu.c

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static u64 dma_iommu_get_required_mask(struct device *dev) 
struct dma_map_ops dma_iommu_ops = {

	.alloc			= dma_iommu_alloc_coherent,

	.free			= dma_iommu_free_coherent,

	.mmap			= dma_direct_mmap_coherent,

	.map_sg			= dma_iommu_map_sg,

	.unmap_sg		= dma_iommu_unmap_sg,

	.dma_supported		= dma_iommu_dma_supported,

arch/powerpc/kernel/dma-swiotlb.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static u64 swiotlb_powerpc_get_required(struct device *dev) 
struct dma_map_ops swiotlb_dma_ops = {

	.alloc = dma_direct_alloc_coherent,

	.free = dma_direct_free_coherent,

	.mmap = dma_direct_mmap_coherent,

	.map_sg = swiotlb_map_sg_attrs,

	.unmap_sg = swiotlb_unmap_sg_attrs,

	.dma_supported = swiotlb_dma_supported,

arch/powerpc/kernel/dma.c

+19 −17
Original line number Diff line number Diff line
@@ -65,6 +65,24 @@ void dma_direct_free_coherent(struct device *dev, size_t size, 
#endif

}



int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma,

			     void *cpu_addr, dma_addr_t handle, size_t size,

			     struct dma_attrs *attrs)

{

	unsigned long pfn;



#ifdef CONFIG_NOT_COHERENT_CACHE

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	pfn = __dma_get_coherent_pfn((unsigned long)cpu_addr);

#else

	pfn = page_to_pfn(virt_to_page(cpu_addr));

#endif

	return remap_pfn_range(vma, vma->vm_start,

			       pfn + vma->vm_pgoff,

			       vma->vm_end - vma->vm_start,

			       vma->vm_page_prot);

}



static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,

			     int nents, enum dma_data_direction direction,

			     struct dma_attrs *attrs)
@@ -154,6 +172,7 @@ static inline void dma_direct_sync_single(struct device *dev, 
struct dma_map_ops dma_direct_ops = {

	.alloc				= dma_direct_alloc_coherent,

	.free				= dma_direct_free_coherent,

	.mmap				= dma_direct_mmap_coherent,

	.map_sg				= dma_direct_map_sg,

	.unmap_sg			= dma_direct_unmap_sg,

	.dma_supported			= dma_direct_dma_supported,
@@ -211,20 +230,3 @@ static int __init dma_init(void) 
}

fs_initcall(dma_init);

int dma_mmap_coherent(struct device *dev, struct vm_area_struct *vma,

		      void *cpu_addr, dma_addr_t handle, size_t size)

{

	unsigned long pfn;



#ifdef CONFIG_NOT_COHERENT_CACHE

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	pfn = __dma_get_coherent_pfn((unsigned long)cpu_addr);

#else

	pfn = page_to_pfn(virt_to_page(cpu_addr));

#endif

	return remap_pfn_range(vma, vma->vm_start,

			       pfn + vma->vm_pgoff,

			       vma->vm_end - vma->vm_start,

			       vma->vm_page_prot);

}

EXPORT_SYMBOL_GPL(dma_mmap_coherent);