Changeset 26aafe8 in mainline for kernel/arch/ppc32

Timestamp:

2011-05-19T16:47:49Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a6d8726

Parents:

bcaca55

Message:

cleanup the huge mess related to stacks, their sizes and locations
use two frames for kernel stacks by default on all platforms (to play it safe)

Location:

kernel/arch/ppc32

Files:

• include/boot/boot.h (modified) (1 diff)
• include/istate.h (modified) (2 diffs)
• include/mm/as.h (modified) (1 diff)
• src/boot/boot.S (modified) (2 diffs)
• src/mm/tlb.c (modified) (2 diffs)
• src/ppc32.c (modified) (1 diff)
• src/proc/scheduler.c (modified) (1 diff)

kernel/arch/ppc32/include/boot/boot.h

@@ -37 +37 @@
 
 #define BOOT_OFFSET  0x8000
-
-/* Temporary stack size for boot process */
-#define TEMP_STACK_SIZE  0x1000
 
 #define TASKMAP_MAX_RECORDS        32

kernel/arch/ppc32/include/istate.h

@@ -73 +73 @@
         uint32_t cr;
         uint32_t pc;
-        uint32_t srr1;
+        uint32_t msr;
         uint32_t lr;
         uint32_t ctr;
@@ -90 +90 @@
 /** Return true if exception happened while in userspace
  *
- * The contexts of MSR register was stored in SRR1.
- *
  */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return (istate->srr1 & MSR_PR) != 0;
+        return (istate->msr & MSR_PR) != 0;
 }
 

kernel/arch/ppc32/include/mm/as.h

@@ -38 +38 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH  ((unsigned long) 0x80000000)
-#define KERNEL_ADDRESS_SPACE_END_ARCH    ((unsigned long) 0xffffffff)
-#define USER_ADDRESS_SPACE_START_ARCH    ((unsigned long) 0x00000000)
-#define USER_ADDRESS_SPACE_END_ARCH      ((unsigned long) 0x7fffffff)
-
-#define USTACK_ADDRESS_ARCH  (0x7fffffff - (PAGE_SIZE - 1))
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT32_C(0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT32_C(0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT32_C(0x7fffffff)
 
 typedef struct {

kernel/arch/ppc32/src/boot/boot.S

@@ -28 +28 @@
 
 #include <arch/asm/regname.h>
-#include <arch/boot/boot.h>
+#include <config.h>
 
 .section K_TEXT_START, "ax"
@@ -56 +56 @@
 .align 12
 kernel_stack_bottom:
-        .space TEMP_STACK_SIZE
+        .space STACK_SIZE
 kernel_stack:

kernel/arch/ppc32/src/mm/tlb.c

@@ -223 +223 @@
                 switch (pfrc) {
                 case AS_PF_FAULT:
-                        goto fail;
-                        break;
+                        page_table_unlock(as, true);
+                        pht_refill_fail(badvaddr, istate);
+                        return;
                 case AS_PF_DEFER:
                         /*
@@ -242 +243 @@
         
         page_table_unlock(as, true);
-        return;
-        
-fail:
-        page_table_unlock(as, true);
-        pht_refill_fail(badvaddr, istate);
 }
 

kernel/arch/ppc32/src/ppc32.c

@@ -265 +265 @@
 {
         userspace_asm((uintptr_t) kernel_uarg->uspace_uarg,
-            (uintptr_t) kernel_uarg->uspace_stack +
-            THREAD_STACK_SIZE - SP_DELTA,
+            (uintptr_t) kernel_uarg->uspace_stack + STACK_SIZE - SP_DELTA,
             (uintptr_t) kernel_uarg->uspace_entry);
         

kernel/arch/ppc32/src/proc/scheduler.c

@@ -55 +55 @@
         asm volatile (
                 "mtsprg0 %[ksp]\n"
-                :: [ksp] "r" (KA2PA(&THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA]))
+                :: [ksp] "r" (KA2PA(&THREAD->kstack[STACK_SIZE - SP_DELTA]))
         );
 }