Changeset ef56a43 in mainline

Timestamp:

2019-04-06T06:55:42Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fd67c9f

Parents:

29beac8

Message:

Do not send EOI to pic1 for the first 8 IRQs

Location:

kernel

Files:

• arch/amd64/include/arch/interrupt.h (modified) (1 diff)
• arch/amd64/src/interrupt.c (modified) (5 diffs)
• arch/ia32/include/arch/interrupt.h (modified) (1 diff)
• arch/ia32/include/arch/smp/apic.h (modified) (1 diff)
• arch/ia32/src/interrupt.c (modified) (5 diffs)
• arch/ia32/src/smp/apic.c (modified) (1 diff)
• arch/mips32/src/mach/malta/malta.c (modified) (1 diff)
• genarch/include/genarch/drivers/i8259/i8259.h (modified) (1 diff)
• genarch/src/drivers/i8259/i8259.c (modified) (1 diff)

kernel/arch/amd64/include/arch/interrupt.h ¶

@@ -86 +86 @@
 extern void (*disable_irqs_function)(uint16_t);
 extern void (*enable_irqs_function)(uint16_t);
-extern void (*eoi_function)(void);
+extern void (*eoi_function)(unsigned int);
 extern const char *irqs_info;
 

kernel/arch/amd64/src/interrupt.c ¶

@@ -60 +60 @@
 void (*disable_irqs_function)(uint16_t irqmask) = NULL;
 void (*enable_irqs_function)(uint16_t irqmask) = NULL;
-void (*eoi_function)(void) = NULL;
+void (*eoi_function)(unsigned int) = NULL;
 const char *irqs_info = NULL;
 
@@ -91 +91 @@
 }
 
-static void trap_virtual_eoi(void)
+static void trap_virtual_eoi(unsigned int irq)
 {
         if (eoi_function)
-                eoi_function();
+                eoi_function(irq);
         else
                 panic("No eoi_function.");
@@ -157 +157 @@
 static void tlb_shootdown_ipi(unsigned int n, istate_t *istate)
 {
-        trap_virtual_eoi();
+        trap_virtual_eoi(0);
         tlb_shootdown_ipi_recv();
 }
@@ -184 +184 @@
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
-                        trap_virtual_eoi();
+                        trap_virtual_eoi(inum);
                         ack = true;
                 }
@@ -200 +200 @@
 
         if (!ack)
-                trap_virtual_eoi();
+                trap_virtual_eoi(inum);
 }
 

kernel/arch/ia32/include/arch/interrupt.h ¶

@@ -90 +90 @@
 extern void (*disable_irqs_function)(uint16_t);
 extern void (*enable_irqs_function)(uint16_t);
-extern void (*eoi_function)(void);
+extern void (*eoi_function)(unsigned int);
 extern const char *irqs_info;
 

kernel/arch/ia32/include/arch/smp/apic.h ¶

@@ -356 +356 @@
 
 extern void l_apic_init(void);
-extern void l_apic_eoi(void);
+extern void l_apic_eoi(unsigned int);
 extern int l_apic_send_custom_ipi(uint8_t, uint8_t);
 extern int l_apic_broadcast_custom_ipi(uint8_t);

kernel/arch/ia32/src/interrupt.c ¶

@@ -63 +63 @@
 void (*disable_irqs_function)(uint16_t irqmask) = NULL;
 void (*enable_irqs_function)(uint16_t irqmask) = NULL;
-void (*eoi_function)(void) = NULL;
+void (*eoi_function)(unsigned int) = NULL;
 const char *irqs_info = NULL;
 
@@ -90 +90 @@
 }
 
-static void trap_virtual_eoi(void)
+static void trap_virtual_eoi(unsigned int inum)
 {
         if (eoi_function)
-                eoi_function();
+                eoi_function(inum);
         else
                 panic("No eoi_function.");
@@ -179 +179 @@
     istate_t *istate __attribute__((unused)))
 {
-        trap_virtual_eoi();
+        trap_virtual_eoi(0);
         tlb_shootdown_ipi_recv();
 }
@@ -204 +204 @@
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
-                        trap_virtual_eoi();
+                        trap_virtual_eoi(inum);
                         ack = true;
                 }
@@ -219 +219 @@
 
         if (!ack)
-                trap_virtual_eoi();
+                trap_virtual_eoi(inum);
 }
 

kernel/arch/ia32/src/smp/apic.c ¶

@@ -508 +508 @@
 
 /** Local APIC End of Interrupt. */
-void l_apic_eoi(void)
+void l_apic_eoi(unsigned int ignored)
 {
         l_apic[EOI] = 0;

kernel/arch/mips32/src/mach/malta/malta.c ¶

@@ -95 +95 @@
 #endif
         }
-        pic_eoi();
+        pic_eoi(isa_irq);
 }
 

kernel/genarch/include/genarch/drivers/i8259/i8259.h ¶

@@ -55 +55 @@
 extern void pic_enable_irqs(uint16_t);
 extern void pic_disable_irqs(uint16_t);
-extern void pic_eoi(void);
+extern void pic_eoi(unsigned int);
 
 #endif

kernel/genarch/src/drivers/i8259/i8259.c ¶

@@ -112 +112 @@
 }
 
-void pic_eoi(void)
+void pic_eoi(unsigned int irq)
 {
+        if (irq >= 8)
+                pio_write_8(&saved_pic1->port1, PIC_OCW4 | PIC_OCW4_NSEOI);
         pio_write_8(&saved_pic0->port1, PIC_OCW4 | PIC_OCW4_NSEOI);
-        pio_write_8(&saved_pic1->port1, PIC_OCW4 | PIC_OCW4_NSEOI);
 }