diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-08-01 15:50:55 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-08-17 19:43:56 -0500 |
| commit | a6a398341d5d073a717858b4488a7abe5f242cf2 (patch) | |
| tree | 726d05f0b8373c6fbde3fd13ac06b1df5500e214 /arch/arm/mach-highbank | |
| parent | 364230b9952143eb2062dc071e919fb751540ae8 (diff) | |
| download | op-kernel-dev-a6a398341d5d073a717858b4488a7abe5f242cf2.zip op-kernel-dev-a6a398341d5d073a717858b4488a7abe5f242cf2.tar.gz | |
ARM: highbank: enable DMA zone for LPAE
Some devices are restricted to 32-bit DMA. Thus the platform dma_zone_size
needs to be set. Otherwise dma-mapping code is complaining, e.g.
calxedaxgmac fff50000.ethernet: coherent DMA mask 0xffffffff is smaller
than system GFP_DMA mask 0xffffffffffffffff
Signed-off-by: Andreas Herrmann <andreas.herrmann@calxeda.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch/arm/mach-highbank')
| -rw-r--r-- | arch/arm/mach-highbank/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig index cd9fcb1..efe4961 100644 --- a/arch/arm/mach-highbank/Kconfig +++ b/arch/arm/mach-highbank/Kconfig @@ -18,3 +18,4 @@ config ARCH_HIGHBANK select PL320_MBOX select SPARSE_IRQ select USE_OF + select ZONE_DMA if ARM_LPAE diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 8881579..0749b42 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -176,6 +176,9 @@ static const char *highbank_match[] __initconst = { }; DT_MACHINE_START(HIGHBANK, "Highbank") +#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE) + .dma_zone_size = (4ULL * SZ_1G), +#endif .smp = smp_ops(highbank_smp_ops), .init_irq = highbank_init_irq, .init_time = highbank_timer_init, |
