diff options
-rw-r--r-- | arch/x86/kernel/Makefile | 1 | ||||
-rw-r--r-- | arch/x86/kernel/pci-base_32.c | 20 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping.h | 10 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping_32.h | 10 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping_64.h | 9 |
5 files changed, 31 insertions, 19 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 7a2a2e93e84b..edd5c54ffde9 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
@@ -26,6 +26,7 @@ obj-y += pci-dma_$(BITS).o bootflag.o e820_$(BITS).o | |||
26 | obj-y += quirks.o i8237.o topology.o kdebugfs.o | 26 | obj-y += quirks.o i8237.o topology.o kdebugfs.o |
27 | obj-y += alternative.o i8253.o | 27 | obj-y += alternative.o i8253.o |
28 | obj-$(CONFIG_X86_64) += pci-nommu_64.o bugs_64.o | 28 | obj-$(CONFIG_X86_64) += pci-nommu_64.o bugs_64.o |
29 | obj-$(CONFIG_X86_32) += pci-base_32.o | ||
29 | obj-y += tsc_$(BITS).o io_delay.o rtc.o | 30 | obj-y += tsc_$(BITS).o io_delay.o rtc.o |
30 | 31 | ||
31 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o | 32 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o |
diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c new file mode 100644 index 000000000000..b613d735f76c --- /dev/null +++ b/arch/x86/kernel/pci-base_32.c | |||
@@ -0,0 +1,20 @@ | |||
1 | #include <linux/mm.h> | ||
2 | #include <linux/kernel.h> | ||
3 | #include <linux/module.h> | ||
4 | #include <linux/dma-mapping.h> | ||
5 | #include <asm/dma-mapping.h> | ||
6 | |||
7 | static dma_addr_t pci32_map_single(struct device *dev, void *ptr, | ||
8 | size_t size, int direction) | ||
9 | { | ||
10 | WARN_ON(size == 0); | ||
11 | flush_write_buffers(); | ||
12 | return virt_to_phys(ptr); | ||
13 | } | ||
14 | |||
15 | static const struct dma_mapping_ops pci32_dma_ops = { | ||
16 | .map_single = pci32_map_single, | ||
17 | }; | ||
18 | |||
19 | const struct dma_mapping_ops *dma_ops = &pci32_dma_ops; | ||
20 | EXPORT_SYMBOL(dma_ops); | ||
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index aebd178a19ac..d320244db8af 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h | |||
@@ -50,10 +50,20 @@ struct dma_mapping_ops { | |||
50 | int is_phys; | 50 | int is_phys; |
51 | }; | 51 | }; |
52 | 52 | ||
53 | extern const struct dma_mapping_ops *dma_ops; | ||
54 | |||
53 | #ifdef CONFIG_X86_32 | 55 | #ifdef CONFIG_X86_32 |
54 | # include "dma-mapping_32.h" | 56 | # include "dma-mapping_32.h" |
55 | #else | 57 | #else |
56 | # include "dma-mapping_64.h" | 58 | # include "dma-mapping_64.h" |
57 | #endif | 59 | #endif |
58 | 60 | ||
61 | static inline dma_addr_t | ||
62 | dma_map_single(struct device *hwdev, void *ptr, size_t size, | ||
63 | int direction) | ||
64 | { | ||
65 | BUG_ON(!valid_dma_direction(direction)); | ||
66 | return dma_ops->map_single(hwdev, ptr, size, direction); | ||
67 | } | ||
68 | |||
59 | #endif | 69 | #endif |
diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h index 55f01bd9e556..b496306d5e98 100644 --- a/include/asm-x86/dma-mapping_32.h +++ b/include/asm-x86/dma-mapping_32.h | |||
@@ -17,16 +17,6 @@ void *dma_alloc_coherent(struct device *dev, size_t size, | |||
17 | void dma_free_coherent(struct device *dev, size_t size, | 17 | void dma_free_coherent(struct device *dev, size_t size, |
18 | void *vaddr, dma_addr_t dma_handle); | 18 | void *vaddr, dma_addr_t dma_handle); |
19 | 19 | ||
20 | static inline dma_addr_t | ||
21 | dma_map_single(struct device *dev, void *ptr, size_t size, | ||
22 | enum dma_data_direction direction) | ||
23 | { | ||
24 | BUG_ON(!valid_dma_direction(direction)); | ||
25 | WARN_ON(size == 0); | ||
26 | flush_write_buffers(); | ||
27 | return virt_to_phys(ptr); | ||
28 | } | ||
29 | |||
30 | static inline void | 20 | static inline void |
31 | dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, | 21 | dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, |
32 | enum dma_data_direction direction) | 22 | enum dma_data_direction direction) |
diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h index 369188a348f4..969a7da0cf97 100644 --- a/include/asm-x86/dma-mapping_64.h +++ b/include/asm-x86/dma-mapping_64.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define _X8664_DMA_MAPPING_H 1 | 2 | #define _X8664_DMA_MAPPING_H 1 |
3 | 3 | ||
4 | extern dma_addr_t bad_dma_address; | 4 | extern dma_addr_t bad_dma_address; |
5 | extern const struct dma_mapping_ops* dma_ops; | ||
6 | extern int iommu_merge; | 5 | extern int iommu_merge; |
7 | 6 | ||
8 | static inline int dma_mapping_error(dma_addr_t dma_addr) | 7 | static inline int dma_mapping_error(dma_addr_t dma_addr) |
@@ -24,14 +23,6 @@ extern void *dma_alloc_coherent(struct device *dev, size_t size, | |||
24 | extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr, | 23 | extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr, |
25 | dma_addr_t dma_handle); | 24 | dma_addr_t dma_handle); |
26 | 25 | ||
27 | static inline dma_addr_t | ||
28 | dma_map_single(struct device *hwdev, void *ptr, size_t size, | ||
29 | int direction) | ||
30 | { | ||
31 | BUG_ON(!valid_dma_direction(direction)); | ||
32 | return dma_ops->map_single(hwdev, ptr, size, direction); | ||
33 | } | ||
34 | |||
35 | static inline void | 26 | static inline void |
36 | dma_unmap_single(struct device *dev, dma_addr_t addr,size_t size, | 27 | dma_unmap_single(struct device *dev, dma_addr_t addr,size_t size, |
37 | int direction) | 28 | int direction) |