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

Timestamp:

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

Author:

max@…

Message:

complete hal_ppm_init, to take into account the reserved areas

File:

• trunk/hal/x86_64/core/hal_ppm.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_ppm.c

@@ -32 +32 @@
 #include <page.h>
 
+#include <hal_boot.h>
 #include <hal_internal.h>
 
 error_t hal_ppm_init(boot_info_t *info)
 {
-        size_t i;
+        boot_rsvd_t *rsvd;
+        size_t i, j;
 
         // get relevant info from boot_info structure
@@ -59 +61 @@
         }
 
-        // TODO
+        // initialize dirty_list as empty
+        list_root_init( &ppm->dirty_root );
 
-        x86_panic((char *)__func__);
-        return 0;
+        // compute size of pages_tbl[] array rounded to an integer number of pages
+        uint32_t bytes = ARROUND_UP( pages_nr * sizeof(page_t), CONFIG_PPM_PAGE_SIZE );
+
+        // compute number of pages required to store page descriptor array
+        uint32_t pages_tbl_nr = bytes >> CONFIG_PPM_PAGE_SHIFT;
+
+        // compute total number of reserved pages (kernel code & pages_tbl[])
+        uint32_t reserved_pages = pages_tbl_offset + pages_tbl_nr;
+
+        // initialize pages_nr, pages_tbl, and vaddr_base pointers
+        ppm->pages_nr   = pages_nr;
+        ppm->vaddr_base = (void *)CLUSTER_MIN_VA(0);
+        ppm->pages_tbl  = (page_t *)hal_gpt_bootstrap_valloc(pages_tbl_nr);
+
+        // make sure we respect the rule [VA = PA + constant_offset]
+        XASSERT(ppm->pages_tbl == ppm->vaddr_base + pages_tbl_offset * PAGE_SIZE);
+
+        // initialize all page descriptors in pages_tbl[]
+        for( i = 0 ; i < pages_nr ; i++ )
+        {
+                page_init( &ppm->pages_tbl[i] );
+
+                // TODO optimisation for this enormous loop on small pages:
+                // make only a partial init with a memset, and complete the
+                // initialisation when page is allocated [AG]
+        }
+
+        /*
+         * Set the PG_RESERVED flag for reserved pages (kernel, pages_tbl[] and
+         * memory holes).
+         */
+        for (i = 0; i < reserved_pages; i++) {
+                page_set_flag(&ppm->pages_tbl[i], PG_RESERVED);
+        }
+        for (i = 0; i < rsvd_nr; i++) {
+                rsvd = &info->rsvd[i];
+                for (j = 0; j < rsvd->npages; j++) {
+                        page_set_flag(&ppm->pages_tbl[rsvd->first_page + j], PG_RESERVED);
+                }
+        }
+
+        /* Release all other pages to populate the free lists */
+        for (i = reserved_pages; i < pages_nr; i++) {
+                if (!page_is_flag(&ppm->pages_tbl[i], PG_RESERVED))
+                        ppm_free_pages_nolock(&ppm->pages_tbl[i]);
+        }
+
+        /* Check consistency */
+        return ppm_assert_order(ppm);
 }