Commit 3719ec50 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] Ensure that both MAX_DMA_ADDRESS and ISA_DMA_THRESHOLD are defined

Both of these symbols should be defined by a platform, or neither
should be defined.  Ensure that all platforms conform.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0560cf5a
...@@ -52,6 +52,7 @@ __arch_adjust_zones(int node, unsigned long *size, unsigned long *holes) ...@@ -52,6 +52,7 @@ __arch_adjust_zones(int node, unsigned long *size, unsigned long *holes)
if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(node, zone_size, holes) if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(node, zone_size, holes)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + (128<<20))
#endif #endif
......
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
* This is the maximum DMA address that can be DMAd to. * This is the maximum DMA address that can be DMAd to.
* There should not be more than (0xd0000000 - 0xc0000000) * There should not be more than (0xd0000000 - 0xc0000000)
* bytes of RAM. * bytes of RAM.
*
* If you set this, you must also set ISA_DMA_THRESHOLD and setup a DMA
* zone if this does not cover all possible RAM.
*/ */
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_256M - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M) #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M)
#endif #endif
...@@ -37,6 +37,7 @@ void cmx2xx_pci_adjust_zones(int node, unsigned long *size, ...@@ -37,6 +37,7 @@ void cmx2xx_pci_adjust_zones(int node, unsigned long *size,
cmx2xx_pci_adjust_zones(node, size, holes) cmx2xx_pci_adjust_zones(node, size, holes)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M)
#endif #endif
#endif #endif
...@@ -23,6 +23,7 @@ void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes); ...@@ -23,6 +23,7 @@ void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes);
sa1111_adjust_zones(node, size, holes) sa1111_adjust_zones(node, size, holes)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_1M)
#endif #endif
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment