diff options
author | Sean Anderson <sean.anderson@seco.com> | 2022-03-23 00:17:35 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-04-01 23:56:53 +0300 |
commit | e97ac4780d69c719b81086bba615c8568afd14a1 (patch) | |
tree | 6003aaab580f6181b363d20eb8c7c32bd1adabd7 /arch/arm/include/asm | |
parent | 93c3d329707e0d8dc98e5f86938bbedbe15b5349 (diff) | |
download | u-boot-e97ac4780d69c719b81086bba615c8568afd14a1.tar.xz |
arm64: Save esr in pt_regs
To avoid passing around an extra register everywhere, save esr in
pt_regs like the rest. For proper alignment we need to have a second
(unused) register. All the printfs have to be adjusted, since
it's now an unsigned long and not an int.
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r-- | arch/arm/include/asm/proc-armv/ptrace.h | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/u-boot-arm.h | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/include/asm/proc-armv/ptrace.h b/arch/arm/include/asm/proc-armv/ptrace.h index e37ad8fd1f..bebcaf6e33 100644 --- a/arch/arm/include/asm/proc-armv/ptrace.h +++ b/arch/arm/include/asm/proc-armv/ptrace.h @@ -21,7 +21,9 @@ * on the stack during an exception. */ struct pt_regs { + unsigned long unused; unsigned long elr; + unsigned long esr; unsigned long regs[31]; }; diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index 0b93cc48c5..aef048708d 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -46,13 +46,8 @@ void do_software_interrupt(struct pt_regs *pt_regs); void do_prefetch_abort(struct pt_regs *pt_regs); void do_data_abort(struct pt_regs *pt_regs); void do_not_used(struct pt_regs *pt_regs); -#ifdef CONFIG_ARM64 -void do_fiq(struct pt_regs *pt_regs, unsigned int esr); -void do_irq(struct pt_regs *pt_regs, unsigned int esr); -#else void do_fiq(struct pt_regs *pt_regs); -void do_irq(struct pt_regs *pt_regswq); -#endif +void do_irq(struct pt_regs *pt_regs); void reset_misc(void); |