From 259a15494f37c35872b64feb0c2f96784cc8fb2d Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 29 Nov 2008 10:50:22 +0000 Subject: [PATCH] --- yaml --- r: 123591 b: refs/heads/master c: b9c78022b0e65cdca2541be658f0e74138e92ffe h: refs/heads/master i: 123589: db4a5ea8065fe0e1fa9ffc7cd298851ec9d4010f 123587: cca56adb2d353b1cce16435f44ef96360681e127 123583: ce04e3de2a23b81236c2b190cf54de8a27fa09c9 v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/dma.h | 1 + trunk/arch/arm/mach-davinci/include/mach/dma.h | 6 ------ trunk/arch/arm/mach-h720x/include/mach/dma.h | 7 ------- trunk/arch/arm/mach-h720x/include/mach/memory.h | 9 +++++++++ trunk/arch/arm/mach-ixp4xx/include/mach/dma.h | 9 --------- trunk/arch/arm/mach-ixp4xx/include/mach/memory.h | 1 + trunk/arch/arm/mach-l7200/include/mach/dma.h | 7 ------- trunk/arch/arm/mach-netx/include/mach/dma.h | 1 - trunk/arch/arm/mach-pnx4008/include/mach/dma.h | 2 -- trunk/arch/arm/mach-rpc/include/mach/dma.h | 6 ------ trunk/arch/arm/mach-s3c2410/include/mach/dma.h | 5 ----- trunk/arch/arm/mach-s3c2410/include/mach/memory.h | 8 ++++++++ trunk/arch/arm/mach-shark/include/mach/dma.h | 1 - trunk/arch/arm/mach-shark/include/mach/memory.h | 1 + 15 files changed, 21 insertions(+), 45 deletions(-) diff --git a/[refs] b/[refs] index c3900dcc2f07..5522186ec3b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bed1fb3287dfb1f6cf717ec200b23d3e537c9ae +refs/heads/master: b9c78022b0e65cdca2541be658f0e74138e92ffe diff --git a/trunk/arch/arm/include/asm/dma.h b/trunk/arch/arm/include/asm/dma.h index 75154b193117..6a4d44a5b458 100644 --- a/trunk/arch/arm/include/asm/dma.h +++ b/trunk/arch/arm/include/asm/dma.h @@ -4,6 +4,7 @@ typedef unsigned int dmach_t; #include +#include #include #include #include diff --git a/trunk/arch/arm/mach-davinci/include/mach/dma.h b/trunk/arch/arm/mach-davinci/include/mach/dma.h index 8e2f2d0ba667..cdf6ec9d46f3 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/dma.h +++ b/trunk/arch/arm/mach-davinci/include/mach/dma.h @@ -8,9 +8,3 @@ * is licensed "as is" without any warranty of any kind, whether express * or implied. */ -#ifndef __ASM_ARCH_DMA_H -#define __ASM_ARCH_DMA_H - -#define MAX_DMA_ADDRESS 0xffffffff - -#endif /* __ASM_ARCH_DMA_H */ diff --git a/trunk/arch/arm/mach-h720x/include/mach/dma.h b/trunk/arch/arm/mach-h720x/include/mach/dma.h index 0a9d86ee84fe..2d7c77a9792a 100644 --- a/trunk/arch/arm/mach-h720x/include/mach/dma.h +++ b/trunk/arch/arm/mach-h720x/include/mach/dma.h @@ -8,13 +8,6 @@ #ifndef __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H -/* - * This is the maximum DMA address that can be DMAd to. - * There should not be more than (0xd0000000 - 0xc0000000) - * bytes of RAM. - */ -#define MAX_DMA_ADDRESS 0xd0000000 - #if defined (CONFIG_CPU_H7201) #define MAX_DMA_CHANNELS 3 #elif defined (CONFIG_CPU_H7202) diff --git a/trunk/arch/arm/mach-h720x/include/mach/memory.h b/trunk/arch/arm/mach-h720x/include/mach/memory.h index 83a2fa090e88..8cfb665e04b1 100644 --- a/trunk/arch/arm/mach-h720x/include/mach/memory.h +++ b/trunk/arch/arm/mach-h720x/include/mach/memory.h @@ -8,5 +8,14 @@ #define __ASM_ARCH_MEMORY_H #define PHYS_OFFSET UL(0x40000000) +/* + * This is the maximum DMA address that can be DMAd to. + * There should not be more than (0xd0000000 - 0xc0000000) + * 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 MAX_DMA_ADDRESS 0xd0000000 #endif diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/dma.h b/trunk/arch/arm/mach-ixp4xx/include/mach/dma.h index 65944f252664..5b7e1a98e987 100644 --- a/trunk/arch/arm/mach-ixp4xx/include/mach/dma.h +++ b/trunk/arch/arm/mach-ixp4xx/include/mach/dma.h @@ -8,12 +8,3 @@ * published by the Free Software Foundation. * */ -#ifndef __ASM_ARCH_DMA_H -#define __ASM_ARCH_DMA_H - -#include -#include - -#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) - -#endif /* _ASM_ARCH_DMA_H */ diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/memory.h b/trunk/arch/arm/mach-ixp4xx/include/mach/memory.h index 2e481db0ca58..98f5e5e20980 100644 --- a/trunk/arch/arm/mach-ixp4xx/include/mach/memory.h +++ b/trunk/arch/arm/mach-ixp4xx/include/mach/memory.h @@ -22,6 +22,7 @@ void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes); ixp4xx_adjust_zones(node, size, holes) #define ISA_DMA_THRESHOLD (SZ_64M - 1) +#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) #endif diff --git a/trunk/arch/arm/mach-l7200/include/mach/dma.h b/trunk/arch/arm/mach-l7200/include/mach/dma.h index c7e48bd4590c..07731f2cccfb 100644 --- a/trunk/arch/arm/mach-l7200/include/mach/dma.h +++ b/trunk/arch/arm/mach-l7200/include/mach/dma.h @@ -11,13 +11,6 @@ /* DMA is not yet implemented! It should be the same as acorn, copy over.. */ -/* - * This is the maximum DMA address that can be DMAd to. - * There should not be more than (0xd0000000 - 0xc0000000) - * bytes of RAM. - */ -#define MAX_DMA_ADDRESS 0xd0000000 - #define DMA_S0 0 #endif /* _ASM_ARCH_DMA_H */ diff --git a/trunk/arch/arm/mach-netx/include/mach/dma.h b/trunk/arch/arm/mach-netx/include/mach/dma.h index 690b3ebc43ac..c0ac3d98a7bd 100644 --- a/trunk/arch/arm/mach-netx/include/mach/dma.h +++ b/trunk/arch/arm/mach-netx/include/mach/dma.h @@ -18,4 +18,3 @@ */ #define MAX_DMA_CHANNELS 0 -#define MAX_DMA_ADDRESS ~0 diff --git a/trunk/arch/arm/mach-pnx4008/include/mach/dma.h b/trunk/arch/arm/mach-pnx4008/include/mach/dma.h index 5442d04fc575..f094bf8bfb18 100644 --- a/trunk/arch/arm/mach-pnx4008/include/mach/dma.h +++ b/trunk/arch/arm/mach-pnx4008/include/mach/dma.h @@ -16,8 +16,6 @@ #include "platform.h" -#define MAX_DMA_ADDRESS 0xffffffff - #define MAX_DMA_CHANNELS 8 #define DMAC_BASE IO_ADDRESS(PNX4008_DMA_CONFIG_BASE) diff --git a/trunk/arch/arm/mach-rpc/include/mach/dma.h b/trunk/arch/arm/mach-rpc/include/mach/dma.h index 360b56f8f29f..f0f8c9fb26bf 100644 --- a/trunk/arch/arm/mach-rpc/include/mach/dma.h +++ b/trunk/arch/arm/mach-rpc/include/mach/dma.h @@ -10,12 +10,6 @@ #ifndef __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H -/* - * This is the maximum DMA address that can be DMAd to. - * There should not be more than (0xd0000000 - 0xc0000000) - * bytes of RAM. - */ -#define MAX_DMA_ADDRESS 0xd0000000 #define MAX_DMA_CHANNELS 8 #define DMA_0 0 diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/dma.h b/trunk/arch/arm/mach-s3c2410/include/mach/dma.h index 891b53cd69b8..7cbea7b82b57 100644 --- a/trunk/arch/arm/mach-s3c2410/include/mach/dma.h +++ b/trunk/arch/arm/mach-s3c2410/include/mach/dma.h @@ -16,11 +16,6 @@ #include #include -/* - * This is the maximum DMA address(physical address) that can be DMAd to. - * - */ -#define MAX_DMA_ADDRESS 0x40000000 #define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ /* We use `virtual` dma channels to hide the fact we have only a limited diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/memory.h b/trunk/arch/arm/mach-s3c2410/include/mach/memory.h index 6f1e5871ae4b..2246966bbbe4 100644 --- a/trunk/arch/arm/mach-s3c2410/include/mach/memory.h +++ b/trunk/arch/arm/mach-s3c2410/include/mach/memory.h @@ -13,4 +13,12 @@ #define PHYS_OFFSET UL(0x30000000) +/* + * This is the maximum DMA address(physical address) that can be DMAd to. + * Err, no, this is a virtual address. And you must set ISA_DMA_THRESHOLD + * and setup a DMA zone if this restricts the amount of RAM which is + * capable of DMA. + */ +#define MAX_DMA_ADDRESS 0x40000000 + #endif diff --git a/trunk/arch/arm/mach-shark/include/mach/dma.h b/trunk/arch/arm/mach-shark/include/mach/dma.h index c0a29bd2a74f..dfe1da0e5aca 100644 --- a/trunk/arch/arm/mach-shark/include/mach/dma.h +++ b/trunk/arch/arm/mach-shark/include/mach/dma.h @@ -10,7 +10,6 @@ * The rest is not DMAable. See dev / .properties * in OpenFirmware. */ -#define MAX_DMA_ADDRESS 0xC0400000 #define MAX_DMA_CHANNELS 8 #define DMA_ISA_CASCADE 4 diff --git a/trunk/arch/arm/mach-shark/include/mach/memory.h b/trunk/arch/arm/mach-shark/include/mach/memory.h index d00c05eabd52..b497a5868b06 100644 --- a/trunk/arch/arm/mach-shark/include/mach/memory.h +++ b/trunk/arch/arm/mach-shark/include/mach/memory.h @@ -33,6 +33,7 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig __arch_adjust_zones(node, size, holes) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1) +#define MAX_DMA_ADDRESS 0xC0400000 #endif