aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2007-07-16 02:40:26 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:45 -0400
commit1b0fac45878bb88759eec347c273285195649ff7 (patch)
treea9871a47ef98c90bac3f65a7f9309e87420c694c /include/asm-generic
parent9e7bf24b1b979db256ddc84d0d4ac6040d706da6 (diff)
dma-mapping: prevent dma dependent code from linking on !HAS_DMA archs
Continuing the work started in 411f0f3edc141a582190d3605cadd1d993abb6df ... This enables code with a dma path, that compiles away, to build without requiring additional code factoring. It also prevents code that calls dma_alloc_coherent and dma_free_coherent from linking whereas previously the code would hit a BUG() at run time. Finally, it allows archs that set !HAS_DMA to delete their asm/dma-mapping.h file. Cc: Cornelia Huck <cornelia.huck@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: John W. Linville <linville@tuxdriver.com> Cc: Kyle McMartin <kyle@parisc-linux.org> Cc: James Bottomley <James.Bottomley@SteelEye.com> Cc: Tejun Heo <htejun@gmail.com> Cc: Jeff Garzik <jeff@garzik.org> Cc: <geert@linux-m68k.org> Cc: <zippel@linux-m68k.org> Cc: <spyro@f2s.com> Cc: <ysato@users.sourceforge.jp> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/dma-mapping-broken.h82
1 files changed, 70 insertions, 12 deletions
diff --git a/include/asm-generic/dma-mapping-broken.h b/include/asm-generic/dma-mapping-broken.h
index 29413d3d4605..e2468f894d2a 100644
--- a/include/asm-generic/dma-mapping-broken.h
+++ b/include/asm-generic/dma-mapping-broken.h
@@ -1,24 +1,82 @@
1#ifndef _ASM_GENERIC_DMA_MAPPING_H 1#ifndef _ASM_GENERIC_DMA_MAPPING_H
2#define _ASM_GENERIC_DMA_MAPPING_H 2#define _ASM_GENERIC_DMA_MAPPING_H
3 3
4/* This is used for archs that do not support DMA */ 4/* define the dma api to allow compilation but not linking of
5 * dma dependent code. Code that depends on the dma-mapping
6 * API needs to set 'depends on HAS_DMA' in its Kconfig
7 */
5 8
6static inline void * 9struct scatterlist;
10
11extern void *
7dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 12dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
8 gfp_t flag) 13 gfp_t flag);
9{
10 BUG();
11 return NULL;
12}
13 14
14static inline void 15extern void
15dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, 16dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
16 dma_addr_t dma_handle) 17 dma_addr_t dma_handle);
17{
18 BUG();
19}
20 18
21#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) 19#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
22#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) 20#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
23 21
22extern dma_addr_t
23dma_map_single(struct device *dev, void *ptr, size_t size,
24 enum dma_data_direction direction);
25
26extern void
27dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
28 enum dma_data_direction direction);
29
30extern int
31dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
32 enum dma_data_direction direction);
33
34extern void
35dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
36 enum dma_data_direction direction);
37
38extern dma_addr_t
39dma_map_page(struct device *dev, struct page *page, unsigned long offset,
40 size_t size, enum dma_data_direction direction);
41
42extern void
43dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
44 enum dma_data_direction direction);
45
46extern void
47dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
48 enum dma_data_direction direction);
49
50extern void
51dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
52 unsigned long offset, size_t size,
53 enum dma_data_direction direction);
54
55extern void
56dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
57 enum dma_data_direction direction);
58
59#define dma_sync_single_for_device dma_sync_single_for_cpu
60#define dma_sync_single_range_for_device dma_sync_single_range_for_cpu
61#define dma_sync_sg_for_device dma_sync_sg_for_cpu
62
63extern int
64dma_mapping_error(dma_addr_t dma_addr);
65
66extern int
67dma_supported(struct device *dev, u64 mask);
68
69extern int
70dma_set_mask(struct device *dev, u64 mask);
71
72extern int
73dma_get_cache_alignment(void);
74
75extern int
76dma_is_consistent(struct device *dev, dma_addr_t dma_handle);
77
78extern void
79dma_cache_sync(struct device *dev, void *vaddr, size_t size,
80 enum dma_data_direction direction);
81
24#endif /* _ASM_GENERIC_DMA_MAPPING_H */ 82#endif /* _ASM_GENERIC_DMA_MAPPING_H */