andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "xlat_tables_v2: add enable_mmu()" into integration

This commit is contained in:
Mark Dykes 2020-03-31 19:56:31 +00:00 committed by TrustedFirmware Code Review
parent 614be75df6 f554773520
commit 787d848a1e
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/lib/xlat_tables/xlat_mmu_helpers.h
View File

@ -56,6 +56,8 @@
#include <stdint.h>
#include <string.h>
#include <arch_helpers.h>
/*
* Return the values that the MMU configuration registers must contain for the
* specified translation context. `params` must be a pointer to array of size
@ -70,6 +72,7 @@ void setup_mmu_cfg(uint64_t *params, unsigned int flags,
void enable_mmu_el1(unsigned int flags);
void enable_mmu_el2(unsigned int flags);
void enable_mmu_el3(unsigned int flags);
void enable_mmu(unsigned int flags);
void enable_mmu_direct_el1(unsigned int flags);
void enable_mmu_direct_el2(unsigned int flags);

17
lib/xlat_tables_v2/xlat_tables_context.c
View File

@ -239,6 +239,23 @@ void enable_mmu_el3(unsigned int flags)
enable_mmu_direct_el3(flags);
}
void enable_mmu(unsigned int flags)
{
switch (get_current_el_maybe_constant()) {
case 1:
enable_mmu_el1(flags);
break;
case 2:
enable_mmu_el2(flags);
break;
case 3:
enable_mmu_el3(flags);
break;
default:
panic();
}
}
#else /* !__aarch64__ */
void enable_mmu_svc_mon(unsigned int flags)