rustsbi-qemu: hart counting fixes, update to RustSBI 0.2.1

Signed-off-by: luojia65 <me@luojia.cc>

Author: luojia65

Cargo.lock

@@ -6,7 +6,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rustsbi = "0.2.0"
+rustsbi = "0.2.1"
 buddy_system_allocator = "0.8"
 lazy_static = { version = "1", features = ["spin_no_std"] }
 spin = "0.9"

rustsbi-qemu/Cargo.toml

@@ -50,16 +50,11 @@ impl Clint {
 }
 
 impl Ipi for Clint {
-    #[inline]
-    fn max_hart_id(&self) -> usize {
-        // 这个值将在初始化的时候加载，会从dtb_pa读取设备树，然后数里面有几个核
-        *crate::count_harts::MAX_HART_ID.lock()
-    }
-
     #[inline]
     fn send_ipi_many(&self, hart_mask: HartMask) -> SbiRet {
         // println!("[rustsbi] send ipi many, {:?}", hart_mask);
-        for i in 0..=self.max_hart_id() {
+        let num_harts = *crate::count_harts::NUM_HARTS.lock();
+        for i in 0..num_harts {
             if hart_mask.has_bit(i) {
                 self.send_soft(i);
             }

rustsbi-qemu/src/clint.rs

@@ -1,13 +1,14 @@
 use device_tree::{DeviceTree, Node};
+
 const DEVICE_TREE_MAGIC: u32 = 0xD00DFEED;
 
 lazy_static::lazy_static! {
     // 最大的硬件线程编号；只在启动时写入，跨核软中断发生时读取
-    pub static ref MAX_HART_ID: spin::Mutex<usize> = spin::Mutex::new(8);
+    pub static ref NUM_HARTS: spin::Mutex<usize> = spin::Mutex::new(8);
 }
 
 pub unsafe fn init_hart_count(dtb_pa: usize) {
-    *MAX_HART_ID.lock() = count_harts(dtb_pa)
+    *NUM_HARTS.lock() = count_harts(dtb_pa)
 }
 
 #[repr(C)]

rustsbi-qemu/src/count_harts.rs

@@ -22,6 +22,7 @@ mod hart_csr_utils;
 mod ns16550a;
 mod prv_mem;
 mod qemu_hsm;
+mod qemu_pmu;
 mod runtime;
 mod test_device;
 
@@ -88,8 +89,8 @@ extern "C" fn rust_main(hartid: usize, opqaue: usize) -> ! {
         hart_csr_utils::print_hart_csrs();
         // start other harts
         let clint = clint::Clint::new(0x2000000 as *mut u8);
-        let max_hart_id = *{ count_harts::MAX_HART_ID.lock() };
-        for target_hart_id in 0..max_hart_id {
+        let num_harts = *{ count_harts::NUM_HARTS.lock() };
+        for target_hart_id in 0..num_harts {
             if target_hart_id != 0 {
                 clint.send_soft(target_hart_id);
             }

rustsbi-qemu/src/main.rs

@@ -4,18 +4,20 @@
 #![no_std]
 #![no_main]
 
-#[macro_use]
-mod console;
-mod mm;
-mod sbi;
-
 use core::arch::asm;
+use core::panic::PanicInfo;
+
 use riscv::register::{
     scause::{self, Exception, Trap},
     sepc,
     stvec::{self, TrapMode},
 };
 
+#[macro_use]
+mod console;
+mod mm;
+mod sbi;
+
 pub extern "C" fn rust_main(hartid: usize, dtb_pa: usize) -> ! {
     if hartid == 0 {
         // initialization
@@ -59,14 +61,12 @@ pub extern "C" fn rust_main(hartid: usize, dtb_pa: usize) -> ! {
             "<< Test-kernel: test for hart {} success, wake another hart",
             hartid
         );
-        let bv: usize = 0b10;
-        let sbi_ret = sbi::send_ipi(&bv as *const _ as usize, hartid); // wake hartid + 1
+        let sbi_ret = sbi::send_ipi(0b10, 0); // wake hart 1
         println!(">> Wake hart 1, sbi return value {:?}", sbi_ret);
         loop {} // wait for machine shutdown
     } else if hartid == 1 {
         // send software IPI to activate hart 2
-        let bv: usize = 0b10;
-        let sbi_ret = sbi::send_ipi(&bv as *const _ as usize, hartid); // wake hartid + 1
+        let sbi_ret = sbi::send_ipi(0b1, 2);
         println!(">> Wake hart 2, sbi return value {:?}", sbi_ret);
         loop {}
     } else {
@@ -153,8 +153,6 @@ pub extern "C" fn rust_trap_exception() {
     sepc::write(sepc::read().wrapping_add(4));
 }
 
-use core::panic::PanicInfo;
-
 #[cfg_attr(not(test), panic_handler)]
 #[allow(unused)]
 fn panic(info: &PanicInfo) -> ! {