Skip to content

L
linux
Commit 3e287bec authored by Russell King's avatar Russell King
Browse files
Options

ARM: entry: data abort: arrange for CPU abort helpers to take pc/psr in r4/r5 

Re-jig the CPU abort helpers to take the PC/PSR in r4/r5 rather
than r2/r3.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8dfe7ac9
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 46 deletions
arch/arm/kernel/entry-armv.S
View file @ 3e287bec
...@@ -56,14 +56,12 @@ ...@@ -56,14 +56,12 @@
.endm .endm
.macro dabt_helper .macro dabt_helper
mov r2, r4
mov r3, r5
@ @
@ Call the processor-specific abort handler: @ Call the processor-specific abort handler:
@ @
@ r2 - aborted context pc @ r4 - aborted context pc
@ r3 - aborted context cpsr @ r5 - aborted context psr
@ @
@ The abort handler must return the aborted address in r0, and @ The abort handler must return the aborted address in r0, and
@ the fault status register in r1. r9 must be preserved. @ the fault status register in r1. r9 must be preserved.
......
arch/arm/mm/abort-ev4.S
View file @ 3e287bec
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
/* /*
* Function: v4_early_abort * Function: v4_early_abort
* *
* Params : r2 = address of aborted instruction * Params : r4 = aborted context pc
* : r3 = saved SPSR * : r5 = aborted context psr
* *
* Returns : r0 = address of abort * Returns : r0 = address of abort
* : r1 = FSR, bit 11 = write * : r1 = FSR, bit 11 = write
...@@ -21,10 +21,8 @@ ...@@ -21,10 +21,8 @@
ENTRY(v4_early_abort) ENTRY(v4_early_abort)
mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR mrc p15, 0, r0, c6, c0, 0 @ get FAR
ldr r3, [r2] @ read aborted ARM instruction ldr r3, [r4] @ read aborted ARM instruction
bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR
tst r3, #1 << 20 @ L = 1 -> write? tst r3, #1 << 20 @ L = 1 -> write?
orreq r1, r1, #1 << 11 @ yes. orreq r1, r1, #1 << 11 @ yes.
mov pc, lr mov pc, lr
arch/arm/mm/abort-ev4t.S
View file @ 3e287bec
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
/* /*
* Function: v4t_early_abort * Function: v4t_early_abort
* *
* Params : r2 = address of aborted instruction * Params : r4 = aborted context pc
* : r3 = saved SPSR * : r5 = aborted context psr
* *
* Returns : r0 = address of abort * Returns : r0 = address of abort
* : r1 = FSR, bit 11 = write * : r1 = FSR, bit 11 = write
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
ENTRY(v4t_early_abort) ENTRY(v4t_early_abort)
mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR mrc p15, 0, r0, c6, c0, 0 @ get FAR
do_thumb_abort fsr=r1, pc=r2, psr=r3, tmp=r3 do_thumb_abort fsr=r1, pc=r4, psr=r5, tmp=r3
ldreq r3, [r2] @ read aborted ARM instruction ldreq r3, [r4] @ read aborted ARM instruction
bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR
tst r3, #1 << 20 @ check write tst r3, #1 << 20 @ check write
orreq r1, r1, #1 << 11 orreq r1, r1, #1 << 11
......
arch/arm/mm/abort-ev5t.S
View file @ 3e287bec
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
/* /*
* Function: v5t_early_abort * Function: v5t_early_abort
* *
* Params : r2 = address of aborted instruction * Params : r4 = aborted context pc
* : r3 = saved SPSR * : r5 = aborted context psr
* *
* Returns : r0 = address of abort * Returns : r0 = address of abort
* : r1 = FSR, bit 11 = write * : r1 = FSR, bit 11 = write
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
ENTRY(v5t_early_abort) ENTRY(v5t_early_abort)
mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR mrc p15, 0, r0, c6, c0, 0 @ get FAR
do_thumb_abort fsr=r1, pc=r2, psr=r3, tmp=r3 do_thumb_abort fsr=r1, pc=r4, psr=r5, tmp=r3
ldreq r3, [r2] @ read aborted ARM instruction ldreq r3, [r4] @ read aborted ARM instruction
bic r1, r1, #1 << 11 @ clear bits 11 of FSR bic r1, r1, #1 << 11 @ clear bits 11 of FSR
do_ldrd_abort tmp=r2, insn=r3 do_ldrd_abort tmp=r2, insn=r3
tst r3, #1 << 20 @ check write tst r3, #1 << 20 @ check write
......
arch/arm/mm/abort-ev5tj.S
View file @ 3e287bec
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
/* /*
* Function: v5tj_early_abort * Function: v5tj_early_abort
* *
* Params : r2 = address of aborted instruction * Params : r4 = aborted context pc
* : r3 = saved SPSR * : r5 = aborted context psr
* *
* Returns : r0 = address of abort * Returns : r0 = address of abort
* : r1 = FSR, bit 11 = write * : r1 = FSR, bit 11 = write
...@@ -23,13 +23,11 @@ ENTRY(v5tj_early_abort) ...@@ -23,13 +23,11 @@ ENTRY(v5tj_early_abort)
mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR mrc p15, 0, r0, c6, c0, 0 @ get FAR
bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR
tst r3, #PSR_J_BIT @ Java? tst r5, #PSR_J_BIT @ Java?
movne pc, lr movne pc, lr
do_thumb_abort fsr=r1, pc=r2, psr=r3, tmp=r3 do_thumb_abort fsr=r1, pc=r4, psr=r5, tmp=r3
ldreq r3, [r2] @ read aborted ARM instruction ldreq r3, [r4] @ read aborted ARM instruction
do_ldrd_abort tmp=r2, insn=r3 do_ldrd_abort tmp=r2, insn=r3
tst r3, #1 << 20 @ L = 0 -> write tst r3, #1 << 20 @ L = 0 -> write
orreq r1, r1, #1 << 11 @ yes. orreq r1, r1, #1 << 11 @ yes.
mov pc, lr mov pc, lr
arch/arm/mm/abort-ev6.S
View file @ 3e287bec
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
/* /*
* Function: v6_early_abort * Function: v6_early_abort
* *
* Params : r2 = address of aborted instruction * Params : r4 = aborted context pc
* : r3 = saved SPSR * : r5 = aborted context psr
* *
* Returns : r0 = address of abort * Returns : r0 = address of abort
* : r1 = FSR, bit 11 = write * : r1 = FSR, bit 11 = write
...@@ -33,10 +33,10 @@ ENTRY(v6_early_abort) ...@@ -33,10 +33,10 @@ ENTRY(v6_early_abort)
* The test below covers all the write situations, including Java bytecodes * The test below covers all the write situations, including Java bytecodes
*/ */
bic r1, r1, #1 << 11 @ clear bit 11 of FSR bic r1, r1, #1 << 11 @ clear bit 11 of FSR
tst r3, #PSR_J_BIT @ Java? tst r5, #PSR_J_BIT @ Java?
movne pc, lr movne pc, lr
do_thumb_abort fsr=r1, pc=r2, psr=r3, tmp=r3 do_thumb_abort fsr=r1, pc=r4, psr=r5, tmp=r3
ldreq r3, [r2] @ read aborted ARM instruction ldreq r3, [r4] @ read aborted ARM instruction
#ifdef CONFIG_CPU_ENDIAN_BE8 #ifdef CONFIG_CPU_ENDIAN_BE8
reveq r3, r3 reveq r3, r3
#endif #endif
...@@ -44,5 +44,3 @@ ENTRY(v6_early_abort) ...@@ -44,5 +44,3 @@ ENTRY(v6_early_abort)
tst r3, #1 << 20 @ L = 0 -> write tst r3, #1 << 20 @ L = 0 -> write
orreq r1, r1, #1 << 11 @ yes. orreq r1, r1, #1 << 11 @ yes.
mov pc, lr mov pc, lr
arch/arm/mm/abort-ev7.S
View file @ 3e287bec
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
/* /*
* Function: v7_early_abort * Function: v7_early_abort
* *
* Params : r2 = address of aborted instruction * Params : r4 = aborted context pc
* : r3 = saved SPSR * : r5 = aborted context psr
* *
* Returns : r0 = address of abort * Returns : r0 = address of abort
* : r1 = FSR, bit 11 = write * : r1 = FSR, bit 11 = write
......
arch/arm/mm/abort-lv4t.S
View file @ 3e287bec
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
/* /*
* Function: v4t_late_abort * Function: v4t_late_abort
* *
* Params : r2 = address of aborted instruction * Params : r4 = aborted context pc
* : r3 = saved SPSR * : r5 = aborted context psr
* *
* Returns : r0 = address of abort * Returns : r0 = address of abort
* : r1 = FSR, bit 11 = write * : r1 = FSR, bit 11 = write
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* picture. Unfortunately, this does happen. We live with it. * picture. Unfortunately, this does happen. We live with it.
*/ */
ENTRY(v4t_late_abort) ENTRY(v4t_late_abort)
tst r3, #PSR_T_BIT @ check for thumb mode tst r5, #PSR_T_BIT @ check for thumb mode
#ifdef CONFIG_CPU_CP15_MMU #ifdef CONFIG_CPU_CP15_MMU
mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR mrc p15, 0, r0, c6, c0, 0 @ get FAR
...@@ -28,7 +28,7 @@ ENTRY(v4t_late_abort) ...@@ -28,7 +28,7 @@ ENTRY(v4t_late_abort)
mov r1, #0 mov r1, #0
#endif #endif
bne .data_thumb_abort bne .data_thumb_abort
ldr r8, [r2] @ read arm instruction ldr r8, [r4] @ read arm instruction
tst r8, #1 << 20 @ L = 1 -> write? tst r8, #1 << 20 @ L = 1 -> write?
orreq r1, r1, #1 << 11 @ yes. orreq r1, r1, #1 << 11 @ yes.
and r7, r8, #15 << 24 and r7, r8, #15 << 24
...@@ -52,7 +52,7 @@ ENTRY(v4t_late_abort) ...@@ -52,7 +52,7 @@ ENTRY(v4t_late_abort)
/* e */ b .data_unknown /* e */ b .data_unknown
/* f */ /* f */
.data_unknown: @ Part of jumptable .data_unknown: @ Part of jumptable
mov r0, r2 mov r0, r4
mov r1, r8 mov r1, r8
mov r2, sp mov r2, sp
bl baddataabort bl baddataabort
...@@ -159,7 +159,7 @@ ENTRY(v4t_late_abort) ...@@ -159,7 +159,7 @@ ENTRY(v4t_late_abort)
b .data_unknown @ F: MUL? b .data_unknown @ F: MUL?
.data_thumb_abort: .data_thumb_abort:
ldrh r8, [r2] @ read instruction ldrh r8, [r4] @ read instruction
tst r8, #1 << 11 @ L = 1 -> write? tst r8, #1 << 11 @ L = 1 -> write?
orreq r1, r1, #1 << 8 @ yes orreq r1, r1, #1 << 8 @ yes
and r7, r8, #15 << 12 and r7, r8, #15 << 12
......
arch/arm/mm/abort-nommu.S
View file @ 3e287bec
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
/* /*
* Function: nommu_early_abort * Function: nommu_early_abort
* *
* Params : r2 = address of aborted instruction * Params : r4 = aborted context pc
* : r3 = saved SPSR * : r5 = aborted context psr
* *
* Returns : r0 = 0 (abort address) * Returns : r0 = 0 (abort address)
* : r1 = 0 (FSR) * : r1 = 0 (FSR)
......
arch/arm/mm/proc-arm6_7.S
View file @ 3e287bec
...@@ -29,8 +29,8 @@ ENTRY(cpu_arm7_dcache_clean_area) ...@@ -29,8 +29,8 @@ ENTRY(cpu_arm7_dcache_clean_area)
/* /*
* Function: arm6_7_data_abort () * Function: arm6_7_data_abort ()
* *
* Params : r2 = address of aborted instruction * Params : r4 = aborted context pc
* : sp = pointer to registers * : r5 = aborted context psr
* *
* Purpose : obtain information about current aborted instruction * Purpose : obtain information about current aborted instruction
* *
...@@ -41,7 +41,7 @@ ENTRY(cpu_arm7_dcache_clean_area) ...@@ -41,7 +41,7 @@ ENTRY(cpu_arm7_dcache_clean_area)
ENTRY(cpu_arm7_data_abort) ENTRY(cpu_arm7_data_abort)
mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR mrc p15, 0, r0, c6, c0, 0 @ get FAR
ldr r8, [r2] @ read arm instruction ldr r8, [r4] @ read arm instruction
tst r8, #1 << 20 @ L = 0 -> write? tst r8, #1 << 20 @ L = 0 -> write?
orreq r1, r1, #1 << 11 @ yes. orreq r1, r1, #1 << 11 @ yes.
and r7, r8, #15 << 24 and r7, r8, #15 << 24
...@@ -65,7 +65,7 @@ ENTRY(cpu_arm7_data_abort) ...@@ -65,7 +65,7 @@ ENTRY(cpu_arm7_data_abort)
/* e */ b .data_unknown /* e */ b .data_unknown
/* f */ /* f */
.data_unknown: @ Part of jumptable .data_unknown: @ Part of jumptable
mov r0, r2 mov r0, r4
mov r1, r8 mov r1, r8
mov r2, sp mov r2, sp
bl baddataabort bl baddataabort
...@@ -74,7 +74,7 @@ ENTRY(cpu_arm7_data_abort) ...@@ -74,7 +74,7 @@ ENTRY(cpu_arm7_data_abort)
ENTRY(cpu_arm6_data_abort) ENTRY(cpu_arm6_data_abort)
mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR mrc p15, 0, r0, c6, c0, 0 @ get FAR
ldr r8, [r2] @ read arm instruction ldr r8, [r4] @ read arm instruction
tst r8, #1 << 20 @ L = 0 -> write? tst r8, #1 << 20 @ L = 0 -> write?
orreq r1, r1, #1 << 11 @ yes. orreq r1, r1, #1 << 11 @ yes.
and r7, r8, #14 << 24 and r7, r8, #14 << 24
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7