coreboot-mirror
/
arm-trusted-firmware
mirror of https://review.coreboot.org/arm-trusted-firmware.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Correctly check for support of Address Authentication 

Check for both IMPLEMENTATION_DEFINED and Architected algorithms of
Address Authentication.

Change-Id: I209dcc6087172cfef7baf8d09e0454628f02cbd0
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
This commit is contained in:
Antonio Nino Diaz 2019-03-01 09:35:26 +00:00
parent 4476838ae8
commit b6fd41837f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/bl_common.c
View File

@ -265,7 +265,7 @@ void bl_handle_pauth(void)
* system registers. Pointer authentication can't be enabled here or the * system registers. Pointer authentication can't be enabled here or the
* authentication will fail when returning from this function. * authentication will fail when returning from this function.
*/ */
assert(is_armv8_3_pauth_api_present()); assert(is_armv8_3_pauth_apa_api_present());
uint64_t *apiakey = plat_init_apiakey(); uint64_t *apiakey = plat_init_apiakey();

8
include/arch/aarch64/arch_features.h
View File

@ -34,10 +34,12 @@ static inline bool is_armv8_3_pauth_present(void)
return (read_id_aa64isar1_el1() & mask) != 0U; return (read_id_aa64isar1_el1() & mask) != 0U;
} }
static inline bool is_armv8_3_pauth_api_present(void) static inline bool is_armv8_3_pauth_apa_api_present(void)
{ {
return ((read_id_aa64isar1_el1() >> ID_AA64ISAR1_API_SHIFT) & uint64_t mask = (ID_AA64ISAR1_API_MASK << ID_AA64ISAR1_API_SHIFT) |
ID_AA64ISAR1_API_MASK) != 0U; (ID_AA64ISAR1_APA_MASK << ID_AA64ISAR1_APA_SHIFT);
return (read_id_aa64isar1_el1() & mask) != 0U;
} }
static inline bool is_armv8_4_ttst_present(void) static inline bool is_armv8_4_ttst_present(void)