Changeset 96e0748d in mainline for kernel/arch/mips32/src

Timestamp:

2009-02-17T22:47:27Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f89979b

Parents:

e662a5f

Message:

make arch_pre_main optional, don't force any specific prototype
simplify boot process
mips32: detect number of configured CPUs in msim

Location:

kernel/arch/mips32/src

Files:

• mips32.c (modified) (2 diffs)
• smp/smp.c (modified) (2 diffs)
• start.S (modified) (5 diffs)

kernel/arch/mips32/src/mips32.c

@@ -34 +34 @@
 
 #include <arch.h>
-#include <arch/boot.h>
 #include <arch/cp0.h>
 #include <arch/exception.h>
@@ -59 +58 @@
 #include <arch/asm/regname.h>
 
-/* Size of the code jumping to the exception handler code 
- * - J+NOP 
- */
-#define EXCEPTION_JUMP_SIZE    8
-
-#define TLB_EXC ((char *) 0x80000000)
-#define NORM_EXC ((char *) 0x80000180)
-#define CACHE_EXC ((char *) 0x80000100)
+/* Size of the code jumping to the exception handler code
+ * - J+NOP
+ */
+#define EXCEPTION_JUMP_SIZE  8
+
+#define TLB_EXC    ((char *) 0x80000000)
+#define NORM_EXC   ((char *) 0x80000180)
+#define CACHE_EXC  ((char *) 0x80000100)
 
 
 /* Why the linker moves the variable 64K away in assembler
- * when not in .text section ????????
- */
+ * when not in .text section?
+ */
+
+/* Stack pointer saved when entering user mode */
 uintptr_t supervisor_sp __attribute__ ((section (".text")));
-/* Stack pointer saved when entering user mode */
-/* TODO: How do we do it on SMP system???? */
-bootinfo_t bootinfo __attribute__ ((section (".text")));
-
-void arch_pre_main(void)
+
+count_t cpu_count = 0;
+
+void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
 {
         /* Setup usermode */
-        init.cnt = bootinfo.cnt;
-        
-        uint32_t i;
-        
-        for (i = 0; i < bootinfo.cnt; i++) {
-                init.tasks[i].addr = bootinfo.tasks[i].addr;
-                init.tasks[i].size = bootinfo.tasks[i].size;
+        init.cnt = bootinfo->cnt;
+        
+        count_t i;
+        for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
+                init.tasks[i].addr = bootinfo->tasks[i].addr;
+                init.tasks[i].size = bootinfo->tasks[i].size;
+        }
+        
+        for (i = 0; i < CPUMAP_MAX_RECORDS; i++) {
+                if ((bootinfo->cpumap & (1 << i)) != 0)
+                        cpu_count++;
         }
 }

kernel/arch/mips32/src/smp/smp.c

@@ -33 +33 @@
  */
 
+#include <config.h>
 #include <smp/smp.h>
+#include <arch/arch.h>
 
 #ifdef CONFIG_SMP
@@ -39 +41 @@
 void smp_init(void)
 {
+        config.cpu_count = cpu_count;
 }
 

kernel/arch/mips32/src/start.S

@@ -32 +32 @@
 #include <arch/context_offset.h>
 #include <arch/stack.h>
-        
+
 .text
 
@@ -153 +153 @@
         # Move $k0 (superveisor_sp)
         lw $k0, 0($k0)
-1:              
+1:
 .endm
-                
+
 .org 0x0
 kernel_image_start:
@@ -162 +162 @@
         ori $sp, $sp, %lo(end_stack)
         
+        /* Not sure about this, but might
+           be needed for PIC code */
+        lui $gp, 0x8000
+        
         /* $a1 contains physical address of bootinfo_t */
-        /* $a2 contains size of bootinfo_t */
-        
-        beq $a2, $0, bootinfo_end
-        
-        /* Not sure about this, but might be needed for PIC code???? */
-        lui $gp, 0x8000
-        
-        lui $a3, %hi(bootinfo)
-        ori $a3, $a3, %lo(bootinfo)
-        
-        bootinfo_loop:
-                
-                lw $v0, 0($a1)
-                sw $v0, 0($a3)
-                
-                addi $a1, $a1, 4
-                addi $a3, $a3, 4
-                addi $a2, $a2, -4
-                
-                bgtz $a2, bootinfo_loop
-                nop
-                
-        bootinfo_end:
         
         jal arch_pre_main
@@ -206 +187 @@
 exception_entry:
         j exception_handler
-        nop     
-        
+        nop
+
 exception_handler:
         KERNEL_STACK_TO_K0
@@ -216 +197 @@
         mfc0 $k0, $cause
         
-        sra $k0, $k0, 0x2               # cp0_exc_cause() part 1
-        andi $k0, $k0, 0x1f             # cp0_exc_cause() part 2
-        sub $k0, 8                      # 8 = SYSCALL
+        sra $k0, $k0, 0x2    # cp0_exc_cause() part 1
+        andi $k0, $k0, 0x1f  # cp0_exc_cause() part 2
+        sub $k0, 8           # 8 = SYSCALL
         
         beqz $k0, syscall_shortcut
-        add $k0, 8                      # Revert $k0 back to correct exc number
+        add $k0, 8           # Revert $k0 back to correct exc number
         
         REGISTERS_STORE_AND_EXC_RESET $sp
         
         move $a1, $sp
-        jal exc_dispatch                # exc_dispatch(excno, register_space)
+        jal exc_dispatch     # exc_dispatch(excno, register_space)
         move $a0, $k0