git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
arm
/
mm
/
proc-xsc3.S
diff --git
a/arch/arm/mm/proc-xsc3.S
b/arch/arm/mm/proc-xsc3.S
index
8d32e21
..
4ace2d8
100644
(file)
--- a/
arch/arm/mm/proc-xsc3.S
+++ b/
arch/arm/mm/proc-xsc3.S
@@
-426,23
+426,26
@@
__xsc3_setup:
orr r0, r0, #(1 << 10) @ enable L2 for LLR cache
#endif
mcr p15, 0, r0, c1, c0, 1 @ set auxiliary control reg
orr r0, r0, #(1 << 10) @ enable L2 for LLR cache
#endif
mcr p15, 0, r0, c1, c0, 1 @ set auxiliary control reg
+
+ adr r5, xsc3_crval
+ ldmia r5, {r5, r6}
mrc p15, 0, r0, c1, c0, 0 @ get control register
mrc p15, 0, r0, c1, c0, 0 @ get control register
- bic r0, r0,
#0x0002
@ .... .... .... ..A.
- orr r0, r0,
#0x0005
@ .... .... .... .C.M
+ bic r0, r0,
r5
@ .... .... .... ..A.
+ orr r0, r0,
r6
@ .... .... .... .C.M
#if BTB_ENABLE
#if BTB_ENABLE
- bic r0, r0, #0x0200 @ .... ..R. .... ....
- orr r0, r0, #0x3900 @ ..VI Z..S .... ....
-#else
- bic r0, r0, #0x0a00 @ .... Z.R. .... ....
- orr r0, r0, #0x3100 @ ..VI ...S .... ....
+ orr r0, r0, #0x00000800 @ ..VI Z..S .... ....
#endif
#if L2_CACHE_ENABLE
#endif
#if L2_CACHE_ENABLE
- orr r0, r0, #0x
4000000
@ L2 enable
+ orr r0, r0, #0x
04000000
@ L2 enable
#endif
mov pc, lr
.size __xsc3_setup, . - __xsc3_setup
#endif
mov pc, lr
.size __xsc3_setup, . - __xsc3_setup
+ .type xsc3_crval, #object
+xsc3_crval:
+ crval clear=0x04003b02, mmuset=0x00003105, ucset=0x00001100
+
__INITDATA
/*
__INITDATA
/*
@@
-487,7
+490,14
@@
cpu_xsc3_name:
__xsc3_proc_info:
.long 0x69056000
.long 0xffffe000
__xsc3_proc_info:
.long 0x69056000
.long 0xffffe000
- .long 0x00000c0e
+ .long PMD_TYPE_SECT | \
+ PMD_SECT_BUFFERABLE | \
+ PMD_SECT_CACHEABLE | \
+ PMD_SECT_AP_WRITE | \
+ PMD_SECT_AP_READ
+ .long PMD_TYPE_SECT | \
+ PMD_SECT_AP_WRITE | \
+ PMD_SECT_AP_READ
b __xsc3_setup
.long cpu_arch_name
.long cpu_elf_name
b __xsc3_setup
.long cpu_arch_name
.long cpu_elf_name