Changeset e731b0d in mainline for boot/genarch/balloc.c

Timestamp:

2009-08-20T16:58:55Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b9c7425

Parents:

a11099f

Message:

make ppc32 OFW usage on par with sparc64, make appropriate modifications elsewhere

• introduce ofw_tree_walk_by_device_type() to gather all OFW devices of a given type
• ppc32 uses canonized OFW tree, mac-io and display devices are detected in kernel (not by the boot loader) by means of device type
• various busses (PCI, EBUS, etc.) stay sparc64 specific for now
• boot memcpy() is defined in a common way
• BALLOC_MAX_SIZE is platform-dependent
• ppc32 and sparc64 boot loaders cleanup (removal of obsolete stuff, data is not passed by global variables if not necessary, etc.)
• balloc and OFW tree canonizer have now a provision to support different mapping of the data during boot time and kernel run-time
• OFW tree canonizer uses balloc_rebase() to store pointers suitable for access during kernel run-time (with potentially different memory mapping than during boot time)

File:

• boot/genarch/balloc.c (modified) (2 diffs)

boot/genarch/balloc.c

@@ -28 +28 @@
 
 #include <balloc.h>
+#include <asm.h>
 #include <types.h>
 #include <align.h>
 
 static ballocs_t *ballocs;
+static uintptr_t phys_base;
 
-void balloc_init(ballocs_t *b, uintptr_t base)
+void balloc_init(ballocs_t *ball, uintptr_t base, uintptr_t kernel_base)
 {
-        ballocs = b;
-        ballocs->base = base;
+        ballocs = ball;
+        phys_base = base;
+        ballocs->base = kernel_base;
         ballocs->size = 0;
 }
@@ -42 +45 @@
 void *balloc(size_t size, size_t alignment)
 {
-        uintptr_t addr;
-
         /* Enforce minimal alignment. */
         alignment = ALIGN_UP(alignment, 4);
         
-        addr = ballocs->base + ALIGN_UP(ballocs->size, alignment);
-
+        uintptr_t addr = phys_base + ALIGN_UP(ballocs->size, alignment);
+        
         if (ALIGN_UP(ballocs->size, alignment) + size > BALLOC_MAX_SIZE)
                 return NULL;
-                
+        
         ballocs->size = ALIGN_UP(ballocs->size, alignment) + size;
         
         return (void *) addr;
 }
+
+void *balloc_rebase(void *ptr)
+{
+        return (void *) ((uintptr_t) ptr - phys_base + ballocs->base);
+}