Changeset 383ddd6 in mainline for kernel

Timestamp:

2010-01-20T20:33:55Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

975e7e9

Parents:

6c01702 (diff), 3c081d0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel

Files:

• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/arm32/include/context.h (modified) (2 diffs)
• arch/arm32/include/exception.h (modified) (2 diffs)
• arch/arm32/src/debug/stacktrace.c (modified) (1 diff)
• arch/arm32/src/debug/stacktrace_asm.S (modified) (1 diff)
• arch/arm32/src/exc_handler.S (modified) (1 diff)
• arch/arm32/src/exception.c (modified) (2 diffs)
• arch/arm32/src/mm/page_fault.c (modified) (2 diffs)
• arch/arm32/src/start.S (modified) (1 diff)
• arch/ia64/include/mm/asid.h (modified) (1 diff)
• arch/ia64/src/ia64.c (modified) (1 diff)
• arch/ia64/src/mm/page.c (modified) (1 diff)
• arch/ia64/src/start.S (modified) (1 diff)
• generic/src/console/kconsole.c (modified) (1 diff)

kernel/arch/arm32/Makefile.inc

@@ -38 +38 @@
 ATSIGN = %
 
-GCC_CFLAGS += -fno-zero-initialized-in-bss
+GCC_CFLAGS += -fno-zero-initialized-in-bss -mapcs-frame
 
 BITS = 32

kernel/arch/arm32/include/context.h

@@ -43 +43 @@
 #define SP_DELTA  (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
+#define context_set(c, _pc, stack, size) \
+        do { \
+                (c)->pc = (uintptr_t) (_pc); \
+                (c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \
+                (c)->fp = 0; \
+        } while (0)
+
 #ifndef __ASM__
 
@@ -62 +69 @@
         uint32_t r9;
         uint32_t r10;
-        uint32_t r11;
+        uint32_t fp;    /* r11 */
         
         ipl_t ipl;

kernel/arch/arm32/include/exception.h

@@ -102 +102 @@
         uint32_t r9;
         uint32_t r10;
-        uint32_t r11;
+        uint32_t fp;
         uint32_t r12;
 
@@ -135 +135 @@
 static inline unative_t istate_get_fp(istate_t *istate)
 {
-        return istate->r11;
+        return istate->fp;
 }
 

kernel/arch/arm32/src/debug/stacktrace.c

@@ -38 +38 @@
 #include <typedefs.h>
 
+#define FRAME_OFFSET_FP_PREV    -3
+#define FRAME_OFFSET_RA         -1
+
 bool kernel_frame_pointer_validate(uintptr_t fp)
 {
-        return false;
+        return fp != 0;
 }
 
 bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
 {
-        return false;
+        uint32_t *stack = (void *) fp;
+
+        *prev = stack[FRAME_OFFSET_FP_PREV];
+        return true;
 }
 
 bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra)
 {
-        return false;
+        uint32_t *stack = (void *) fp;
+
+        *ra = stack[FRAME_OFFSET_RA];
+        return true;
 }
 
 bool uspace_frame_pointer_validate(uintptr_t fp)
 {
-        return false;
+        return fp != 0;
 }
 
 bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
 {
-        return false;
+        return !copy_from_uspace((void *) prev,
+            (uint32_t *) fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra)
 {
-        return false;
+        return !copy_from_uspace((void *) ra, (uint32_t *) fp + FRAME_OFFSET_RA,
+            sizeof(*ra));
 }
 

kernel/arch/arm32/src/debug/stacktrace_asm.S

@@ -33 +33 @@
 
 frame_pointer_get:
+        mov r0, fp
         mov pc, lr
 
 program_counter_get:
+        mov r0, lr
         mov pc, lr

kernel/arch/arm32/src/exc_handler.S

@@ -123 +123 @@
         stmfd r13!, {r2}
 2:
+        # Stop stack traces here
+        mov fp, #0
 .endm
 

kernel/arch/arm32/src/exception.c

@@ -42 +42 @@
 #include <print.h>
 #include <syscall/syscall.h>
+#include <stacktrace.h>
 
 #ifdef MACHINE_testarm
@@ -183 +184 @@
         printf(" r4: %x    r5: %x    r6: %x    r7: %x\n", 
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf(" r8: %x    r8: %x   r10: %x   r11: %x\n", 
-            istate->r8, istate->r9, istate->r10, istate->r11);
+        printf(" r8: %x    r8: %x   r10: %x    fp: %x\n", 
+            istate->r8, istate->r9, istate->r10, istate->fp);
         printf(" r12: %x    sp: %x    lr: %x  spsr: %x\n",
             istate->r12, istate->sp, istate->lr, istate->spsr);
         
         printf(" pc: %x\n", istate->pc);
+
+        stack_trace_istate(istate);
 }
 

kernel/arch/arm32/src/mm/page_fault.c

@@ -181 +181 @@
 
         if (ret == AS_PF_FAULT) {
+                fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
                 print_istate(istate);
                 printf("page fault - pc: %x, va: %x, status: %x(%x), "
@@ -186 +187 @@
                     access);
                 
-                fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
                 panic("Page fault.");
         }

kernel/arch/arm32/src/start.S

@@ -69 +69 @@
         bl arch_pre_main
         
+        #
+        # Create the first stack frame.
+        #
+        mov fp, #0
+        mov ip, sp
+        push {fp, ip, lr, pc}
+        sub fp, ip, #4
+
         bl main_bsp
 

kernel/arch/ia64/include/mm/asid.h

@@ -50 +50 @@
  * but those extra bits are not used by the kernel. 
  */
-#define RIDS_PER_ASID           7
+#define RIDS_PER_ASID           8
 
 #define RID_MAX                 262143          /* 2^18 - 1 */
-#define RID_KERNEL              0
-#define RID_INVALID             1
+#define RID_KERNEL7             7
 
-#define ASID2RID(asid, vrn)     (((asid)>RIDS_PER_ASID)?(((asid)*RIDS_PER_ASID)+(vrn)):(asid))
-#define RID2ASID(rid)           ((rid)/RIDS_PER_ASID)
+#define ASID2RID(asid, vrn) \
+        ((asid) * RIDS_PER_ASID + (vrn))
 
-#define ASID_MAX_ARCH           (RID_MAX/RIDS_PER_ASID)
+#define RID2ASID(rid) \
+        ((rid) / RIDS_PER_ASID)
+
+#define ASID_MAX_ARCH           (RID_MAX / RIDS_PER_ASID)
 
 #endif

kernel/arch/ia64/src/ia64.c

@@ -203 +203 @@
         }
         
-        sysinfo_set_item_val("kbd", NULL, true);
-        sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
-        sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
-        sysinfo_set_item_val("kbd.address.physical", NULL,
+        sysinfo_set_item_val("i8042", NULL, true);
+        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
+        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
+        sysinfo_set_item_val("i8042.address.physical", NULL,
             (uintptr_t) I8042_BASE);
-        sysinfo_set_item_val("kbd.address.kernel", NULL,
+        sysinfo_set_item_val("i8042.address.kernel", NULL,
             (uintptr_t) I8042_BASE);
 #endif

kernel/arch/ia64/src/mm/page.c

@@ -71 +71 @@
 
         /*
-         * First set up kernel region register.
-         * This is redundant (see start.S) but we keep it here just for sure.
-         */
-        rr.word = rr_read(VRN_KERNEL);
-        rr.map.ve = 0;                  /* disable VHPT walker */
-        rr.map.ps = PAGE_WIDTH;
-        rr.map.rid = ASID2RID(ASID_KERNEL, VRN_KERNEL);
-        rr_write(VRN_KERNEL, rr.word);
-        srlz_i();
-        srlz_d();
-
-        /*
-         * And setup the rest of region register.
+         * Set up kernel region registers.
+         * VRN_KERNEL has already been set in start.S.
+         * For paranoia reasons, we set it again.
          */
         for(i = 0; i < REGION_REGISTERS; i++) {
-                /* skip kernel rr */
-                if (i == VRN_KERNEL)
-                        continue;
-        
                 rr.word = rr_read(i);
                 rr.map.ve = 0;          /* disable VHPT walker */
-                rr.map.rid = RID_KERNEL;
+                rr.map.rid = ASID2RID(ASID_KERNEL, i);
                 rr.map.ps = PAGE_WIDTH;
                 rr_write(i, rr.word);

kernel/arch/ia64/src/start.S

@@ -74 +74 @@
         movl r10 = (RR_MASK)
         and r9 = r10, r9
-        movl r10 = ((RID_KERNEL << RID_SHIFT) | (KERNEL_PAGE_WIDTH << PS_SHIFT))
+        movl r10 = (((RID_KERNEL7) << RID_SHIFT) | (KERNEL_PAGE_WIDTH << PS_SHIFT))
         or r9 = r10, r9
         

kernel/generic/src/console/kconsole.c

@@ -543 +543 @@
                 if (str_lcmp(hlp->name, cmdline + start,
                     max(str_length(hlp->name),
-                    str_nlength(cmdline + start, (size_t) (end - start) - 1))) == 0) {
+                    str_nlength(cmdline + start, (size_t) (end - start)))) == 0) {
                         cmd = hlp;
                         break;