Changeset 116 for trunk/hal/x86_64/core/hal_init.c

Timestamp:

Jun 30, 2017, 5:18:13 PM (7 years ago)

Author:

max@…

Message:

complete hal_ppm_init, to take into account the reserved areas

File:

• trunk/hal/x86_64/core/hal_init.c (modified) (3 diffs)

trunk/hal/x86_64/core/hal_init.c

@@ -80 +80 @@
 }
 
+static size_t init_bootinfo_rsvd(boot_rsvd_t *rsvd)
+{
+        size_t mmap_length = mb_info.mi_mmap_length;
+        uint8_t *mmap_addr = (uint8_t *)&mb_mmap;
+        size_t i, rsvd_nr;
+
+        memset(rsvd, 0, sizeof(boot_rsvd_t));
+
+        i = 0, rsvd_nr = 0;
+        while (i < mmap_length) {
+                struct multiboot_mmap *mm;
+
+                mm = (struct multiboot_mmap *)(mmap_addr + i);
+
+                rsvd[rsvd_nr].first_page =
+                    rounddown(mm->mm_base_addr, PAGE_SIZE) / PAGE_SIZE;
+                rsvd[rsvd_nr].npages =
+                    roundup(mm->mm_length, PAGE_SIZE) / PAGE_SIZE;
+                rsvd_nr++;
+
+                if (rsvd_nr == CONFIG_PPM_MAX_RSVD)
+                        x86_panic("too many memory holes");
+
+                i += mm->mm_size + 4;
+        }
+
+        return rsvd_nr;
+}
+
 static void init_bootinfo_core(boot_core_t *core)
 {
@@ -109 +138 @@
 static void init_bootinfo(boot_info_t *info)
 {
-        extern paddr_t pa_avail;
-        extern vaddr_t va_avail;
+        size_t offset;
 
         extern uint64_t __kernel_data_start;
         extern uint64_t __kernel_end;
-
-        size_t pa_offset = pa_avail - 0;
-        size_t va_offset = va_avail - CLUSTER_MIN_VA(0);
 
         memset(info, 0, sizeof(boot_info_t));
@@ -136 +161 @@
         init_bootinfo_core(&info->core[0]);
 
-        info->rsvd_nr = 0;
-        /* rsvd XXX */
+        info->rsvd_nr = init_bootinfo_rsvd(&info->rsvd);
 
         /* dev_ XXX */
-
-        info->pages_offset = MAX(pa_offset, va_offset);
+        offset = hal_gpt_bootstrap_uniformize();
+        info->pages_offset = offset / PAGE_SIZE;
         info->pages_nr = 0; /* XXX */