Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

arm: mvebu: increase atomic coherent pool size for armada 370/XP

Browse source 
For Armada 370/XP we have the same problem that for the commit
cb01b63, so we applied the same solution: "The default 256 KiB
coherent pool may be too small for some of the Kirkwood devices, so
increase it to make sure that devices will be able to allocate their
buffers with GFP_ATOMIC flag"

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
This commit is contained in:
Gregory CLEMENT 2012-10-26 14:30:46 +02:00 committed by Thomas Petazzoni
parent 1611f87251
commit 53d2f8899f
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/mach-mvebu/armada-370-xp.c
View file

@ -18,6 +18,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/time-armada-370-xp.h> #include <linux/time-armada-370-xp.h>
#include <linux/clk/mvebu.h> #include <linux/clk/mvebu.h>
#include <linux/dma-mapping.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
@ -44,6 +45,16 @@ void __init armada_370_xp_timer_and_clk_init(void)
armada_370_xp_timer_init(); armada_370_xp_timer_init();
} }
void __init armada_370_xp_init_early(void)
{
/*
* Some Armada 370/XP devices allocate their coherent buffers
* from atomic context. Increase size of atomic coherent pool
* to make sure such the allocations won't fail.
*/
init_dma_coherent_pool_size(SZ_1M);
}
struct sys_timer armada_370_xp_timer = { struct sys_timer armada_370_xp_timer = {
.init = armada_370_xp_timer_and_clk_init, .init = armada_370_xp_timer_and_clk_init,
}; };
@ -62,6 +73,7 @@ static const char * const armada_370_xp_dt_board_dt_compat[] = {
DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)") DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")
.init_machine = armada_370_xp_dt_init, .init_machine = armada_370_xp_dt_init,
.map_io = armada_370_xp_map_io, .map_io = armada_370_xp_map_io,
.init_early = armada_370_xp_init_early,
.init_irq = armada_370_xp_init_irq, .init_irq = armada_370_xp_init_irq,
.handle_irq = armada_370_xp_handle_irq, .handle_irq = armada_370_xp_handle_irq,
.timer = &armada_370_xp_timer, .timer = &armada_370_xp_timer,