Changeset b7068da in mainline for kernel/generic/src/main/main.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/main/main.c (modified) (6 diffs)

kernel/generic/src/main/main.c

@@ -68 +68 @@
 #include <mm/page.h>
 #include <genarch/mm/page_pt.h>
+#include <mm/km.h>
 #include <mm/tlb.h>
 #include <mm/as.h>
@@ -86 +87 @@
 #include <sysinfo/sysinfo.h>
 #include <sysinfo/stats.h>
+#include <lib/ra.h>
 
 /** Global configuration structure. */
-config_t config;
+config_t config = {
+        .identity_configured = false,
+        .non_identity_configured = false,
+        .physmem_end = 0
+};
 
 /** Initial user-space tasks */
@@ -145 +151 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                if (PA_OVERLAPS(config.stack_base, config.stack_size,
-                    init.tasks[i].addr, init.tasks[i].size))
-                        config.stack_base = ALIGN_UP(init.tasks[i].addr +
-                            init.tasks[i].size, config.stack_size);
+                if (overlaps(KA2PA(config.stack_base), config.stack_size,
+                    init.tasks[i].paddr, init.tasks[i].size)) {
+                        /*
+                         * The init task overlaps with the memory behind the
+                         * kernel image so it must be in low memory and we can
+                         * use PA2KA on the init task's physical address.
+                         */
+                        config.stack_base = ALIGN_UP(
+                            PA2KA(init.tasks[i].paddr) + init.tasks[i].size,
+                            config.stack_size);
+                }
         }
         
@@ -205 +218 @@
          */
         arch_pre_mm_init();
+        km_identity_init();
         frame_init();
-        
-        /* Initialize at least 1 memory segment big enough for slab to work. */
         slab_cache_init();
+        ra_init();      
         sysinfo_init();
         btree_init();
@@ -214 +227 @@
         page_init();
         tlb_init();
+        km_non_identity_init();
         ddi_init();
         arch_post_mm_init();
@@ -262 +276 @@
          * Create the first thread.
          */
-        thread_t *kinit_thread
-                = thread_create(kinit, NULL, kernel, 0, "kinit", true);
+        thread_t *kinit_thread =
+            thread_create(kinit, NULL, kernel, 0, "kinit", true);
         if (!kinit_thread)
                 panic("Cannot create kinit thread.");