summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-03-14 11:08:45 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-03-29 08:16:41 +0200
commit1a257333208d3e2790c872f0cefaaea4fe09bcc9 (patch)
tree90022abb361968f7a45195f8b28d7d1caec71fce
parent726f3e2403f0cd30a5c5fc7bdb84ac6c1e18cbc2 (diff)
downloadbarebox-1a257333208d3e2790c872f0cefaaea4fe09bcc9.tar.gz
barebox-1a257333208d3e2790c872f0cefaaea4fe09bcc9.tar.xz
ARM: aarch64: implement ignoring data aborts
Data aborts can be masked using the data_abort_mask() function. Add the missing pieces for functionality on aarch64 so that the 'md' command is safe to call even with faulting addresses. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/cpu/interrupts_64.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/cpu/interrupts_64.c b/arch/arm/cpu/interrupts_64.c
index ee3dc3380b..32c8dfcb2d 100644
--- a/arch/arm/cpu/interrupts_64.c
+++ b/arch/arm/cpu/interrupts_64.c
@@ -143,8 +143,18 @@ void do_bad_error(struct pt_regs *pt_regs)
do_exception(pt_regs);
}
+extern volatile int arm_ignore_data_abort;
+extern volatile int arm_data_abort_occurred;
+
void do_sync(struct pt_regs *pt_regs, unsigned int esr, unsigned long far)
{
+ if ((esr >> ESR_ELx_EC_SHIFT) == ESR_ELx_EC_DABT_CUR &&
+ arm_ignore_data_abort) {
+ arm_data_abort_occurred = 1;
+ pt_regs->elr += 4;
+ return;
+ }
+
printf("%s exception at 0x%016lx\n", esr_get_class_string(esr), far);
do_exception(pt_regs);
}
@@ -156,9 +166,6 @@ void do_error(struct pt_regs *pt_regs)
do_exception(pt_regs);
}
-extern volatile int arm_ignore_data_abort;
-extern volatile int arm_data_abort_occurred;
-
void data_abort_mask(void)
{
arm_data_abort_occurred = 0;