diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-10-25 20:50:51 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-25 20:50:51 -0400 |
commit | f32154c9b580f11017b01bf093514c900c09364e (patch) | |
tree | 3ec811bc69fd2e562bd9000c323fc3ae1584ce68 /arch/sh/mm/consistent.c | |
parent | 73c926bee0e4b7739bbb992a0a3df561178dd522 (diff) |
sh: Add dma-mapping support for dma_alloc/free_coherent() overrides.
This moves the current dma_alloc/free_coherent() calls to a generic
variant and plugs them in for the nommu default. Other variants can
override the defaults in the dma mapping ops directly.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm/consistent.c')
-rw-r--r-- | arch/sh/mm/consistent.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index 1165161e472c..ef20bbabefa0 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c | |||
@@ -33,15 +33,12 @@ static int __init dma_init(void) | |||
33 | } | 33 | } |
34 | fs_initcall(dma_init); | 34 | fs_initcall(dma_init); |
35 | 35 | ||
36 | void *dma_alloc_coherent(struct device *dev, size_t size, | 36 | void *dma_generic_alloc_coherent(struct device *dev, size_t size, |
37 | dma_addr_t *dma_handle, gfp_t gfp) | 37 | dma_addr_t *dma_handle, gfp_t gfp) |
38 | { | 38 | { |
39 | void *ret, *ret_nocache; | 39 | void *ret, *ret_nocache; |
40 | int order = get_order(size); | 40 | int order = get_order(size); |
41 | 41 | ||
42 | if (dma_alloc_from_coherent(dev, size, dma_handle, &ret)) | ||
43 | return ret; | ||
44 | |||
45 | ret = (void *)__get_free_pages(gfp, order); | 42 | ret = (void *)__get_free_pages(gfp, order); |
46 | if (!ret) | 43 | if (!ret) |
47 | return NULL; | 44 | return NULL; |
@@ -63,30 +60,21 @@ void *dma_alloc_coherent(struct device *dev, size_t size, | |||
63 | 60 | ||
64 | *dma_handle = virt_to_phys(ret); | 61 | *dma_handle = virt_to_phys(ret); |
65 | 62 | ||
66 | debug_dma_alloc_coherent(dev, size, *dma_handle, ret_nocache); | ||
67 | |||
68 | return ret_nocache; | 63 | return ret_nocache; |
69 | } | 64 | } |
70 | EXPORT_SYMBOL(dma_alloc_coherent); | ||
71 | 65 | ||
72 | void dma_free_coherent(struct device *dev, size_t size, | 66 | void dma_generic_free_coherent(struct device *dev, size_t size, |
73 | void *vaddr, dma_addr_t dma_handle) | 67 | void *vaddr, dma_addr_t dma_handle) |
74 | { | 68 | { |
75 | int order = get_order(size); | 69 | int order = get_order(size); |
76 | unsigned long pfn = dma_handle >> PAGE_SHIFT; | 70 | unsigned long pfn = dma_handle >> PAGE_SHIFT; |
77 | int k; | 71 | int k; |
78 | 72 | ||
79 | WARN_ON(irqs_disabled()); /* for portability */ | ||
80 | |||
81 | if (dma_release_from_coherent(dev, order, vaddr)) | ||
82 | return; | ||
83 | |||
84 | debug_dma_free_coherent(dev, size, vaddr, dma_handle); | ||
85 | for (k = 0; k < (1 << order); k++) | 73 | for (k = 0; k < (1 << order); k++) |
86 | __free_pages(pfn_to_page(pfn + k), 0); | 74 | __free_pages(pfn_to_page(pfn + k), 0); |
75 | |||
87 | iounmap(vaddr); | 76 | iounmap(vaddr); |
88 | } | 77 | } |
89 | EXPORT_SYMBOL(dma_free_coherent); | ||
90 | 78 | ||
91 | void dma_cache_sync(struct device *dev, void *vaddr, size_t size, | 79 | void dma_cache_sync(struct device *dev, void *vaddr, size_t size, |
92 | enum dma_data_direction direction) | 80 | enum dma_data_direction direction) |