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

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

MIPS: adapt for dma_map_ops changes 



Adapt core MIPS 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 missing changes to arch/mips/cavium-octeon/dma-octeon.c,
 fixed attrs argument in dma-mapping.h]
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent baa676fc

arch/mips/cavium-octeon/dma-octeon.c

+6 −6
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static void octeon_dma_sync_sg_for_device(struct device *dev, 
}



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

	dma_addr_t *dma_handle, gfp_t gfp)

	dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)

{

	void *ret;
@@ -192,7 +192,7 @@ static void *octeon_dma_alloc_coherent(struct device *dev, size_t size, 
}



static void octeon_dma_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)

{

	int order = get_order(size);
@@ -240,8 +240,8 @@ EXPORT_SYMBOL(dma_to_phys); 


static struct octeon_dma_map_ops octeon_linear_dma_map_ops = {

	.dma_map_ops = {

		.alloc_coherent = octeon_dma_alloc_coherent,

		.free_coherent = octeon_dma_free_coherent,

		.alloc = octeon_dma_alloc_coherent,

		.free = octeon_dma_free_coherent,

		.map_page = octeon_dma_map_page,

		.unmap_page = swiotlb_unmap_page,

		.map_sg = octeon_dma_map_sg,
@@ -325,8 +325,8 @@ void __init plat_swiotlb_setup(void) 
#ifdef CONFIG_PCI

static struct octeon_dma_map_ops _octeon_pci_dma_map_ops = {

	.dma_map_ops = {

		.alloc_coherent = octeon_dma_alloc_coherent,

		.free_coherent = octeon_dma_free_coherent,

		.alloc = octeon_dma_alloc_coherent,

		.free = octeon_dma_free_coherent,

		.map_page = octeon_dma_map_page,

		.unmap_page = swiotlb_unmap_page,

		.map_sg = octeon_dma_map_sg,

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

+12 −6
Original line number Diff line number Diff line
@@ -57,25 +57,31 @@ dma_set_mask(struct device *dev, u64 mask) 
extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size,

	       enum dma_data_direction direction);



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

				       dma_addr_t *dma_handle, gfp_t gfp)

#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 gfp,

				    struct dma_attrs *attrs)

{

	void *ret;

	struct dma_map_ops *ops = get_dma_ops(dev);



	ret = ops->alloc_coherent(dev, size, dma_handle, gfp);

	ret = ops->alloc(dev, size, dma_handle, gfp, attrs);



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



	return ret;

}



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

				     void *vaddr, 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 *vaddr, dma_addr_t dma_handle,

				  struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);



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

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



	debug_dma_free_coherent(dev, size, vaddr, dma_handle);

}

arch/mips/mm/dma-default.c

+4 −4
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, 
EXPORT_SYMBOL(dma_alloc_noncoherent);



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

	dma_addr_t * dma_handle, gfp_t gfp)

	dma_addr_t * dma_handle, gfp_t gfp, struct dma_attrs *attrs)

{

	void *ret;
@@ -132,7 +132,7 @@ void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, 
EXPORT_SYMBOL(dma_free_noncoherent);



static void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,

	dma_addr_t dma_handle)

	dma_addr_t dma_handle, struct dma_attrs *attrs)

{

	unsigned long addr = (unsigned long) vaddr;

	int order = get_order(size);
@@ -323,8 +323,8 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, 
EXPORT_SYMBOL(dma_cache_sync);



static struct dma_map_ops mips_default_dma_map_ops = {

	.alloc_coherent = mips_dma_alloc_coherent,

	.free_coherent = mips_dma_free_coherent,

	.alloc = mips_dma_alloc_coherent,

	.free = mips_dma_free_coherent,

	.map_page = mips_dma_map_page,

	.unmap_page = mips_dma_unmap_page,

	.map_sg = mips_dma_map_sg,