core: fix non-LPAE page mapped static mapping

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
OP-TEE · Apr 27, 2017 · 2c39ee1 · 2c39ee1
1 parent 2dd446e
commit 2c39ee1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/core/arch/arm/mm/core_mmu.c b/core/arch/arm/mm/core_mmu.c
@@ -579,6 +579,10 @@ static void init_mem_map(struct tee_mmap_region *memory_map, size_t num_elems)
 			map->attr = core_mmu_type_to_attr(map->type);
 			va -= map->size;
 			va = ROUNDDOWN(va, map->region_size);
+#if !defined(CFG_WITH_LPAE)
+			/* Mapping does not yet support sharing L2 tables */
+			va = ROUNDDOWN(va, CORE_MMU_PGDIR_SIZE);
+#endif
 			map->va = va;
 		}
 	} else {
@@ -590,6 +594,10 @@ static void init_mem_map(struct tee_mmap_region *memory_map, size_t num_elems)
 
 			map->attr = core_mmu_type_to_attr(map->type);
 			va = ROUNDUP(va, map->region_size);
+#if !defined(CFG_WITH_LPAE)
+			/* Mapping does not yet support sharing L2 tables */
+			va = ROUNDUP(va, CORE_MMU_PGDIR_SIZE);
+#endif
 			map->va = va;
 			va += map->size;
 		}