Changeset 61e90dd in mainline for boot

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:

boot

Files:

• arch/sparc64/loader/Makefile (modified) (1 diff)
• arch/sparc64/loader/main.c (modified) (3 diffs)
• arch/sparc64/loader/main.h (modified) (2 diffs)
• genarch/balloc.c (added)
• genarch/balloc.h (added)
• genarch/ofw_tree.c (modified) (1 diff)
• genarch/ofw_tree.h (modified) (2 diffs)

boot/arch/sparc64/loader/Makefile

@@ -53 +53 @@
         ../../../generic/printf.c \
         ../../../generic/string.c \
+        ../../../genarch/balloc.c \
         ../../../genarch/ofw.c \
         ../../../genarch/ofw_tree.c \

boot/arch/sparc64/loader/main.c

@@ -31 +31 @@
 #include "asm.h"
 #include "_components.h"
+#include <balloc.h>
 #include <ofw.h>
+#include <ofw_tree.h>
 #include "ofwarch.h"
 #include <align.h>
@@ -84 +86 @@
                 printf(" %P: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
 
+        void * base = (void *) KERNEL_VIRTUAL_ADDRESS;
+        unsigned int top = 0;
+
         printf("\nCopying components\n");
-        unsigned int top = 0;
         bootinfo.taskmap.count = 0;
         for (i = 0; i < COMPONENTS; i++) {
-                void * base = (void *) KERNEL_VIRTUAL_ADDRESS;
-        
                 printf(" %s...", components[i].name);
                 top = ALIGN_UP(top, PAGE_SIZE);
@@ -102 +104 @@
         }
 
+        balloc_init(&bootinfo.ballocs, ALIGN_UP(((uintptr_t) base) + top, PAGE_SIZE));
+
+        printf("\nCanonizing OpenFirmware device tree...");
+        bootinfo.ofw_root = ofw_tree_build();
+        printf("done.\n");
+
         printf("\nBooting the kernel...\n");
         jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo, sizeof(bootinfo));

boot/arch/sparc64/loader/main.h

@@ -31 +31 @@
 
 #include <ofw.h>
+#include <ofw_tree.h>
+#include <balloc.h>
 #include <types.h>
 
@@ -55 +57 @@
         keyboard_t keyboard;
         cpu_t cpu;
+        ballocs_t ballocs;
+        ofw_tree_node_t *ofw_root;
 } bootinfo_t;
 

boot/genarch/ofw_tree.c

@@ -31 +31 @@
 #include <types.h>
 #include <string.h>
+#include <balloc.h>
 
 static ofw_tree_node_t *ofw_tree_node_alloc(void)
 {
-        return NULL;
+        return balloc(sizeof(ofw_tree_node_t), sizeof(ofw_tree_node_t));
 }
 
 static ofw_tree_property_t *ofw_tree_properties_alloc(unsigned count)
 {
-        return NULL;
+        return balloc(count * sizeof(ofw_tree_property_t), sizeof(ofw_tree_property_t));
 }
 
 static void * ofw_tree_space_alloc(size_t size)
 {
-        return NULL;
+        return balloc(size, size);
 }
 

boot/genarch/ofw_tree.h

@@ -38 +38 @@
 typedef struct ofw_tree_property ofw_tree_property_t;
 
+/** Memory representation of OpenFirmware device tree node. */
 struct ofw_tree_node {
         ofw_tree_node_t *parent;
@@ -43 +44 @@
         ofw_tree_node_t *child;
 
-        unsigned properties;
+        unsigned properties;                    /**< Number of properties. */
         ofw_tree_property_t *property;
 };
 
+/** Memory representation of OpenFirmware device tree node property. */
 struct ofw_tree_property {
         char name[OFW_TREE_PROPERTY_MAX_NAMELEN];