diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 05:56:33 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 13:42:34 -0500 |
commit | c72e005b099302b3c6bee8381396199b77b6dd4f (patch) | |
tree | 00b12648664fe10d86bcf45348cc348515a10eaa /arch | |
parent | b9c78022b0e65cdca2541be658f0e74138e92ffe (diff) |
[ARM] fix constant values of MAX_DMA_ADDRESS
Since 8d5796d2ec6b5a4e7a52861144e63af438d6f8f7, we have allowed
PAGE_OFFSET to be configurable, so a constant virtual address
for MAX_DMA_ADDRESS is buggy. It should be defined in terms of
PAGE_OFFSET rather than a constant virtual address.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-h720x/include/mach/memory.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/memory.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-shark/include/mach/memory.h | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-h720x/include/mach/memory.h b/arch/arm/mach-h720x/include/mach/memory.h index 8cfb665e04b1..c9bdb21a4445 100644 --- a/arch/arm/mach-h720x/include/mach/memory.h +++ b/arch/arm/mach-h720x/include/mach/memory.h | |||
@@ -16,6 +16,6 @@ | |||
16 | * If you set this, you must also set ISA_DMA_THRESHOLD and setup a DMA | 16 | * If you set this, you must also set ISA_DMA_THRESHOLD and setup a DMA |
17 | * zone if this does not cover all possible RAM. | 17 | * zone if this does not cover all possible RAM. |
18 | */ | 18 | */ |
19 | #define MAX_DMA_ADDRESS 0xd0000000 | 19 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M) |
20 | 20 | ||
21 | #endif | 21 | #endif |
diff --git a/arch/arm/mach-s3c2410/include/mach/memory.h b/arch/arm/mach-s3c2410/include/mach/memory.h index 2246966bbbe4..6f1e5871ae4b 100644 --- a/arch/arm/mach-s3c2410/include/mach/memory.h +++ b/arch/arm/mach-s3c2410/include/mach/memory.h | |||
@@ -13,12 +13,4 @@ | |||
13 | 13 | ||
14 | #define PHYS_OFFSET UL(0x30000000) | 14 | #define PHYS_OFFSET UL(0x30000000) |
15 | 15 | ||
16 | /* | ||
17 | * This is the maximum DMA address(physical address) that can be DMAd to. | ||
18 | * Err, no, this is a virtual address. And you must set ISA_DMA_THRESHOLD | ||
19 | * and setup a DMA zone if this restricts the amount of RAM which is | ||
20 | * capable of DMA. | ||
21 | */ | ||
22 | #define MAX_DMA_ADDRESS 0x40000000 | ||
23 | |||
24 | #endif | 16 | #endif |
diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h index b497a5868b06..c5ab038925d6 100644 --- a/arch/arm/mach-shark/include/mach/memory.h +++ b/arch/arm/mach-shark/include/mach/memory.h | |||
@@ -33,7 +33,7 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig | |||
33 | __arch_adjust_zones(node, size, holes) | 33 | __arch_adjust_zones(node, size, holes) |
34 | 34 | ||
35 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1) | 35 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1) |
36 | #define MAX_DMA_ADDRESS 0xC0400000 | 36 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_4M) |
37 | 37 | ||
38 | #endif | 38 | #endif |
39 | 39 | ||