raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-08 02:49:48 +00:00
Code Issues Projects Releases Wiki Activity

Revert "ARM: proc-v7: Retry uncached stmia if necessary"

Browse Source 
This reverts commit 3e1698ed50.
This commit is contained in:
Phil Elwell
2021-10-28 12:16:00 +01:00
parent 84dc624be6
commit 9bca33d570
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mm/proc-v7.S
View File

@@ -288,11 +288,7 @@ __v7_ca17mp_setup:
1: adr r0, __v7_setup_stack_ptr 1: adr r0, __v7_setup_stack_ptr
ldr r12, [r0] ldr r12, [r0]
add r12, r12, r0 @ the local stack add r12, r12, r0 @ the local stack
1:
stmia r12, {r1-r6, lr} @ v7_invalidate_l1 touches r0-r6 stmia r12, {r1-r6, lr} @ v7_invalidate_l1 touches r0-r6
ldr r0, [r12, #(6 * 4)] @ read back the return address
teq r0, lr @ confirm it is correct
bne 1b @ retrying if not
bl v7_invalidate_l1 bl v7_invalidate_l1
ldmia r12, {r1-r6, lr} ldmia r12, {r1-r6, lr}
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
@@ -478,11 +474,7 @@ __v7_setup:
adr r0, __v7_setup_stack_ptr adr r0, __v7_setup_stack_ptr
ldr r12, [r0] ldr r12, [r0]
add r12, r12, r0 @ the local stack add r12, r12, r0 @ the local stack
1:
stmia r12, {r1-r6, lr} @ v7_invalidate_l1 touches r0-r6 stmia r12, {r1-r6, lr} @ v7_invalidate_l1 touches r0-r6
ldr r0, [r12, #(6 * 4)] @ read back the return address
teq r0, lr @ confirm it is correct
bne 1b @ retrying if not
bl v7_invalidate_l1 bl v7_invalidate_l1
ldmia r12, {r1-r6, lr} ldmia r12, {r1-r6, lr}