Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit aaf4f97f267aa0dbc42f089b33325e61aac8622e

Authored by Geert Uytterhoeven
1 parent 4a09ab6771
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

asm-generic/dma-mapping-broken.h: Provide dma_alloc_attrs()/dma_free_attrs() 

Since commit 0049fb2603b7afb1080776ee691dfa5a3d282357 ("OMAPFB: use
dma_alloc_attrs to allocate memory") we have one non-arch user of
dma_{alloc,free}_attrs().

Hence provide these functions, as wrappers around
dma_{alloc,free}_coherent().

Note that most architectures do it the other way around. But as these are
dummy functions, we don't care.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Showing 1 changed file with 16 additions and 0 deletions Inline Diff

include/asm-generic/dma-mapping-broken.h
Diff comments   View file @ aaf4f97
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 /* define the dma api to allow compilation but not linking of 4 /* define the dma api to allow compilation but not linking of
5 * dma dependent code. Code that depends on the dma-mapping 5 * dma dependent code. Code that depends on the dma-mapping
6 * API needs to set 'depends on HAS_DMA' in its Kconfig 6 * API needs to set 'depends on HAS_DMA' in its Kconfig
7 */ 7 */
8 8
9 struct scatterlist; 9 struct scatterlist;
10 10
11 extern void * 11 extern void *
12 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 12 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
13 gfp_t flag); 13 gfp_t flag);
14 14
15 extern void 15 extern void
16 dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, 16 dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
17 dma_addr_t dma_handle); 17 dma_addr_t dma_handle);
18 18
19 static inline void *dma_alloc_attrs(struct device *dev, size_t size,
20 dma_addr_t *dma_handle, gfp_t flag,
21 struct dma_attrs *attrs)
22 {
23 /* attrs is not supported and ignored */
24 return dma_alloc_coherent(dev, size, dma_handle, flag);
25 }
26
27 static inline void dma_free_attrs(struct device *dev, size_t size,
28 void *cpu_addr, dma_addr_t dma_handle,
29 struct dma_attrs *attrs)
30 {
31 /* attrs is not supported and ignored */
32 dma_free_coherent(dev, size, cpu_addr, dma_handle);
33 }
34
19 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) 35 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
20 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) 36 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
21 37
22 extern dma_addr_t 38 extern dma_addr_t
23 dma_map_single(struct device *dev, void *ptr, size_t size, 39 dma_map_single(struct device *dev, void *ptr, size_t size,
24 enum dma_data_direction direction); 40 enum dma_data_direction direction);
25 41
26 extern void 42 extern void
27 dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, 43 dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
28 enum dma_data_direction direction); 44 enum dma_data_direction direction);
29 45
30 extern int 46 extern int
31 dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, 47 dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
32 enum dma_data_direction direction); 48 enum dma_data_direction direction);
33 49
34 extern void 50 extern void
35 dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, 51 dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
36 enum dma_data_direction direction); 52 enum dma_data_direction direction);
37 53
38 extern dma_addr_t 54 extern dma_addr_t
39 dma_map_page(struct device *dev, struct page *page, unsigned long offset, 55 dma_map_page(struct device *dev, struct page *page, unsigned long offset,
40 size_t size, enum dma_data_direction direction); 56 size_t size, enum dma_data_direction direction);
41 57
42 extern void 58 extern void
43 dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, 59 dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
44 enum dma_data_direction direction); 60 enum dma_data_direction direction);
45 61
46 extern void 62 extern void
47 dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size, 63 dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
48 enum dma_data_direction direction); 64 enum dma_data_direction direction);
49 65
50 extern void 66 extern void
51 dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, 67 dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
52 unsigned long offset, size_t size, 68 unsigned long offset, size_t size,
53 enum dma_data_direction direction); 69 enum dma_data_direction direction);
54 70
55 extern void 71 extern void
56 dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, 72 dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
57 enum dma_data_direction direction); 73 enum dma_data_direction direction);
58 74
59 #define dma_sync_single_for_device dma_sync_single_for_cpu 75 #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 76 #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 77 #define dma_sync_sg_for_device dma_sync_sg_for_cpu
62 78
63 extern int 79 extern int
64 dma_mapping_error(struct device *dev, dma_addr_t dma_addr); 80 dma_mapping_error(struct device *dev, dma_addr_t dma_addr);
65 81
66 extern int 82 extern int
67 dma_supported(struct device *dev, u64 mask); 83 dma_supported(struct device *dev, u64 mask);
68 84
69 extern int 85 extern int
70 dma_set_mask(struct device *dev, u64 mask); 86 dma_set_mask(struct device *dev, u64 mask);
71 87
72 extern int 88 extern int
73 dma_get_cache_alignment(void); 89 dma_get_cache_alignment(void);
74 90
75 extern void 91 extern void
76 dma_cache_sync(struct device *dev, void *vaddr, size_t size, 92 dma_cache_sync(struct device *dev, void *vaddr, size_t size,
77 enum dma_data_direction direction); 93 enum dma_data_direction direction);
78 94
79 #endif /* _ASM_GENERIC_DMA_MAPPING_H */ 95 #endif /* _ASM_GENERIC_DMA_MAPPING_H */
80 96