From c722aff68a2e4ed0db8525f849e449341370f705 Mon Sep 17 00:00:00 2001
From: Damien Zammit <damien@zamaudio.com>
Date: Mon, 5 Apr 2021 21:59:20 +1000
Subject: ioapic: Refactor EOI

Message-Id: <20210405115921.184572-2-damien@zamaudio.com>
---
 i386/i386/irq.c         | 1 -
 i386/i386at/interrupt.S | 1 -
 i386/i386at/ioapic.c    | 2 ++
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'i386')

diff --git a/i386/i386/irq.c b/i386/i386/irq.c
index 42921617..a7c98890 100644
--- a/i386/i386/irq.c
+++ b/i386/i386/irq.c
@@ -31,7 +31,6 @@ irq_eoi (struct irqdev *dev, int id)
 {
 #ifdef APIC
   ioapic_irq_eoi (dev->irq[id]);
-  lapic_eoi ();
 #endif
 }
 
diff --git a/i386/i386at/interrupt.S b/i386/i386at/interrupt.S
index cb314d32..e6a6af00 100644
--- a/i386/i386at/interrupt.S
+++ b/i386/i386at/interrupt.S
@@ -92,7 +92,6 @@ _isa_eoi:
 	pushl	%ecx			/* push irq number */
 	call	EXT(ioapic_irq_eoi)	/* ioapic irq specific EOI */
 	addl	$4,%esp			/* pop irq number */
-	call	EXT(lapic_eoi)		/* lapic broadcast EOI */
 _no_eoi:
 	ret
 #endif
diff --git a/i386/i386at/ioapic.c b/i386/i386at/ioapic.c
index 30ae30e1..4d0f4fca 100644
--- a/i386/i386at/ioapic.c
+++ b/i386/i386at/ioapic.c
@@ -262,6 +262,8 @@ ioapic_irq_eoi(int pin)
         entry.both = ioapic_read_entry(apic, pin);
         ioapic->eoi.r = entry.both.vector;
     }
+
+    lapic_eoi ();
 }
 
 void
-- 
cgit v1.2.3