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

Commit 1e893752 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

dma-mapping: consolidate dma_{alloc,free}_noncoherent 



Most architectures do not support non-coherent allocations and either
define dma_{alloc,free}_noncoherent to their coherent versions or stub
them out.

Openrisc uses dma_{alloc,free}_attrs to implement them, and only Mips
implements them directly.

This patch moves the Openrisc version to common code, and handles the
DMA_ATTR_NON_CONSISTENT case in the mips dma_map_ops instance.

Note that actual non-coherent allocations require a dma_cache_sync
implementation, so if non-coherent allocations didn't work on
an architecture before this patch they still won't work after it.

[jcmvbkbc@gmail.com: fix xtensa]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6894258e

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

+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ static inline int dma_set_mask(struct device *dev, u64 mask) 
	return get_dma_ops(dev)->set_dma_mask(dev, mask);

}



#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)



#define dma_cache_sync(dev, va, size, dir)		  ((void)0)



#endif	/* _ALPHA_DMA_MAPPING_H */

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

+6 −15
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) 
	dev->archdata.dma_ops = ops;

}



/*

 * Note that while the generic code provides dummy dma_{alloc,free}_noncoherent

 * implementations, we don't provide a dma_cache_sync function so drivers using

 * this API are highlighted with build warnings.

 */



#include <asm-generic/dma-mapping-common.h>



static inline int dma_set_mask(struct device *dev, u64 mask)
@@ -175,21 +181,6 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) 
	return dma_addr == DMA_ERROR_CODE;

}



/*

 * Dummy noncoherent implementation.  We don't provide a dma_cache_sync

 * function so drivers using this API are highlighted with build warnings.

 */

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

		dma_addr_t *handle, gfp_t gfp)

{

	return NULL;

}



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

		void *cpu_addr, dma_addr_t handle)

{

}



extern int dma_supported(struct device *dev, u64 mask);



extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);

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

+0 −14
Original line number Diff line number Diff line
@@ -118,19 +118,5 @@ static inline void dma_mark_clean(void *addr, size_t size) 
{

}



/*

 * There is no dma_cache_sync() implementation, so just return NULL here.

 */

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

					  dma_addr_t *handle, gfp_t flags)

{

	return NULL;

}



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

					void *cpu_addr, dma_addr_t handle)

{

}



#endif	/* __KERNEL__ */

#endif	/* __ASM_DMA_MAPPING_H */

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

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ static inline int dma_set_mask(struct device *dev, u64 mask) 
	return 0;

}



#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 int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return 0;

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

+0 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ extern int bad_dma_address; 


extern struct dma_map_ops *dma_ops;



#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 struct dma_map_ops *get_dma_ops(struct device *dev)

{

	if (unlikely(dev == NULL))