Changeset 00aece0 in mainline for kernel/generic/src/main

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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.

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (4 diffs)
• main.c (modified) (7 diffs)

kernel/generic/src/main/kinit.c

@@ -57 +57 @@
 #include <mm/as.h>
 #include <mm/frame.h>
+#include <mm/km.h>
 #include <print.h>
 #include <memstr.h>
@@ -68 +69 @@
 #include <str.h>
 #include <sysinfo/stats.h>
+#include <align.h>
 
 #ifdef CONFIG_SMP
@@ -178 +180 @@
         
         for (i = 0; i < init.cnt; i++) {
-                if (init.tasks[i].addr % FRAME_SIZE) {
-                        printf("init[%zu].addr is not frame aligned\n", i);
+                if (init.tasks[i].paddr % FRAME_SIZE) {
+                        printf("init[%zu]: Address is not frame aligned\n", i);
                         programs[i].task = NULL;
                         continue;
@@ -199 +201 @@
                 str_cpy(namebuf + INIT_PREFIX_LEN,
                     TASK_NAME_BUFLEN - INIT_PREFIX_LEN, name);
-                
-                int rc = program_create_from_image((void *) init.tasks[i].addr,
-                    namebuf, &programs[i]);
-                
-                if ((rc == 0) && (programs[i].task != NULL)) {
+
+                /*
+                 * Create virtual memory mappings for init task images.
+                 */
+                uintptr_t page = km_map(init.tasks[i].paddr,
+                    init.tasks[i].size,
+                    PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
+                ASSERT(page);
+                
+                int rc = program_create_from_image((void *) page, namebuf,
+                    &programs[i]);
+                
+                if (rc == 0) {
+                        if (programs[i].task != NULL) {
+                                /*
+                                 * Set capabilities to init userspace tasks.
+                                 */
+                                cap_set(programs[i].task, CAP_CAP | CAP_MEM_MANAGER |
+                                    CAP_IO_MANAGER | CAP_IRQ_REG);
+                                
+                                if (!ipc_phone_0)
+                                        ipc_phone_0 = &programs[i].task->answerbox;
+                        }
+                        
                         /*
-                         * Set capabilities to init userspace tasks.
+                         * If programs[i].task == NULL then it is
+                         * the program loader and it was registered
+                         * successfully.
                          */
-                        cap_set(programs[i].task, CAP_CAP | CAP_MEM_MANAGER |
-                            CAP_IO_MANAGER | CAP_IRQ_REG);
-                        
-                        if (!ipc_phone_0)
-                                ipc_phone_0 = &programs[i].task->answerbox;
-                } else if (rc == 0) {
-                        /* It was the program loader and was registered */
-                } else {
-                        /* RAM disk image */
-                        int rd = init_rd((rd_header_t *) init.tasks[i].addr, init.tasks[i].size);
-                        
-                        if (rd != RE_OK)
-                                printf("Init binary %zu not used (error %d)\n", i, rd);
-                }
+                } else if (i == init.cnt - 1) {
+                        /*
+                         * Assume the last task is the RAM disk.
+                         */
+                        init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
+                } else
+                        printf("init[%zu]: Init binary load failed (error %d)\n", i, rc);
         }
         

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();
@@ -243 +257 @@
                 for (i = 0; i < init.cnt; i++)
                         LOG("init[%zu].addr=%p, init[%zu].size=%zu",
-                            i, (void *) init.tasks[i].addr, i, init.tasks[i].size);
+                            i, (void *) init.tasks[i].paddr, i, init.tasks[i].size);
         } else
                 printf("No init binaries found.\n");
@@ -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.");