diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2018-10-24 11:29:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 11:29:57 +0200 |
| commit | 44445ae5d86f820c3764fdfac0a109f315ebb54f (patch) | |
| tree | 11bf7c45ce59d0dcfdd108c1fe2a5e3e3080d433 /include/common | |
| parent | 414c9e6d86e80ef29b6fc8797df8aa1f4e1ea9c6 (diff) | |
| parent | 3ff4aaaca44b75504aec5ab5b72cd587a6fcd432 (diff) | |
Merge pull request #1641 from jeenu-arm/ptrauth
AArch64: Enable lower ELs to use pointer authentication
Diffstat (limited to 'include/common')
| -rw-r--r-- | include/common/aarch64/el3_common_macros.S | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/common/aarch64/el3_common_macros.S b/include/common/aarch64/el3_common_macros.S index 03b977e3..143c70c3 100644 --- a/include/common/aarch64/el3_common_macros.S +++ b/include/common/aarch64/el3_common_macros.S @@ -70,9 +70,14 @@ * * SCR_EL3.EA: Set to one to route External Aborts and SError Interrupts * to EL3 when executing at any EL. + * + * SCR_EL3.{API,APK}: For Armv8.3 pointer authentication feature, + * disable traps to EL3 when accessing key registers or using pointer + * authentication instructions from lower ELs. * --------------------------------------------------------------------- */ - mov x0, #((SCR_RESET_VAL | SCR_EA_BIT | SCR_SIF_BIT) \ + mov_imm x0, ((SCR_RESET_VAL | SCR_EA_BIT | SCR_SIF_BIT | \ + SCR_API_BIT | SCR_APK_BIT) \ & ~(SCR_TWE_BIT | SCR_TWI_BIT | SCR_SMD_BIT)) msr scr_el3, x0 |