diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-07-12 15:44:42 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-07-13 14:02:43 +0100 |
| commit | 6563c0beb8b64168debba5e6ea40719fc810796c (patch) | |
| tree | da3c952e7af7f08c6d6a7d41693a6cd84926bcc2 /include | |
| parent | aa1d5f60474ae0508b2953c72148c176c08d9cfe (diff) | |
xlat v2: Turn MMU parameters into 64-bit values
Most registers are 64-bit wide, even in AArch32 mode:
- MAIR_ELx is equivalent to MAIR0 and MAIR1.
- TTBR is 64 bit in both AArch64 and AArch32.
The only difference is the TCR register, which is 32 bit in AArch32 and
in EL3 in AArch64. For consistency with the rest of ELs in AArch64, it
makes sense to also have it as a 64-bit value.
Change-Id: I2274d66a28876702e7085df5f8aad0e7ec139da9
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib/xlat_tables/xlat_tables_v2_helpers.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/lib/xlat_tables/xlat_tables_v2_helpers.h b/include/lib/xlat_tables/xlat_tables_v2_helpers.h index 4e79aecc..74384250 100644 --- a/include/lib/xlat_tables/xlat_tables_v2_helpers.h +++ b/include/lib/xlat_tables/xlat_tables_v2_helpers.h @@ -16,12 +16,11 @@ #error "Do not include this header file directly. Include xlat_tables_v2.h instead." #endif -/* Offsets into mmu_cfg_params array. All parameters are 32 bits wide. */ -#define MMU_CFG_MAIR0 0 +/* Offsets into mmu_cfg_params array. All parameters are 64 bits wide. */ +#define MMU_CFG_MAIR 0 #define MMU_CFG_TCR 1 -#define MMU_CFG_TTBR0_LO 2 -#define MMU_CFG_TTBR0_HI 3 -#define MMU_CFG_PARAM_MAX 4 +#define MMU_CFG_TTBR0 2 +#define MMU_CFG_PARAM_MAX 3 #ifndef __ASSEMBLY__ @@ -32,7 +31,7 @@ #include <xlat_tables_defs.h> /* Parameters of register values required when enabling MMU */ -extern uint32_t mmu_cfg_params[MMU_CFG_PARAM_MAX]; +extern uint64_t mmu_cfg_params[MMU_CFG_PARAM_MAX]; /* Forward declaration */ struct mmap_region; |