iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ARM] Clean up save_and_disable_irqs macro and allow use of ARMv6 CPSID

Browse Source 
save_and_disable_irqs does not need to use mov + msr (which was
introduced to work around a documentation bug which was propagated
into binutils.)  Use msr with an immediate constant, and if we're
building for ARMv6 or later, use the new CPSID instruction.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2005-11-09 15:04:22 +00:00 committed by Russell King
parent be6eb9b79f
commit 59d1ff3bfb
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/lib/bitops.h
View File

@ -34,7 +34,7 @@
and r2, r0, #7 and r2, r0, #7
mov r3, #1 mov r3, #1
mov r3, r3, lsl r2 mov r3, r3, lsl r2
save_and_disable_irqs ip, r2 save_and_disable_irqs ip
ldrb r2, [r1, r0, lsr #3] ldrb r2, [r1, r0, lsr #3]
\instr r2, r2, r3 \instr r2, r2, r3
strb r2, [r1, r0, lsr #3] strb r2, [r1, r0, lsr #3]
@ -54,7 +54,7 @@
add r1, r1, r0, lsr #3 add r1, r1, r0, lsr #3
and r3, r0, #7 and r3, r0, #7
mov r0, #1 mov r0, #1
save_and_disable_irqs ip, r2 save_and_disable_irqs ip
ldrb r2, [r1] ldrb r2, [r1]
tst r2, r0, lsl r3 tst r2, r0, lsl r3
\instr r2, r2, r0, lsl r3 \instr r2, r2, r0, lsl r3

9
include/asm-arm/assembler.h
View File

@ -83,10 +83,13 @@
* Save the current IRQ state and disable IRQs. Note that this macro * Save the current IRQ state and disable IRQs. Note that this macro
* assumes FIQs are enabled, and that the processor is in SVC mode. * assumes FIQs are enabled, and that the processor is in SVC mode.
*/ */
.macro save_and_disable_irqs, oldcpsr, temp .macro save_and_disable_irqs, oldcpsr
mrs \oldcpsr, cpsr mrs \oldcpsr, cpsr
mov \temp, #PSR_I_BIT | MODE_SVC #if __LINUX_ARM_ARCH__ >= 6
msr cpsr_c, \temp cpsid i
#else
msr cpsr_c, #PSR_I_BIT | MODE_SVC
#endif
.endm .endm
/* /*