Changeset 982f0fe in mainline

Timestamp:

2006-06-01T10:21:00Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

bd571f44

Parents:

80d31883

Message:

Added ability to process external interrupts to ppc.

Location:

arch/ppc32

Files:

• Makefile.inc (modified) (1 diff)
• include/drivers/cuda.h (modified) (1 diff)
• include/drivers/pic.h (added)
• include/interrupt.h (modified) (2 diffs)
• src/drivers/cuda.c (modified) (2 diffs)
• src/drivers/pic.c (added)
• src/exception.S (modified) (1 diff)
• src/interrupt.c (modified) (2 diffs)
• src/ppc32.c (modified) (3 diffs)

arch/ppc32/Makefile.inc

@@ -79 +79 @@
         arch/$(ARCH)/src/mm/memory_init.c \
         arch/$(ARCH)/src/mm/page.c \
-        arch/$(ARCH)/src/mm/tlb.c
+        arch/$(ARCH)/src/mm/tlb.c \
+        arch/$(ARCH)/src/drivers/pic.c

arch/ppc32/include/drivers/cuda.h

@@ -32 +32 @@
 #include <arch/types.h>
 
+#define CUDA_IRQ 10
+
 extern void cuda_init(void);
 extern void cuda_packet(const __u8 data);

arch/ppc32/include/interrupt.h

@@ -32 +32 @@
 #include <arch/exception.h>
 
-#define IRQ_COUNT       1
-#define IVT_ITEMS   15
-#define INT_OFFSET  0
+#define IRQ_COUNT       64
+
+
+#define IVT_ITEMS   (16 + IRQ_COUNT)
+#define INT_OFFSET  16
+
+#define int_register(it, name, handler) exc_register(((it)+INT_OFFSET),name,handler)
 
 #define VECTOR_DECREMENTER 10
@@ -40 +44 @@
 extern void start_decrementer(void);
 extern void interrupt_init(void);
+extern void extint_handler(int n, istate_t *istate);
 
 #endif

arch/ppc32/src/drivers/cuda.c

@@ -31 +31 @@
 #include <console/chardev.h>
 #include <console/console.h>
+#include <arch/drivers/pic.h>
+#include <interrupt.h>
 
 #define CUDA_PACKET 0x01
@@ -48 +50 @@
 static volatile __u8 *cuda = (__u8 *) 0xf2000000;
 
+#include <print.h>
+static void cuda_irq(int n, istate_t *istate)
+{
+        printf("Got cuda msg\n");
+}
 
 void cuda_init(void)
 {
+        int_register(CUDA_IRQ, "cuda", cuda_irq);
+        pic_enable_interrupt(CUDA_IRQ);
 }
 

arch/ppc32/src/exception.S

@@ -186 +186 @@
 .global exc_external
 exc_external:
-        b exc_external
+        CONTEXT_STORE
+
+        lis r12, extint_handler@ha
+        addi r12, r12, extint_handler@l
+        mtsrr0 r12
+
+        li r3, 0
+        b jump_to_kernel
 
 .org 0x600

arch/ppc32/src/interrupt.c

@@ -33 +33 @@
 #include <time/clock.h>
 #include <ipc/sysipc.h>
+#include <arch/drivers/pic.h>
 
 
@@ -65 +66 @@
         /* TODO */
 }
+
+#include <print.h>
+/** Handler of externul interrupts */
+void extint_handler(int n, istate_t *istate)
+{
+        int inum;
+
+        while ((inum = pic_get_pending()) != -1) {
+                exc_dispatch(inum+INT_OFFSET, istate);
+                pic_ack_interrupt(inum);
+        }
+}

arch/ppc32/src/ppc32.c

@@ -36 +36 @@
 #include <proc/uarg.h>
 #include <console/console.h>
+#include <arch/drivers/pic.h>
 
 bootinfo_t bootinfo;
@@ -56 +57 @@
         /* Initialize dispatch table */
         interrupt_init();
-        
+
         /* Start decrementer */
         start_decrementer();
-        cuda_init();
 }
 
@@ -67 +67 @@
                 fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);    
         
+                /* Initialize PIC */
+                pic_init();
+        
+                cuda_init();
                 /* Merge all zones to 1 big zone */
                 zone_merge_all();