summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2012-08-28 20:57:41 +0200
committerMarek Szyprowski <m.szyprowski@samsung.com>2012-08-28 21:01:04 +0200
commitcb01b633eeb77ae7128cab0a3b5d3de56da6e913 (patch)
treebf98713ea6b742592be8c4cf7ffc3327df90bbfc /arch
parentfb71285f0c1633a85544784aae7577502274b77a (diff)
downloadop-kernel-dev-cb01b633eeb77ae7128cab0a3b5d3de56da6e913.zip
op-kernel-dev-cb01b633eeb77ae7128cab0a3b5d3de56da6e913.tar.gz
ARM: Kirkwood: increase atomic coherent pool size
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. Suggested-by: Josh Coombs <josh.coombs@gmail.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-kirkwood/common.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index c4b64ad..d748f50 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -517,6 +517,13 @@ void __init kirkwood_wdt_init(void)
void __init kirkwood_init_early(void)
{
orion_time_set_base(TIMER_VIRT_BASE);
+
+ /*
+ * Some Kirkwood 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);
}
int kirkwood_tclk;
OpenPOWER on IntegriCloud