Changeset 3e828ea in mainline for kernel/arch/ia64

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

kernel/arch/ia64

Files:

• include/arch/interrupt.h (modified) (1 diff)
• include/arch/istate.h (modified) (1 diff)
• include/arch/mm/as.h (modified) (1 diff)
• include/arch/mm/page.h (modified) (2 diffs)
• include/arch/register.h (modified) (1 diff)
• meson.build (added)
• src/ia64.c (modified) (1 diff)
• src/interrupt.c (modified) (1 diff)
• src/mm/tlb.c (modified) (8 diffs)

kernel/arch/ia64/include/arch/interrupt.h

@@ -92 +92 @@
 extern void disabled_fp_register(unsigned int, istate_t *);
 
-extern void trap_virtual_enable_irqs(uint16_t);
-
 void exception_init(void);
 #endif

kernel/arch/ia64/include/arch/istate.h

@@ -71 +71 @@
 _NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return (istate->cr_iip) < 0xe000000000000000ULL;
+        return istate->cr_ipsr.cpl == PSR_CPL_USER;
 }
 

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

@@ -37 +37 @@
 
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
+#define KERNEL_SEPARATE_PTL0_ARCH           0
 
 #define KERNEL_ADDRESS_SPACE_START_ARCH  UINT64_C(0xe000000000000000)

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

@@ -38 +38 @@
 
 #include <arch/mm/frame.h>
+#include <arch/register.h>
 
 #ifndef __ASSEMBLER__
@@ -76 +77 @@
 
 /** Privilege Levels. Only the most and the least privileged ones are ever used. */
-#define PL_KERNEL  0x00
-#define PL_USER    0x03
+#define PL_KERNEL  PSR_CPL_KERNEL
+#define PL_USER    PSR_CPL_USER
 
 /* Access Rigths. Only certain combinations are used by the kernel. */

kernel/arch/ia64/include/arch/register.h

@@ -57 +57 @@
 #define PSR_RT_MASK   (1 << 27)
 #define PSR_IT_MASK   (1 << 36)
+
+#define PSR_CPL_USER   3
+#define PSR_CPL_KERNEL 0
 
 #define PSR_CPL_SHIFT         32

kernel/arch/ia64/src/ia64.c

@@ -244 +244 @@
          * uspace_stack_size / 2 bytes.
          */
-        switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+        switch_to_userspace(kernel_uarg->uspace_entry,
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size / 2 -
             ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size / 2,
-            (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
+            kernel_uarg->uspace_uarg, psr.value, rsc.value);
 
         while (true)

kernel/arch/ia64/src/interrupt.c

@@ -301 +301 @@
 }
 
-void trap_virtual_enable_irqs(uint16_t irqmask)
-{
-}
-
 void exception_init(void)
 {

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

@@ -464 +464 @@
 }
 
-static bool is_kernel_fault(uintptr_t va)
+static bool is_kernel_fault(istate_t *istate, uintptr_t va)
 {
         region_register_t rr;
+
+        if (istate_from_uspace(istate))
+                return false;
 
         rr.word = rr_read(VA2VRN(va));
@@ -484 +487 @@
         pte_t t;
 
+        assert(istate_from_uspace(istate));
+
         va = istate->cr_ifa; /* faulting address */
-
-        assert(!is_kernel_fault(va));
 
         bool found = page_mapping_find(AS, va, true, &t);
@@ -587 +590 @@
         as_t *as = AS;
 
-        if (is_kernel_fault(va)) {
+        if (is_kernel_fault(istate, va)) {
                 if (va < end_of_identity) {
                         /*
@@ -648 +651 @@
         va = istate->cr_ifa;  /* faulting address */
 
-        if (is_kernel_fault(va))
+        if (is_kernel_fault(istate, va))
                 as = AS_KERNEL;
 
@@ -680 +683 @@
         pte_t t;
 
+        assert(istate_from_uspace(istate));
+
         va = istate->cr_ifa;  /* faulting address */
-
-        assert(!is_kernel_fault(va));
 
         bool found = page_mapping_find(AS, va, true, &t);
@@ -716 +719 @@
         va = istate->cr_ifa;  /* faulting address */
 
-        if (is_kernel_fault(va))
+        if (is_kernel_fault(istate, va))
                 as = AS_KERNEL;
 
@@ -752 +755 @@
         pte_t t;
 
+        assert(istate_from_uspace(istate));
+
         va = istate->cr_ifa;  /* faulting address */
-
-        assert(!is_kernel_fault(va));
 
         /*
@@ -779 +782 @@
         pte_t t;
 
+        assert(istate_from_uspace(istate));
+
         va = istate->cr_ifa;  /* faulting address */
-
-        assert(!is_kernel_fault(va));
 
         bool found = page_mapping_find(AS, va, true, &t);