leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

microblaze: Wire CMA allocator

Browse Source 
Based on commit 04e3543e22 ("microblaze: use the generic dma coherent
remap allocator")
CMA can be easily enabled by calling dma_contiguous_reserve() at the end of
mmu_init(). High limit is end of lowmem space which is completely unused at
this point of time.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Michal Simek 2020-01-14 10:05:24 +01:00
parent def3f7cefe
commit 2602276d3d
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/microblaze/Kconfig
View File

@ -27,6 +27,7 @@ config MICROBLAZE
select HAVE_ARCH_HASH select HAVE_ARCH_HASH
select HAVE_ARCH_KGDB select HAVE_ARCH_KGDB
select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_KMEMLEAK
select HAVE_DMA_CONTIGUOUS
select HAVE_DYNAMIC_FTRACE select HAVE_DYNAMIC_FTRACE
select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_GRAPH_TRACER

2
arch/microblaze/configs/mmu_defconfig
View File

@ -26,6 +26,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
CONFIG_PARTITION_ADVANCED=y CONFIG_PARTITION_ADVANCED=y
# CONFIG_EFI_PARTITION is not set # CONFIG_EFI_PARTITION is not set
CONFIG_CMA=y
CONFIG_NET=y CONFIG_NET=y
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_UNIX=y CONFIG_UNIX=y
@ -82,6 +83,7 @@ CONFIG_NFS_FS=y
CONFIG_CIFS=y CONFIG_CIFS=y
CONFIG_CIFS_STATS2=y CONFIG_CIFS_STATS2=y
CONFIG_ENCRYPTED_KEYS=y CONFIG_ENCRYPTED_KEYS=y
CONFIG_DMA_CMA=y
CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO=y
CONFIG_KGDB=y CONFIG_KGDB=y
CONFIG_KGDB_TESTS=y CONFIG_KGDB_TESTS=y

4
arch/microblaze/mm/init.c
View File

@ -7,6 +7,7 @@
* for more details. * for more details.
*/ */
#include <linux/dma-contiguous.h>
#include <linux/memblock.h> #include <linux/memblock.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -345,6 +346,9 @@ asmlinkage void __init mmu_init(void)
/* This will also cause that unflatten device tree will be allocated /* This will also cause that unflatten device tree will be allocated
* inside 768MB limit */ * inside 768MB limit */
memblock_set_current_limit(memory_start + lowmem_size - 1); memblock_set_current_limit(memory_start + lowmem_size - 1);
/* CMA initialization */
dma_contiguous_reserve(memory_start + lowmem_size - 1);
} }
/* This is only called until mem_init is done. */ /* This is only called until mem_init is done. */