Changeset 9d47440 in mainline for kernel/arch/ia64

Timestamp:

2011-05-21T16:23:17Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ff03f3

Parents:

8d308b9 (diff), 13f2461 (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/arch/ia64

Files:

• include/arch.h (modified) (1 diff)
• include/asm.h (modified) (1 diff)
• include/context.h (modified) (1 diff)
• include/mm/as.h (modified) (1 diff)
• include/mm/frame.h (modified) (1 diff)
• src/ia64.c (modified) (1 diff)
• src/proc/scheduler.c (modified) (2 diffs)

kernel/arch/ia64/include/arch.h

@@ -36 +36 @@
 #define KERN_ia64_ARCH_H_
 
-#define LOADED_PROG_STACK_PAGES_NO 2
-
 #include <arch/drivers/ski.h>
 

kernel/arch/ia64/include/asm.h

@@ -122 +122 @@
 }
 
-/** Return base address of current stack
- *
- * Return the base address of the current stack.
- * The stack is assumed to be STACK_SIZE long.
- * The stack must start on page boundary.
- *
+/** Return base address of current memory stack.
+ *
+ * The memory stack is assumed to be STACK_SIZE / 2 long. Note that there is
+ * also the RSE stack, which takes up the upper half of STACK_SIZE.
+ * The memory stack must start on page boundary.
  */
 NO_TRACE static inline uintptr_t get_stack_base(void)
 {
-        uint64_t v;
-        
-        /*
-         * I'm not sure why but this code inlines badly
-         * in scheduler, resulting in THE shifting about
-         * 16B and causing kernel panic.
-         *
-         * asm volatile (
-         *     "and %[value] = %[mask], r12"
-         *     : [value] "=r" (v)
-         *     : [mask] "r" (~(STACK_SIZE - 1))
-         * );
-         * return v;
-         *
-         * The following code has the same semantics but
-         * inlines correctly.
-         *
-         */
+        uint64_t value;
         
         asm volatile (
                 "mov %[value] = r12"
-                : [value] "=r" (v)
-        );
-        
-        return (v & (~(STACK_SIZE - 1)));
+                : [value] "=r" (value)
+        );
+        
+        return (value & (~(STACK_SIZE / 2 - 1)));
 }
 

kernel/arch/ia64/include/context.h

@@ -49 +49 @@
 #define SP_DELTA        (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
-/* RSE stack starts at the bottom of memory stack. */
+/* RSE stack starts at the bottom of memory stack, hence the division by 2. */
 #define context_set(c, _pc, stack, size)                                                                \
         do {                                                                                            \
                 (c)->pc = (uintptr_t) _pc;                                                              \
-                (c)->bsp = ((uintptr_t) stack) + ALIGN_UP((size), REGISTER_STACK_ALIGNMENT);            \
+                (c)->bsp = ((uintptr_t) stack) + ALIGN_UP((size / 2), REGISTER_STACK_ALIGNMENT);        \
                 (c)->ar_pfs &= PFM_MASK;                                                                \
-                (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;           \
+                (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size / 2), STACK_ALIGNMENT) - SP_DELTA;       \
         } while (0);
 

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

@@ -38 +38 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH  ((unsigned long) 0xe000000000000000ULL)
-#define KERNEL_ADDRESS_SPACE_END_ARCH    ((unsigned long) 0xffffffffffffffffULL)
-#define USER_ADDRESS_SPACE_START_ARCH    ((unsigned long) 0x0000000000000000ULL)
-#define USER_ADDRESS_SPACE_END_ARCH      ((unsigned long) 0xdfffffffffffffffULL)
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT64_C(0xe000000000000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT64_C(0xffffffffffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT64_C(0x0000000000000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT64_C(0xdfffffffffffffff)
 
-#define USTACK_ADDRESS_ARCH  0x0000000ff0000000ULL
+#define USTACK_ADDRESS_ARCH  UINT64_C(0x0000000ff0000000)
 
 typedef struct {

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

@@ -49 +49 @@
 #define physmem_print()
 
-#define ARCH_STACK_FRAMES TWO_FRAMES
-
 #endif /* __ASM__ */
 #endif /* KERNEL */

kernel/arch/ia64/src/ia64.c

@@ -249 +249 @@
         rsc.mode = 3;                   /* eager mode */
 
+        /*
+         * Switch to userspace.
+         *
+         * When calculating stack addresses, mind the stack split between the
+         * memory stack and the RSE stack. Each occuppies STACK_SIZE / 2 bytes.
+         */
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE -
+            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2 -
             ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE,
+            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2,
             (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
 

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

@@ -79 +79 @@
          * Record address of kernel stack to bank 0 r23.
          * These values will be found there after switch from userspace.
+         *
+         * Mind the 1:1 split of the entire STACK_SIZE long region between the
+         * memory stack and the RSE stack.
          */
         asm volatile (
@@ -86 +89 @@
                 "bsw.1\n"
                 :
-                : "r" (&THREAD->kstack[THREAD_STACK_SIZE]),
-                  "r" (&THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA])
+                : "r" (&THREAD->kstack[STACK_SIZE / 2]),
+                  "r" (&THREAD->kstack[STACK_SIZE / 2 - SP_DELTA])
                 );
 }