Changes in boot/arch/riscv64/src/main.c [8b6aa39:ae8d7b0] in mainline

File:

• boot/arch/riscv64/src/main.c (modified) (7 diffs)

boot/arch/riscv64/src/main.c

@@ -30 +30 @@
 #include <arch/arch.h>
 #include <arch/asm.h>
+#include <arch/ucb.h>
+#include <arch/mm.h>
 #include <version.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <printf.h>
 #include <macros.h>
@@ -39 +41 @@
 #include <halt.h>
 #include <inflate.h>
-#include <arch/_components.h>
-
-#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
-#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
+#include "../../components.h"
 
 static bootinfo_t bootinfo;
@@ -50 +49 @@
         version_print();
         
+        bootinfo.htif_frame = ((uintptr_t) &htif_page) >> PAGE_WIDTH;
+        bootinfo.pt_frame = ((uintptr_t) &pt_page) >> PAGE_WIDTH;
+        
+        bootinfo.ucbinfo.tohost =
+            (volatile uint64_t *) PA2KA((uintptr_t) &tohost);
+        bootinfo.ucbinfo.fromhost =
+            (volatile uint64_t *) PA2KA((uintptr_t) &fromhost);
+        
         // FIXME TODO: read from device tree
-        bootinfo.memmap.total = 1024 * 1024 * 1024;
-        bootinfo.memmap.cnt = 0;
+        bootinfo.physmem_start = PHYSMEM_START;
+        bootinfo.memmap.total = PHYSMEM_SIZE;
+        bootinfo.memmap.cnt = 1;
+        bootinfo.memmap.zones[0].start = (void *) PHYSMEM_START;
+        bootinfo.memmap.zones[0].size = PHYSMEM_SIZE;
         
-        printf("\nMemory statistics (total %lu MB)\n\n", bootinfo.memmap.total >> 20);
+        printf("\nMemory statistics (total %lu MB, starting at %p)\n\n",
+            bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
         printf(" %p: boot info structure\n", &bootinfo);
         
-        uintptr_t top = 0;
+        uintptr_t top = BOOT_OFFSET;
         
         for (size_t i = 0; i < COMPONENTS; i++) {
-                printf(" %p: %s image (%zu/%zu bytes)\n", components[i].start,
+                printf(" %p: %s image (%zu/%zu bytes)\n", components[i].addr,
                     components[i].name, components[i].inflated,
                     components[i].size);
                 
-                uintptr_t tail = (uintptr_t) components[i].start +
+                uintptr_t tail = (uintptr_t) components[i].addr +
                     components[i].size;
-                if (tail > top)
-                        top = tail;
+                if (tail > top) {
+                        printf("\n%s: Image too large to fit (%p >= %p), halting.\n",
+                            components[i].name, (void *) tail, (void *) top);
+                        halt();
+                }
         }
         
-        top = ALIGN_UP(top, PAGE_SIZE);
         printf(" %p: inflate area\n", (void *) top);
         
@@ -92 +105 @@
                         bootinfo.taskmap.cnt++;
                 } else
-                        kernel_entry = (void *) top;
+                        kernel_entry = (void *) PA2KA(top);
                 
                 dest[i] = (void *) top;
@@ -101 +114 @@
         printf(" %p: kernel entry point\n", kernel_entry);
         
-        if (top >= bootinfo.memmap.total) {
+        if (top >= bootinfo.physmem_start + bootinfo.memmap.total) {
                 printf("Not enough physical memory available.\n");
                 printf("The boot image is too large. Halting.\n");
@@ -112 +125 @@
                 printf("%s ", components[i - 1].name);
                 
-                int err = inflate(components[i - 1].start, components[i - 1].size,
+                int err = inflate(components[i - 1].addr, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
                 
@@ -125 +138 @@
         
         printf("Booting the kernel...\n");
-        jump_to_kernel(kernel_entry, PA2KA(&bootinfo));
+        jump_to_kernel(PA2KA(&bootinfo));
 }