Changeset ccc362a1 in mainline for kernel/arch/riscv64/src/riscv64.c

Timestamp:

2017-08-21T18:46:34Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6c742f5e

Parents:

c16479e

Message:

riscv64: memory management routines, reflecting the latest Privileged Architecture specification (1.10)

File:

• kernel/arch/riscv64/src/riscv64.c (modified) (3 diffs)

kernel/arch/riscv64/src/riscv64.c

@@ -49 +49 @@
 #include <console/console.h>
 #include <mem.h>
+#include <str.h>
 
 char memcpy_from_uspace_failover_address;
 char memcpy_to_uspace_failover_address;
 
+static void riscv64_post_mm_init(void);
+
 arch_ops_t riscv64_ops = {
+        .post_mm_init = riscv64_post_mm_init
 };
 
 arch_ops_t *arch_ops = &riscv64_ops;
+
+void riscv64_pre_main(bootinfo_t *bootinfo)
+{
+        physmem_start = bootinfo->physmem_start;
+        htif_frame = bootinfo->htif_frame;
+        pt_frame = bootinfo->pt_frame;
+        
+        htif_init(bootinfo->ucbinfo.tohost, bootinfo->ucbinfo.fromhost);
+        
+        /* Copy tasks map. */
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS,
+            CONFIG_INIT_TASKS);
+        
+        for (size_t i = 0; i < init.cnt; i++) {
+                init.tasks[i].paddr = KA2PA(bootinfo->taskmap.tasks[i].addr);
+                init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
+                str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
+                    bootinfo->taskmap.tasks[i].name);
+        }
+        
+        /* Copy physical memory map. */
+        memmap.total = bootinfo->memmap.total;
+        memmap.cnt = min(bootinfo->memmap.cnt, MEMMAP_MAX_RECORDS);
+        for (size_t i = 0; i < memmap.cnt; i++) {
+                memmap.zones[i].start = bootinfo->memmap.zones[i].start;
+                memmap.zones[i].size = bootinfo->memmap.zones[i].size;
+        }
+}
+
+void riscv64_post_mm_init(void)
+{
+        outdev_t *htifout = htifout_init();
+        if (htifout)
+                stdout_wire(htifout);
+}
 
 void calibrate_delay_loop(void)
@@ -90 +129 @@
 }
 
-int context_save_arch(context_t *ctx)
-{
-        return 1;
-}
-
-void context_restore_arch(context_t *ctx)
-{
-        while (true);
-}
-
 void fpu_init(void)
 {
@@ -122 +151 @@
 }
 
-void early_putchar(wchar_t ch)
-{
-}
-
 /** @}
  */