irq

Author: ZR233

Cargo.lock

@@ -8,12 +8,16 @@ name = "axplat-aarch64-dyn"
 repository.workspace = true
 version = "0.1.0"
 
+[features]
+fp-simd = ["axcpu/fp-simd"]
+smp = ["axplat/smp"]
+
 [dependencies]
 aarch64-cpu = "10"
 any-uart = "0.2.11"
 axconfig-macros = "0.2"
 axcpu = {workspace = true}
-axplat = {workspace = true}
+axplat = {workspace = true, features = ["irq"]}
 fdt-parser = "0.4"
 heapless = "0.8"
 log = "0.4"
@@ -22,3 +26,4 @@ pie-boot = {version = "0.2.9"}
 rdrive = "0.15"
 smccc = "0.2"
 spin = "0.10"
+lazyinit = "0.2"

platforms/axplat-aarch64-dyn/Cargo.toml

@@ -13,8 +13,6 @@ pub fn setup() {
 
     init(Platform::Fdt { addr: fdt }).unwrap();
 
-    register_append(&driver_registers());
-
     probe_pre_kernel().unwrap();
 }
 

platforms/axplat-aarch64-dyn/src/driver.rs

@@ -39,6 +39,7 @@ impl InitIf for InitIfImpl {
     /// Initializes the platform at the early stage for secondary cores.
     ///
     /// See [`init_early`] for details.
+    #[cfg(feature = "smp")]
     fn init_early_secondary(cpu_id: usize) {
         axcpu::init::init_trap();
     }
@@ -69,12 +70,15 @@ impl InitIf for InitIfImpl {
     /// * Other platform devices are initialized.
     fn init_later(cpu_id: usize, arg: usize) {
         driver::setup();
-
-        driver::probe_all(true).unwrap();
+        crate::irq::init();
+        crate::irq::init_current_cpu();
     }
 
     /// Initializes the platform at the later stage for secondary cores.
     ///
     /// See [`init_later`] for details.
-    fn init_later_secondary(cpu_id: usize) {}
+    #[cfg(feature = "smp")]
+    fn init_later_secondary(cpu_id: usize) {
+        crate::irq::init_current_cpu();
+    }
 }