Changeset 9970a5a in mainline for kernel/generic/src/main

Timestamp:

2012-01-27T23:24:27Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b3b571, fe56c08a

Parents:

d81eaf94 (diff), 221c9ec (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 from lp:~jakub/helenos/mm.

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (5 diffs)
• main.c (modified) (1 diff)

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) {
+                if (init.tasks[i].paddr % FRAME_SIZE) {
                         printf("init[%zu]: Address is not frame aligned\n", i);
                         programs[i].task = NULL;
@@ -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]);
+
+                /*
+                 * 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) {
@@ -224 +234 @@
                          * Assume the last task is the RAM disk.
                          */
-                        init_rd((void *) init.tasks[i].addr, init.tasks[i].size);
+                        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

@@ -151 +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);
+                }
         }