Changeset 119

Timestamp:

Jul 3, 2017, 12:33:21 PM (7 years ago)

Author:

max@…

Message:

provide pages_nr

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_pages_nr()
+{
+        size_t mmap_length = mb_info.mi_mmap_length;
+        uint8_t *mmap_addr = (uint8_t *)&mb_mmap;
+        paddr_t maxpa, pa;
+        size_t i;
+
+        i = 0;
+        maxpa = 0;
+        while (i < mmap_length) {
+                struct multiboot_mmap *mm;
+
+                mm = (struct multiboot_mmap *)(mmap_addr + i);
+
+                if (mm->mm_type == 1) {
+                        pa = mm->mm_base_addr + mm->mm_length;
+                        if (pa > maxpa)
+                                maxpa = pa;
+                }
+
+                i += mm->mm_size + 4;
+        }
+
+        return (maxpa / PAGE_SIZE);
+}
+
 static size_t init_bootinfo_rsvd(boot_rsvd_t *rsvd)
 {
@@ -94 +120 @@
                 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");
+                if (mm->mm_type != 1) {
+                        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;
@@ -166 +193 @@
         offset = hal_gpt_bootstrap_uniformize();
         info->pages_offset = offset / PAGE_SIZE;
-        info->pages_nr = 0; /* XXX */
+        info->pages_nr = init_bootinfo_pages_nr();
 
         info->kernel_code_start = (intptr_t)(KERNTEXTOFF - KERNBASE);