feat: 添加 spin 依赖并实现共享数据的互斥锁管理 (#50)

fix: 更新构建逻辑以支持强制重建加载器
chore: 更新 Cargo.lock 以包含新依赖

Author: ZR233

Cargo.lock

@@ -122,28 +122,28 @@ where
             ));
         }
 
-        let size = if table.entry_size() == table.max_block_size() {
-            table.entry_size() * (T::TABLE_LEN / 2)
-        } else {
-            table.max_block_size() * T::TABLE_LEN
-        };
-        let start = 0x0usize;
-
-        printkv!("eq", "[{:#x}, {:#x})", start, start + size);
-
-        if CurrentEL.read(CurrentEL::EL) == 1 {
-            early_err!(table.map(
-                MapConfig {
-                    vaddr: start.into(),
-                    paddr: start.into(),
-                    size,
-                    pte: new_pte(CacheKind::NoCache),
-                    allow_huge: true,
-                    flush: false,
-                },
-                access,
-            ));
-        }
+        // let size = if table.entry_size() == table.max_block_size() {
+        //     table.entry_size() * (T::TABLE_LEN / 2)
+        // } else {
+        //     table.max_block_size() * T::TABLE_LEN
+        // };
+        // let start = 0x0usize;
+
+        // printkv!("eq", "[{:#x}, {:#x})", start, start + size);
+
+        // if CurrentEL.read(CurrentEL::EL) == 1 {
+        //     early_err!(table.map(
+        //         MapConfig {
+        //             vaddr: start.into(),
+        //             paddr: start.into(),
+        //             size,
+        //             pte: new_pte(CacheKind::Normal),
+        //             allow_huge: true,
+        //             flush: false,
+        //         },
+        //         access,
+        //     ));
+        // }
     }
 
     let pg = table.paddr().raw() as _;

loader/pie-boot-loader-aarch64/src/mmu.rs

@@ -11,6 +11,7 @@ version = "0.4.1"
 
 [features]
 hv = ["kdef-pgtable/space-low"]
+force-rebuild-loader = []
 
 [dependencies]
 any-uart = {version = "0.2"}

somehal/Cargo.toml

@@ -120,12 +120,17 @@ fn extract_version_from_toml_value(value: &toml::Value) -> Option<String> {
 }
 
 fn aarch64_set_loader() {
-    // 首先尝试从 release 下载，如果失败则回退到本地构建
-    let download_success = download_latest_release();
-
-    if !download_success {
-        // 回退到原来的本地构建逻辑
+    let force_rebuild = std::env::var("CARGO_FEATURE_FORCE_REBUILD_LOADER").is_ok();
+    if force_rebuild {
         build_loader_locally();
+    } else {
+        let download_success = download_latest_release();
+        // 首先尝试从 release 下载，如果失败则回退到本地构建
+
+        if !download_success {
+            // 回退到原来的本地构建逻辑
+            build_loader_locally();
+        }
     }
 }
 

somehal/build.rs

@@ -20,10 +20,9 @@ SECTIONS{
         *(.init_array .init_array.*)
         __init_array_end = .;
     }
-    . = ALIGN(4K);
-    _erodata = .;
 
     .data : ALIGN(4K) {
+        _erodata = .;
         _sdata = .;
         . = ALIGN(4K);
         *(.data .data.*)

somehal/link.ld

@@ -21,8 +21,10 @@ SECTIONS{
 }
 
 SECTIONS{ 
-    .boot_loader  : {
+    .boot_loader : ALIGN(PAGE_SIZE) {
+        __boot_loader_start = .;
         KEEP(*(.boot_loader))
+        __boot_loader_end = .;
     }
 } INSERT BEFORE .data
 

somehal/link_base.ld

@@ -25,3 +25,7 @@ pub fn iomap(phys: usize, size: usize) -> Result<NonNull<u8>, page_table_generic
 
     Ok(NonNull::new(vaddr).unwrap())
 }
+
+pub fn flush_tlb(vaddr: Option<VirtAddr>) {
+    crate::arch::el::flush_tlb(vaddr);
+}

somehal/src/arch/aarch64/mem/mod.rs

@@ -3,6 +3,7 @@ use core::{
     mem::{offset_of, size_of},
 };
 
+use aarch64_cpu_ext::cache::{CacheOp, dcache_all};
 use kdef_pgtable::{KLINER_OFFSET, PAGE_SIZE};
 #[cfg(not(feature = "hv"))]
 use pie_boot_loader_aarch64::el1::{set_table, setup_sctlr, setup_table_regs};
@@ -196,6 +197,7 @@ fn enable_fp() {
 
 #[start_code]
 fn init_mmu() -> usize {
+    dcache_all(CacheOp::Invalidate);
     setup_table_regs();
 
     let addr = boot_info().pg_start as usize;

somehal/src/arch/aarch64/mod.rs

@@ -4,7 +4,6 @@ use aarch64_cpu::asm::wfi;
 use aarch64_cpu_ext::cache::{CacheOp, dcache_range};
 use fdt_parser::Fdt;
 use log::debug;
-use pie_boot_if::BootInfo;
 use smccc::{Hvc, Smc, psci};
 
 use crate::{_start_secondary, boot_info, lazy_static::LazyStatic, println};
@@ -78,9 +77,20 @@ pub fn cpu_on(cpu_id: u64, stack_top: u64) -> Result<(), PsciError> {
 
     let entry = secondary_entry_addr();
 
-    let start = boot_info() as *const _ as usize;
-    let size = core::mem::size_of::<BootInfo>();
+    unsafe extern "C" {
+        fn _srodata();
+        fn __cpu0_stack();
+        fn __bss_start();
+        fn __bss_stop();
+    }
+
+    let start = _srodata as usize;
+    let size = (__cpu0_stack as usize) - start;
+
+    dcache_range(CacheOp::Clean, start, size);
 
+    let start = __bss_start as usize;
+    let size = (__bss_stop as usize) - start;
     dcache_range(CacheOp::Clean, start, size);
 
     _cpu_on(cpu_id, entry as _, stack_top)

somehal/src/arch/aarch64/power.rs

@@ -1,3 +1,3 @@
 #!/bin/bash
-cargo test --target aarch64-unknown-none-softfloat -p test-some-rt --test test --features "hv" -- --show-output --uboot
+cargo test --target aarch64-unknown-none-softfloat -p test-some-rt --test test --features "hv,somehal/force-rebuild-loader" -- --show-output --uboot
 # cargo test --target aarch64-unknown-none-softfloat -p test-some-rt --test test  -- --show-output --uboot