Changeset 323a5aaf in mainline for kernel/arch/ia64/src/interrupt.c

Timestamp:

2008-11-30T12:17:56Z (16 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

File:

• kernel/arch/ia64/src/interrupt.c (modified) (4 diffs)

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;
                 }
-        }
 }