Changeset 323a5aaf in mainline for kernel/arch/ia64/src

Timestamp:

2008-11-30T12:17:56Z (17 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

0ad9e47

Parents:

57e76cb

Message:

Legacy IRQ support, uspace NS16550 support, some minor changes

Location:

kernel/arch/ia64/src

Files:

• drivers/ega.c (modified) (1 diff)
• ia64.c (modified) (9 diffs)
• interrupt.c (modified) (4 diffs)
• ski/ski.c (modified) (2 diffs)

kernel/arch/ia64/src/drivers/ega.c

@@ -95 +95 @@
         sysinfo_set_item_val("fb.width", NULL, ROW);
         sysinfo_set_item_val("fb.height", NULL, ROWS);
+        sysinfo_set_item_val("fb.blinking", NULL, true);
         sysinfo_set_item_val("fb.address.physical", NULL, VIDEORAM & 0xffffffff);
         

kernel/arch/ia64/src/ia64.c

@@ -64 +64 @@
 
 /*NS16550 as a COM 1*/
-#define NS16550_IRQ 4
+#define NS16550_IRQ (4+LAGACY_INTERRUPT_BASE)
 #define NS16550_PORT 0x3f8
 
 bootinfo_t *bootinfo;
+
+static uint64_t iosapic_base=0xfec00000;
 
 void arch_pre_main(void)
@@ -112 +114 @@
 }
 
+static void iosapic_init(void)
+{
+
+        uint64_t IOSAPIC = PA2KA((unative_t)(iosapic_base))|FW_OFFSET;
+        int i;
+        
+        
+        for(i=0;i<16;i++)
+        {
+        
+                if(i==2) continue;       //Disable Cascade interrupt
+                ((uint32_t*)(IOSAPIC+0x00))[0]=0x10+2*i;
+                srlz_d();
+                ((uint32_t*)(IOSAPIC+0x10))[0]=LAGACY_INTERRUPT_BASE+i;
+                srlz_d();
+                ((uint32_t*)(IOSAPIC+0x00))[0]=0x10+2*i+1;
+                srlz_d();
+                ((uint32_t*)(IOSAPIC+0x10))[0]=1<<(56-32);
+                srlz_d();
+        }
+
+}
+
+
 void arch_post_mm_init(void)
 {
         if(config.cpu_active==1)
         {
+                iosapic_init();
+        
                 irq_init(INR_COUNT, INR_COUNT);
 #ifdef SKI
@@ -123 +151 @@
 #endif  
         }
-        it_init();      
+        it_init();
+                
 }
 
@@ -143 +172 @@
                 i8042_poll();
 #ifdef CONFIG_NS16550
+        #ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
                 ns16550_poll();
+        #endif  
 #endif
                 thread_usleep(POLL_INTERVAL);
@@ -149 +180 @@
 }
 #endif
+
+
+static void end_of_irq_void(void *cir_arg __attribute__((unused)),inr_t inr __attribute__((unused)))
+{
+        return;
+}
+
 
 void arch_post_smp_init(void)
@@ -172 +210 @@
 
 #ifdef CONFIG_NS16550
-                ns16550_init(kbd, NS16550_IRQ, NS16550_PORT); // as a COM 1
+                ns16550_init(kbd, NS16550_IRQ, NS16550_PORT,end_of_irq_void,NULL); // as a COM 1
 #else
 #endif
@@ -188 +226 @@
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address.virtual", NULL, IO_OFFSET);
+
+
+
+
 
 }
@@ -238 +280 @@
 #ifdef SKI
         ski_kbd_grab();
+#else
+        i8042_grab();
+        #ifdef CONFIG_NS16550
+                ns16550_grab();
+        #endif  
+                
 #endif  
 }
@@ -247 +295 @@
 #ifdef SKI
         ski_kbd_release();
+        i8042_release();
+#else   
+        #ifdef CONFIG_NS16550
+                ns16550_release();
+        #endif  
+
 #endif
 }

kernel/arch/ia64/src/interrupt.c

@@ -236 +236 @@
 }
 
-static void end_of_local_irq()
+static void end_of_local_irq(void)
 {
         asm volatile ("mov cr.eoi=r0;;");
@@ -244 +244 @@
 void external_interrupt(uint64_t vector, istate_t *istate)
 {
-        irq_t *irq;
         cr_ivr_t ivr;
         
@@ -250 +249 @@
         srlz_d();
 
-        irq = irq_dispatch_and_lock(ivr.vector);
-        if (irq) {
-                irq->handler(irq, irq->arg);
-                spinlock_unlock(&irq->lock);
-        } else {
                 switch (ivr.vector) {
                 case INTERRUPT_SPURIOUS:
@@ -271 +265 @@
 
                 default:
-                        panic("\nUnhandled External Interrupt Vector %d\n",
-                            ivr.vector);
+                        {
+
+                                int ack=false;
+                                irq_t *irq = irq_dispatch_and_lock(ivr.vector);
+                                if (irq) {
+                                        /*
+                                         * The IRQ handler was found.
+                                         */
+                 
+                                        if (irq->preack) {
+                                                /* Send EOI before processing the interrupt */
+                                                end_of_local_irq();
+                                                ack=true;
+                                        }
+                                        irq->handler(irq, irq->arg);
+                                        spinlock_unlock(&irq->lock);
+                                } else {
+                                        /*
+                                         * Unhandled interrupt.
+                                         */
+                                        end_of_local_irq();
+                                        ack=true;
+#ifdef CONFIG_DEBUG
+                                        printf("\nUnhandled External Interrupt Vector %d\n",ivr.vector);
+#endif
+                                }
+                                if(!ack) end_of_local_irq();
+
+                        }       
+
+
                         break;
                 }
-        }
 }
 

kernel/arch/ia64/src/ski/ski.c

@@ -45 +45 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
+#include <drivers/kbd.h>
 
 #define SKI_KBD_INR     0
@@ -228 +229 @@
         sysinfo_set_item_val("kbd.inr", NULL, SKI_KBD_INR);
         sysinfo_set_item_val("kbd.devno", NULL, ski_kbd_devno);
+        sysinfo_set_item_val("kbd.type", NULL, KBD_SKI);
 }