Changeset 61e90dd in mainline for kernel/generic/src

Timestamp:

2006-09-19T22:42:57Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

16529d5

Parents:

3abe07f5

Message:

Add balloc() (a.k.a boot allocator):

• balloc() only needs to know how to allocate memory.
• Memory allocated via balloc() is supposed to be passed to kernel and never freed by boot itself.
• make kernel aware of boot allocations

More work on OFW device tree:

• use balloc() to efficiently and safely allocate memory for the canonical copy of the device tree

sparc64 boot:

• pass OFW device tree root node pointer to kernel

Location:

kernel/generic/src

Files:

• main/main.c (modified) (3 diffs)
• mm/frame.c (modified) (1 diff)

kernel/generic/src/main/main.c

@@ -95 +95 @@
 };
 
+/** Boot allocations. */
+ballocs_t ballocs = {
+        .base = NULL,
+        .size = 0
+};
+
 context_t ctx;
 
@@ -106 +112 @@
 size_t hardcoded_kdata_size = 0;        /**< Size of the kernel data in bytes. */
 
-uintptr_t stack_safe = 0;       /**< Lowest safe stack virtual address */
+uintptr_t stack_safe = 0;               /**< Lowest safe stack virtual address */
 
 void main_bsp(void);
@@ -152 +158 @@
                 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);
+        }
+
+        /* Avoid placing stack on top of boot allocations. */
+        if (ballocs.size) {
+                if (PA_overlaps(config.stack_base, config.stack_size, ballocs.base, ballocs.size))
+                        config.stack_base = ALIGN_UP(ballocs.base + ballocs.size, PAGE_SIZE);
         }
         

kernel/generic/src/mm/frame.c

@@ -1078 +1078 @@
                         frame_mark_unavailable(ADDR2PFN(KA2PA(init.tasks[i].addr)), SIZE2FRAMES(init.tasks[i].size));
 
+                if (ballocs.size)
+                        frame_mark_unavailable(ADDR2PFN(KA2PA(ballocs.base)), SIZE2FRAMES(ballocs.size));
+
                 /* Black list first frame, as allocating NULL would
                  * fail in some places */