From 6bca5c2873ef4cfccd8d2ebeedad29c9d5a6ec7f Mon Sep 17 00:00:00 2001
From: Damien Zammit <damien@zamaudio.com>
Date: Mon, 29 Jan 2024 10:06:57 +0000
Subject: Support up to two IOAPICs with up to 32 GSIs on each

Previously, only IOAPIC[0] was supported.
Now this supports up to two IOAPICs.

Message-ID: <20240129100652.1262126-1-damien@zamaudio.com>
---
 i386/i386at/int_init.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'i386/i386at/int_init.c')

diff --git a/i386/i386at/int_init.c b/i386/i386at/int_init.c
index d55d7a48..262bef1b 100644
--- a/i386/i386at/int_init.c
+++ b/i386/i386at/int_init.c
@@ -24,6 +24,10 @@
 #include <i386at/idt.h>
 #include <i386at/int_init.h>
 #include <i386/mp_desc.h>
+#include <kern/printf.h>
+#ifdef APIC
+#include <i386/apic.h>
+#endif
 
 /* defined in locore.S */
 extern vm_offset_t int_entry_table[];
@@ -37,7 +41,7 @@ int_fill(struct real_gate *myidt)
 	int nirq = 16;
 #else
 	int base = IOAPIC_INT_BASE;
-	int nirq = 24;
+	int nirq = NINTR;
 #endif
 
 	for (i = 0; i < nirq; i++) {
-- 
cgit v1.2.3