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

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

SH: adapt for dma_map_ops changes 



Adapt core SH 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>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4ce9a91f

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

+18 −10
Original line number Diff line number Diff line
@@ -52,25 +52,31 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) 
	return dma_addr == 0;

}



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)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	void *memory;



	if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))

		return memory;

	if (!ops->alloc_coherent)

	if (!ops->alloc)

		return NULL;



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

	memory = ops->alloc(dev, size, dma_handle, gfp, 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 *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);
@@ -78,14 +84,16 @@ static inline void dma_free_coherent(struct device *dev, size_t size, 
		return;



	debug_dma_free_coherent(dev, size, vaddr, dma_handle);

	if (ops->free_coherent)

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

	if (ops->free)

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

}



/* arch/sh/mm/consistent.c */

extern void *dma_generic_alloc_coherent(struct device *dev, size_t size,

					dma_addr_t *dma_addr, gfp_t flag);

					dma_addr_t *dma_addr, gfp_t flag,

					struct dma_attrs *attrs);

extern void dma_generic_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);



#endif /* __ASM_SH_DMA_MAPPING_H */

arch/sh/kernel/dma-nommu.c

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ static void nommu_sync_sg(struct device *dev, struct scatterlist *sg, 
#endif



struct dma_map_ops nommu_dma_ops = {

	.alloc_coherent		= dma_generic_alloc_coherent,

	.free_coherent		= dma_generic_free_coherent,

	.alloc			= dma_generic_alloc_coherent,

	.free			= dma_generic_free_coherent,

	.map_page		= nommu_map_page,

	.map_sg			= nommu_map_sg,

#ifdef CONFIG_DMA_NONCOHERENT

arch/sh/mm/consistent.c

+4 −2
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ static int __init dma_init(void) 
fs_initcall(dma_init);



void *dma_generic_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, *ret_nocache;

	int order = get_order(size);
@@ -64,7 +65,8 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, 
}



void dma_generic_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);

	unsigned long pfn = dma_handle >> PAGE_SHIFT;