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

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

Microblaze: adapt for dma_map_ops changes 



Adapt core Microblaze 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>
[fixed coding style issues]
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 552c0d3e

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

+12 −6
Original line number Diff line number Diff line
@@ -123,28 +123,34 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) 
#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)



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 *ops = get_dma_ops(dev);

	void *memory;



	BUG_ON(!ops);



	memory = ops->alloc_coherent(dev, size, dma_handle, flag);

	memory = ops->alloc(dev, size, dma_handle, flag, attrs);



	debug_dma_alloc_coherent(dev, size, *dma_handle, memory);

	return memory;

}



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 *ops = get_dma_ops(dev);



	BUG_ON(!ops);

	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);

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

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

}



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

arch/microblaze/kernel/dma.c

+6 −4
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ static unsigned long get_dma_direct_offset(struct device *dev) 
#define NOT_COHERENT_CACHE



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

				dma_addr_t *dma_handle, gfp_t flag)

				       dma_addr_t *dma_handle, gfp_t flag,

				       struct dma_attrs *attrs)

{

#ifdef NOT_COHERENT_CACHE

	return consistent_alloc(flag, size, dma_handle);
@@ -57,7 +58,8 @@ static void *dma_direct_alloc_coherent(struct device *dev, size_t size, 
}



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

			      void *vaddr, dma_addr_t dma_handle)

				     void *vaddr, dma_addr_t dma_handle,

				     struct dma_attrs *attrs)

{

#ifdef NOT_COHERENT_CACHE

	consistent_free(size, vaddr);
@@ -176,8 +178,8 @@ dma_direct_sync_sg_for_device(struct device *dev, 
}



struct dma_map_ops dma_direct_ops = {

	.alloc_coherent	= dma_direct_alloc_coherent,

	.free_coherent	= dma_direct_free_coherent,

	.alloc		= dma_direct_alloc_coherent,

	.free		= dma_direct_free_coherent,

	.map_sg		= dma_direct_map_sg,

	.unmap_sg	= dma_direct_unmap_sg,

	.dma_supported	= dma_direct_dma_supported,