Changeset 031e264 in mainline

Timestamp:

2005-12-18T23:03:45Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

75e1db0

Parents:

ff12a3c

Message:

Fix cpu_init(): frame_alloc() can return 0 as the valid address of block of frames. Do not signal error.

sparc64 work.
Reorganize kernel vs. userspace memory layout.
Add panic_printf().
Turn dummy() into nop rather than into infinite loop.

Files:

• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/mm/page.h (modified) (1 diff)
• arch/sparc64/include/mm/vm.h (modified) (1 diff)
• arch/sparc64/src/dummy.s (modified) (5 diffs)
• arch/sparc64/src/mm/tlb.c (modified) (1 diff)
• arch/sparc64/src/panic.S (added)
• arch/sparc64/src/sparc64.c (modified) (1 diff)
• generic/src/cpu/cpu.c (modified) (1 diff)

arch/sparc64/Makefile.inc

@@ -50 +50 @@
         arch/$(ARCH)/src/cpu/cpu.c \
         arch/$(ARCH)/src/asm.S \
+        arch/$(ARCH)/src/panic.S \
         arch/$(ARCH)/src/console.c \
         arch/$(ARCH)/src/context.S \

arch/sparc64/include/mm/page.h

@@ -36 +36 @@
 #define PAGE_SIZE       FRAME_SIZE
 
-#define KA2PA(x)        (((__address) (x)) - 0x80000000)
-#define PA2KA(x)        (((__address) (x)) + 0x80000000)
+#define KA2PA(x)        ((__address) (x))
+#define PA2KA(x)        ((__address) (x))
 
 #define PTL0_INDEX_ARCH(vaddr)          0

arch/sparc64/include/mm/vm.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH         (__address) 0x8000000000000000
+#define KERNEL_ADDRESS_SPACE_START_ARCH         (__address) 0x0000000000000000
 #define KERNEL_ADDRESS_SPACE_END_ARCH           (__address) 0xffffffffffffffff
 #define USER_ADDRESS_SPACE_START_ARCH           (__address) 0x0000000000000000
-#define USER_ADDRESS_SPACE_END_ARCH             (__address) 0x7fffffffffffffff
+#define USER_ADDRESS_SPACE_END_ARCH             (__address) 0xffffffffffffffff
 
-#define UTEXT_ADDRESS_ARCH      0x0000000000001000
+#define UTEXT_ADDRESS_ARCH      (0x0000000000000000+PAGE_SIZE)
 #define USTACK_ADDRESS_ARCH     (0x7fffffffffffffff-(PAGE_SIZE-1))
-#define UDATA_ADDRESS_ARCH      0x0000000001001000
+#define UDATA_ADDRESS_ARCH      0x8000000000000000
 
 #define vm_install_arch(vm)

arch/sparc64/src/dummy.s

@@ -30 +30 @@
 
 .global asm_delay_loop
-.global before_thread_runs_arch
 .global cpu_halt
 .global cpu_sleep
@@ -42 +41 @@
 .global fpu_enable
 .global fpu_init
-.global panic_printf
 .global userspace
 
@@ -48 +46 @@
 
 asm_delay_loop:
-before_thread_runs_arch:
 cpu_halt:
 cpu_sleep:
@@ -60 +57 @@
 fpu_enable:
 fpu_init:
-panic_printf:
 userspace:
 
@@ -66 +62 @@
 dummy:
 0:
-        b 0b
+        retl
         nop

arch/sparc64/src/mm/tlb.c

@@ -58 +58 @@
         fr.address = config.base;
         pg.address = config.base;
-        
+
         immu_disable();
         dmmu_disable();

arch/sparc64/src/sparc64.c

@@ -53 +53 @@
 {
 }
+
+void before_thread_runs_arch(void)
+{
+}

generic/src/cpu/cpu.c

@@ -62 +62 @@
                 for (i=0; i < config.cpu_count; i++) {
                         cpus[i].stack = (__u8 *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
-                        if (!cpus[i].stack)
-                                panic("malloc/cpus[%d].stack\n", i);
                         
                         cpus[i].id = i;