diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:24 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:24 +0100 |
commit | ac81a0d8768d75484212b208b6c42f6d11241c16 (patch) | |
tree | de3cf7aef1dd7892eb17c4a2e998a48b1be39df2 /arch/arm/cpu | |
parent | c3efa8470b3addb3cfbcfbf2a2be1ed799489623 (diff) | |
parent | 7033089ddf4c62fa2cfd4549d2bbfe0c101c65d1 (diff) | |
download | barebox-ac81a0d8768d75484212b208b6c42f6d11241c16.tar.gz barebox-ac81a0d8768d75484212b208b6c42f6d11241c16.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r-- | arch/arm/cpu/exceptions.S | 22 | ||||
-rw-r--r-- | arch/arm/cpu/interrupts.c | 17 |
2 files changed, 39 insertions, 0 deletions
diff --git a/arch/arm/cpu/exceptions.S b/arch/arm/cpu/exceptions.S index 167c8d1fe2..f17f1e11e4 100644 --- a/arch/arm/cpu/exceptions.S +++ b/arch/arm/cpu/exceptions.S @@ -88,6 +88,21 @@ movs pc, lr .endm + .macro try_data_abort + ldr r13, =arm_ignore_data_abort @ check try mode + ldr r13, [r13] + cmp r13, #0 + beq do_abort_\@ + ldr r13, =arm_data_abort_occurred + str r13, [r13] + mrs r13, spsr @ read saved CPSR + tst r13, #1<<5 @ check Thumb mode + subeq lr, #4 @ next ARM instr + subne lr, #6 @ next Thumb instr + movs pc, lr +do_abort_\@: + .endm + .macro get_irq_stack @ setup IRQ stack ldr sp, IRQ_STACK_START .endm @@ -122,6 +137,7 @@ prefetch_abort: .align 5 data_abort: + try_data_abort get_bad_stack bad_save_user_regs bl do_data_abort @@ -202,5 +218,11 @@ _fiq: .word fiq .section .data .align 4 +.global arm_ignore_data_abort +arm_ignore_data_abort: +.word arm_ignore_data_abort /* When != 0 data aborts are ignored */ +.global arm_data_abort_occurred +arm_data_abort_occurred: +.word arm_data_abort_occurred /* set != 0 by the data abort handler */ abort_stack: .space 8 diff --git a/arch/arm/cpu/interrupts.c b/arch/arm/cpu/interrupts.c index 6e60adc43a..c437af7188 100644 --- a/arch/arm/cpu/interrupts.c +++ b/arch/arm/cpu/interrupts.c @@ -23,6 +23,7 @@ */ #include <common.h> +#include <abort.h> #include <asm/ptrace.h> #include <asm/unwind.h> @@ -161,3 +162,19 @@ void do_irq (struct pt_regs *pt_regs) printf ("interrupt request\n"); 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; + arm_ignore_data_abort = 1; +} + +int data_abort_unmask(void) +{ + arm_ignore_data_abort = 0; + + return arm_data_abort_occurred != 0; +} |