Skip to content

L
linux
Commit 40f0b90a authored by Russell King's avatar Russell King
Browse files
Options

ARM: entry: data abort: ensure r5 is preserved by abort functions 

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 108f6af0
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 43 deletions
arch/arm/mm/abort-lv4t.S
View file @ 40f0b90a
...@@ -7,11 +7,7 @@ ...@@ -7,11 +7,7 @@
* : r4 = aborted context pc * : r4 = aborted context pc
* : r5 = aborted context psr * : r5 = aborted context psr
* *
* Returns : r0 = address of abort * Returns : r4-r5, r10-r11, r13 preserved
* : r1 = FSR, bit 11 = write
* : r2-r8 = corrupted
* : r9 = preserved
* : sp = pointer to registers
* *
* Purpose : obtain information about current aborted instruction. * Purpose : obtain information about current aborted instruction.
* Note: we read user space. This means we might cause a data * Note: we read user space. This means we might cause a data
...@@ -72,30 +68,30 @@ ENTRY(v4t_late_abort) ...@@ -72,30 +68,30 @@ ENTRY(v4t_late_abort)
add r6, r6, r6, lsr #8 add r6, r6, r6, lsr #8
add r6, r6, r6, lsr #4 add r6, r6, r6, lsr #4
and r6, r6, #15 @ r6 = no. of registers to transfer. and r6, r6, #15 @ r6 = no. of registers to transfer.
and r5, r8, #15 << 16 @ Extract 'n' from instruction and r9, r8, #15 << 16 @ Extract 'n' from instruction
ldr r7, [r2, r5, lsr #14] @ Get register 'Rn' ldr r7, [r2, r9, lsr #14] @ Get register 'Rn'
tst r8, #1 << 23 @ Check U bit tst r8, #1 << 23 @ Check U bit
subne r7, r7, r6, lsl #2 @ Undo increment subne r7, r7, r6, lsl #2 @ Undo increment
addeq r7, r7, r6, lsl #2 @ Undo decrement addeq r7, r7, r6, lsl #2 @ Undo decrement
str r7, [r2, r5, lsr #14] @ Put register 'Rn' str r7, [r2, r9, lsr #14] @ Put register 'Rn'
b do_DataAbort b do_DataAbort
.data_arm_lateldrhpre: .data_arm_lateldrhpre:
tst r8, #1 << 21 @ Check writeback bit tst r8, #1 << 21 @ Check writeback bit
beq do_DataAbort @ No writeback -> no fixup beq do_DataAbort @ No writeback -> no fixup
.data_arm_lateldrhpost: .data_arm_lateldrhpost:
and r5, r8, #0x00f @ get Rm / low nibble of immediate value and r9, r8, #0x00f @ get Rm / low nibble of immediate value
tst r8, #1 << 22 @ if (immediate offset) tst r8, #1 << 22 @ if (immediate offset)
andne r6, r8, #0xf00 @ { immediate high nibble andne r6, r8, #0xf00 @ { immediate high nibble
orrne r6, r5, r6, lsr #4 @ combine nibbles } else orrne r6, r9, r6, lsr #4 @ combine nibbles } else
ldreq r6, [r2, r5, lsl #2] @ { load Rm value } ldreq r6, [r2, r9, lsl #2] @ { load Rm value }
.data_arm_apply_r6_and_rn: .data_arm_apply_r6_and_rn:
and r5, r8, #15 << 16 @ Extract 'n' from instruction and r9, r8, #15 << 16 @ Extract 'n' from instruction
ldr r7, [r2, r5, lsr #14] @ Get register 'Rn' ldr r7, [r2, r9, lsr #14] @ Get register 'Rn'
tst r8, #1 << 23 @ Check U bit tst r8, #1 << 23 @ Check U bit
subne r7, r7, r6 @ Undo incrmenet subne r7, r7, r6 @ Undo incrmenet
addeq r7, r7, r6 @ Undo decrement addeq r7, r7, r6 @ Undo decrement
str r7, [r2, r5, lsr #14] @ Put register 'Rn' str r7, [r2, r9, lsr #14] @ Put register 'Rn'
b do_DataAbort b do_DataAbort
.data_arm_lateldrpreconst: .data_arm_lateldrpreconst:
...@@ -104,12 +100,12 @@ ENTRY(v4t_late_abort) ...@@ -104,12 +100,12 @@ ENTRY(v4t_late_abort)
.data_arm_lateldrpostconst: .data_arm_lateldrpostconst:
movs r6, r8, lsl #20 @ Get offset movs r6, r8, lsl #20 @ Get offset
beq do_DataAbort @ zero -> no fixup beq do_DataAbort @ zero -> no fixup
and r5, r8, #15 << 16 @ Extract 'n' from instruction and r9, r8, #15 << 16 @ Extract 'n' from instruction
ldr r7, [r2, r5, lsr #14] @ Get register 'Rn' ldr r7, [r2, r9, lsr #14] @ Get register 'Rn'
tst r8, #1 << 23 @ Check U bit tst r8, #1 << 23 @ Check U bit
subne r7, r7, r6, lsr #20 @ Undo increment subne r7, r7, r6, lsr #20 @ Undo increment
addeq r7, r7, r6, lsr #20 @ Undo decrement addeq r7, r7, r6, lsr #20 @ Undo decrement
str r7, [r2, r5, lsr #14] @ Put register 'Rn' str r7, [r2, r9, lsr #14] @ Put register 'Rn'
b do_DataAbort b do_DataAbort
.data_arm_lateldrprereg: .data_arm_lateldrprereg:
...@@ -118,14 +114,14 @@ ENTRY(v4t_late_abort) ...@@ -118,14 +114,14 @@ ENTRY(v4t_late_abort)
.data_arm_lateldrpostreg: .data_arm_lateldrpostreg:
and r7, r8, #15 @ Extract 'm' from instruction and r7, r8, #15 @ Extract 'm' from instruction
ldr r6, [r2, r7, lsl #2] @ Get register 'Rm' ldr r6, [r2, r7, lsl #2] @ Get register 'Rm'
mov r5, r8, lsr #7 @ get shift count mov r9, r8, lsr #7 @ get shift count
ands r5, r5, #31 ands r9, r9, #31
and r7, r8, #0x70 @ get shift type and r7, r8, #0x70 @ get shift type
orreq r7, r7, #8 @ shift count = 0 orreq r7, r7, #8 @ shift count = 0
add pc, pc, r7 add pc, pc, r7
nop nop
mov r6, r6, lsl r5 @ 0: LSL #!0 mov r6, r6, lsl r9 @ 0: LSL #!0
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
b .data_arm_apply_r6_and_rn @ 1: LSL #0 b .data_arm_apply_r6_and_rn @ 1: LSL #0
nop nop
...@@ -133,7 +129,7 @@ ENTRY(v4t_late_abort) ...@@ -133,7 +129,7 @@ ENTRY(v4t_late_abort)
nop nop
b .data_unknown @ 3: MUL? b .data_unknown @ 3: MUL?
nop nop
mov r6, r6, lsr r5 @ 4: LSR #!0 mov r6, r6, lsr r9 @ 4: LSR #!0
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
mov r6, r6, lsr #32 @ 5: LSR #32 mov r6, r6, lsr #32 @ 5: LSR #32
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
...@@ -141,7 +137,7 @@ ENTRY(v4t_late_abort) ...@@ -141,7 +137,7 @@ ENTRY(v4t_late_abort)
nop nop
b .data_unknown @ 7: MUL? b .data_unknown @ 7: MUL?
nop nop
mov r6, r6, asr r5 @ 8: ASR #!0 mov r6, r6, asr r9 @ 8: ASR #!0
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
mov r6, r6, asr #32 @ 9: ASR #32 mov r6, r6, asr #32 @ 9: ASR #32
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
...@@ -149,7 +145,7 @@ ENTRY(v4t_late_abort) ...@@ -149,7 +145,7 @@ ENTRY(v4t_late_abort)
nop nop
b .data_unknown @ B: MUL? b .data_unknown @ B: MUL?
nop nop
mov r6, r6, ror r5 @ C: ROR #!0 mov r6, r6, ror r9 @ C: ROR #!0
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
mov r6, r6, rrx @ D: RRX mov r6, r6, rrx @ D: RRX
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
...@@ -216,9 +212,9 @@ ENTRY(v4t_late_abort) ...@@ -216,9 +212,9 @@ ENTRY(v4t_late_abort)
and r6, r6, #0x33 and r6, r6, #0x33
add r6, r6, r9, lsr #2 add r6, r6, r9, lsr #2
add r6, r6, r6, lsr #4 add r6, r6, r6, lsr #4
and r5, r8, #7 << 8 and r9, r8, #7 << 8
ldr r7, [r2, r5, lsr #6] ldr r7, [r2, r9, lsr #6]
and r6, r6, #15 @ number of regs to transfer and r6, r6, #15 @ number of regs to transfer
sub r7, r7, r6, lsl #2 @ always decrement sub r7, r7, r6, lsl #2 @ always decrement
str r7, [r2, r5, lsr #6] str r7, [r2, r9, lsr #6]
b do_DataAbort b do_DataAbort
arch/arm/mm/proc-arm6_7.S
View file @ 40f0b90a
...@@ -35,8 +35,7 @@ ENTRY(cpu_arm7_dcache_clean_area) ...@@ -35,8 +35,7 @@ ENTRY(cpu_arm7_dcache_clean_area)
* *
* Purpose : obtain information about current aborted instruction * Purpose : obtain information about current aborted instruction
* *
* Returns : r0 = address of abort * Returns : r4-r5, r10-r11, r13 preserved
* : r1 = FSR
*/ */
ENTRY(cpu_arm7_data_abort) ENTRY(cpu_arm7_data_abort)
...@@ -95,21 +94,21 @@ ENTRY(cpu_arm6_data_abort) ...@@ -95,21 +94,21 @@ ENTRY(cpu_arm6_data_abort)
add r6, r6, r6, lsr #8 add r6, r6, r6, lsr #8
add r6, r6, r6, lsr #4 add r6, r6, r6, lsr #4
and r6, r6, #15 @ r6 = no. of registers to transfer. and r6, r6, #15 @ r6 = no. of registers to transfer.
and r5, r8, #15 << 16 @ Extract 'n' from instruction and r9, r8, #15 << 16 @ Extract 'n' from instruction
ldr r7, [r2, r5, lsr #14] @ Get register 'Rn' ldr r7, [r2, r9, lsr #14] @ Get register 'Rn'
tst r8, #1 << 23 @ Check U bit tst r8, #1 << 23 @ Check U bit
subne r7, r7, r6, lsl #2 @ Undo increment subne r7, r7, r6, lsl #2 @ Undo increment
addeq r7, r7, r6, lsl #2 @ Undo decrement addeq r7, r7, r6, lsl #2 @ Undo decrement
str r7, [r2, r5, lsr #14] @ Put register 'Rn' str r7, [r2, r9, lsr #14] @ Put register 'Rn'
b do_DataAbort b do_DataAbort
.data_arm_apply_r6_and_rn: .data_arm_apply_r6_and_rn:
and r5, r8, #15 << 16 @ Extract 'n' from instruction and r9, r8, #15 << 16 @ Extract 'n' from instruction
ldr r7, [r2, r5, lsr #14] @ Get register 'Rn' ldr r7, [r2, r9, lsr #14] @ Get register 'Rn'
tst r8, #1 << 23 @ Check U bit tst r8, #1 << 23 @ Check U bit
subne r7, r7, r6 @ Undo incrmenet subne r7, r7, r6 @ Undo incrmenet
addeq r7, r7, r6 @ Undo decrement addeq r7, r7, r6 @ Undo decrement
str r7, [r2, r5, lsr #14] @ Put register 'Rn' str r7, [r2, r9, lsr #14] @ Put register 'Rn'
b do_DataAbort b do_DataAbort
.data_arm_lateldrpreconst: .data_arm_lateldrpreconst:
...@@ -118,12 +117,12 @@ ENTRY(cpu_arm6_data_abort) ...@@ -118,12 +117,12 @@ ENTRY(cpu_arm6_data_abort)
.data_arm_lateldrpostconst: .data_arm_lateldrpostconst:
movs r6, r8, lsl #20 @ Get offset movs r6, r8, lsl #20 @ Get offset
beq do_DataAbort @ zero -> no fixup beq do_DataAbort @ zero -> no fixup
and r5, r8, #15 << 16 @ Extract 'n' from instruction and r9, r8, #15 << 16 @ Extract 'n' from instruction
ldr r7, [r2, r5, lsr #14] @ Get register 'Rn' ldr r7, [r2, r9, lsr #14] @ Get register 'Rn'
tst r8, #1 << 23 @ Check U bit tst r8, #1 << 23 @ Check U bit
subne r7, r7, r6, lsr #20 @ Undo increment subne r7, r7, r6, lsr #20 @ Undo increment
addeq r7, r7, r6, lsr #20 @ Undo decrement addeq r7, r7, r6, lsr #20 @ Undo decrement
str r7, [r2, r5, lsr #14] @ Put register 'Rn' str r7, [r2, r9, lsr #14] @ Put register 'Rn'
b do_DataAbort b do_DataAbort
.data_arm_lateldrprereg: .data_arm_lateldrprereg:
...@@ -132,14 +131,14 @@ ENTRY(cpu_arm6_data_abort) ...@@ -132,14 +131,14 @@ ENTRY(cpu_arm6_data_abort)
.data_arm_lateldrpostreg: .data_arm_lateldrpostreg:
and r7, r8, #15 @ Extract 'm' from instruction and r7, r8, #15 @ Extract 'm' from instruction
ldr r6, [r2, r7, lsl #2] @ Get register 'Rm' ldr r6, [r2, r7, lsl #2] @ Get register 'Rm'
mov r5, r8, lsr #7 @ get shift count mov r9, r8, lsr #7 @ get shift count
ands r5, r5, #31 ands r9, r9, #31
and r7, r8, #0x70 @ get shift type and r7, r8, #0x70 @ get shift type
orreq r7, r7, #8 @ shift count = 0 orreq r7, r7, #8 @ shift count = 0
add pc, pc, r7 add pc, pc, r7
nop nop
mov r6, r6, lsl r5 @ 0: LSL #!0 mov r6, r6, lsl r9 @ 0: LSL #!0
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
b .data_arm_apply_r6_and_rn @ 1: LSL #0 b .data_arm_apply_r6_and_rn @ 1: LSL #0
nop nop
...@@ -147,7 +146,7 @@ ENTRY(cpu_arm6_data_abort) ...@@ -147,7 +146,7 @@ ENTRY(cpu_arm6_data_abort)
nop nop
b .data_unknown @ 3: MUL? b .data_unknown @ 3: MUL?
nop nop
mov r6, r6, lsr r5 @ 4: LSR #!0 mov r6, r6, lsr r9 @ 4: LSR #!0
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
mov r6, r6, lsr #32 @ 5: LSR #32 mov r6, r6, lsr #32 @ 5: LSR #32
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
...@@ -155,7 +154,7 @@ ENTRY(cpu_arm6_data_abort) ...@@ -155,7 +154,7 @@ ENTRY(cpu_arm6_data_abort)
nop nop
b .data_unknown @ 7: MUL? b .data_unknown @ 7: MUL?
nop nop
mov r6, r6, asr r5 @ 8: ASR #!0 mov r6, r6, asr r9 @ 8: ASR #!0
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
mov r6, r6, asr #32 @ 9: ASR #32 mov r6, r6, asr #32 @ 9: ASR #32
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
...@@ -163,7 +162,7 @@ ENTRY(cpu_arm6_data_abort) ...@@ -163,7 +162,7 @@ ENTRY(cpu_arm6_data_abort)
nop nop
b .data_unknown @ B: MUL? b .data_unknown @ B: MUL?
nop nop
mov r6, r6, ror r5 @ C: ROR #!0 mov r6, r6, ror r9 @ C: ROR #!0
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
mov r6, r6, rrx @ D: RRX mov r6, r6, rrx @ D: RRX
b .data_arm_apply_r6_and_rn b .data_arm_apply_r6_and_rn
......
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