mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-30 03:12:07 +00:00
53b40e8d54
The use of ARMv8.3 pointer authentication (PAuth) is governed by fields in HCR_EL2, which trigger a 'trap to EL2' if not enabled. The reset value of these fields is 'architecturally unknown' so we must ensure that the fields are enabled (to disable the traps) if we are entering the kernel at EL1. The APK field disables PAuth instruction traps and the API field disables PAuth register traps Add code to disable the traps in armv8_switch_to_el1_m. Prior to doing so, it checks fields in the ID_AA64ISAR1_EL1 register to ensure pointer authentication is supported by the hardware. The runtime checks require a second temporary register, so add this to the EL1 transition macro signature and update 2 call sites. Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
51 lines
1.1 KiB
ArmAsm
51 lines
1.1 KiB
ArmAsm
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* (C) Copyright 2013
|
|
* David Feng <fenghua@phytium.com.cn>
|
|
*/
|
|
|
|
#include <asm-offsets.h>
|
|
#include <config.h>
|
|
#include <linux/linkage.h>
|
|
#include <asm/macro.h>
|
|
|
|
.pushsection .text.armv8_switch_to_el2, "ax"
|
|
ENTRY(armv8_switch_to_el2)
|
|
switch_el x6, 1f, 0f, 0f
|
|
0:
|
|
cmp x5, #ES_TO_AARCH64
|
|
b.eq 2f
|
|
/*
|
|
* When loading 32-bit kernel, it will jump
|
|
* to secure firmware again, and never return.
|
|
*/
|
|
bl armv8_el2_to_aarch32
|
|
2:
|
|
/*
|
|
* x4 is kernel entry point or switch_to_el1
|
|
* if CONFIG_ARMV8_SWITCH_TO_EL1 is defined.
|
|
* When running in EL2 now, jump to the
|
|
* address saved in x4.
|
|
*/
|
|
br x4
|
|
1: armv8_switch_to_el2_m x4, x5, x6
|
|
ENDPROC(armv8_switch_to_el2)
|
|
.popsection
|
|
|
|
.pushsection .text.armv8_switch_to_el1, "ax"
|
|
ENTRY(armv8_switch_to_el1)
|
|
switch_el x6, 0f, 1f, 0f
|
|
0:
|
|
/* x4 is kernel entry point. When running in EL1
|
|
* now, jump to the address saved in x4.
|
|
*/
|
|
br x4
|
|
1: armv8_switch_to_el1_m x4, x5, x6, x7
|
|
ENDPROC(armv8_switch_to_el1)
|
|
.popsection
|
|
|
|
.pushsection .text.armv8_el2_to_aarch32, "ax"
|
|
WEAK(armv8_el2_to_aarch32)
|
|
ret
|
|
ENDPROC(armv8_el2_to_aarch32)
|
|
.popsection
|