更新 axplat-aarch64-dyn 平台的依赖项，添加驱动程序注册功能，优化内存管理，完善电源管理接口。

Author: ZR233

Cargo.lock

@@ -16,6 +16,9 @@ axcpu = {workspace = true}
 axplat = {workspace = true}
 fdt-parser = "0.4"
 heapless = "0.8"
+log = "0.4"
 memory_addr = "0.3"
-pie-boot = {version = "0.2.6"}
+pie-boot = {version = "0.2.7"}
+rdrive = "0.14"
+smccc = "0.2"
 spin = "0.10"

platforms/axplat-aarch64-dyn/Cargo.toml

@@ -37,6 +37,11 @@ SECTIONS
         _sdata = .;
         *(.data.boot_page_table)
         . = ALIGN(4K);
+        
+        __sdriver_register = .;
+        KEEP(*(.driver.register*))
+        __edriver_register = .;
+
         *(.data .data.*)
         *(.sdata .sdata.*)
         *(.got .got.*)

platforms/axplat-aarch64-dyn/link.ld

@@ -1,5 +1,3 @@
-use core::ptr::NonNull;
-
 use any_uart::{Receiver, Sender};
 use axplat::console::ConsoleIf;
 use fdt_parser::Fdt;

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

@@ -0,0 +1,35 @@
+use core::ops::Deref;
+
+use pie_boot::boot_info;
+use rdrive::{
+    Platform, init,
+    register::{DriverRegister, DriverRegisterSlice},
+    register_append,
+};
+
+pub fn setup() {
+    let fdt = boot_info().fdt.expect("FDT must be present");
+
+    init(Platform::Fdt { addr: fdt }).unwrap();
+
+    register_append(&driver_registers());
+}
+
+fn driver_registers() -> impl Deref<Target = [DriverRegister]> {
+    unsafe extern "C" {
+        fn __sdriver_register();
+        fn __edriver_register();
+    }
+
+    unsafe {
+        let len = __edriver_register as usize - __sdriver_register as usize;
+
+        if len == 0 {
+            return DriverRegisterSlice::empty();
+        }
+
+        let data = core::slice::from_raw_parts(__sdriver_register as _, len);
+
+        DriverRegisterSlice::from_raw(data)
+    }
+}

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

@@ -1,6 +1,6 @@
 use axplat::init::InitIf;
 
-use crate::console;
+use crate::{console, driver};
 
 struct InitIfImpl;
 
@@ -68,13 +68,11 @@ impl InitIf for InitIfImpl {
     /// * Timer interrupts are enabled (if applicable).
     /// * Other platform devices are initialized.
     fn init_later(cpu_id: usize, arg: usize) {
-       
+        driver::setup();
     }
 
     /// Initializes the platform at the later stage for secondary cores.
     ///
     /// See [`init_later`] for details.
-    fn init_later_secondary(cpu_id: usize) {
-         
-    }
+    fn init_later_secondary(cpu_id: usize) {}
 }

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

@@ -3,10 +3,12 @@
 
 #[macro_use]
 extern crate axplat;
+extern crate alloc;
 
 use pie_boot::BootInfo;
 
 mod console;
+mod driver;
 mod init;
 mod irq;
 mod mem;
@@ -19,8 +21,5 @@ mod config {
 
 #[pie_boot::entry]
 fn main(args: &BootInfo) -> ! {
-    axplat::call_main(
-        args.cpu_id,
-        args.fdt.map(|p| p.as_ptr() as usize).unwrap_or_default(),
-    );
+    axplat::call_main(0, args.fdt.map(|p| p.as_ptr() as usize).unwrap_or_default());
 }

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

@@ -4,7 +4,7 @@ use axplat::mem::{MemIf, RawRange};
 use heapless::Vec;
 use memory_addr::{MemoryAddr, PhysAddr, VirtAddr};
 use pie_boot::{KIMAGE_VADDR, KLINER_OFFSET, MemoryRegionKind, boot_info};
-use spin::{Mutex, Once, RwLock};
+use spin::Once;
 
 struct MemIfImpl;
 
@@ -47,7 +47,7 @@ pub fn setup() {
                     MemoryRegionKind::Reserved | MemoryRegionKind::Bootloader
                 )
             })
-            .map(|one| (one.start, one.end - one.start))
+            .map(|one| (one.start, one.end.align_up_4k() - one.start))
         {
             let _ = ram_list.push(region);
         }