diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /include/asm-alpha/dma.h | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'include/asm-alpha/dma.h')
| -rw-r--r-- | include/asm-alpha/dma.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/asm-alpha/dma.h b/include/asm-alpha/dma.h index 686921599..2f14838dd 100644 --- a/include/asm-alpha/dma.h +++ b/include/asm-alpha/dma.h @@ -78,13 +78,18 @@ due to a hardware SIO (PCI<->ISA bus bridge) chip limitation, is 64MB. See <asm/apecs.h> for more info. */ +/* The maximum address that we can perform a DMA transfer to on RUFFIAN, + due to a hardware SIO (PCI<->ISA bus bridge) chip limitation, is 16MB. + See <asm/pyxis.h> for more info. +*/ /* NOTE: we must define the maximum as something less than 64Mb, to prevent virt_to_bus() from returning an address in the first window, for a data area that goes beyond the 64Mb first DMA window. Sigh... We MUST coordinate the maximum with <asm/apecs.h> for consistency. For now, this limit is set to 48Mb... */ -#define ALPHA_XL_MAX_DMA_ADDRESS (0xfffffc0003000000UL) +#define ALPHA_XL_MAX_DMA_ADDRESS (IDENT_ADDR+0x3000000UL) +#define ALPHA_RUFFIAN_MAX_DMA_ADDRESS (IDENT_ADDR+0x1000000UL) #define ALPHA_MAX_DMA_ADDRESS (~0UL) #ifdef CONFIG_ALPHA_GENERIC @@ -92,6 +97,8 @@ #else # ifdef CONFIG_ALPHA_XL # define MAX_DMA_ADDRESS ALPHA_XL_MAX_DMA_ADDRESS +# elif defined(CONFIG_ALPHA_RUFFIAN) +# define MAX_DMA_ADDRESS ALPHA_RUFFIAN_MAX_DMA_ADDRESS # else # define MAX_DMA_ADDRESS ALPHA_MAX_DMA_ADDRESS # endif |