aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/dma.h
diff options
context:
space:
mode:
authorJan Glauber <jang@linux.vnet.ibm.com>2012-11-29 14:33:30 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-11-30 17:47:23 +0100
commit828b35f60eb0148f994bb13e328df94578b07142 (patch)
tree2e06065339ebbfb9aab46f3167fe77ac952ac6fa /arch/s390/include/asm/dma.h
parents390/pci: PCI adapter interrupts for MSI/MSI-X (diff)
downloadlinux-dev-828b35f60eb0148f994bb13e328df94578b07142.tar.xz
linux-dev-828b35f60eb0148f994bb13e328df94578b07142.zip
s390/pci: DMA support
Add DMA IOMMU support using 4K page table entries. Implement dma_map_ops. Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/dma.h')
-rw-r--r--arch/s390/include/asm/dma.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/s390/include/asm/dma.h b/arch/s390/include/asm/dma.h
index 6fb6de4f15b0..de015d85e3e5 100644
--- a/arch/s390/include/asm/dma.h
+++ b/arch/s390/include/asm/dma.h
@@ -1,14 +1,13 @@
-/*
- * S390 version
- */
-
-#ifndef _ASM_DMA_H
-#define _ASM_DMA_H
+#ifndef _ASM_S390_DMA_H
+#define _ASM_S390_DMA_H
-#include <asm/io.h> /* need byte IO */
+#include <asm/io.h>
+/*
+ * MAX_DMA_ADDRESS is ambiguous because on s390 its completely unrelated
+ * to DMA. It _is_ used for the s390 memory zone split at 2GB caused
+ * by the 31 bit heritage.
+ */
#define MAX_DMA_ADDRESS 0x80000000
-#define free_dma(x) do { } while (0)
-
-#endif /* _ASM_DMA_H */
+#endif /* _ASM_S390_DMA_H */