rustsbi: enable H extension; reformat

Author: luojia65

rustsbi-qemu/src/main.rs

@@ -21,8 +21,8 @@ mod runtime;
 mod test_device;
 
 use buddy_system_allocator::LockedHeap;
-use core::panic::PanicInfo;
 use core::arch::asm;
+use core::panic::PanicInfo;
 
 const PER_HART_STACK_SIZE: usize = 4 * 4096; // 16KiB
 const SBI_STACK_SIZE: usize = 8 * PER_HART_STACK_SIZE; // assume 8 cores in QEMU
@@ -61,7 +61,10 @@ extern "C" fn rust_main(hartid: usize, opqaue: usize) -> ! {
         init_legacy_stdio();
         init_clint();
         init_test_device();
-        println!("[rustsbi] RustSBI version {}", rustsbi::VERSION);
+        println!(
+            "[rustsbi] RustSBI version {}, adapting to RISC-V SBI v0.3",
+            rustsbi::VERSION
+        );
         println!("{}", rustsbi::LOGO);
         println!(
             "[rustsbi] Implementation: RustSBI-QEMU Version {}",
@@ -78,6 +81,11 @@ extern "C" fn rust_main(hartid: usize, opqaue: usize) -> ! {
     unsafe {
         // enable wake by ipi
         riscv::register::mstatus::set_mie();
+        // enable H extension
+        asm!(
+            "csrr {val}, misa", "li {h}, 0x80", "or {val}, {val}, {h}", "csrw misa, {val}",
+            val = lateout(reg) _, h = lateout(reg) _
+        );
     }
     if hartid == 0 {
         // print hart csr configuration
@@ -92,6 +100,7 @@ extern "C" fn rust_main(hartid: usize, opqaue: usize) -> ! {
         }
         println!("[rustsbi] enter supervisor 0x80200000");
     }
+    // start SBI environment
     execute::execute_supervisor(0x80200000, hartid, opqaue, HSM.clone());
 }
 

rustsbi-qemu/src/test_device.rs

@@ -3,10 +3,13 @@
 // This is a test finisher memory mapped device used to exit simulation
 //
 // Ref: https://github.com/qemu/qemu/blob/master/hw/misc/sifive_test.c
-use rustsbi::{Reset, SbiRet, reset::{
-    RESET_TYPE_SHUTDOWN, RESET_TYPE_COLD_REBOOT, RESET_TYPE_WARM_REBOOT,
-    RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE
-}};
+use rustsbi::{
+    reset::{
+        RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE, RESET_TYPE_COLD_REBOOT,
+        RESET_TYPE_SHUTDOWN, RESET_TYPE_WARM_REBOOT,
+    },
+    Reset, SbiRet,
+};
 
 // Zero sized structure for a static write-only device
 pub struct SiFiveTest;
@@ -26,7 +29,7 @@ impl Reset for SiFiveTest {
             RESET_TYPE_SHUTDOWN => match reset_reason {
                 RESET_REASON_NO_REASON => TEST_PASS,
                 RESET_REASON_SYSTEM_FAILURE => TEST_FAIL | (QEMU_ERR_EXIT_CODE << 16),
-                // pass unknown reason from [2, 0xFFFF] to qemu return value output  
+                // pass unknown reason from [2, 0xFFFF] to qemu return value output
                 // reason if reason <= 0xFFFF => TEST_FAIL | (((reason & 0xFFFF) as u32) << 16),
                 _ => return SbiRet::invalid_param(),
             },

test-kernel/src/main.rs

@@ -76,7 +76,10 @@ pub extern "C" fn rust_main(hartid: usize, dtb_pa: usize) -> ! {
 }
 
 extern "C" fn hart_2_resume(hart_id: usize, param: usize) {
-    println!("<< The parameter passed to hart {} resume is: {:#x}", hart_id, param);
+    println!(
+        "<< The parameter passed to hart {} resume is: {:#x}",
+        hart_id, param
+    );
     let param = 0x12345678;
     println!(">> Start hart 3 with parameter {:#x}", param);
     /* start_addr should be physical address, and here pa == va */
@@ -86,7 +89,10 @@ extern "C" fn hart_2_resume(hart_id: usize, param: usize) {
 }
 
 extern "C" fn hart_3_start(hart_id: usize, param: usize) {
-    println!("<< The parameter passed to hart {} start is: {:#x}", hart_id, param);
+    println!(
+        "<< The parameter passed to hart {} start is: {:#x}",
+        hart_id, param
+    );
     println!("<< Test-kernel: All hart SBI test SUCCESS, shutdown");
     sbi::shutdown()
 }

test-kernel/src/sbi.rs

@@ -1,6 +1,6 @@
 #![allow(unused)]
-use core::fmt;
 use core::arch::asm;
+use core::fmt;
 
 pub const EXTENSION_BASE: usize = 0x10;
 pub const EXTENSION_TIMER: usize = 0x54494D45;
@@ -97,11 +97,21 @@ pub const RESET_REASON_SYSTEM_FAILURE: usize = 0x0000_0001;
 
 #[inline]
 pub fn reset(reset_type: usize, reset_reason: usize) -> SbiRet {
-    sbi_call_2(EXTENSION_SRST, FUNCTION_SYSTEM_RESET, reset_type, reset_reason)
+    sbi_call_2(
+        EXTENSION_SRST,
+        FUNCTION_SYSTEM_RESET,
+        reset_type,
+        reset_reason,
+    )
 }
 
 pub fn shutdown() -> ! {
-    sbi_call_2(EXTENSION_SRST, FUNCTION_SYSTEM_RESET, RESET_TYPE_SHUTDOWN, RESET_REASON_NO_REASON);
+    sbi_call_2(
+        EXTENSION_SRST,
+        FUNCTION_SYSTEM_RESET,
+        RESET_TYPE_SHUTDOWN,
+        RESET_REASON_NO_REASON,
+    );
     unreachable!()
 }
 

xtask/src/main.rs

@@ -308,11 +308,13 @@ fn check_tool<S: AsRef<str>>(tool: S) -> Option<String> {
             return Some(format!("riscv64-unknown-elf-{}", tool.as_ref()));
         }
     }
-    println!("
+    println!(
+        "
 No binutils found, try install using:
 
     rustup component add llvm-tools-preview
-    cargo install cargo-binutils");
+    cargo install cargo-binutils"
+    );
     return None;
 }