Changeset 371bd7d in mainline for kernel/arch/ppc32/src

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/ppc32/src

Files:

• cpu/cpu.c (modified) (1 diff)
• ddi/ddi.c (modified) (1 diff)
• debug/stacktrace.c (added)
• debug/stacktrace_asm.S (added)
• interrupt.c (modified) (1 diff)
• mm/as.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• mm/tlb.c (modified) (2 diffs)
• ppc32.c (modified) (7 diffs)

kernel/arch/ppc32/src/cpu/cpu.c

@@ -54 +54 @@
 void cpu_print_report(cpu_t *m)
 {
-        char *name;
+        const char *name;
         
         switch (m->arch.version) {

kernel/arch/ppc32/src/ddi/ddi.c

@@ -35 +35 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Enable I/O space range for task.

kernel/arch/ppc32/src/interrupt.c

@@ -36 +36 @@
 #include <interrupt.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <time/clock.h>

kernel/arch/ppc32/src/mm/as.c

@@ -35 +35 @@
 #include <arch/mm/as.h>
 #include <genarch/mm/as_pt.h>
+#include <genarch/mm/page_pt.h>
 #include <genarch/mm/asid_fifo.h>
 #include <arch.h>

kernel/arch/ppc32/src/mm/page.c

@@ -51 +51 @@
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
                 panic("Unable to map physical memory %p (%" PRIs " bytes).",
-                    physaddr, size)
+                    physaddr, size);
         
         uintptr_t virtaddr = PA2KA(last_frame);

kernel/arch/ppc32/src/mm/tlb.c

@@ -38 +38 @@
 #include <interrupt.h>
 #include <mm/as.h>
+#include <mm/page.h>
 #include <arch.h>
 #include <print.h>
@@ -113 +114 @@
 static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
-        char *symbol;
-        char *sym2;
-
-        symbol = symtab_fmt_name_lookup(istate->pc);
-        sym2 = symtab_fmt_name_lookup(istate->lr);
-
+        const char *symbol = symtab_fmt_name_lookup(istate->pc);
+        const char *sym2 = symtab_fmt_name_lookup(istate->lr);
+        
         fault_if_from_uspace(istate,
             "PHT Refill Exception on %p.", badvaddr);

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>
 
@@ -57 +60 @@
 
 bootinfo_t bootinfo;
+
+static cir_t pic_cir;
+static void *pic_cir_arg;
 
 /** Performs ppc32-specific initialization before main_bsp() is called. */
@@ -185 +191 @@
         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
                 uintptr_t pa = assigned_address[0].addr + 0x16000;
@@ -200 +205 @@
                 /* 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 +215 @@
                         }
                 }
+
+                /*
+                 * 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
         }
@@ -215 +230 @@
         /* Consider only a single device for now */
         return false;
+}
+
+void irq_initialize_arch(irq_t *irq)
+{
+        irq->cir = pic_cir;
+        irq->cir_arg = pic_cir_arg;
+        irq->preack = true;
 }