diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-09-09 18:39:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-10 16:29:01 -0400 |
| commit | 6894258eda2f9badc28c878086c0e54bd5b7fb30 (patch) | |
| tree | 97f59bd766c2d70858d7f683e7302efafe07a349 /arch/hexagon | |
| parent | fb6dd5fa4165c4b82f1a11416c2fc192ae3a84e2 (diff) | |
dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}
Since 2009 we have a nice asm-generic header implementing lots of DMA API
functions for architectures using struct dma_map_ops, but unfortunately
it's still missing a lot of APIs that all architectures still have to
duplicate.
This series consolidates the remaining functions, although we still need
arch opt outs for two of them as a few architectures have very
non-standard implementations.
This patch (of 5):
The coherent DMA allocator works the same over all architectures supporting
dma_map operations.
This patch consolidates them and converges the minor differences:
- the debug_dma helpers are now called from all architectures, including
those that were previously missing them
- dma_alloc_from_coherent and dma_release_from_coherent are now always
called from the generic alloc/free routines instead of the ops
dma-mapping-common.h always includes dma-coherent.h to get the defintions
for them, or the stubs if the architecture doesn't support this feature
- checks for ->alloc / ->free presence are removed. There is only one
magic instead of dma_map_ops without them (mic_dma_ops) and that one
is x86 only anyway.
Besides that only x86 needs special treatment to replace a default devices
if none is passed and tweak the gfp_flags. An optional arch hook is provided
for that.
[linux@roeck-us.net: fix build]
[jcmvbkbc@gmail.com: fix xtensa]
Signed-off-by: Christoph 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: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/hexagon')
| -rw-r--r-- | arch/hexagon/include/asm/dma-mapping.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/hexagon/include/asm/dma-mapping.h b/arch/hexagon/include/asm/dma-mapping.h index 16965427f6b4..c20d3caa7dad 100644 --- a/arch/hexagon/include/asm/dma-mapping.h +++ b/arch/hexagon/include/asm/dma-mapping.h | |||
| @@ -70,37 +70,4 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | |||
| 70 | return (dma_addr == bad_dma_address); | 70 | return (dma_addr == bad_dma_address); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | #define dma_alloc_coherent(d,s,h,f) dma_alloc_attrs(d,s,h,f,NULL) | ||
| 74 | |||
| 75 | static inline void *dma_alloc_attrs(struct device *dev, size_t size, | ||
| 76 | dma_addr_t *dma_handle, gfp_t flag, | ||
| 77 | struct dma_attrs *attrs) | ||
| 78 | { | ||
| 79 | void *ret; | ||
| 80 | struct dma_map_ops *ops = get_dma_ops(dev); | ||
| 81 | |||
| 82 | BUG_ON(!dma_ops); | ||
| 83 | |||
| 84 | ret = ops->alloc(dev, size, dma_handle, flag, attrs); | ||
| 85 | |||
| 86 | debug_dma_alloc_coherent(dev, size, *dma_handle, ret); | ||
| 87 | |||
| 88 | return ret; | ||
| 89 | } | ||
| 90 | |||
| 91 | #define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL) | ||
| 92 | |||
| 93 | static inline void dma_free_attrs(struct device *dev, size_t size, | ||
| 94 | void *cpu_addr, dma_addr_t dma_handle, | ||
| 95 | struct dma_attrs *attrs) | ||
| 96 | { | ||
| 97 | struct dma_map_ops *dma_ops = get_dma_ops(dev); | ||
| 98 | |||
| 99 | BUG_ON(!dma_ops); | ||
| 100 | |||
| 101 | dma_ops->free(dev, size, cpu_addr, dma_handle, attrs); | ||
| 102 | |||
| 103 | debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); | ||
| 104 | } | ||
| 105 | |||
| 106 | #endif | 73 | #endif |