ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS

The values of ISA_DMA_THRESHOLD and MAX_DMA_ADDRESS are related; one is
the physical/bus address, the other is the virtual address.  Both need
to be kept in step, so rather than having platforms define both, allow
them to define a single macro which sets both of these macros
appropraitely.

Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index ca51143f97f179132ffa2117443172f4da612c57..42005542932b3d38fa727ff3de6c25ff750c0271 100644 (file)
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -6,8 +6,10 @@
 /*
  * This is the maximum virtual address which can be DMA'd from.
  */
-#ifndef MAX_DMA_ADDRESS
+#ifndef ARM_DMA_ZONE_SIZE
 #define MAX_DMA_ADDRESS        0xffffffff
+#else
+#define MAX_DMA_ADDRESS        (PAGE_OFFSET + ARM_DMA_ZONE_SIZE)
 #endif
 
 #ifdef CONFIG_ISA_DMA_API

diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 431077c5a867717f9f725be3cf4debe0ce657d1d..ee5ff41027a355b677a33909bd760d59a46e64e8 100644 (file)
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -209,8 +209,10 @@ static inline unsigned long __phys_to_virt(unsigned long x)
  * allocations.  This must be the smallest DMA mask in the system,
  * so a successful GFP_DMA allocation will always satisfy this.
  */
-#ifndef ISA_DMA_THRESHOLD
+#ifndef ARM_DMA_ZONE_SIZE
 #define ISA_DMA_THRESHOLD      (0xffffffffULL)
+#else
+#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + ARM_DMA_ZONE_SIZE - 1)
 #endif
 
 #ifndef arch_adjust_zones

diff --git a/arch/arm/mach-davinci/include/mach/memory.h b/arch/arm/mach-davinci/include/mach/memory.h
index 78822723f382b09674a10f0a50c259307a8220f8..8d27246cca4dd008b590a4d074b52c66bd98b30d 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/memory.h
+++ b/arch/arm/mach-davinci/include/mach/memory.h
@@ -59,8 +59,7 @@ __arch_adjust_zones(unsigned long *size, unsigned long *holes)
 #define arch_adjust_zones(zone_size, holes) \
         if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(zone_size, holes)
 
-#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + (128<<20) - 1)
-#define MAX_DMA_ADDRESS                (PAGE_OFFSET + (128<<20))
+#define ARM_DMA_ZONE_SIZE      SZ_128M
 
 #endif
 

diff --git a/arch/arm/mach-h720x/include/mach/memory.h b/arch/arm/mach-h720x/include/mach/memory.h
index 9d3687651462e66185474e43b0fba9e2051f40ad..b0b3baec9acfbabd6426571ba1d2a1cb3a48f876 100644 (file)
--- a/arch/arm/mach-h720x/include/mach/memory.h
+++ b/arch/arm/mach-h720x/include/mach/memory.h
@@ -13,7 +13,6 @@
  * There should not be more than (0xd0000000 - 0xc0000000)
  * bytes of RAM.
  */
-#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + SZ_256M - 1)
-#define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_256M)
+#define ARM_DMA_ZONE_SIZE      SZ_256M
 
 #endif

diff --git a/arch/arm/mach-ixp4xx/include/mach/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h
index 6d388c9d0e209fd22460eb22d27efadd03168a18..a5c26f8d3125159356abaaf694567bf8b179fca4 100644 (file)
--- a/arch/arm/mach-ixp4xx/include/mach/memory.h
+++ b/arch/arm/mach-ixp4xx/include/mach/memory.h
@@ -21,8 +21,7 @@ void ixp4xx_adjust_zones(unsigned long *size, unsigned long *holes);
 #define arch_adjust_zones(size, holes) \
        ixp4xx_adjust_zones(size, holes)
 
-#define ISA_DMA_THRESHOLD (SZ_64M - 1)
-#define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_64M)
+#define ARM_DMA_ZONE_SIZE      SZ_64M
 
 #endif
 

diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h
index 7f68724dcc274d067387c520eca1e20ed33a6f4e..57a0b689b4d022cfabda54d942deb47c3478d928 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/memory.h
+++ b/arch/arm/mach-pxa/include/mach/memory.h
@@ -23,8 +23,7 @@ void cmx2xx_pci_adjust_zones(unsigned long *size, unsigned long *holes);
 #define arch_adjust_zones(size, holes) \
        cmx2xx_pci_adjust_zones(size, holes)
 
-#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + SZ_64M - 1)
-#define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_64M)
+#define ARM_DMA_ZONE_SIZE      SZ_64M
 #endif
 
 #endif

diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h
index e05fc2c4c0802911e7b642fa4e950efaf4135eec..973428d3f7cb4d23ba91e2cefaeb1ac6058370a7 100644 (file)
--- a/arch/arm/mach-realview/include/mach/memory.h
+++ b/arch/arm/mach-realview/include/mach/memory.h
@@ -34,8 +34,7 @@ extern void realview_adjust_zones(unsigned long *size, unsigned long *hole);
 #define arch_adjust_zones(size, hole) \
        realview_adjust_zones(size, hole)
 
-#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + SZ_256M - 1)
-#define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_256M)
+#define ARM_DMA_ZONE_SIZE      SZ_256M
 #endif
 
 #ifdef CONFIG_SPARSEMEM

diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h
index a44da6a2916c9cfc02e9f6ee3ea0e8caa3923b1e..090b82982abb24abc51fd0f262b30fa66166426d 100644 (file)
--- a/arch/arm/mach-sa1100/include/mach/memory.h
+++ b/arch/arm/mach-sa1100/include/mach/memory.h
@@ -22,8 +22,7 @@ void sa1111_adjust_zones(unsigned long *size, unsigned long *holes);
 #define arch_adjust_zones(size, holes) \
        sa1111_adjust_zones(size, holes)
 
-#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + SZ_1M - 1)
-#define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_1M)
+#define ARM_DMA_ZONE_SIZE      SZ_1M
 
 #endif
 #endif

diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h
index 9afb170000085f4bb21338c8a6913b34319c5d69..48fe84b1f2787ba5ff11d5084ab9584f40eec854 100644 (file)
--- a/arch/arm/mach-shark/include/mach/memory.h
+++ b/arch/arm/mach-shark/include/mach/memory.h
@@ -32,8 +32,7 @@ static inline void __arch_adjust_zones(unsigned long *zone_size, unsigned long *
 #define arch_adjust_zones(size, holes) \
        __arch_adjust_zones(size, holes)
 
-#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + SZ_4M - 1)
-#define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_4M)
+#define ARM_DMA_ZONE_SIZE      SZ_4M
 
 #endif