Changes in kernel/arch/ppc32/src/ppc32.c [a71c158:eff1f033] in mainline

File:

• kernel/arch/ppc32/src/ppc32.c (modified) (8 diffs)

kernel/arch/ppc32/src/ppc32.c

@@ -39 +39 @@
 #include <genarch/kbrd/kbrd.h>
 #include <arch/interrupt.h>
+#include <interrupt.h>
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>
@@ -44 +45 @@
 #include <genarch/ofw/pci.h>
 #include <userspace.h>
+#include <mm/page.h>
 #include <proc/uarg.h>
 #include <console/console.h>
+#include <sysinfo/sysinfo.h>
 #include <ddi/irq.h>
 #include <arch/drivers/pic.h>
 #include <align.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 
@@ -58 +61 @@
 bootinfo_t bootinfo;
 
+static cir_t pic_cir;
+static void *pic_cir_arg;
+
 /** Performs ppc32-specific initialization before main_bsp() is called. */
-void arch_pre_main(void)
-{
-        init.cnt = bootinfo.taskmap.count;
-        
-        uint32_t i;
-        
-        for (i = 0; i < min3(bootinfo.taskmap.count, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
-                init.tasks[i].addr = bootinfo.taskmap.tasks[i].addr;
-                init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
+void arch_pre_main(bootinfo_t *bootinfo)
+{
+        /* Copy tasks map. */
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+        size_t i;
+        for (i = 0; i < init.cnt; i++) {
+                init.tasks[i].addr = (uintptr_t) bootinfo->taskmap.tasks[i].addr;
+                init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
-                    bootinfo.taskmap.tasks[i].name);
+                    bootinfo->taskmap.tasks[i].name);
+        }
+        
+        /* Copy physical memory map. */
+        memmap.total = bootinfo->memmap.total;
+        memmap.cnt = min(bootinfo->memmap.cnt, MEMMAP_MAX_RECORDS);
+        for (i = 0; i < memmap.cnt; i++) {
+                memmap.zones[i].start = bootinfo->memmap.zones[i].start;
+                memmap.zones[i].size = bootinfo->memmap.zones[i].size;
         }
         
         /* Copy boot allocations info. */
-        ballocs.base = bootinfo.ballocs.base;
-        ballocs.size = bootinfo.ballocs.size;
-        
-        ofw_tree_init(bootinfo.ofw_root);
+        ballocs.base = bootinfo->ballocs.base;
+        ballocs.size = bootinfo->ballocs.size;
+        
+        /* Copy OFW tree. */
+        ofw_tree_init(bootinfo->ofw_root);
 }
 
@@ -185 +199 @@
         if (assigned_address) {
                 /* Initialize PIC */
-                cir_t cir;
-                void *cir_arg;
-                pic_init(assigned_address[0].addr, PAGE_SIZE, &cir, &cir_arg);
+                pic_init(assigned_address[0].addr, PAGE_SIZE, &pic_cir,
+                    &pic_cir_arg);
                 
 #ifdef CONFIG_MAC_KBD
@@ -200 +213 @@
                 /* Initialize I/O controller */
                 cuda_instance_t *cuda_instance =
-                    cuda_init(cuda, IRQ_CUDA, cir, cir_arg);
+                    cuda_init(cuda, IRQ_CUDA, pic_cir, pic_cir_arg);
                 if (cuda_instance) {
                         kbrd_instance_t *kbrd_instance = kbrd_init();
@@ -210 +223 @@
                         }
                 }
+                
+                /*
+                 * This is the necessary evil until the userspace driver is entirely
+                 * self-sufficient.
+                 */
+                sysinfo_set_item_val("cuda", NULL, true);
+                sysinfo_set_item_val("cuda.inr", NULL, IRQ_CUDA);
+                sysinfo_set_item_val("cuda.address.physical", NULL, pa);
+                sysinfo_set_item_val("cuda.address.kernel", NULL,
+                    (uintptr_t) cuda);
 #endif
         }
@@ -217 +240 @@
 }
 
+void irq_initialize_arch(irq_t *irq)
+{
+        irq->cir = pic_cir;
+        irq->cir_arg = pic_cir_arg;
+        irq->preack = true;
+}
+
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for ppc32 is 'mac'. */
+        static const char *platform = "mac";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
         ofw_tree_walk_by_device_type("mac-io", macio_register, NULL);
 }
@@ -254 +290 @@
 {
         // TODO
-        while (1);
+        while (true);
 }