feat(sbi): 换一种获取 SMP 的方式

Author: YdrMaster

rustsbi-qemu/src/device_tree.rs

@@ -12,7 +12,7 @@ pub(crate) struct BoardInfo {
 pub(crate) fn parse(_opaque: usize) -> BoardInfo {
     BoardInfo {
         model: vec![String::from("riscv-virtio,qemu")],
-        smp: 4,
+        smp: 8,
         uart: 0x1000_0000..0x1000_0100,
         test: 0x10_0000..0x10_1000,
         clint: 0x200_0000..0x201_0000,

rustsbi-qemu/src/main.rs

@@ -142,7 +142,7 @@ extern "C" fn rust_main(_hartid: usize, opaque: usize) {
         clint::init(board_info.clint.start);
         test_device::init(board_info.test.start);
         let uart = unsafe { ns16550a::Ns16550a::new(board_info.uart.start) };
-        let hsm = HSM.call_once(|| qemu_hsm::QemuHsm::new(clint::get(), board_info.smp, opaque));
+        let hsm = HSM.call_once(|| qemu_hsm::QemuHsm::new(clint::get(), NUM_HART_MAX, opaque));
         // 初始化 SBI 服务
         rustsbi::legacy_stdio::init_legacy_stdio_embedded_hal(uart);
         rustsbi::init_ipi(clint::get());
@@ -166,7 +166,7 @@ extern "C" fn rust_main(_hartid: usize, opaque: usize) {
             logo = rustsbi::LOGO,
             ver_impl = env!("CARGO_PKG_VERSION"),
             model = board_info.model,
-            smp = board_info.smp,
+            smp = SMP.load(Acquire),
             hartid = hart_id(),
             dtb = opaque,
             firmware = entry as usize,

xtask/src/main.rs

@@ -216,7 +216,7 @@ fn xtask_qemu_run(xtask_env: &XtaskEnv) {
         .args(&["-machine", "virt"])
         .args(&["-bios", "rustsbi-qemu.bin"])
         .args(&["-kernel", "test-kernel.bin"])
-        .args(&["-smp", "4"]) // 8 cores
+        .args(&["-smp", "8"]) // 8 cores
         .arg("-nographic")
         .status()
         .unwrap();
@@ -233,7 +233,7 @@ fn xtask_qemu_debug(xtask_env: &XtaskEnv) {
         .args(&["-machine", "virt"])
         .args(&["-bios", "rustsbi-qemu.bin"])
         .args(&["-kernel", "test-kernel.bin"])
-        .args(&["-smp", "4"]) // 8 cores
+        .args(&["-smp", "8"]) // 8 cores
         .arg("-nographic")
         .args(&["-gdb", "tcp::1234", "-S"])
         .status()