diff options
| author | Julius Werner <jwerner@chromium.org> | 2018-10-10 15:31:36 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2018-10-12 20:14:54 +0000 |
| commit | ca52a258822c1c47d533684c5a4cbe5f2b7bd487 (patch) | |
| tree | 4017c7a2e999f6a7e58f942a7a789352a6666660 /payloads/libpayload/arch/arm64/exception_asm.S | |
| parent | e1b1ec7154e4c41adf4eb6a0e4ebd08a2e938a2c (diff) | |
| download | coreboot-ca52a258822c1c47d533684c5a4cbe5f2b7bd487.tar.gz | |
libpayload: arm64: Conform to new coreboot lib_helpers.h and assume EL2
This patch adds the new, faster architectural register accessors to
libpayload that were already added to coreboot in CB:27881. It also
hardcodes the assumption that coreboot payloads run at EL2, which has
already been hardcoded in coreboot with CB:27880 (see rationale there).
This means we can drop all the read_current/write_current stuff which
added a lot of unnecessary helpers to check the current exception level.
This patch breaks payloads that used read_current/write_current
accessors, but it seems unlikely that many payloads deal with this stuff
anyway, and it should be a trivial fix (just replace them with the
respective _el2 versions).
Also add accessors for a couple of more registers that are required to
enable debug mode while I'm here.
Change-Id: Ic9dfa48411f3805747613f03611f8a134a51cc46
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/29017
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Diffstat (limited to 'payloads/libpayload/arch/arm64/exception_asm.S')
| -rw-r--r-- | payloads/libpayload/arch/arm64/exception_asm.S | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/payloads/libpayload/arch/arm64/exception_asm.S b/payloads/libpayload/arch/arm64/exception_asm.S index c9e694ac5f..d428940730 100644 --- a/payloads/libpayload/arch/arm64/exception_asm.S +++ b/payloads/libpayload/arch/arm64/exception_asm.S @@ -27,11 +27,6 @@ * SUCH DAMAGE. */ -#define __ASSEMBLY__ -#include <arch/lib_helpers.h> - - .text - /* Macro for exception entry * Store x30 before any branch * Branch to exception_prologue to save rest of the registers @@ -92,10 +87,10 @@ exception_prologue: stp x0, x1, [sp, #-16]! /* Save the exception reason on stack */ - read_current x1, esr + mrs x1, esr_el2 /* Save the return address on stack */ - read_current x0, elr + mrs x0, elr_el2 stp x0, x1, [sp, #-16]! ret @@ -109,8 +104,8 @@ exception_handler: /* Pop return address saved on stack */ ldp x0, x1, [sp], #16 - write_current elr, x0, x2 - write_current esr, x1, x2 + msr elr_el2, x0 + msr esr_el2, x1 /* Pop exception reason saved on stack, followed by regs x0-x30 */ ldp x0, x1, [sp], #16 ldp x2, x3, [sp], #16 @@ -132,5 +127,5 @@ exception_handler: .global set_vbar set_vbar: - write_current vbar, x0, x1 + msr vbar_el2, x0 ret |