Changeset b6d4566 in mainline

Timestamp:

2006-03-27T16:56:51Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ff75d34

Parents:

50fe620

Message:

CPU stacks must have two frames on ia64.
Make sure both thread stack frames are mapped in before_thread_runs_arch().
Take STACK_FRAMES into account during kernel memory layout initialization in main_bsp().

Files:

• arch/ia64/include/context.h (modified) (3 diffs)
• arch/ia64/include/mm/tlb.h (modified) (1 diff)
• arch/ia64/src/ivt.S (modified) (1 diff)
• arch/ia64/src/proc/scheduler.c (modified) (1 diff)
• contrib/conf/msim.conf (modified) (1 diff)
• generic/include/config.h (modified) (1 diff)
• generic/include/mm/frame.h (modified) (1 diff)
• generic/src/cpu/cpu.c (modified) (1 diff)
• generic/src/main/main.c (modified) (2 diffs)
• generic/src/proc/thread.c (modified) (1 diff)

arch/ia64/include/context.h

@@ -37 +37 @@
 
 /*
- * context_save() and context_restore() are both leaf procedures.
+ * context_save_arch() and context_restore_arch() are both leaf procedures.
  * No need to allocate scratch area.
  *
@@ -48 +48 @@
 #endif
 
-/*RSE stack should begin under bottom of stack @ kernel*/
-#define context_set(c, _pc, stack, size)                                                                \
-        (c)->pc = (__address) _pc;                                                                      \
-        (c)->bsp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) ;    \
-        (c)->ar_pfs &= PFM_MASK;                                                                        \
-        (c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;
+/* RSE stack starts at the bottom of memory stack. */
+#define context_set(c, _pc, stack, size)                                                                \
+        do {                                                                                            \
+                (c)->pc = (__address) _pc;                                                              \
+                (c)->bsp = ((__address) stack) + ALIGN_UP((size), REGISTER_STACK_ALIGNMENT);            \
+                (c)->ar_pfs &= PFM_MASK;                                                                \
+                (c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;           \
+        } while (0);
 
 /*
@@ -123 +125 @@
 };
 
-
-
 #endif

arch/ia64/include/mm/tlb.h

@@ -42 +42 @@
 #define DTR_KERNEL      0
 #define ITR_KERNEL      0
-#define DTR_KSTACK      1
+#define DTR_KSTACK1     1
+#define DTR_KSTACK2     2
 
 /** Portion of TLB insertion format data structure. */

arch/ia64/src/ivt.S

@@ -33 +33 @@
 #include <align.h>
 
-
 #define FRS_TO_SAVE 30
 #define STACK_ITEMS             (19 + FRS_TO_SAVE*2)
-//#define STACK_ITEMS           19              
-        /* 30*2 for FPU registers */
 #define STACK_FRAME_SIZE        ALIGN_UP((STACK_ITEMS*STACK_ITEM_SIZE) + STACK_SCRATCH_AREA_SIZE, STACK_ALIGNMENT)
 

arch/ia64/src/proc/scheduler.c

@@ -44 +44 @@
         base = ALIGN_DOWN(config.base, 1<<KERNEL_PAGE_WIDTH);
 
-        if ((__address) THREAD->kstack < base || (__address) THREAD->kstack > base + (1<<KERNEL_PAGE_WIDTH)) {
+        if ((__address) THREAD->kstack < base || (__address) THREAD->kstack > base + (1<<(KERNEL_PAGE_WIDTH))) {
                 /*
                  * Kernel stack of this thread is not mapped by DTR[TR_KERNEL].
-                 * Use DTR[TR_KSTACK] to map it.
+                 * Use DTR[TR_KSTACK1] and DTR[TR_KSTACK2] to map it.
                  */
-                 dtlb_kernel_mapping_insert((__address) THREAD->kstack, KA2PA(THREAD->kstack), true, DTR_KSTACK);
+                dtlb_kernel_mapping_insert((__address) THREAD->kstack, KA2PA(THREAD->kstack), true, DTR_KSTACK1);
+                dtlb_kernel_mapping_insert((__address) THREAD->kstack + PAGE_SIZE, KA2PA(THREAD->kstack) + FRAME_SIZE, true, DTR_KSTACK2);
         }
         

contrib/conf/msim.conf

@@ -6 +6 @@
 
 add rwm mainmem         0x0                     8M              load    "/dev/zero"
-add rom startmem        0x1fc00000      1024k   load    "image.boot" 
-add rwm init            0x01000000      1M              load    "init"
+add rom startmem        0x1fc00000              1024k           load    "image.boot" 
+add rwm init            0x01000000              1M              load    "init"
 
 add dprinter printer 0x10000000

generic/include/config.h

@@ -37 +37 @@
 
 #define CONFIG_MEMORY_SIZE      (8 * 1024 * 1024)
-#define CONFIG_STACK_SIZE       STACK_SIZE
+
 #define CONFIG_INIT_TASKS       32
 

generic/include/mm/frame.h

@@ -48 +48 @@
 #endif
 
-
 #define ZONES_MAX       16      /**< Maximum number of zones in system */
 
-#define ZONE_JOIN       0x1     /**< If possible, merge with neighberhood zones */
+#define ZONE_JOIN       0x1     /**< If possible, merge with neighbouring zones */
 
 #define FRAME_KA                0x1     /* skip frames conflicting with user address space */

generic/src/cpu/cpu.c

@@ -63 +63 @@
 
                 for (i=0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC)));
+                        cpus[i].stack = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(STACK_FRAMES, FRAME_KA | FRAME_PANIC)));
                         
                         cpus[i].id = i;

generic/src/main/main.c

@@ -93 +93 @@
 #endif
 
+#define CONFIG_STACK_SIZE       ((1<<STACK_FRAMES)*STACK_SIZE)
+
 /** Bootstrap CPU main kernel routine
  *
@@ -129 +131 @@
         
         context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack), 
-                    stackaddr, CONFIG_STACK_SIZE);
+        context_set(&ctx, FADDR(main_bsp_separated_stack), stackaddr, THREAD_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */

generic/src/proc/thread.c

@@ -267 +267 @@
         
         /* Not needed, but good for debugging */
-        memsetb((__address)t->kstack, THREAD_STACK_SIZE, 0);
+        memsetb((__address)t->kstack, THREAD_STACK_SIZE * 1<<STACK_FRAMES, 0);
         
         ipl = interrupts_disable();