diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 13:02:04 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 13:02:04 -0500 |
commit | 6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d (patch) | |
tree | 41d04269f268d6162e5f1866496dd42fbc79d2a4 /arch/arm/mm/proc-v7.S | |
parent | 3ee0fc5ca129cbae81c073756febcb1c552af446 (diff) | |
parent | 497b7e943d0dc5743454de56dcdb67352bbf96b2 (diff) |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable
Conflicts:
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/arm/mm/proc-v7.S')
-rw-r--r-- | arch/arm/mm/proc-v7.S | 177 |
1 files changed, 20 insertions, 157 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 66a185f018a0..7efa2a721d5d 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S | |||
@@ -19,24 +19,11 @@ | |||
19 | 19 | ||
20 | #include "proc-macros.S" | 20 | #include "proc-macros.S" |
21 | 21 | ||
22 | #define TTB_S (1 << 1) | 22 | #ifdef CONFIG_ARM_LPAE |
23 | #define TTB_RGN_NC (0 << 3) | 23 | #include "proc-v7-3level.S" |
24 | #define TTB_RGN_OC_WBWA (1 << 3) | 24 | #else |
25 | #define TTB_RGN_OC_WT (2 << 3) | 25 | #include "proc-v7-2level.S" |
26 | #define TTB_RGN_OC_WB (3 << 3) | 26 | #endif |
27 | #define TTB_NOS (1 << 5) | ||
28 | #define TTB_IRGN_NC ((0 << 0) | (0 << 6)) | ||
29 | #define TTB_IRGN_WBWA ((0 << 0) | (1 << 6)) | ||
30 | #define TTB_IRGN_WT ((1 << 0) | (0 << 6)) | ||
31 | #define TTB_IRGN_WB ((1 << 0) | (1 << 6)) | ||
32 | |||
33 | /* PTWs cacheable, inner WB not shareable, outer WB not shareable */ | ||
34 | #define TTB_FLAGS_UP TTB_IRGN_WB|TTB_RGN_OC_WB | ||
35 | #define PMD_FLAGS_UP PMD_SECT_WB | ||
36 | |||
37 | /* PTWs cacheable, inner WBWA shareable, outer WBWA not shareable */ | ||
38 | #define TTB_FLAGS_SMP TTB_IRGN_WBWA|TTB_S|TTB_NOS|TTB_RGN_OC_WBWA | ||
39 | #define PMD_FLAGS_SMP PMD_SECT_WBWA|PMD_SECT_S | ||
40 | 27 | ||
41 | ENTRY(cpu_v7_proc_init) | 28 | ENTRY(cpu_v7_proc_init) |
42 | mov pc, lr | 29 | mov pc, lr |
@@ -99,127 +86,12 @@ ENTRY(cpu_v7_dcache_clean_area) | |||
99 | mov pc, lr | 86 | mov pc, lr |
100 | ENDPROC(cpu_v7_dcache_clean_area) | 87 | ENDPROC(cpu_v7_dcache_clean_area) |
101 | 88 | ||
102 | /* | ||
103 | * cpu_v7_switch_mm(pgd_phys, tsk) | ||
104 | * | ||
105 | * Set the translation table base pointer to be pgd_phys | ||
106 | * | ||
107 | * - pgd_phys - physical address of new TTB | ||
108 | * | ||
109 | * It is assumed that: | ||
110 | * - we are not using split page tables | ||
111 | */ | ||
112 | ENTRY(cpu_v7_switch_mm) | ||
113 | #ifdef CONFIG_MMU | ||
114 | mov r2, #0 | ||
115 | ldr r1, [r1, #MM_CONTEXT_ID] @ get mm->context.id | ||
116 | ALT_SMP(orr r0, r0, #TTB_FLAGS_SMP) | ||
117 | ALT_UP(orr r0, r0, #TTB_FLAGS_UP) | ||
118 | #ifdef CONFIG_ARM_ERRATA_430973 | ||
119 | mcr p15, 0, r2, c7, c5, 6 @ flush BTAC/BTB | ||
120 | #endif | ||
121 | #ifdef CONFIG_ARM_ERRATA_754322 | ||
122 | dsb | ||
123 | #endif | ||
124 | mcr p15, 0, r2, c13, c0, 1 @ set reserved context ID | ||
125 | isb | ||
126 | 1: mcr p15, 0, r0, c2, c0, 0 @ set TTB 0 | ||
127 | isb | ||
128 | #ifdef CONFIG_ARM_ERRATA_754322 | ||
129 | dsb | ||
130 | #endif | ||
131 | mcr p15, 0, r1, c13, c0, 1 @ set context ID | ||
132 | isb | ||
133 | #endif | ||
134 | mov pc, lr | ||
135 | ENDPROC(cpu_v7_switch_mm) | ||
136 | |||
137 | /* | ||
138 | * cpu_v7_set_pte_ext(ptep, pte) | ||
139 | * | ||
140 | * Set a level 2 translation table entry. | ||
141 | * | ||
142 | * - ptep - pointer to level 2 translation table entry | ||
143 | * (hardware version is stored at +2048 bytes) | ||
144 | * - pte - PTE value to store | ||
145 | * - ext - value for extended PTE bits | ||
146 | */ | ||
147 | ENTRY(cpu_v7_set_pte_ext) | ||
148 | #ifdef CONFIG_MMU | ||
149 | str r1, [r0] @ linux version | ||
150 | |||
151 | bic r3, r1, #0x000003f0 | ||
152 | bic r3, r3, #PTE_TYPE_MASK | ||
153 | orr r3, r3, r2 | ||
154 | orr r3, r3, #PTE_EXT_AP0 | 2 | ||
155 | |||
156 | tst r1, #1 << 4 | ||
157 | orrne r3, r3, #PTE_EXT_TEX(1) | ||
158 | |||
159 | eor r1, r1, #L_PTE_DIRTY | ||
160 | tst r1, #L_PTE_RDONLY | L_PTE_DIRTY | ||
161 | orrne r3, r3, #PTE_EXT_APX | ||
162 | |||
163 | tst r1, #L_PTE_USER | ||
164 | orrne r3, r3, #PTE_EXT_AP1 | ||
165 | #ifdef CONFIG_CPU_USE_DOMAINS | ||
166 | @ allow kernel read/write access to read-only user pages | ||
167 | tstne r3, #PTE_EXT_APX | ||
168 | bicne r3, r3, #PTE_EXT_APX | PTE_EXT_AP0 | ||
169 | #endif | ||
170 | |||
171 | tst r1, #L_PTE_XN | ||
172 | orrne r3, r3, #PTE_EXT_XN | ||
173 | |||
174 | tst r1, #L_PTE_YOUNG | ||
175 | tstne r1, #L_PTE_PRESENT | ||
176 | moveq r3, #0 | ||
177 | |||
178 | ARM( str r3, [r0, #2048]! ) | ||
179 | THUMB( add r0, r0, #2048 ) | ||
180 | THUMB( str r3, [r0] ) | ||
181 | mcr p15, 0, r0, c7, c10, 1 @ flush_pte | ||
182 | #endif | ||
183 | mov pc, lr | ||
184 | ENDPROC(cpu_v7_set_pte_ext) | ||
185 | |||
186 | string cpu_v7_name, "ARMv7 Processor" | 89 | string cpu_v7_name, "ARMv7 Processor" |
187 | .align | 90 | .align |
188 | 91 | ||
189 | /* | ||
190 | * Memory region attributes with SCTLR.TRE=1 | ||
191 | * | ||
192 | * n = TEX[0],C,B | ||
193 | * TR = PRRR[2n+1:2n] - memory type | ||
194 | * IR = NMRR[2n+1:2n] - inner cacheable property | ||
195 | * OR = NMRR[2n+17:2n+16] - outer cacheable property | ||
196 | * | ||
197 | * n TR IR OR | ||
198 | * UNCACHED 000 00 | ||
199 | * BUFFERABLE 001 10 00 00 | ||
200 | * WRITETHROUGH 010 10 10 10 | ||
201 | * WRITEBACK 011 10 11 11 | ||
202 | * reserved 110 | ||
203 | * WRITEALLOC 111 10 01 01 | ||
204 | * DEV_SHARED 100 01 | ||
205 | * DEV_NONSHARED 100 01 | ||
206 | * DEV_WC 001 10 | ||
207 | * DEV_CACHED 011 10 | ||
208 | * | ||
209 | * Other attributes: | ||
210 | * | ||
211 | * DS0 = PRRR[16] = 0 - device shareable property | ||
212 | * DS1 = PRRR[17] = 1 - device shareable property | ||
213 | * NS0 = PRRR[18] = 0 - normal shareable property | ||
214 | * NS1 = PRRR[19] = 1 - normal shareable property | ||
215 | * NOS = PRRR[24+n] = 1 - not outer shareable | ||
216 | */ | ||
217 | .equ PRRR, 0xff0a81a8 | ||
218 | .equ NMRR, 0x40e040e0 | ||
219 | |||
220 | /* Suspend/resume support: derived from arch/arm/mach-s5pv210/sleep.S */ | 92 | /* Suspend/resume support: derived from arch/arm/mach-s5pv210/sleep.S */ |
221 | .globl cpu_v7_suspend_size | 93 | .globl cpu_v7_suspend_size |
222 | .equ cpu_v7_suspend_size, 4 * 7 | 94 | .equ cpu_v7_suspend_size, 4 * 8 |
223 | #ifdef CONFIG_ARM_CPU_SUSPEND | 95 | #ifdef CONFIG_ARM_CPU_SUSPEND |
224 | ENTRY(cpu_v7_do_suspend) | 96 | ENTRY(cpu_v7_do_suspend) |
225 | stmfd sp!, {r4 - r10, lr} | 97 | stmfd sp!, {r4 - r10, lr} |
@@ -228,10 +100,11 @@ ENTRY(cpu_v7_do_suspend) | |||
228 | stmia r0!, {r4 - r5} | 100 | stmia r0!, {r4 - r5} |
229 | mrc p15, 0, r6, c3, c0, 0 @ Domain ID | 101 | mrc p15, 0, r6, c3, c0, 0 @ Domain ID |
230 | mrc p15, 0, r7, c2, c0, 1 @ TTB 1 | 102 | mrc p15, 0, r7, c2, c0, 1 @ TTB 1 |
103 | mrc p15, 0, r11, c2, c0, 2 @ TTB control register | ||
231 | mrc p15, 0, r8, c1, c0, 0 @ Control register | 104 | mrc p15, 0, r8, c1, c0, 0 @ Control register |
232 | mrc p15, 0, r9, c1, c0, 1 @ Auxiliary control register | 105 | mrc p15, 0, r9, c1, c0, 1 @ Auxiliary control register |
233 | mrc p15, 0, r10, c1, c0, 2 @ Co-processor access control | 106 | mrc p15, 0, r10, c1, c0, 2 @ Co-processor access control |
234 | stmia r0, {r6 - r10} | 107 | stmia r0, {r6 - r11} |
235 | ldmfd sp!, {r4 - r10, pc} | 108 | ldmfd sp!, {r4 - r10, pc} |
236 | ENDPROC(cpu_v7_do_suspend) | 109 | ENDPROC(cpu_v7_do_suspend) |
237 | 110 | ||
@@ -243,13 +116,15 @@ ENTRY(cpu_v7_do_resume) | |||
243 | ldmia r0!, {r4 - r5} | 116 | ldmia r0!, {r4 - r5} |
244 | mcr p15, 0, r4, c13, c0, 0 @ FCSE/PID | 117 | mcr p15, 0, r4, c13, c0, 0 @ FCSE/PID |
245 | mcr p15, 0, r5, c13, c0, 3 @ User r/o thread ID | 118 | mcr p15, 0, r5, c13, c0, 3 @ User r/o thread ID |
246 | ldmia r0, {r6 - r10} | 119 | ldmia r0, {r6 - r11} |
247 | mcr p15, 0, r6, c3, c0, 0 @ Domain ID | 120 | mcr p15, 0, r6, c3, c0, 0 @ Domain ID |
121 | #ifndef CONFIG_ARM_LPAE | ||
248 | ALT_SMP(orr r1, r1, #TTB_FLAGS_SMP) | 122 | ALT_SMP(orr r1, r1, #TTB_FLAGS_SMP) |
249 | ALT_UP(orr r1, r1, #TTB_FLAGS_UP) | 123 | ALT_UP(orr r1, r1, #TTB_FLAGS_UP) |
124 | #endif | ||
250 | mcr p15, 0, r1, c2, c0, 0 @ TTB 0 | 125 | mcr p15, 0, r1, c2, c0, 0 @ TTB 0 |
251 | mcr p15, 0, r7, c2, c0, 1 @ TTB 1 | 126 | mcr p15, 0, r7, c2, c0, 1 @ TTB 1 |
252 | mcr p15, 0, ip, c2, c0, 2 @ TTB control register | 127 | mcr p15, 0, r11, c2, c0, 2 @ TTB control register |
253 | mrc p15, 0, r4, c1, c0, 1 @ Read Auxiliary control register | 128 | mrc p15, 0, r4, c1, c0, 1 @ Read Auxiliary control register |
254 | teq r4, r9 @ Is it already set? | 129 | teq r4, r9 @ Is it already set? |
255 | mcrne p15, 0, r9, c1, c0, 1 @ No, so write it | 130 | mcrne p15, 0, r9, c1, c0, 1 @ No, so write it |
@@ -379,12 +254,7 @@ __v7_setup: | |||
379 | dsb | 254 | dsb |
380 | #ifdef CONFIG_MMU | 255 | #ifdef CONFIG_MMU |
381 | mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs | 256 | mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs |
382 | mcr p15, 0, r10, c2, c0, 2 @ TTB control register | 257 | v7_ttb_setup r10, r4, r8, r5 @ TTBCR, TTBRx setup |
383 | ALT_SMP(orr r4, r4, #TTB_FLAGS_SMP) | ||
384 | ALT_UP(orr r4, r4, #TTB_FLAGS_UP) | ||
385 | ALT_SMP(orr r8, r8, #TTB_FLAGS_SMP) | ||
386 | ALT_UP(orr r8, r8, #TTB_FLAGS_UP) | ||
387 | mcr p15, 0, r8, c2, c0, 1 @ load TTB1 | ||
388 | ldr r5, =PRRR @ PRRR | 258 | ldr r5, =PRRR @ PRRR |
389 | ldr r6, =NMRR @ NMRR | 259 | ldr r6, =NMRR @ NMRR |
390 | mcr p15, 0, r5, c10, c2, 0 @ write PRRR | 260 | mcr p15, 0, r5, c10, c2, 0 @ write PRRR |
@@ -406,16 +276,7 @@ __v7_setup: | |||
406 | mov pc, lr @ return to head.S:__ret | 276 | mov pc, lr @ return to head.S:__ret |
407 | ENDPROC(__v7_setup) | 277 | ENDPROC(__v7_setup) |
408 | 278 | ||
409 | /* AT | 279 | .align 2 |
410 | * TFR EV X F I D LR S | ||
411 | * .EEE ..EE PUI. .T.T 4RVI ZWRS BLDP WCAM | ||
412 | * rxxx rrxx xxx0 0101 xxxx xxxx x111 xxxx < forced | ||
413 | * 1 0 110 0011 1100 .111 1101 < we want | ||
414 | */ | ||
415 | .type v7_crval, #object | ||
416 | v7_crval: | ||
417 | crval clear=0x0120c302, mmuset=0x10c03c7d, ucset=0x00c01c7c | ||
418 | |||
419 | __v7_setup_stack: | 280 | __v7_setup_stack: |
420 | .space 4 * 11 @ 11 registers | 281 | .space 4 * 11 @ 11 registers |
421 | 282 | ||
@@ -437,11 +298,11 @@ __v7_setup_stack: | |||
437 | */ | 298 | */ |
438 | .macro __v7_proc initfunc, mm_mmuflags = 0, io_mmuflags = 0, hwcaps = 0 | 299 | .macro __v7_proc initfunc, mm_mmuflags = 0, io_mmuflags = 0, hwcaps = 0 |
439 | ALT_SMP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \ | 300 | ALT_SMP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \ |
440 | PMD_FLAGS_SMP | \mm_mmuflags) | 301 | PMD_SECT_AF | PMD_FLAGS_SMP | \mm_mmuflags) |
441 | ALT_UP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \ | 302 | ALT_UP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \ |
442 | PMD_FLAGS_UP | \mm_mmuflags) | 303 | PMD_SECT_AF | PMD_FLAGS_UP | \mm_mmuflags) |
443 | .long PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_AP_WRITE | \ | 304 | .long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | \ |
444 | PMD_SECT_AP_READ | \io_mmuflags | 305 | PMD_SECT_AP_READ | PMD_SECT_AF | \io_mmuflags |
445 | W(b) \initfunc | 306 | W(b) \initfunc |
446 | .long cpu_arch_name | 307 | .long cpu_arch_name |
447 | .long cpu_elf_name | 308 | .long cpu_elf_name |
@@ -454,6 +315,7 @@ __v7_setup_stack: | |||
454 | .long v7_cache_fns | 315 | .long v7_cache_fns |
455 | .endm | 316 | .endm |
456 | 317 | ||
318 | #ifndef CONFIG_ARM_LPAE | ||
457 | /* | 319 | /* |
458 | * ARM Ltd. Cortex A5 processor. | 320 | * ARM Ltd. Cortex A5 processor. |
459 | */ | 321 | */ |
@@ -473,6 +335,7 @@ __v7_ca9mp_proc_info: | |||
473 | .long 0xff0ffff0 | 335 | .long 0xff0ffff0 |
474 | __v7_proc __v7_ca9mp_setup | 336 | __v7_proc __v7_ca9mp_setup |
475 | .size __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info | 337 | .size __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info |
338 | #endif /* CONFIG_ARM_LPAE */ | ||
476 | 339 | ||
477 | /* | 340 | /* |
478 | * ARM Ltd. Cortex A15 processor. | 341 | * ARM Ltd. Cortex A15 processor. |