diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 17:36:20 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:56 -0400 |
commit | 6f5366354bf86f8d2c1cf241c9bbf44b2d350e30 (patch) | |
tree | 5f252a68c623a213ea4d767015d6c12e8f54f10f | |
parent | 752bea4abbff5e3ffef36802b860e80d0b632990 (diff) |
x86: move dma_ops struct definition to dma-mapping.h
take it off the x86_64 specific header
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | include/asm-x86/dma-mapping.h | 54 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping_64.h | 49 |
2 files changed, 54 insertions, 49 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index 58f790f4df52..aebd178a19ac 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h | |||
@@ -1,5 +1,59 @@ | |||
1 | #ifndef _ASM_DMA_MAPPING_H_ | ||
2 | #define _ASM_DMA_MAPPING_H_ | ||
3 | |||
4 | /* | ||
5 | * IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for | ||
6 | * documentation. | ||
7 | */ | ||
8 | |||
9 | #include <linux/scatterlist.h> | ||
10 | #include <asm/io.h> | ||
11 | #include <asm/swiotlb.h> | ||
12 | |||
13 | struct dma_mapping_ops { | ||
14 | int (*mapping_error)(dma_addr_t dma_addr); | ||
15 | void* (*alloc_coherent)(struct device *dev, size_t size, | ||
16 | dma_addr_t *dma_handle, gfp_t gfp); | ||
17 | void (*free_coherent)(struct device *dev, size_t size, | ||
18 | void *vaddr, dma_addr_t dma_handle); | ||
19 | dma_addr_t (*map_single)(struct device *hwdev, void *ptr, | ||
20 | size_t size, int direction); | ||
21 | /* like map_single, but doesn't check the device mask */ | ||
22 | dma_addr_t (*map_simple)(struct device *hwdev, char *ptr, | ||
23 | size_t size, int direction); | ||
24 | void (*unmap_single)(struct device *dev, dma_addr_t addr, | ||
25 | size_t size, int direction); | ||
26 | void (*sync_single_for_cpu)(struct device *hwdev, | ||
27 | dma_addr_t dma_handle, size_t size, | ||
28 | int direction); | ||
29 | void (*sync_single_for_device)(struct device *hwdev, | ||
30 | dma_addr_t dma_handle, size_t size, | ||
31 | int direction); | ||
32 | void (*sync_single_range_for_cpu)(struct device *hwdev, | ||
33 | dma_addr_t dma_handle, unsigned long offset, | ||
34 | size_t size, int direction); | ||
35 | void (*sync_single_range_for_device)(struct device *hwdev, | ||
36 | dma_addr_t dma_handle, unsigned long offset, | ||
37 | size_t size, int direction); | ||
38 | void (*sync_sg_for_cpu)(struct device *hwdev, | ||
39 | struct scatterlist *sg, int nelems, | ||
40 | int direction); | ||
41 | void (*sync_sg_for_device)(struct device *hwdev, | ||
42 | struct scatterlist *sg, int nelems, | ||
43 | int direction); | ||
44 | int (*map_sg)(struct device *hwdev, struct scatterlist *sg, | ||
45 | int nents, int direction); | ||
46 | void (*unmap_sg)(struct device *hwdev, | ||
47 | struct scatterlist *sg, int nents, | ||
48 | int direction); | ||
49 | int (*dma_supported)(struct device *hwdev, u64 mask); | ||
50 | int is_phys; | ||
51 | }; | ||
52 | |||
1 | #ifdef CONFIG_X86_32 | 53 | #ifdef CONFIG_X86_32 |
2 | # include "dma-mapping_32.h" | 54 | # include "dma-mapping_32.h" |
3 | #else | 55 | #else |
4 | # include "dma-mapping_64.h" | 56 | # include "dma-mapping_64.h" |
5 | #endif | 57 | #endif |
58 | |||
59 | #endif | ||
diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h index ecd0f6125ba3..369188a348f4 100644 --- a/include/asm-x86/dma-mapping_64.h +++ b/include/asm-x86/dma-mapping_64.h | |||
@@ -1,55 +1,6 @@ | |||
1 | #ifndef _X8664_DMA_MAPPING_H | 1 | #ifndef _X8664_DMA_MAPPING_H |
2 | #define _X8664_DMA_MAPPING_H 1 | 2 | #define _X8664_DMA_MAPPING_H 1 |
3 | 3 | ||
4 | /* | ||
5 | * IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for | ||
6 | * documentation. | ||
7 | */ | ||
8 | |||
9 | #include <linux/scatterlist.h> | ||
10 | #include <asm/io.h> | ||
11 | #include <asm/swiotlb.h> | ||
12 | |||
13 | struct dma_mapping_ops { | ||
14 | int (*mapping_error)(dma_addr_t dma_addr); | ||
15 | void* (*alloc_coherent)(struct device *dev, size_t size, | ||
16 | dma_addr_t *dma_handle, gfp_t gfp); | ||
17 | void (*free_coherent)(struct device *dev, size_t size, | ||
18 | void *vaddr, dma_addr_t dma_handle); | ||
19 | dma_addr_t (*map_single)(struct device *hwdev, void *ptr, | ||
20 | size_t size, int direction); | ||
21 | /* like map_single, but doesn't check the device mask */ | ||
22 | dma_addr_t (*map_simple)(struct device *hwdev, char *ptr, | ||
23 | size_t size, int direction); | ||
24 | void (*unmap_single)(struct device *dev, dma_addr_t addr, | ||
25 | size_t size, int direction); | ||
26 | void (*sync_single_for_cpu)(struct device *hwdev, | ||
27 | dma_addr_t dma_handle, size_t size, | ||
28 | int direction); | ||
29 | void (*sync_single_for_device)(struct device *hwdev, | ||
30 | dma_addr_t dma_handle, size_t size, | ||
31 | int direction); | ||
32 | void (*sync_single_range_for_cpu)(struct device *hwdev, | ||
33 | dma_addr_t dma_handle, unsigned long offset, | ||
34 | size_t size, int direction); | ||
35 | void (*sync_single_range_for_device)(struct device *hwdev, | ||
36 | dma_addr_t dma_handle, unsigned long offset, | ||
37 | size_t size, int direction); | ||
38 | void (*sync_sg_for_cpu)(struct device *hwdev, | ||
39 | struct scatterlist *sg, int nelems, | ||
40 | int direction); | ||
41 | void (*sync_sg_for_device)(struct device *hwdev, | ||
42 | struct scatterlist *sg, int nelems, | ||
43 | int direction); | ||
44 | int (*map_sg)(struct device *hwdev, struct scatterlist *sg, | ||
45 | int nents, int direction); | ||
46 | void (*unmap_sg)(struct device *hwdev, | ||
47 | struct scatterlist *sg, int nents, | ||
48 | int direction); | ||
49 | int (*dma_supported)(struct device *hwdev, u64 mask); | ||
50 | int is_phys; | ||
51 | }; | ||
52 | |||
53 | extern dma_addr_t bad_dma_address; | 4 | extern dma_addr_t bad_dma_address; |
54 | extern const struct dma_mapping_ops* dma_ops; | 5 | extern const struct dma_mapping_ops* dma_ops; |
55 | extern int iommu_merge; | 6 | extern int iommu_merge; |