Changeset 61e90dd in mainline for kernel

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

Files:

• arch/sparc64/include/boot/boot.h (modified) (4 diffs)
• arch/sparc64/src/sparc64.c (modified) (2 diffs)
• genarch/Makefile.inc (modified) (1 diff)
• genarch/include/ofw/ofw_tree.h (added)
• genarch/src/ofw/ofw_tree.c (added)
• generic/include/config.h (modified) (2 diffs)
• generic/src/main/main.c (modified) (3 diffs)
• generic/src/mm/frame.c (modified) (1 diff)

kernel/arch/sparc64/include/boot/boot.h

@@ -36 +36 @@
 #define KERN_sparc64_BOOT_H_
 
-
 #define VMA                     0x400000
 #define LMA                     VMA
@@ -43 +42 @@
 #ifndef __LINKER__
 
+#include <config.h>
 #include <arch/types.h>
 #include <typedefs.h>
+#include <genarch/ofw/ofw_tree.h>
 
 #define TASKMAP_MAX_RECORDS     32
@@ -87 +88 @@
 } processor_t;
 
+/** Bootinfo structure.
+ *
+ * Must be in sync with bootinfo structure used by the boot loader.
+ */
 typedef struct {
         taskmap_t taskmap;
@@ -93 +98 @@
         keyboard_t keyboard;
         processor_t processor;
+        ballocs_t ballocs;
+        ofw_tree_node_t *ofw_root;
 } bootinfo_t;
 

kernel/arch/sparc64/src/sparc64.c

@@ -52 +52 @@
 void arch_pre_main(void)
 {
-        /* Setup usermode */
+        /* Copy init task info. */
         init.cnt = bootinfo.taskmap.count;
         
@@ -61 +61 @@
                 init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
         }
+        
+        /* Copy boot allocations info. */
+        ballocs.base = bootinfo.ballocs.base;
+        ballocs.size = bootinfo.ballocs.size;
 }
 

kernel/genarch/Makefile.inc

@@ -88 +88 @@
                 genarch/src/kbd/scanc_sun.c
 endif
+
+
+## OpenFirmware Device Tree
+ifeq ($(CONFIG_OFW_TREE), y)
+        GENARCH_SOURCES += \
+                genarch/src/ofw/ofw_tree,c
+endif

kernel/generic/include/config.h

@@ -56 +56 @@
 } init_t;
 
+/** Boot allocations.
+ *
+ * Allocatations made by the boot that are meant to be used by the kernel
+ * are all recorded in the ballocs_t type.
+ */
+typedef struct {
+        uintptr_t base;
+        size_t size;
+} ballocs_t;
+
 typedef struct {
         count_t cpu_count;              /**< Number of processors detected. */
@@ -70 +80 @@
 extern config_t config;
 extern init_t init;
+extern ballocs_t ballocs;
 
 #endif

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 */