diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-27 15:47:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-27 15:47:24 -0700 |
| commit | e556cb3e330d231628ccb5110c49811b618ad5b9 (patch) | |
| tree | 912e632c7aaca0280419211f22f494b07de4808b /arch | |
| parent | Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping (diff) | |
| parent | ARM: Orion5x: Fix too small coherent pool. (diff) | |
| download | linux-dev-e556cb3e330d231628ccb5110c49811b618ad5b9.tar.xz linux-dev-e556cb3e330d231628ccb5110c49811b618ad5b9.zip | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull one more arm-soc bugfix from Olof Johansson:
"Here's a bugfix for orion5x. Without this, PCI doesn't initialize
properly because of too small coherent pool to cover the allocations
needed.
A similar fix has already been done on kirkwood."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: Orion5x: Fix too small coherent pool.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-orion5x/common.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 410291c67666..a6cd14ab1e4e 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -204,6 +204,13 @@ void __init orion5x_wdt_init(void) void __init orion5x_init_early(void) { orion_time_set_base(TIMER_VIRT_BASE); + + /* + * Some Orion5x 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 orion5x_tclk; |