更新内存管理逻辑，修复保留列表的初始化，调整 CPU 启动信息的日志格式，并启用定时器中断

Author: ZR233

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

@@ -36,7 +36,15 @@ pub fn setup() {
     });
 
     RESERVED_LIST.call_once(|| {
-        let mut ram_list = Vec::new();
+        let mut rsv_list = Vec::new();
+
+        unsafe extern "C" {
+            fn _skernel();
+        }
+        let head_start = boot_info().kimage_start_lma as usize;
+        let head_section = (head_start, (_skernel as usize) - va_offset() - head_start);
+
+        rsv_list.push(head_section);
 
         for region in boot_info()
             .memory_regions
@@ -49,9 +57,9 @@ pub fn setup() {
             })
             .map(|one| (one.start, one.end.align_up_4k() - one.start))
         {
-            let _ = ram_list.push(region);
+            let _ = rsv_list.push(region);
         }
-        ram_list
+        rsv_list
     });
 
     MMIO.call_once(|| {
@@ -110,11 +118,10 @@ impl MemIf for MemIfImpl {
 
 fn kimage_range_phys() -> Range<PhysAddr> {
     unsafe extern "C" {
-        fn _skernel();
         fn _ekernel();
     }
 
-    let start = PhysAddr::from_usize(KIMAGE_VADDR - va_offset());
+    let start = PhysAddr::from_usize(boot_info().kimage_start_lma as usize);
     let end = PhysAddr::from_usize(_ekernel as usize - va_offset());
     start..end
 }

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

@@ -27,8 +27,7 @@ impl PowerIf for PowerImpl {
         let cpu_id = crate::smp::cpu_idx_to_id(cpu_idx);
         let entry = crate::smp::secondary_entry_phys_addr();
         info!(
-            "booting CPU {cpu_id} with entry {:#x} and stack top {:#x}",
-            entry, stack_top_paddr
+            "booting CPU{cpu_idx} id {cpu_id:#x} with entry {entry:#x} and stack top {stack_top_paddr:#x}",
         );
         dcache_all(CacheOp::CleanAndInvalidate);
         cpu_on(cpu_id as _, entry.as_usize() as _, stack_top_paddr as _).unwrap();

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

@@ -1,3 +1,4 @@
+use aarch64_cpu_ext::cache::{CacheOp, dcache_all};
 use alloc::vec::Vec;
 use axplat::mem::{PhysAddr, va, virt_to_phys};
 use fdt_parser::Status;
@@ -25,19 +26,19 @@ pub fn init() {
         ls
     });
 
-    debug!("CPU ID list: {:?}", CPU_ID_LIST.wait());
+    debug!("CPU ID list: {:#x?}", CPU_ID_LIST.wait());
 
     if CPU_ID_LIST.wait().len() < CPU_NUM {
         panic!(
-            "CPU count {} is less than expected `cpu_num` in `.axconfig.toml`{}",
+            "CPU count {} is less than expected `cpu_num` in `.axconfig.toml` is {}",
             CPU_ID_LIST.wait().len(),
             CPU_NUM
         );
     }
 
     if CPU_ID_LIST.wait().len() > CPU_NUM {
         info!(
-            "CPU count {} is more than expected `cpu_num` in `.axconfig.toml`{}",
+            "CPU count {} is more than expected `cpu_num` in `.axconfig.toml` is {}",
             CPU_ID_LIST.wait().len(),
             CPU_NUM
         );
@@ -128,6 +129,7 @@ unsafe extern "C" fn _start_secondary() -> ! {
 }
 
 fn _secondary_main(cpu_id: usize) -> ! {
+    dcache_all(CacheOp::CleanAndInvalidate);
     let cpu_idx = cpu_id_to_idx(cpu_id);
     axplat::call_secondary_main(cpu_idx)
 }

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

@@ -71,7 +71,7 @@ pub fn enable_irqs() {
         "axconfig.toml `timer-irq` must match the IRQ number used in the driver"
     );
 
-    crate::irq::set_enable(irq_raw, Some(TIMER_IRQ_CONFIG.trigger), false);
+    crate::irq::set_enable(irq_raw, Some(TIMER_IRQ_CONFIG.trigger), true);
 }
 
 module_driver!(