Commit 2602276d authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: Wire CMA allocator 



Based on commit 04e3543e ("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: default avatarMichal Simek <michal.simek@xilinx.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent def3f7ce

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config MICROBLAZE 
	select HAVE_ARCH_HASH

	select HAVE_ARCH_KGDB

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

arch/microblaze/configs/mmu_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_CMA=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -82,6 +83,7 @@ CONFIG_NFS_FS=y 
CONFIG_CIFS=y

CONFIG_CIFS_STATS2=y

CONFIG_ENCRYPTED_KEYS=y

CONFIG_DMA_CMA=y

CONFIG_DEBUG_INFO=y

CONFIG_KGDB=y

CONFIG_KGDB_TESTS=y

arch/microblaze/mm/init.c

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * for more details.

 */



#include <linux/dma-contiguous.h>

#include <linux/memblock.h>

#include <linux/init.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

	 * inside 768MB limit */

	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. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE