lib: riscv64: use RISC-V SBI 2.0 ratified DBCN write instead of depre…

…cated legacy console write Legacy extensions are deprecated in SBI 0.2 dated back to 2021; some of the SBI implementations have already dropped support for legacy console, resulting in no console output for hermit OS loader. To solve this problem, we use its replacement in the SBI 2.0 DBCN extension, which is supported by modern SBI firmwares. We do this by modify our code to use console_write_byte function from sbi-rt. Signed-off-by: Zhouqi Jiang <[email protected]>
hermit-os · Feb 29, 2024 · af78a1c · af78a1c
1 parent c27b41e
commit af78a1c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,7 +43,7 @@ qemu-exit = "3"
 fdt = "0.1"
 naked-function = "0.1"
 riscv = "0.11"
-sbi = "0.2"
+sbi-rt = "0.0.3"
 sptr = "0.3"
 
 [profile.release]

diff --git a/src/arch/riscv64/mod.rs b/src/arch/riscv64/mod.rs
@@ -16,7 +16,7 @@ use sptr::Strict;
 
 pub fn message_output_init() {}
 
-pub use sbi::legacy::console_putchar as output_message_byte;
+pub use sbi_rt::console_write_byte as output_message_byte;
 
 fn find_kernel_linux(chosen: &FdtNode<'_, '_>) -> Option<&'static [u8]> {
 	let initrd_start = chosen.property("linux,initrd-start")?.as_usize()?;