diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-05-12 22:48:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 22:48:34 +0100 |
| commit | 823cc7a9d28aa77a8329f7581bb91038935b4df8 (patch) | |
| tree | d4a4fe0496554c7e79494fa6d2b5ae79ebfaf452 /lib | |
| parent | b4b541cb29e13da89b886c1c6b6fb251f9282a6c (diff) | |
| parent | e769db3eb87df6139d68c2e997588ef247923135 (diff) | |
Merge pull request #930 from antonio-nino-diaz-arm/an/fixes-xlat-v2
Minor fixes to the xlat tables lib v2
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/xlat_tables_v2/aarch64/xlat_tables_arch.c | 2 | ||||
| -rw-r--r-- | lib/xlat_tables_v2/xlat_tables_common.c | 2 | ||||
| -rw-r--r-- | lib/xlat_tables_v2/xlat_tables_private.h | 10 |
3 files changed, 10 insertions, 4 deletions
diff --git a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c index cc41fc3e..14f6cd6a 100644 --- a/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c +++ b/lib/xlat_tables_v2/aarch64/xlat_tables_arch.c @@ -60,7 +60,7 @@ static const unsigned int pa_range_bits_arr[] = { PARANGE_0101 }; -unsigned long long xlat_arch_get_max_supported_pa(void) +static unsigned long long xlat_arch_get_max_supported_pa(void) { u_register_t pa_range = read_id_aa64mmfr0_el1() & ID_AA64MMFR0_EL1_PARANGE_MASK; diff --git a/lib/xlat_tables_v2/xlat_tables_common.c b/lib/xlat_tables_v2/xlat_tables_common.c index a6f3b7ce..f20bf93a 100644 --- a/lib/xlat_tables_v2/xlat_tables_common.c +++ b/lib/xlat_tables_v2/xlat_tables_common.c @@ -34,8 +34,6 @@ static uint64_t tf_xlat_tables[MAX_XLAT_TABLES][XLAT_TABLE_ENTRIES] static uint64_t tf_base_xlat_table[NUM_BASE_LEVEL_ENTRIES] __aligned(NUM_BASE_LEVEL_ENTRIES * sizeof(uint64_t)); -static mmap_region_t tf_mmap[MAX_MMAP_REGIONS + 1]; - #if PLAT_XLAT_TABLES_DYNAMIC static int xlat_tables_mapped_regions[MAX_XLAT_TABLES]; #endif /* PLAT_XLAT_TABLES_DYNAMIC */ diff --git a/lib/xlat_tables_v2/xlat_tables_private.h b/lib/xlat_tables_v2/xlat_tables_private.h index 07bf39f1..7b3e555e 100644 --- a/lib/xlat_tables_v2/xlat_tables_private.h +++ b/lib/xlat_tables_v2/xlat_tables_private.h @@ -47,8 +47,11 @@ typedef struct { * Array of all memory regions stored in order of ascending end address * and ascending size to simplify the code that allows overlapping * regions. The list is terminated by the first entry with size == 0. + * The max size of the list is stored in `mmap_num`. `mmap` points to an + * array of mmap_num + 1 elements, so that there is space for the final + * null entry. */ - mmap_region_t *mmap; /* mmap_num + 1 elements */ + mmap_region_t *mmap; int mmap_num; /* @@ -75,6 +78,11 @@ typedef struct { uint64_t *base_table; int base_table_entries; + /* + * Max Physical and Virtual addresses currently in use by the + * translation tables. These might get updated as we map/unmap memory + * regions but they will never go beyond pa/va_max_address. + */ unsigned long long max_pa; uintptr_t max_va; |