Changeset e28175d in mainline for kernel/arch/arm64

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

Location:

kernel/arch/arm64

Files:

• Makefile.inc (deleted)
• meson.build (moved) (moved from uspace/lib/c/arch/arm64/Makefile.inc ) (1 diff)
• src/arm64.c (modified) (3 diffs)
• src/debug/stacktrace.c (modified) (1 diff)

kernel/arch/arm64/meson.build

@@ -27 +27 @@
 #
 
-ARCH_SOURCES = \
-        arch/$(UARCH)/src/entryjmp.S \
-        arch/$(UARCH)/src/fibril.S \
-        arch/$(UARCH)/src/stacktrace.c \
-        arch/$(UARCH)/src/stacktrace_asm.S \
-        arch/$(UARCH)/src/syscall.c \
-        arch/$(UARCH)/src/tls.c \
-        arch/$(UARCH)/src/thread_entry.S
+arch_src += files(
+        'src/arm64.c',
+        'src/asm.S',
+        'src/context.S',
+        'src/cpu/cpu.c',
+        'src/debug/stacktrace.c',
+        'src/debug/stacktrace_asm.S',
+        'src/exception.c',
+        'src/fpu.S',
+        'src/fpu_context.c',
+        'src/interrupt.c',
+        'src/machine_func.c',
+        'src/mm/as.c',
+        'src/mm/frame.c',
+        'src/mm/km.c',
+        'src/mm/page.c',
+        'src/mm/tlb.c',
+        'src/smc.c',
+        'src/smp/ipi.c',
+        'src/smp/smp.c',
+        'src/start.S',
+)
 
-ARCH_AUTOCHECK_HEADERS = \
-        arch/$(UARCH)/include/libarch/fibril_context.h
+if MACHINE == 'virt'
+        arch_src += files('src/mach/virt/virt.c')
+endif
+
+_check_headers = [
+        'include/arch/context_struct.h',
+        'include/arch/fpu_context_struct.h',
+        'include/arch/istate_struct.h',
+]
+
+foreach h : _check_headers
+        arch_src += [ autocheck.process(h) ]
+endforeach

kernel/arch/arm64/src/arm64.c

@@ -156 +156 @@
 
         /* Set program entry. */
-        ELR_EL1_write((uint64_t) kernel_uarg->uspace_entry);
+        ELR_EL1_write(kernel_uarg->uspace_entry);
 
         /* Set user stack. */
-        SP_EL0_write(((uint64_t) kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size));
+        SP_EL0_write(kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size);
 
         /* Clear Thread ID register. */
@@ -167 +167 @@
         asm volatile (
             /*
-             * Clear all general-purpose registers, except x0 that holds an
-             * argument for the user space.
+             * Reset the kernel stack to its base value.
+             *
+             * Clear all general-purpose registers,
+             * except x0 that holds an argument for
+             * the user space.
              */
+            "mov sp, %[kstack]\n"
             "mov x0, %[uspace_uarg]\n"
             "mov x1, #0\n"
@@ -202 +206 @@
             "mov x30, #0\n"
             "eret\n"
-            :: [uspace_uarg] "r" (kernel_uarg->uspace_uarg)
+            :: [uspace_uarg] "r" (kernel_uarg->uspace_uarg),
+              [kstack] "r" (((uint64_t) (THREAD->kstack)) +
+              MEM_STACK_SIZE - SP_DELTA)
         );
 

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

@@ -68 +68 @@
 bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        return !copy_from_uspace((void *) prev,
-            (uint64_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+        return !copy_from_uspace(prev,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra,
-            (uint64_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
+        return !copy_from_uspace(ra,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_RA, sizeof(*ra));
 }