Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamic allocation of mmu translation tables #7192

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+481 −83
Open

Dynamic allocation of mmu translation tables #7192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a724278
core: allow partially unmapped MEM_AREA_TEE_RAM_RW
jenswi-linaro Sep 16, 2024
11e3280
core: boot_mem: allow NULL pointers while relocating
jenswi-linaro Sep 16, 2024
b29eadd
core: boot_mem: keep track of padding
jenswi-linaro Sep 16, 2024
af4a896
core: arm: add boot mem paddings to the heap
jenswi-linaro Sep 16, 2024
9eba79f
core: mm: extend temporary dummy memory map
jenswi-linaro Jul 10, 2024
1f6e385
core: arm: mm: refactor LPAE translation table handling
jenswi-linaro Jul 9, 2024
544c0f3
core: arm: mm: dynamic allocation of LPAE translation tables
jenswi-linaro Jul 9, 2024
489a140
core: arm: mm: dynamic allocation of v7 translation tables
jenswi-linaro Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions core/arch/arm/include/mm/core_mmu_arch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@
* that these magic numbers are correct.
*/
#define CORE_MMU_BASE_TABLE_OFFSET \
(CFG_TEE_CORE_NB_CORE * \
BIT(CFG_LPAE_ADDR_SPACE_BITS - CORE_MMU_BASE_TABLE_SHIFT) * \
U(8))
(BIT(CFG_LPAE_ADDR_SPACE_BITS - CORE_MMU_BASE_TABLE_SHIFT) * U(8))
#endif

#ifndef __ASSEMBLER__
Expand Down
11 changes: 11 additions & 0 deletions core/arch/arm/kernel/boot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,16 @@ void init_tee_runtime(void)
thread_update_canaries();
}

static bool add_padding_to_pool(vaddr_t va, size_t len, void *ptr __unused)
{
#ifdef CFG_NS_VIRTUALIZATION
nex_malloc_add_pool((void *)va, len);
#else
malloc_add_pool((void *)va, len);
#endif
return true;
}

static void init_primary(unsigned long pageable_part, unsigned long nsec_entry)
{
vaddr_t va = 0;
Expand Down Expand Up @@ -937,6 +947,7 @@ static void init_primary(unsigned long pageable_part, unsigned long nsec_entry)

core_mmu_save_mem_map();
core_mmu_init_phys_mem();
boot_mem_foreach_padding(add_padding_to_pool, NULL);
va = boot_mem_release_unused();
if (!IS_ENABLED(CFG_WITH_PAGER)) {
/*
Expand Down
Loading
Loading