cleanup

src/ipi.rs

@@ -1,6 +1,4 @@
-use crate::ecall::SbiRet;
-use crate::hart_mask::HartMask;
-use crate::util::AmoOnceRef;
+use crate::{ecall::SbiRet, hart_mask::HartMask, util::AmoOnceRef};
 
 /// Inter-processor interrupt support
 pub trait Ipi: Send + Sync {
@@ -34,8 +32,7 @@ pub(crate) fn probe_ipi() -> bool {
 
 pub(crate) fn send_ipi_many(hart_mask: HartMask) -> SbiRet {
     if let Some(ipi) = IPI.get() {
-        ipi.send_ipi_many(hart_mask)
-    } else {
-        SbiRet::not_supported()
+        return ipi.send_ipi_many(hart_mask);
     }
+    SbiRet::not_supported()
 }

src/legacy_stdio.rs

@@ -10,6 +10,12 @@ pub trait LegacyStdio: Send + Sync {
     fn getchar(&self) -> u8;
     /// Put a character into legacy stdout
     fn putchar(&self, ch: u8);
+
+    fn write_str(&self, s: &str) {
+        for byte in s.as_bytes() {
+            self.putchar(*byte)
+        }
+    }
 }
 
 static STDIO: AmoOnceRef<dyn LegacyStdio> = AmoOnceRef::new();
@@ -45,9 +51,7 @@ impl fmt::Write for Stdout {
     #[inline]
     fn write_str(&mut self, s: &str) -> fmt::Result {
         if let Some(stdio) = STDIO.get() {
-            for byte in s.as_bytes() {
-                stdio.putchar(*byte)
-            }
+            stdio.write_str(s);
         }
         Ok(())
     }

src/lib.rs

@@ -171,7 +171,6 @@ mod hart_mask;
 mod hsm;
 mod ipi;
 mod pmu;
-mod privileged;
 #[doc(hidden)]
 pub mod reset;
 mod rfence;
@@ -228,7 +227,6 @@ pub use ipi::{init_ipi, Ipi};
 #[doc(hidden)]
 pub use legacy_stdio::{legacy_stdio_getchar, legacy_stdio_putchar};
 pub use pmu::{init_pmu, Pmu};
-pub use privileged::enter_privileged;
 pub use reset::{init_reset, Reset};
 pub use rfence::{init_rfence as init_remote_fence, Rfence as Fence};
 pub use timer::{init_timer, Timer};

src/pmu.rs

@@ -1,5 +1,4 @@
-use crate::ecall::SbiRet;
-use crate::util::AmoOnceRef;
+use crate::{ecall::SbiRet, util::AmoOnceRef};
 
 /// Performance Monitoring Unit Extension
 ///

src/privileged.rs

@@ -1,48 +0,0 @@
-/// Enter lower privilege from M code with given SBI parameters.
-///
-/// Before calling this function, you must write target start address into `mepc` register,
-/// and write target privilege into `mstatus` register.
-/// Platform binarys should call this function on all harts to enter lower privilege levels
-/// after the initialization process is finished.
-///
-/// After this function is called, the stack pointer register `sp` is swapped with `mscratch`,
-/// and a `mret` is called to return to `mepc` address with target privilege.
-///
-/// # Safety
-///
-/// This function implictly returns to the program address with the address from `mepc` register.
-/// Caller must ensure that the value in `mepc` is a valid program address.
-/// Caller should also ensure that `mstatus.MPP` register bits contain valid target privilege level.
-///
-/// # Example
-///
-/// ```no_run
-/// # use riscv::register::{mepc, mstatus::{self, MPP}, mhartid};
-/// # extern "C" fn rust_main(hart_id: usize, opauqe: usize) {
-/// # fn read_address_from_boot_media() -> usize { 0 /* */ }
-/// # let s_mode_start = read_address_from_boot_media(); // read from boot media
-/// unsafe {
-///     mepc::write(s_mode_start);
-///     mstatus::set_mpp(MPP::Supervisor);
-///     rustsbi::enter_privileged(mhartid::read(), opauqe);
-/// }
-/// # }
-/// ```
-#[inline]
-pub unsafe fn enter_privileged(mhartid: usize, opaque: usize) -> ! {
-    match () {
-        #[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))] // pass cargo test
-        () => core::arch::asm!(
-        "csrrw  sp, mscratch, sp",
-        "mret",
-        in("a0") mhartid,
-        in("a1") opaque,
-        options(nomem, noreturn)
-        ),
-        #[cfg(not(any(target_arch = "riscv32", target_arch = "riscv64")))]
-        () => {
-            let _ = (mhartid, opaque);
-            unimplemented!("not RISC-V architecture")
-        }
-    }
-}

src/reset.rs

@@ -1,5 +1,4 @@
-use crate::ecall::SbiRet;
-use crate::util::AmoOnceRef;
+use crate::{ecall::SbiRet, util::AmoOnceRef};
 
 /// System Reset Extension
 ///
@@ -52,23 +51,21 @@ pub trait Reset: Send + Sync {
 static RESET: AmoOnceRef<dyn Reset> = AmoOnceRef::new();
 
 #[doc(hidden)]
-#[allow(unused)]
 pub const RESET_TYPE_SHUTDOWN: usize = 0x0000_0000;
+
 #[doc(hidden)]
-#[allow(unused)]
 pub const RESET_TYPE_COLD_REBOOT: usize = 0x0000_0001;
+
 #[doc(hidden)]
-#[allow(unused)]
 pub const RESET_TYPE_WARM_REBOOT: usize = 0x0000_0002;
 
 #[doc(hidden)]
-#[allow(unused)]
 pub const RESET_REASON_NO_REASON: usize = 0x0000_0000;
+
 #[doc(hidden)]
-#[allow(unused)]
 pub const RESET_REASON_SYSTEM_FAILURE: usize = 0x0000_0001;
 
-#[doc(hidden)] // use through a macro
+#[doc(hidden)]
 pub fn init_reset(reset: &'static dyn Reset) {
     if !RESET.try_call_once(reset) {
         panic!("load sbi module when already loaded")

src/rfence.rs

@@ -1,6 +1,4 @@
-use crate::ecall::SbiRet;
-use crate::hart_mask::HartMask;
-use crate::util::AmoOnceRef;
+use crate::{ecall::SbiRet, hart_mask::HartMask, util::AmoOnceRef};
 
 /// Remote fence support
 ///