feat: update x2apic to 0.5 (#17)

Author: AsakuraMizu

Cargo.lock

@@ -32,7 +32,7 @@ axplat = { workspace = true }
 
 x86 = "0.52"
 x86_64 = "0.15.2"
-x2apic = "0.4"
+x2apic = "0.5"
 multiboot = "0.8"
 raw-cpuid = "11.5"
 uart_16550 = "0.3"

platforms/axplat-x86-pc/Cargo.toml

@@ -1,6 +1,6 @@
 //! Advanced Programmable Interrupt Controller (APIC) support.
 
-use core::{cell::SyncUnsafeCell, mem::MaybeUninit};
+use core::mem::MaybeUninit;
 
 use axplat::mem::{PhysAddr, pa, phys_to_virt};
 use kspin::SpinNoIrq;
@@ -19,8 +19,7 @@ pub(super) mod vectors {
 
 const IO_APIC_BASE: PhysAddr = pa!(0xFEC0_0000);
 
-static LOCAL_APIC: SyncUnsafeCell<MaybeUninit<LocalApic>> =
-    SyncUnsafeCell::new(MaybeUninit::uninit());
+static mut LOCAL_APIC: MaybeUninit<LocalApic> = MaybeUninit::uninit();
 static mut IS_X2APIC: bool = false;
 static IO_APIC: LazyInit<SpinNoIrq<IoApic>> = LazyInit::new();
 
@@ -40,9 +39,10 @@ pub fn set_enable(vector: usize, enabled: bool) {
 }
 
 #[cfg(any(feature = "smp", feature = "irq"))]
+#[allow(static_mut_refs)]
 pub fn local_apic<'a>() -> &'a mut LocalApic {
     // It's safe as `LOCAL_APIC` is initialized in `init_primary`.
-    unsafe { LOCAL_APIC.get().as_mut().unwrap().assume_init_mut() }
+    unsafe { LOCAL_APIC.assume_init_mut() }
 }
 
 #[cfg(feature = "smp")]
@@ -88,7 +88,8 @@ pub fn init_primary() {
     let mut lapic = builder.build().unwrap();
     unsafe {
         lapic.enable();
-        LOCAL_APIC.get().as_mut().unwrap().write(lapic);
+        #[allow(static_mut_refs)]
+        LOCAL_APIC.write(lapic);
     }
 
     info!("Initialize IO APIC...");
@@ -149,7 +150,7 @@ mod irq_impl {
         fn handle(vector: usize) {
             trace!("IRQ {}", vector);
             if !IRQ_HANDLER_TABLE.handle(vector) {
-                warn!("Unhandled IRQ {}", vector);
+                warn!("Unhandled IRQ {vector}");
             }
             unsafe { super::local_apic().end_of_interrupt() };
         }

platforms/axplat-x86-pc/src/apic.rs

@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(sync_unsafe_cell)]
 
 #[macro_use]
 extern crate log;

platforms/axplat-x86-pc/src/lib.rs

@@ -54,7 +54,7 @@ pub fn init_primary() {
         use x2apic::lapic::{TimerDivide, TimerMode};
         let lapic = super::apic::local_apic();
         lapic.set_timer_mode(TimerMode::OneShot);
-        lapic.set_timer_divide(TimerDivide::Div256); // indeed it is Div1, the name is confusing.
+        lapic.set_timer_divide(TimerDivide::Div1); // indeed it is Div1, the name is confusing.
         lapic.enable_timer();
 
         // TODO: calibrate with HPET