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

Timestamp:

2008-12-31T15:33:29Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9805cde

Parents:

d8c0dc5

Message:

Humanitarian facelift for ia64.

File:

• kernel/arch/ia64/src/interrupt.c (modified) (1 diff)

kernel/arch/ia64/src/interrupt.c

@@ -245 +245 @@
 {
         cr_ivr_t ivr;
+        irq_t *irq;
         
         ivr.value = ivr_read();
         srlz_d();
 
-                switch (ivr.vector) {
-                case INTERRUPT_SPURIOUS:
+        switch (ivr.vector) {
+        case INTERRUPT_SPURIOUS:
 #ifdef CONFIG_DEBUG
-                        printf("cpu%d: spurious interrupt\n", CPU->id);
+                printf("cpu%d: spurious interrupt\n", CPU->id);
 #endif
-                        break;
+                break;
 
 #ifdef CONFIG_SMP
-                case VECTOR_TLB_SHOOTDOWN_IPI:
-                        tlb_shootdown_ipi_recv();
+        case VECTOR_TLB_SHOOTDOWN_IPI:
+                tlb_shootdown_ipi_recv();
+                end_of_local_irq();
+                break;
+#endif
+
+        case INTERRUPT_TIMER:
+                irq = irq_dispatch_and_lock(ivr.vector);
+                if (irq) {
+                        irq->handler(irq, irq->arg);
+                        spinlock_unlock(&irq->lock);
+                } else {
+                        panic("\nUnhandled Internal Timer Interrupt (%d)\n",
+                            ivr.vector);
+                }
+                break;
+        default:
+                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();
+                        }
+                        irq->handler(irq, irq->arg);
+                        if (!irq->preack)
+                                end_of_local_irq();
+                        spinlock_unlock(&irq->lock);
+                } else {
+                        /*
+                         * Unhandled interrupt.
+                         */
                         end_of_local_irq();
-                        break;
+#ifdef CONFIG_DEBUG
+                        printf("\nUnhandled External Interrupt Vector %d\n",
+                            ivr.vector);
 #endif
-
-                case INTERRUPT_TIMER:
-                        {
-
-                                irq_t *irq = irq_dispatch_and_lock(ivr.vector);
-                                if (irq) {
-                                        irq->handler(irq, irq->arg);
-                                        spinlock_unlock(&irq->lock);
-                                } else {
-                                        panic("\nUnhandled Internal Timer Interrupt (%d)\n",ivr.vector);
-                                }
-                        }       
-                        break;
-                                
-                default:
-                        {
-
-                                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;
                 }
+                break;
+        }
 }