diff options
author | Michal Simek <monstr@monstr.eu> | 2011-11-09 09:39:58 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2012-03-23 04:28:16 -0400 |
commit | 173701d7745d07888a929bf08d77d29996ca13dc (patch) | |
tree | ad86f50ce8d08b4ff51e1a0adada9a62d548e3a7 /arch | |
parent | cc5647a64e8c6691be87a83632d8b1c78b795023 (diff) |
microblaze: Clear all MSR flags on the first kernel instruction
The main reason is bug because of dynamic TLB allocation.
U-BOOT didn't disable dcache and then writing to physical address
from ASM wan't visible for reading through MMU.
Disabling caches and clearing all flags from previous code
is good to do so.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/kernel/head.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S index 77320b8fc16a..a5ba9925ae89 100644 --- a/arch/microblaze/kernel/head.S +++ b/arch/microblaze/kernel/head.S | |||
@@ -63,9 +63,7 @@ ENTRY(_start) | |||
63 | real_start: | 63 | real_start: |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | mfs r1, rmsr | 66 | mts rmsr, r0 |
67 | andi r1, r1, ~2 | ||
68 | mts rmsr, r1 | ||
69 | /* | 67 | /* |
70 | * According to Xilinx, msrclr instruction behaves like 'mfs rX,rpc' | 68 | * According to Xilinx, msrclr instruction behaves like 'mfs rX,rpc' |
71 | * if the msrclr instruction is not enabled. We use this to detect | 69 | * if the msrclr instruction is not enabled. We use this to detect |
@@ -73,6 +71,7 @@ real_start: | |||
73 | * r8 == 0 - msr instructions are implemented | 71 | * r8 == 0 - msr instructions are implemented |
74 | * r8 != 0 - msr instructions are not implemented | 72 | * r8 != 0 - msr instructions are not implemented |
75 | */ | 73 | */ |
74 | mfs r1, rmsr | ||
76 | msrclr r8, 0 /* clear nothing - just read msr for test */ | 75 | msrclr r8, 0 /* clear nothing - just read msr for test */ |
77 | cmpu r8, r8, r1 /* r1 must contain msr reg content */ | 76 | cmpu r8, r8, r1 /* r1 must contain msr reg content */ |
78 | 77 | ||