Changeset 5cde90f in mainline for kernel/arch/ppc32

Timestamp:

2010-02-19T17:16:46Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

617652f

Parents:

b86d436 (diff), f41aa81 (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:

Synchronizing with head (which has just been synchronized with this branch).

Location:

kernel/arch/ppc32

Files:

• include/asm.h (modified) (2 diffs)
• include/context.h (modified) (3 diffs)
• src/ppc32.c (modified) (7 diffs)

kernel/arch/ppc32/include/asm.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -146 +146 @@
 }
 
-void cpu_halt(void);
-void asm_delay_loop(uint32_t t);
-
+extern void cpu_halt(void) __attribute__((noreturn));
+extern void asm_delay_loop(uint32_t t);
 extern void userspace_asm(uintptr_t uspace_uarg, uintptr_t stack, uintptr_t entry);
 
 static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {
-        *port = v;      
+        *port = v;
 }
 
 static inline void pio_write_16(ioport16_t *port, uint16_t v)
 {
-        *port = v;      
+        *port = v;
 }
 
 static inline void pio_write_32(ioport32_t *port, uint32_t v)
 {
-        *port = v;      
+        *port = v;
 }
 
 static inline uint8_t pio_read_8(ioport8_t *port)
 {
-        return *port; 
+        return *port;
 }
 
 static inline uint16_t pio_read_16(ioport16_t *port)
 {
-        return *port; 
+        return *port;
 }
 
 static inline uint32_t pio_read_32(ioport32_t *port)
 {
-        return *port; 
+        return *port;
 }
 

kernel/arch/ppc32/include/context.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -38 +38 @@
 #include <arch/types.h>
 
-#define SP_DELTA        16
+#define SP_DELTA  16
+
+#define context_set(ctx, pc, stack, size) \
+    context_set_generic(ctx, pc, stack, size)
 
 typedef struct {
@@ -68 +71 @@
         
         ipl_t ipl;
-} __attribute__ ((packed)) context_t;
+} __attribute__((packed)) context_t;
 
 #endif

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>
@@ -47 +48 @@
 #include <proc/uarg.h>
 #include <console/console.h>
+#include <sysinfo/sysinfo.h>
 #include <ddi/irq.h>
 #include <arch/drivers/pic.h>
@@ -58 +60 @@
 
 bootinfo_t bootinfo;
+
+static cir_t pic_cir;
+static void *pic_cir_arg;
 
 /** Performs ppc32-specific initialization before main_bsp() is called. */
@@ -186 +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;
@@ -201 +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();
@@ -211 +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
         }
@@ -216 +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;
 }