diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-07-18 11:30:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 21:14:01 +0200 |
| commit | 1fe532685a1984dc9f2603ed20bd5e630ba79709 (patch) | |
| tree | dfae117e13e895bc7cf46a09a969f226e59991f4 /arch/arm/mm | |
| parent | Generic dma-coherent: fix DMA_MEMORY_EXCLUSIVE (diff) | |
| download | linux-1fe532685a1984dc9f2603ed20bd5e630ba79709.tar.xz linux-1fe532685a1984dc9f2603ed20bd5e630ba79709.zip | |
ARM: support generic per-device coherent dma mem
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/consistent.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c index 333a82a3717e..db7b3e38ef1d 100644 --- a/arch/arm/mm/consistent.c +++ b/arch/arm/mm/consistent.c @@ -274,6 +274,11 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp, void * dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp) { + void *memory; + + if (dma_alloc_from_coherent(dev, size, handle, &memory)) + return memory; + if (arch_is_coherent()) { void *virt; @@ -362,6 +367,9 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr WARN_ON(irqs_disabled()); + if (dma_release_from_coherent(dev, get_order(size), cpu_addr)) + return; + if (arch_is_coherent()) { kfree(cpu_addr); return; |