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

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

dma-mapping: consolidate dma_supported 



Most architectures just call into ->dma_supported, but some also return 1
if the method is not present, or 0 if no dma ops are present (although
that should never happeb). Consolidate this more broad version into
common code.

Also fix h8300 which inorrectly always returned 0, which would have been
a problem if it's dma_set_mask implementation wasn't a similarly buggy
noop.

As a few architectures have much more elaborate implementations, we
still allow for arch overrides.

[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 efa21e43

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

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) 


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



static inline int dma_supported(struct device *dev, u64 mask)

{

	return get_dma_ops(dev)->dma_supported(dev, mask);

}



static inline int dma_set_mask(struct device *dev, u64 mask)

{

	return get_dma_ops(dev)->set_dma_mask(dev, mask);

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

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

}



#define HAVE_ARCH_DMA_SUPPORTED 1

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



/*

 * 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)
@@ -172,8 +174,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) 


static inline void dma_mark_clean(void *addr, size_t size) { }



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 −6
Original line number Diff line number Diff line
@@ -84,12 +84,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr) 
	return (phys_addr_t)dev_addr;

}



static inline int dma_supported(struct device *dev, u64 mask)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	return ops->dma_supported(dev, mask);

}



static inline int dma_set_mask(struct device *dev, u64 mask)

{

	if (!dev->dma_mask || !dma_supported(dev, mask))

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

+0 −5
Original line number Diff line number Diff line
@@ -10,11 +10,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) 


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



static inline int dma_supported(struct device *dev, u64 mask)

{

	return 0;

}



static inline int dma_set_mask(struct device *dev, u64 mask)

{

	return 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) 
	return dma_ops;

}



#define HAVE_ARCH_DMA_SUPPORTED 1

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

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

extern int dma_is_consistent(struct device *dev, dma_addr_t dma_handle);