Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-26 23:04:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1370 from antonio-nino-diaz-arm/an/fix-parange

Browse source 
xlat: Have all values of PARange for 8.x architectures
This commit is contained in:
danh-arm 2018-05-03 16:48:14 +01:00 • committed by GitHub
commit 0ef858bdad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/xlat_tables/aarch64/xlat_tables.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -57,13 +57,13 @@ static unsigned long long calc_physical_addr_size_bits(
} }
#if ENABLE_ASSERTIONS #if ENABLE_ASSERTIONS
/* Physical Address ranges supported in the AArch64 Memory Model */ /*
* Physical Address ranges supported in the AArch64 Memory Model. Value 0b110 is
* supported in ARMv8.2 onwards.
*/
static const unsigned int pa_range_bits_arr[] = { static const unsigned int pa_range_bits_arr[] = {
PARANGE_0000, PARANGE_0001, PARANGE_0010, PARANGE_0011, PARANGE_0100, PARANGE_0000, PARANGE_0001, PARANGE_0010, PARANGE_0011, PARANGE_0100,
PARANGE_0101, PARANGE_0101, PARANGE_0110
#if ARM_ARCH_AT_LEAST(8, 2)
PARANGE_0110,
#endif
}; };
static unsigned long long get_max_supported_pa(void) static unsigned long long get_max_supported_pa(void)

12
lib/xlat_tables_v2/aarch64/xlat_tables_arch.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -45,13 +45,13 @@ unsigned long long tcr_physical_addr_size_bits(unsigned long long max_addr)
} }
#if ENABLE_ASSERTIONS #if ENABLE_ASSERTIONS
/* Physical Address ranges supported in the AArch64 Memory Model */ /*
* Physical Address ranges supported in the AArch64 Memory Model. Value 0b110 is
* supported in ARMv8.2 onwards.
*/
static const unsigned int pa_range_bits_arr[] = { static const unsigned int pa_range_bits_arr[] = {
PARANGE_0000, PARANGE_0001, PARANGE_0010, PARANGE_0011, PARANGE_0100, PARANGE_0000, PARANGE_0001, PARANGE_0010, PARANGE_0011, PARANGE_0100,
PARANGE_0101, PARANGE_0101, PARANGE_0110
#if ARM_ARCH_AT_LEAST(8, 2)
PARANGE_0110,
#endif
}; };
unsigned long long xlat_arch_get_max_supported_pa(void) unsigned long long xlat_arch_get_max_supported_pa(void)