aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHyok S. Choi <hyok.choi@samsung.com>2006-03-27 08:58:25 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-03-27 08:58:25 -0500
commit75d90832d58aa5855972cfc2bdaa94970ccd4aca (patch)
tree3e93ec4714fe4951c67f61787b026fcbc4656f9b
parent10c2df65060e1ab57b2f75e0749de0ee9b8f4810 (diff)
[ARM] nommu: start-up code
This patch adds nommu version start-up code head-nommu.S. The common part of the start-up codes is moved to head-common.S. Signed-off-by: Hyok S. Choi <hyok.choi@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/kernel/head-common.S217
-rw-r--r--arch/arm/kernel/head-nommu.S83
-rw-r--r--arch/arm/kernel/head.S207
4 files changed, 302 insertions, 207 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index fbfc14a56b96..e3770ed87825 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -69,7 +69,7 @@ AFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float
69CHECKFLAGS += -D__arm__ 69CHECKFLAGS += -D__arm__
70 70
71#Default value 71#Default value
72head-y := arch/arm/kernel/head.o arch/arm/kernel/init_task.o 72head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o
73textofs-y := 0x00008000 73textofs-y := 0x00008000
74 74
75 machine-$(CONFIG_ARCH_RPC) := rpc 75 machine-$(CONFIG_ARCH_RPC) := rpc
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
new file mode 100644
index 000000000000..a52da0ddb43d
--- /dev/null
+++ b/arch/arm/kernel/head-common.S
@@ -0,0 +1,217 @@
1/*
2 * linux/arch/arm/kernel/head-common.S
3 *
4 * Copyright (C) 1994-2002 Russell King
5 * Copyright (c) 2003 ARM Limited
6 * All Rights Reserved
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation.
11 *
12 */
13
14 .type __switch_data, %object
15__switch_data:
16 .long __mmap_switched
17 .long __data_loc @ r4
18 .long __data_start @ r5
19 .long __bss_start @ r6
20 .long _end @ r7
21 .long processor_id @ r4
22 .long __machine_arch_type @ r5
23 .long cr_alignment @ r6
24 .long init_thread_union + THREAD_START_SP @ sp
25
26/*
27 * The following fragment of code is executed with the MMU on in MMU mode,
28 * and uses absolute addresses; this is not position independent.
29 *
30 * r0 = cp#15 control register
31 * r1 = machine ID
32 * r9 = processor ID
33 */
34 .type __mmap_switched, %function
35__mmap_switched:
36 adr r3, __switch_data + 4
37
38 ldmia r3!, {r4, r5, r6, r7}
39 cmp r4, r5 @ Copy data segment if needed
401: cmpne r5, r6
41 ldrne fp, [r4], #4
42 strne fp, [r5], #4
43 bne 1b
44
45 mov fp, #0 @ Clear BSS (and zero fp)
461: cmp r6, r7
47 strcc fp, [r6],#4
48 bcc 1b
49
50 ldmia r3, {r4, r5, r6, sp}
51 str r9, [r4] @ Save processor ID
52 str r1, [r5] @ Save machine type
53 bic r4, r0, #CR_A @ Clear 'A' bit
54 stmia r6, {r0, r4} @ Save control register values
55 b start_kernel
56
57/*
58 * Exception handling. Something went wrong and we can't proceed. We
59 * ought to tell the user, but since we don't have any guarantee that
60 * we're even running on the right architecture, we do virtually nothing.
61 *
62 * If CONFIG_DEBUG_LL is set we try to print out something about the error
63 * and hope for the best (useful if bootloader fails to pass a proper
64 * machine ID for example).
65 */
66
67 .type __error_p, %function
68__error_p:
69#ifdef CONFIG_DEBUG_LL
70 adr r0, str_p1
71 bl printascii
72 b __error
73str_p1: .asciz "\nError: unrecognized/unsupported processor variant.\n"
74 .align
75#endif
76
77 .type __error_a, %function
78__error_a:
79#ifdef CONFIG_DEBUG_LL
80 mov r4, r1 @ preserve machine ID
81 adr r0, str_a1
82 bl printascii
83 mov r0, r4
84 bl printhex8
85 adr r0, str_a2
86 bl printascii
87 adr r3, 3f
88 ldmia r3, {r4, r5, r6} @ get machine desc list
89 sub r4, r3, r4 @ get offset between virt&phys
90 add r5, r5, r4 @ convert virt addresses to
91 add r6, r6, r4 @ physical address space
921: ldr r0, [r5, #MACHINFO_TYPE] @ get machine type
93 bl printhex8
94 mov r0, #'\t'
95 bl printch
96 ldr r0, [r5, #MACHINFO_NAME] @ get machine name
97 add r0, r0, r4
98 bl printascii
99 mov r0, #'\n'
100 bl printch
101 add r5, r5, #SIZEOF_MACHINE_DESC @ next machine_desc
102 cmp r5, r6
103 blo 1b
104 adr r0, str_a3
105 bl printascii
106 b __error
107str_a1: .asciz "\nError: unrecognized/unsupported machine ID (r1 = 0x"
108str_a2: .asciz ").\n\nAvailable machine support:\n\nID (hex)\tNAME\n"
109str_a3: .asciz "\nPlease check your kernel config and/or bootloader.\n"
110 .align
111#endif
112
113 .type __error, %function
114__error:
115#ifdef CONFIG_ARCH_RPC
116/*
117 * Turn the screen red on a error - RiscPC only.
118 */
119 mov r0, #0x02000000
120 mov r3, #0x11
121 orr r3, r3, r3, lsl #8
122 orr r3, r3, r3, lsl #16
123 str r3, [r0], #4
124 str r3, [r0], #4
125 str r3, [r0], #4
126 str r3, [r0], #4
127#endif
1281: mov r0, r0
129 b 1b
130
131
132/*
133 * Read processor ID register (CP#15, CR0), and look up in the linker-built
134 * supported processor list. Note that we can't use the absolute addresses
135 * for the __proc_info lists since we aren't running with the MMU on
136 * (and therefore, we are not in the correct address space). We have to
137 * calculate the offset.
138 *
139 * r9 = cpuid
140 * Returns:
141 * r3, r4, r6 corrupted
142 * r5 = proc_info pointer in physical address space
143 * r9 = cpuid (preserved)
144 */
145 .type __lookup_processor_type, %function
146__lookup_processor_type:
147 adr r3, 3f
148 ldmda r3, {r5 - r7}
149 sub r3, r3, r7 @ get offset between virt&phys
150 add r5, r5, r3 @ convert virt addresses to
151 add r6, r6, r3 @ physical address space
1521: ldmia r5, {r3, r4} @ value, mask
153 and r4, r4, r9 @ mask wanted bits
154 teq r3, r4
155 beq 2f
156 add r5, r5, #PROC_INFO_SZ @ sizeof(proc_info_list)
157 cmp r5, r6
158 blo 1b
159 mov r5, #0 @ unknown processor
1602: mov pc, lr
161
162/*
163 * This provides a C-API version of the above function.
164 */
165ENTRY(lookup_processor_type)
166 stmfd sp!, {r4 - r7, r9, lr}
167 mov r9, r0
168 bl __lookup_processor_type
169 mov r0, r5
170 ldmfd sp!, {r4 - r7, r9, pc}
171
172/*
173 * Look in include/asm-arm/procinfo.h and arch/arm/kernel/arch.[ch] for
174 * more information about the __proc_info and __arch_info structures.
175 */
176 .long __proc_info_begin
177 .long __proc_info_end
1783: .long .
179 .long __arch_info_begin
180 .long __arch_info_end
181
182/*
183 * Lookup machine architecture in the linker-build list of architectures.
184 * Note that we can't use the absolute addresses for the __arch_info
185 * lists since we aren't running with the MMU on (and therefore, we are
186 * not in the correct address space). We have to calculate the offset.
187 *
188 * r1 = machine architecture number
189 * Returns:
190 * r3, r4, r6 corrupted
191 * r5 = mach_info pointer in physical address space
192 */
193 .type __lookup_machine_type, %function
194__lookup_machine_type:
195 adr r3, 3b
196 ldmia r3, {r4, r5, r6}
197 sub r3, r3, r4 @ get offset between virt&phys
198 add r5, r5, r3 @ convert virt addresses to
199 add r6, r6, r3 @ physical address space
2001: ldr r3, [r5, #MACHINFO_TYPE] @ get machine type
201 teq r3, r1 @ matches loader number?
202 beq 2f @ found
203 add r5, r5, #SIZEOF_MACHINE_DESC @ next machine_desc
204 cmp r5, r6
205 blo 1b
206 mov r5, #0 @ unknown machine
2072: mov pc, lr
208
209/*
210 * This provides a C-API version of the above function.
211 */
212ENTRY(lookup_machine_type)
213 stmfd sp!, {r4 - r6, lr}
214 mov r1, r0
215 bl __lookup_machine_type
216 mov r0, r5
217 ldmfd sp!, {r4 - r6, pc}
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
new file mode 100644
index 000000000000..b093ab8738b5
--- /dev/null
+++ b/arch/arm/kernel/head-nommu.S
@@ -0,0 +1,83 @@
1/*
2 * linux/arch/arm/kernel/head-nommu.S
3 *
4 * Copyright (C) 1994-2002 Russell King
5 * Copyright (C) 2003-2006 Hyok S. Choi
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as
9 * published by the Free Software Foundation.
10 *
11 * Common kernel startup code (non-paged MM)
12 * for 32-bit CPUs which has a process ID register(CP15).
13 *
14 */
15#include <linux/config.h>
16#include <linux/linkage.h>
17#include <linux/init.h>
18
19#include <asm/assembler.h>
20#include <asm/mach-types.h>
21#include <asm/procinfo.h>
22#include <asm/ptrace.h>
23#include <asm/constants.h>
24#include <asm/system.h>
25
26#define PROCINFO_INITFUNC 12
27
28/*
29 * Kernel startup entry point.
30 * ---------------------------
31 *
32 * This is normally called from the decompressor code. The requirements
33 * are: MMU = off, D-cache = off, I-cache = dont care, r0 = 0,
34 * r1 = machine nr.
35 *
36 * See linux/arch/arm/tools/mach-types for the complete list of machine
37 * numbers for r1.
38 *
39 */
40 __INIT
41 .type stext, %function
42ENTRY(stext)
43 msr cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC @ ensure svc mode
44 @ and irqs disabled
45 mrc p15, 0, r9, c0, c0 @ get processor id
46 bl __lookup_processor_type @ r5=procinfo r9=cpuid
47 movs r10, r5 @ invalid processor (r5=0)?
48 beq __error_p @ yes, error 'p'
49 bl __lookup_machine_type @ r5=machinfo
50 movs r8, r5 @ invalid machine (r5=0)?
51 beq __error_a @ yes, error 'a'
52
53 ldr r13, __switch_data @ address to jump to after
54 @ the initialization is done
55 adr lr, __after_proc_init @ return (PIC) address
56 add pc, r10, #PROCINFO_INITFUNC
57
58/*
59 * Set the Control Register and Read the process ID.
60 */
61 .type __after_proc_init, %function
62__after_proc_init:
63 mrc p15, 0, r0, c1, c0, 0 @ read control reg
64#ifdef CONFIG_ALIGNMENT_TRAP
65 orr r0, r0, #CR_A
66#else
67 bic r0, r0, #CR_A
68#endif
69#ifdef CONFIG_CPU_DCACHE_DISABLE
70 bic r0, r0, #CR_C
71#endif
72#ifdef CONFIG_CPU_BPREDICT_DISABLE
73 bic r0, r0, #CR_Z
74#endif
75#ifdef CONFIG_CPU_ICACHE_DISABLE
76 bic r0, r0, #CR_I
77#endif
78 mcr p15, 0, r0, c1, c0, 0 @ write control reg
79
80 mov pc, r13 @ clear the BSS and jump
81 @ to start_kernel
82
83#include "head-common.S"
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 571d6d584919..d848f3a38924 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -103,49 +103,6 @@ ENTRY(stext)
103 adr lr, __enable_mmu @ return (PIC) address 103 adr lr, __enable_mmu @ return (PIC) address
104 add pc, r10, #PROCINFO_INITFUNC 104 add pc, r10, #PROCINFO_INITFUNC
105 105
106 .type __switch_data, %object
107__switch_data:
108 .long __mmap_switched
109 .long __data_loc @ r4
110 .long __data_start @ r5
111 .long __bss_start @ r6
112 .long _end @ r7
113 .long processor_id @ r4
114 .long __machine_arch_type @ r5
115 .long cr_alignment @ r6
116 .long init_thread_union + THREAD_START_SP @ sp
117
118/*
119 * The following fragment of code is executed with the MMU on, and uses
120 * absolute addresses; this is not position independent.
121 *
122 * r0 = cp#15 control register
123 * r1 = machine ID
124 * r9 = processor ID
125 */
126 .type __mmap_switched, %function
127__mmap_switched:
128 adr r3, __switch_data + 4
129
130 ldmia r3!, {r4, r5, r6, r7}
131 cmp r4, r5 @ Copy data segment if needed
1321: cmpne r5, r6
133 ldrne fp, [r4], #4
134 strne fp, [r5], #4
135 bne 1b
136
137 mov fp, #0 @ Clear BSS (and zero fp)
1381: cmp r6, r7
139 strcc fp, [r6],#4
140 bcc 1b
141
142 ldmia r3, {r4, r5, r6, sp}
143 str r9, [r4] @ Save processor ID
144 str r1, [r5] @ Save machine type
145 bic r4, r0, #CR_A @ Clear 'A' bit
146 stmia r6, {r0, r4} @ Save control register values
147 b start_kernel
148
149#if defined(CONFIG_SMP) 106#if defined(CONFIG_SMP)
150 .type secondary_startup, #function 107 .type secondary_startup, #function
151ENTRY(secondary_startup) 108ENTRY(secondary_startup)
@@ -368,166 +325,4 @@ __create_page_tables:
368 mov pc, lr 325 mov pc, lr
369 .ltorg 326 .ltorg
370 327
371 328#include "head-common.S"
372
373/*
374 * Exception handling. Something went wrong and we can't proceed. We
375 * ought to tell the user, but since we don't have any guarantee that
376 * we're even running on the right architecture, we do virtually nothing.
377 *
378 * If CONFIG_DEBUG_LL is set we try to print out something about the error
379 * and hope for the best (useful if bootloader fails to pass a proper
380 * machine ID for example).
381 */
382
383 .type __error_p, %function
384__error_p:
385#ifdef CONFIG_DEBUG_LL
386 adr r0, str_p1
387 bl printascii
388 b __error
389str_p1: .asciz "\nError: unrecognized/unsupported processor variant.\n"
390 .align
391#endif
392
393 .type __error_a, %function
394__error_a:
395#ifdef CONFIG_DEBUG_LL
396 mov r4, r1 @ preserve machine ID
397 adr r0, str_a1
398 bl printascii
399 mov r0, r4
400 bl printhex8
401 adr r0, str_a2
402 bl printascii
403 adr r3, 3f
404 ldmia r3, {r4, r5, r6} @ get machine desc list
405 sub r4, r3, r4 @ get offset between virt&phys
406 add r5, r5, r4 @ convert virt addresses to
407 add r6, r6, r4 @ physical address space
4081: ldr r0, [r5, #MACHINFO_TYPE] @ get machine type
409 bl printhex8
410 mov r0, #'\t'
411 bl printch
412 ldr r0, [r5, #MACHINFO_NAME] @ get machine name
413 add r0, r0, r4
414 bl printascii
415 mov r0, #'\n'
416 bl printch
417 add r5, r5, #SIZEOF_MACHINE_DESC @ next machine_desc
418 cmp r5, r6
419 blo 1b
420 adr r0, str_a3
421 bl printascii
422 b __error
423str_a1: .asciz "\nError: unrecognized/unsupported machine ID (r1 = 0x"
424str_a2: .asciz ").\n\nAvailable machine support:\n\nID (hex)\tNAME\n"
425str_a3: .asciz "\nPlease check your kernel config and/or bootloader.\n"
426 .align
427#endif
428
429 .type __error, %function
430__error:
431#ifdef CONFIG_ARCH_RPC
432/*
433 * Turn the screen red on a error - RiscPC only.
434 */
435 mov r0, #0x02000000
436 mov r3, #0x11
437 orr r3, r3, r3, lsl #8
438 orr r3, r3, r3, lsl #16
439 str r3, [r0], #4
440 str r3, [r0], #4
441 str r3, [r0], #4
442 str r3, [r0], #4
443#endif
4441: mov r0, r0
445 b 1b
446
447
448/*
449 * Read processor ID register (CP#15, CR0), and look up in the linker-built
450 * supported processor list. Note that we can't use the absolute addresses
451 * for the __proc_info lists since we aren't running with the MMU on
452 * (and therefore, we are not in the correct address space). We have to
453 * calculate the offset.
454 *
455 * r9 = cpuid
456 * Returns:
457 * r3, r4, r6 corrupted
458 * r5 = proc_info pointer in physical address space
459 * r9 = cpuid (preserved)
460 */
461 .type __lookup_processor_type, %function
462__lookup_processor_type:
463 adr r3, 3f
464 ldmda r3, {r5 - r7}
465 sub r3, r3, r7 @ get offset between virt&phys
466 add r5, r5, r3 @ convert virt addresses to
467 add r6, r6, r3 @ physical address space
4681: ldmia r5, {r3, r4} @ value, mask
469 and r4, r4, r9 @ mask wanted bits
470 teq r3, r4
471 beq 2f
472 add r5, r5, #PROC_INFO_SZ @ sizeof(proc_info_list)
473 cmp r5, r6
474 blo 1b
475 mov r5, #0 @ unknown processor
4762: mov pc, lr
477
478/*
479 * This provides a C-API version of the above function.
480 */
481ENTRY(lookup_processor_type)
482 stmfd sp!, {r4 - r7, r9, lr}
483 mov r9, r0
484 bl __lookup_processor_type
485 mov r0, r5
486 ldmfd sp!, {r4 - r7, r9, pc}
487
488/*
489 * Look in include/asm-arm/procinfo.h and arch/arm/kernel/arch.[ch] for
490 * more information about the __proc_info and __arch_info structures.
491 */
492 .long __proc_info_begin
493 .long __proc_info_end
4943: .long .
495 .long __arch_info_begin
496 .long __arch_info_end
497
498/*
499 * Lookup machine architecture in the linker-build list of architectures.
500 * Note that we can't use the absolute addresses for the __arch_info
501 * lists since we aren't running with the MMU on (and therefore, we are
502 * not in the correct address space). We have to calculate the offset.
503 *
504 * r1 = machine architecture number
505 * Returns:
506 * r3, r4, r6 corrupted
507 * r5 = mach_info pointer in physical address space
508 */
509 .type __lookup_machine_type, %function
510__lookup_machine_type:
511 adr r3, 3b
512 ldmia r3, {r4, r5, r6}
513 sub r3, r3, r4 @ get offset between virt&phys
514 add r5, r5, r3 @ convert virt addresses to
515 add r6, r6, r3 @ physical address space
5161: ldr r3, [r5, #MACHINFO_TYPE] @ get machine type
517 teq r3, r1 @ matches loader number?
518 beq 2f @ found
519 add r5, r5, #SIZEOF_MACHINE_DESC @ next machine_desc
520 cmp r5, r6
521 blo 1b
522 mov r5, #0 @ unknown machine
5232: mov pc, lr
524
525/*
526 * This provides a C-API version of the above function.
527 */
528ENTRY(lookup_machine_type)
529 stmfd sp!, {r4 - r6, lr}
530 mov r1, r0
531 bl __lookup_machine_type
532 mov r0, r5
533 ldmfd sp!, {r4 - r6, pc}