aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfangsuowu <fangsuowu@asrmicro.com>2018-02-13 11:27:34 +0800
committerJérôme Forissier <jerome.forissier@linaro.org>2018-03-14 08:24:33 +0100
commit42dd7a206a8f357cf0501feb76d76b856bc52ab8 (patch)
treed1f8bd1f8e1f3b8eae27b2adcfb8e65b61a35dbe
parente81475af90c79f25c4b7908ada56aabc9d8b70d5 (diff)
core: mmu: set reserved vaspace size configurable
Signed-off-by: Fangsuo Wu <fangsuowu@asrmicro.com> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
-rw-r--r--core/arch/arm/arm.mk1
-rw-r--r--core/arch/arm/mm/core_mmu.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk
index 63d32217..ba858b41 100644
--- a/core/arch/arm/arm.mk
+++ b/core/arch/arm/arm.mk
@@ -5,6 +5,7 @@ CFG_CORE_TZSRAM_EMUL_SIZE ?= 458752
CFG_LPAE_ADDR_SPACE_SIZE ?= (1ull << 32)
CFG_MMAP_REGIONS ?= 13
+CFG_RESERVED_VASPACE_SIZE ?= (1024 * 1024 * 10)
ifeq ($(CFG_ARM64_core),y)
CFG_KERN_LINKER_FORMAT ?= elf64-littleaarch64
diff --git a/core/arch/arm/mm/core_mmu.c b/core/arch/arm/mm/core_mmu.c
index 72af39b7..f7c283d5 100644
--- a/core/arch/arm/mm/core_mmu.c
+++ b/core/arch/arm/mm/core_mmu.c
@@ -56,7 +56,6 @@
#define DEBUG_XLAT_TABLE 0
#endif
-#define RES_VASPACE_SIZE (CORE_MMU_PGDIR_SIZE * 10)
#define SHM_VASPACE_SIZE (1024 * 1024 * 32)
/*
@@ -828,7 +827,7 @@ static void init_mem_map(struct tee_mmap_region *memory_map, size_t num_elems)
&__end_phys_nsec_ddr_section, "NSEC DDR");
add_va_space(memory_map, num_elems, MEM_AREA_RES_VASPACE,
- RES_VASPACE_SIZE, &last);
+ CFG_RESERVED_VASPACE_SIZE, &last);
add_va_space(memory_map, num_elems, MEM_AREA_SHM_VASPACE,
SHM_VASPACE_SIZE, &last);