public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

microblaze: Remove nop after MSRCLR/SET, MTS, MFS instructions

Browse source 
We need to save instruction and the latest Microblaze shouldn't
have any problem with it.

Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Michal Simek 2010-06-22 21:18:57 +02:00
parent 0e41c90908
commit 958063e67b
1 changed files with 0 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
arch/microblaze/kernel/entry.S
View file

@ -49,138 +49,106 @@
#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
.macro clear_bip .macro clear_bip
msrclr r0, MSR_BIP msrclr r0, MSR_BIP
nop
.endm .endm
.macro set_bip .macro set_bip
msrset r0, MSR_BIP msrset r0, MSR_BIP
nop
.endm .endm
.macro clear_eip .macro clear_eip
msrclr r0, MSR_EIP msrclr r0, MSR_EIP
nop
.endm .endm
.macro set_ee .macro set_ee
msrset r0, MSR_EE msrset r0, MSR_EE
nop
.endm .endm
.macro disable_irq .macro disable_irq
msrclr r0, MSR_IE msrclr r0, MSR_IE
nop
.endm .endm
.macro enable_irq .macro enable_irq
msrset r0, MSR_IE msrset r0, MSR_IE
nop
.endm .endm
.macro set_ums .macro set_ums
msrset r0, MSR_UMS msrset r0, MSR_UMS
nop
msrclr r0, MSR_VMS msrclr r0, MSR_VMS
nop
.endm .endm
.macro set_vms .macro set_vms
msrclr r0, MSR_UMS msrclr r0, MSR_UMS
nop
msrset r0, MSR_VMS msrset r0, MSR_VMS
nop
.endm .endm
.macro clear_ums .macro clear_ums
msrclr r0, MSR_UMS msrclr r0, MSR_UMS
nop
.endm .endm
.macro clear_vms_ums .macro clear_vms_ums
msrclr r0, MSR_VMS | MSR_UMS msrclr r0, MSR_VMS | MSR_UMS
nop
.endm .endm
#else #else
.macro clear_bip .macro clear_bip
mfs r11, rmsr mfs r11, rmsr
nop
andi r11, r11, ~MSR_BIP andi r11, r11, ~MSR_BIP
mts rmsr, r11 mts rmsr, r11
nop
.endm .endm
.macro set_bip .macro set_bip
mfs r11, rmsr mfs r11, rmsr
nop
ori r11, r11, MSR_BIP ori r11, r11, MSR_BIP
mts rmsr, r11 mts rmsr, r11
nop
.endm .endm
.macro clear_eip .macro clear_eip
mfs r11, rmsr mfs r11, rmsr
nop
andi r11, r11, ~MSR_EIP andi r11, r11, ~MSR_EIP
mts rmsr, r11 mts rmsr, r11
nop
.endm .endm
.macro set_ee .macro set_ee
mfs r11, rmsr mfs r11, rmsr
nop
ori r11, r11, MSR_EE ori r11, r11, MSR_EE
mts rmsr, r11 mts rmsr, r11
nop
.endm .endm
.macro disable_irq .macro disable_irq
mfs r11, rmsr mfs r11, rmsr
nop
andi r11, r11, ~MSR_IE andi r11, r11, ~MSR_IE
mts rmsr, r11 mts rmsr, r11
nop
.endm .endm
.macro enable_irq .macro enable_irq
mfs r11, rmsr mfs r11, rmsr
nop
ori r11, r11, MSR_IE ori r11, r11, MSR_IE
mts rmsr, r11 mts rmsr, r11
nop
.endm .endm
.macro set_ums .macro set_ums
mfs r11, rmsr mfs r11, rmsr
nop
ori r11, r11, MSR_VMS ori r11, r11, MSR_VMS
andni r11, r11, MSR_UMS andni r11, r11, MSR_UMS
mts rmsr, r11 mts rmsr, r11
nop
.endm .endm
.macro set_vms .macro set_vms
mfs r11, rmsr mfs r11, rmsr
nop
ori r11, r11, MSR_VMS ori r11, r11, MSR_VMS
andni r11, r11, MSR_UMS andni r11, r11, MSR_UMS
mts rmsr, r11 mts rmsr, r11
nop
.endm .endm
.macro clear_ums .macro clear_ums
mfs r11, rmsr mfs r11, rmsr
nop
andni r11, r11, MSR_UMS andni r11, r11, MSR_UMS
mts rmsr,r11 mts rmsr,r11
nop
.endm .endm
.macro clear_vms_ums .macro clear_vms_ums
mfs r11, rmsr mfs r11, rmsr
nop
andni r11, r11, (MSR_VMS|MSR_UMS) andni r11, r11, (MSR_VMS|MSR_UMS)
mts rmsr,r11 mts rmsr,r11
nop
.endm .endm
#endif #endif
@ -233,13 +201,11 @@
swi r30, r1, PTO+PT_R30; \ swi r30, r1, PTO+PT_R30; \
swi r31, r1, PTO+PT_R31; /* Save current task reg */ \ swi r31, r1, PTO+PT_R31; /* Save current task reg */ \
mfs r11, rmsr; /* save MSR */ \ mfs r11, rmsr; /* save MSR */ \
nop; \
swi r11, r1, PTO+PT_MSR; swi r11, r1, PTO+PT_MSR;
#define RESTORE_REGS \ #define RESTORE_REGS \
lwi r11, r1, PTO+PT_MSR; \ lwi r11, r1, PTO+PT_MSR; \
mts rmsr , r11; \ mts rmsr , r11; \
nop; \
lwi r2, r1, PTO+PT_R2; /* restore SDA */ \ lwi r2, r1, PTO+PT_R2; /* restore SDA */ \
lwi r3, r1, PTO+PT_R3; \ lwi r3, r1, PTO+PT_R3; \
lwi r4, r1, PTO+PT_R4; \ lwi r4, r1, PTO+PT_R4; \
@ -273,7 +239,6 @@
swi r1, r0, TOPHYS(PER_CPU(ENTRY_SP)); /* save stack */ \ swi r1, r0, TOPHYS(PER_CPU(ENTRY_SP)); /* save stack */ \
/* See if already in kernel mode.*/ \ /* See if already in kernel mode.*/ \
mfs r1, rmsr; \ mfs r1, rmsr; \
nop; \
andi r1, r1, MSR_UMS; \ andi r1, r1, MSR_UMS; \
bnei r1, 1f; \ bnei r1, 1f; \
/* Kernel-mode state save. */ \ /* Kernel-mode state save. */ \
@ -518,11 +483,8 @@ C_ENTRY(full_exception_trap):
/* where the trap should return need -8 to adjust for rtsd r15, 8 */ /* where the trap should return need -8 to adjust for rtsd r15, 8 */
addik r15, r0, ret_from_exc - 8 addik r15, r0, ret_from_exc - 8
mfs r6, resr mfs r6, resr
nop
mfs r7, rfsr; /* save FSR */ mfs r7, rfsr; /* save FSR */
nop
mts rfsr, r0; /* Clear sticky fsr */ mts rfsr, r0; /* Clear sticky fsr */
nop
rted r0, full_exception rted r0, full_exception
addik r5, r1, PTO /* parameter struct pt_regs * regs */ addik r5, r1, PTO /* parameter struct pt_regs * regs */
@ -555,9 +517,7 @@ C_ENTRY(unaligned_data_trap):
/* where the trap should return need -8 to adjust for rtsd r15, 8 */ /* where the trap should return need -8 to adjust for rtsd r15, 8 */
addik r15, r0, ret_from_exc-8 addik r15, r0, ret_from_exc-8
mfs r3, resr /* ESR */ mfs r3, resr /* ESR */
nop
mfs r4, rear /* EAR */ mfs r4, rear /* EAR */
nop
rtbd r0, _unaligned_data_exception rtbd r0, _unaligned_data_exception
addik r7, r1, PTO /* parameter struct pt_regs * regs */ addik r7, r1, PTO /* parameter struct pt_regs * regs */
@ -587,9 +547,7 @@ C_ENTRY(page_fault_data_trap):
/* where the trap should return need -8 to adjust for rtsd r15, 8 */ /* where the trap should return need -8 to adjust for rtsd r15, 8 */
addik r15, r0, ret_from_exc-8 addik r15, r0, ret_from_exc-8
mfs r6, rear /* parameter unsigned long address */ mfs r6, rear /* parameter unsigned long address */
nop
mfs r7, resr /* parameter unsigned long error_code */ mfs r7, resr /* parameter unsigned long error_code */
nop
rted r0, do_page_fault rted r0, do_page_fault
addik r5, r1, PTO /* parameter struct pt_regs * regs */ addik r5, r1, PTO /* parameter struct pt_regs * regs */
@ -601,7 +559,6 @@ C_ENTRY(page_fault_instr_trap):
/* where the trap should return need -8 to adjust for rtsd r15, 8 */ /* where the trap should return need -8 to adjust for rtsd r15, 8 */
addik r15, r0, ret_from_exc-8 addik r15, r0, ret_from_exc-8
mfs r6, rear /* parameter unsigned long address */ mfs r6, rear /* parameter unsigned long address */
nop
ori r7, r0, 0 /* parameter unsigned long error_code */ ori r7, r0, 0 /* parameter unsigned long error_code */
rted r0, do_page_fault rted r0, do_page_fault
addik r5, r1, PTO /* parameter struct pt_regs * regs */ addik r5, r1, PTO /* parameter struct pt_regs * regs */
@ -936,16 +893,12 @@ ENTRY(_switch_to)
swi r30, r11, CC_R30 swi r30, r11, CC_R30
/* special purpose registers */ /* special purpose registers */
mfs r12, rmsr mfs r12, rmsr
nop
swi r12, r11, CC_MSR swi r12, r11, CC_MSR
mfs r12, rear mfs r12, rear
nop
swi r12, r11, CC_EAR swi r12, r11, CC_EAR
mfs r12, resr mfs r12, resr
nop
swi r12, r11, CC_ESR swi r12, r11, CC_ESR
mfs r12, rfsr mfs r12, rfsr
nop
swi r12, r11, CC_FSR swi r12, r11, CC_FSR
/* update r31, the current-give me pointer to task which will be next */ /* update r31, the current-give me pointer to task which will be next */
@ -984,10 +937,8 @@ ENTRY(_switch_to)
/* special purpose registers */ /* special purpose registers */
lwi r12, r11, CC_FSR lwi r12, r11, CC_FSR
mts rfsr, r12 mts rfsr, r12
nop
lwi r12, r11, CC_MSR lwi r12, r11, CC_MSR
mts rmsr, r12 mts rmsr, r12
nop
rtsd r15, 8 rtsd r15, 8
nop nop
@ -997,10 +948,8 @@ ENTRY(_reset)
ENTRY(_break) ENTRY(_break)
mfs r5, rmsr mfs r5, rmsr
nop
swi r5, r0, 0x250 + TOPHYS(r0_ram) swi r5, r0, 0x250 + TOPHYS(r0_ram)
mfs r5, resr mfs r5, resr
nop
swi r5, r0, 0x254 + TOPHYS(r0_ram) swi r5, r0, 0x254 + TOPHYS(r0_ram)
bri 0 bri 0