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

Commit ffc4a3fa authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Marek Szyprowski
Browse files

Unicore32: adapt for dma_map_ops changes 



Adapt core Unicore32 architecture code for dma_map_ops changes: replace
alloc/free_coherent with generic alloc/free methods.

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
[added swiotlb_alloc/free_coherent wrappers]
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 988624ec

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

+12 −6
Original line number Diff line number Diff line
@@ -82,20 +82,26 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask) 
	return 0;

}



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

				       dma_addr_t *dma_handle, gfp_t flag)

#define dma_alloc_coherent(d,s,h,f)	dma_alloc_attrs(d,s,h,f,NULL)



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

				    dma_addr_t *dma_handle, gfp_t flag,

				    struct dma_attrs *attrs)

{

	struct dma_map_ops *dma_ops = get_dma_ops(dev);



	return dma_ops->alloc_coherent(dev, size, dma_handle, flag);

	return dma_ops->alloc(dev, size, dma_handle, flag, attrs);

}



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

				     void *cpu_addr, dma_addr_t dma_handle)

#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)



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

				  void *cpu_addr, dma_addr_t dma_handle,

				  struct dma_attrs *attrs)

{

	struct dma_map_ops *dma_ops = get_dma_ops(dev);



	dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);

	dma_ops->free(dev, size, cpu_addr, dma_handle, attrs);

}



#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

arch/unicore32/mm/dma-swiotlb.c

+16 −2
Original line number Diff line number Diff line
@@ -17,9 +17,23 @@ 


#include <asm/dma.h>



static void *unicore_swiotlb_alloc_coherent(struct device *dev, size_t size,

					    dma_addr_t *dma_handle, gfp_t flags,

					    struct dma_attrs *attrs)

{

	return swiotlb_alloc_coherent(dev, size, dma_handle, flags);

}



static void unicore_swiotlb_free_coherent(struct device *dev, size_t size,

					  void *vaddr, dma_addr_t dma_addr,

					  struct dma_attrs *attrs)

{

	swiotlb_free_coherent(dev, size, vaddr, dma_addr);

}



struct dma_map_ops swiotlb_dma_map_ops = {

	.alloc_coherent = swiotlb_alloc_coherent,

	.free_coherent = swiotlb_free_coherent,

	.alloc = unicore_swiotlb_alloc_coherent,

	.free = unicore_swiotlb_free_coherent,

	.map_sg = swiotlb_map_sg_attrs,

	.unmap_sg = swiotlb_unmap_sg_attrs,

	.dma_supported = swiotlb_dma_supported,