fix: use wfi for all suspend

Signed-off-by: YdrMaster <ydrml@hotmail.com>

Author: YdrMaster

.vscode/settings.json

@@ -1,10 +1,6 @@
 {
     // Prevent "can't find crate for `test`" error on no_std
     // Ref: https://github.com/rust-lang/vscode-rust/issues/729
-    // For vscode-rust plugin users:
-    "rust.target": "riscv64imac-unknown-none-elf",
-    "rust.all_targets": false,
-    // For Rust Analyzer plugin users:
     "rust-analyzer.cargo.target": "riscv64imac-unknown-none-elf",
     "rust-analyzer.checkOnSave.allTargets": false,
 }

CHANGELOG.md

@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Use crate aclint version 0.0.0 in rustsbi-qemu for aclint structs
 - Use crate os-xtask-utils version 0.0.0 in xtask builder
 - Use crate sifive-test-device version 0.0.0 instead of qemu-exit
+- Use `wfi` without enable mie
 
 ### Fixed
 

rustsbi-qemu/src/main.rs

@@ -214,6 +214,10 @@ extern "C" fn fast_handler(
                 });
                 mie::write(mie::MSIE | mie::MTIE);
                 trap_vec::load(true);
+                unsafe {
+                    riscv::register::sstatus::clear_sie();
+                    riscv::register::satp::write(0);
+                }
                 ctx.regs().a[0] = hart_id;
                 ctx.regs().a[1] = supervisor.opaque;
                 ctx.regs().pc = supervisor.start_addr;
@@ -254,8 +258,13 @@ extern "C" fn fast_handler(
                         if a6 == hsm::HART_SUSPEND
                             && ctx.a0() == hsm::HART_SUSPEND_TYPE_NON_RETENTIVE as usize
                         {
-                            trap_vec::load(false);
-                            ctx.regs().pc = _stop as _;
+                            unsafe {
+                                riscv::register::sstatus::clear_sie();
+                                riscv::register::satp::write(0);
+                            }
+                            ctx.regs().a[0] = hart_id();
+                            ctx.regs().a[1] = a2;
+                            ctx.regs().pc = a1;
                             return ctx.call(0);
                         }
                     }
@@ -389,23 +398,18 @@ impl rustsbi::Hsm for Hsm {
         }
     }
 
-    fn hart_suspend(&self, suspend_type: u32, resume_addr: usize, opaque: usize) -> SbiRet {
-        use rustsbi::spec::hsm as spec;
-        match suspend_type {
-            spec::HART_SUSPEND_TYPE_NON_RETENTIVE => {
-                local_hsm().suspend_non_retentive(Supervisor {
-                    start_addr: resume_addr,
-                    opaque,
-                });
-                SbiRet::success(0)
-            }
-            spec::HART_SUSPEND_TYPE_RETENTIVE => unsafe {
-                local_hsm().suspend();
-                riscv::asm::wfi();
-                local_hsm().resume();
-                SbiRet::success(0)
-            },
-            _ => SbiRet::not_supported(),
+    fn hart_suspend(&self, suspend_type: u32, _resume_addr: usize, _opaque: usize) -> SbiRet {
+        use rustsbi::spec::hsm::*;
+        if matches!(
+            suspend_type,
+            HART_SUSPEND_TYPE_NON_RETENTIVE | HART_SUSPEND_TYPE_RETENTIVE
+        ) {
+            local_hsm().suspend();
+            unsafe { riscv::asm::wfi() };
+            local_hsm().resume();
+            SbiRet::success(0)
+        } else {
+            SbiRet::not_supported()
         }
     }
 }