diff options
| author | Sathees Balya <sathees.balya@arm.com> | 2019-01-25 11:36:01 +0000 |
|---|---|---|
| committer | Sathees Balya <sathees.balya@arm.com> | 2019-01-30 11:17:38 +0000 |
| commit | cedfa04ba58841b5c547b409e435c0bdafa4c912 (patch) | |
| tree | f7de45c25aed76ee15d2ee3930e3bbdeb624fd65 /lib/xlat_tables | |
| parent | 83a2285ec8d5e4bdbf12481b441489eed5bb6018 (diff) | |
lib/xlat_tables: Add support for ARMv8.4-TTST
ARMv8.4-TTST (Small Translation tables) relaxes the lower limit on the
size of translation tables by increasing the maximum permitted value
of the T1SZ and T0SZ fields in TCR_EL1, TCR_EL2, TCR_EL3, VTCR_EL2 and
VSTCR_EL2.
This feature is supported in AArch64 state only.
This patch adds support for this feature to both versions of the
translation tables library. It also removes the static build time
checks for virtual address space size checks to runtime assertions.
Change-Id: I4e8cebc197ec1c2092dc7d307486616786e6c093
Signed-off-by: Sathees Balya <sathees.balya@arm.com>
Diffstat (limited to 'lib/xlat_tables')
| -rw-r--r-- | lib/xlat_tables/aarch32/xlat_tables.c | 5 | ||||
| -rw-r--r-- | lib/xlat_tables/aarch64/xlat_tables.c | 23 | ||||
| -rw-r--r-- | lib/xlat_tables/xlat_tables_private.h | 3 |
3 files changed, 27 insertions, 4 deletions
diff --git a/lib/xlat_tables/aarch32/xlat_tables.c b/lib/xlat_tables/aarch32/xlat_tables.c index 468a9e7d..4b01b9b7 100644 --- a/lib/xlat_tables/aarch32/xlat_tables.c +++ b/lib/xlat_tables/aarch32/xlat_tables.c @@ -55,6 +55,11 @@ void init_xlat_tables(void) { unsigned long long max_pa; uintptr_t max_va; + + assert(PLAT_VIRT_ADDR_SPACE_SIZE >= MIN_VIRT_ADDR_SPACE_SIZE); + assert(PLAT_VIRT_ADDR_SPACE_SIZE <= MAX_VIRT_ADDR_SPACE_SIZE); + assert(IS_POWER_OF_TWO(PLAT_VIRT_ADDR_SPACE_SIZE)); + print_mmap(); init_xlation_table(0U, base_xlation_table, XLAT_TABLE_LEVEL_BASE, &max_va, &max_pa); diff --git a/lib/xlat_tables/aarch64/xlat_tables.c b/lib/xlat_tables/aarch64/xlat_tables.c index 71f491a2..e64fd3ef 100644 --- a/lib/xlat_tables/aarch64/xlat_tables.c +++ b/lib/xlat_tables/aarch64/xlat_tables.c @@ -10,7 +10,7 @@ #include <platform_def.h> #include <arch.h> -#include <arch_helpers.h> +#include <arch_features.h> #include <common/bl_common.h> #include <lib/utils.h> #include <lib/xlat_tables/xlat_tables.h> @@ -79,6 +79,21 @@ static unsigned long long get_max_supported_pa(void) return (1ULL << pa_range_bits_arr[pa_range]) - 1ULL; } + +/* + * Return minimum virtual address space size supported by the architecture + */ +static uintptr_t xlat_get_min_virt_addr_space_size(void) +{ + uintptr_t ret; + + if (is_armv8_4_ttst_present()) + ret = MIN_VIRT_ADDR_SPACE_SIZE_TTST; + else + ret = MIN_VIRT_ADDR_SPACE_SIZE; + + return ret; +} #endif /* ENABLE_ASSERTIONS */ unsigned int xlat_arch_current_el(void) @@ -104,6 +119,12 @@ void init_xlat_tables(void) { unsigned long long max_pa; uintptr_t max_va; + + assert(PLAT_VIRT_ADDR_SPACE_SIZE >= + (xlat_get_min_virt_addr_space_size() - 1U)); + assert(PLAT_VIRT_ADDR_SPACE_SIZE <= MAX_VIRT_ADDR_SPACE_SIZE); + assert(IS_POWER_OF_TWO(PLAT_VIRT_ADDR_SPACE_SIZE)); + print_mmap(); init_xlation_table(0U, base_xlation_table, XLAT_TABLE_LEVEL_BASE, &max_va, &max_pa); diff --git a/lib/xlat_tables/xlat_tables_private.h b/lib/xlat_tables/xlat_tables_private.h index 4390f34e..82bc70cd 100644 --- a/lib/xlat_tables/xlat_tables_private.h +++ b/lib/xlat_tables/xlat_tables_private.h @@ -16,9 +16,6 @@ #error xlat tables v2 must be used with HW_ASSISTED_COHERENCY #endif -CASSERT(CHECK_VIRT_ADDR_SPACE_SIZE(PLAT_VIRT_ADDR_SPACE_SIZE), - assert_valid_virt_addr_space_size); - CASSERT(CHECK_PHY_ADDR_SPACE_SIZE(PLAT_PHY_ADDR_SPACE_SIZE), assert_valid_phy_addr_space_size); |