From df9db9291a6020be55f6724e580e5fe57d38e862 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 30 Oct 2024 21:09:06 -0600 Subject: [PATCH] Fix AP CPU ID on newer Intel CPUs --- src/acpi/madt/arch/x86.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/acpi/madt/arch/x86.rs b/src/acpi/madt/arch/x86.rs index 8fbc5714a6..508c146003 100644 --- a/src/acpi/madt/arch/x86.rs +++ b/src/acpi/madt/arch/x86.rs @@ -78,7 +78,7 @@ pub(super) fn init(madt: Madt) { // Set the ap_ready to 0, volatile unsafe { ap_ready.write(0); - ap_cpu_id.write(ap_local_apic.id.into()); + ap_cpu_id.write(ap_local_apic.processor.into()); ap_page_table.write(page_table_physaddr as u64); ap_stack_start.write(stack_start as u64); ap_stack_end.write(stack_end as u64); @@ -89,7 +89,7 @@ pub(super) fn init(madt: Madt) { }; AP_READY.store(false, Ordering::SeqCst); - print!(" AP {}:", ap_local_apic.id); + print!(" AP {} APIC {}:", ap_local_apic.processor, ap_local_apic.id); // Send INIT IPI {