From 9bf1f0849061723d9fb195991b0b6f198708c73d Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Mon, 13 Oct 2025 17:10:57 -0400
Subject: kern/amd64: Init LAPIC before PCI bus driver

A lot of PCI(e) devices rely in MSI-X which pokes the Local APIC via
MMIO, we'll want the LAPIC up before PCI(e)

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 src/sys/arch/amd64/boot/boot_chip.c | 2 ++
 src/sys/arch/amd64/cpu/cpu_conf.c   | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/sys')

diff --git a/src/sys/arch/amd64/boot/boot_chip.c b/src/sys/arch/amd64/boot/boot_chip.c
index e2a2d6b..d6e082a 100644
--- a/src/sys/arch/amd64/boot/boot_chip.c
+++ b/src/sys/arch/amd64/boot/boot_chip.c
@@ -32,6 +32,7 @@
 #include <sys/cpuvar.h>
 #include <machine/uart.h>
 #include <machine/boot.h>
+#include <machine/lapic.h>
 #include <machine/i8259.h>
 #include <machine/ioapic.h>
 #include <machine/tss.h>
@@ -85,6 +86,7 @@ platform_boot(void)
     }
 
     init_tss(core);
+    lapic_init();
     chipset_init();
     irq_init_pins();
 }
diff --git a/src/sys/arch/amd64/cpu/cpu_conf.c b/src/sys/arch/amd64/cpu/cpu_conf.c
index f844cf7..da2d747 100644
--- a/src/sys/arch/amd64/cpu/cpu_conf.c
+++ b/src/sys/arch/amd64/cpu/cpu_conf.c
@@ -32,7 +32,6 @@
 #include <machine/msr.h>
 #include <machine/idt.h>
 #include <machine/trap.h>
-#include <machine/lapic.h>
 #include <machine/gdt.h>
 #include <machine/mdcpu.h>
 #include <machine/cpuid.h>
@@ -204,5 +203,4 @@ void
 cpu_init(struct pcore *pcore)
 {
     platform_boot();
-    lapic_init();
 }
-- 
cgit v1.2.3