diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-14 10:55:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-29 08:16:40 +0200 |
| commit | 04177bad21165fea1825d0cfceef40a71e4333d6 (patch) | |
| tree | 2f6b3a185b6894df7bdebdb8180bb956f8d8cf53 | |
| parent | c2024e4ee8136febbe7ea537c98049b9fe79204b (diff) | |
| download | barebox-04177bad21165fea1825d0cfceef40a71e4333d6.tar.gz barebox-04177bad21165fea1825d0cfceef40a71e4333d6.tar.xz | |
ARM: aarch64: fix exception level mixup
When entering an exception the we currently jump to the code handling
EL1 when we are actually at EL3 and the other way round. Fix this by
introducing and using the switch_el macro from U-Boot.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/cpu/exceptions_64.S | 10 | ||||
| -rw-r--r-- | arch/arm/include/asm/assembler64.h | 21 |
2 files changed, 23 insertions, 8 deletions
diff --git a/arch/arm/cpu/exceptions_64.S b/arch/arm/cpu/exceptions_64.S index 58120253a1..a7069a8475 100644 --- a/arch/arm/cpu/exceptions_64.S +++ b/arch/arm/cpu/exceptions_64.S @@ -7,6 +7,7 @@ #include <config.h> #include <asm/ptrace.h> +#include <asm/assembler64.h> #include <linux/linkage.h> /* @@ -31,14 +32,7 @@ stp x3, x4, [sp, #-16]! stp x1, x2, [sp, #-16]! - /* Could be running at EL3/EL2/EL1 */ - mrs x11, CurrentEL - cmp x11, #0xC /* Check EL3 state */ - b.eq 1f - cmp x11, #0x8 /* Check EL2 state */ - b.eq 2f - cmp x11, #0x4 /* Check EL1 state */ - b.eq 3f + switch_el x11, 3f, 2f, 1f 3: mrs x1, esr_el3 mrs x2, elr_el3 b 0f diff --git a/arch/arm/include/asm/assembler64.h b/arch/arm/include/asm/assembler64.h new file mode 100644 index 0000000000..26182aa5f6 --- /dev/null +++ b/arch/arm/include/asm/assembler64.h @@ -0,0 +1,21 @@ +#ifndef __ASM_ARCH_ASSEMBLY_H +#define __ASM_ARCH_ASSEMBLY_H + +#ifndef __ASSEMBLY__ +#error "Only include this from assembly code" +#endif + +/* + * Branch according to exception level + */ +.macro switch_el, xreg, el3_label, el2_label, el1_label + mrs \xreg, CurrentEL + cmp \xreg, 0xc + b.eq \el3_label + cmp \xreg, 0x8 + b.eq \el2_label + cmp \xreg, 0x4 + b.eq \el1_label +.endm + +#endif /* __ASM_ARCH_ASSEMBLY_H */
\ No newline at end of file |