riscv64: use SBI SRST extension instead of legacy SBI for system shut…

…down Legacy SBI have been deprecated years ago (on Jun 9, 2021). Modern RISC-V SBI firmware would use SBI SRST extension to shutdown an S-mode environment; we use `sbi-rt` crate for this purpose. Unused feature gate `opensbi` is removed, as RISC-V SBI support does not usually satisfy which implementation we'd use, unless e.g. fixing implementation-specific bugs. Signed-off-by: Zhouqi Jiang <[email protected]>
r9os · Oct 24, 2024 · 4f56ee9 · 4f56ee9
1 parent 0cda5c2
commit 4f56ee9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/riscv64/Cargo.toml b/riscv64/Cargo.toml
@@ -8,9 +8,9 @@ default-target = "riscv64gc-unknown-none-elf"
 
 [dependencies]
 port = { path = "../port" }
+sbi-rt = "0.0.3"
 
 [features]
-opensbi = []
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(platform, values("nezha"))', 'cfg(platform, values("virt"))'] }
diff --git a/riscv64/src/sbi.rs b/riscv64/src/sbi.rs
@@ -49,6 +49,8 @@ pub fn _consgetb() -> u8 {
 }
 
 pub fn shutdown() -> ! {
-    sbi_call_legacy(SBI_SHUTDOWN, 0, 0, 0);
-    panic!("shutdown failed!");
+    sbi_rt::system_reset(sbi_rt::Shutdown, sbi_rt::NoReason);
+    loop {
+        unsafe { core::arch::asm!("wfi") }
+    }
 }