diff options
| author | Jeenu Viswambharan <jeenu.viswambharan@arm.com> | 2018-08-15 14:29:29 +0100 |
|---|---|---|
| committer | Jeenu Viswambharan <jeenu.viswambharan@arm.com> | 2018-10-16 08:31:13 +0100 |
| commit | 3ff4aaaca44b75504aec5ab5b72cd587a6fcd432 (patch) | |
| tree | 44b97dc48ba347fb1056d075f0ea9e549ee61cf7 /lib/el3_runtime | |
| parent | 0a09313ec780d2f66efcda3eb2a5d1632719bd81 (diff) | |
AArch64: Enable lower ELs to use pointer authentication
Pointer authentication is an Armv8.3 feature that introduces
instructions that can be used to authenticate and verify pointers.
Pointer authentication instructions are allowed to be accessed from all
ELs but only when EL3 explicitly allows for it; otherwise, their usage
will trap to EL3. Since EL3 doesn't have trap handling in place, this
patch unconditionally disables all related traps to EL3 to avoid
potential misconfiguration leading to an unhandled EL3 exception.
Fixes ARM-software/tf-issues#629
Change-Id: I9bd2efe0dc714196f503713b721ffbf05672c14d
Signed-off-by: Jeenu Viswambharan <jeenu.viswambharan@arm.com>
Diffstat (limited to 'lib/el3_runtime')
| -rw-r--r-- | lib/el3_runtime/aarch64/context_mgmt.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index acc8d6d2..d3984a28 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -290,6 +290,7 @@ void cm_prepare_el3_exit(uint32_t security_state) uint32_t sctlr_elx, scr_el3, mdcr_el2; cpu_context_t *ctx = cm_get_context(security_state); int el2_unused = 0; + uint64_t hcr_el2 = 0; assert(ctx); @@ -309,13 +310,20 @@ void cm_prepare_el3_exit(uint32_t security_state) * EL2 present but unused, need to disable safely. * SCTLR_EL2 can be ignored in this case. * - * Initialise all fields in HCR_EL2, except HCR_EL2.RW, - * to zero so that Non-secure operations do not trap to - * EL2. - * - * HCR_EL2.RW: Set this field to match SCR_EL3.RW + * Set EL2 register width appropriately: Set HCR_EL2 + * field to match SCR_EL3.RW. */ - write_hcr_el2((scr_el3 & SCR_RW_BIT) ? HCR_RW_BIT : 0); + if (scr_el3 & SCR_RW_BIT) + hcr_el2 |= HCR_RW_BIT; + + /* + * For Armv8.3 pointer authentication feature, disable + * traps to EL2 when accessing key registers or using + * pointer authentication instructions from lower ELs. + */ + hcr_el2 |= (HCR_API_BIT | HCR_APK_BIT); + + write_hcr_el2(hcr_el2); /* * Initialise CPTR_EL2 setting all fields rather than |