fix(prototyper): temporarily remove pmpm module in prototyper; will be added back in the future

Signed-off-by: Zhouqi Jiang <[email protected]>

Author: luojia65

prototyper/prototyper/Cargo.toml

@@ -21,7 +21,6 @@ rustsbi = { version = "0.4.0", features = [
 sbi-spec = { version = "0.0.8", features = [
     "legacy",
 ], path = "../../library/sbi-spec" }
-pmpm = { version = "0.0.0", path = "../../library/pmpm" }
 serde = { version = "1.0.202", default-features = false, features = ["derive"] }
 aclint = { git = "https://github.com/rustsbi/aclint", rev = "b2136a66" }
 fast-trap = { git = "https://github.com/rustsbi/fast-trap", rev = "8d855afa", features = ["riscv-m"] }

prototyper/prototyper/src/firmware/mod.rs

@@ -11,11 +11,12 @@ cfg_if::cfg_if! {
     }
 }
 
-use crate::fail;
 use alloc::{format, vec};
 #[allow(unused)]
 use core::arch::{asm, naked_asm};
-use core::{ops::Range, usize};
+use core::ops::Range;
+
+use crate::fail;
 
 use riscv::register::mstatus;
 use serde::Serialize;

prototyper/prototyper/src/sbi/hart_context.rs

@@ -1,7 +1,6 @@
 use crate::sbi::features::HartFeatures;
 use crate::sbi::features::PrivilegedVersion;
 use crate::sbi::hsm::HsmCell;
-use crate::sbi::pmpm::PmpSyncCell;
 use crate::sbi::rfence::RFenceCell;
 use core::ptr::NonNull;
 use core::sync::atomic::AtomicU8;
@@ -19,8 +18,6 @@ pub(crate) struct HartContext {
     pub hsm: HsmCell<NextStage>,
     /// Remote fence synchronization cell.
     pub rfence: RFenceCell,
-    /// PMP synchronization cell.
-    pub pmpsync: PmpSyncCell,
     /// Type of inter-processor interrupt pending.
     pub ipi_type: AtomicU8,
     /// Supported hart features.

prototyper/prototyper/src/sbi/ipi.rs

@@ -4,7 +4,6 @@ use crate::riscv::csr::stimecmp;
 use crate::riscv::current_hartid;
 use crate::sbi::features::{Extension, hart_extension_probe};
 use crate::sbi::hsm::remote_hsm;
-use crate::sbi::pmpm;
 use crate::sbi::rfence;
 use crate::sbi::trap_stack::hart_context;
 use alloc::boxed::Box;
@@ -17,8 +16,6 @@ use spin::Mutex;
 pub(crate) const IPI_TYPE_SSOFT: u8 = 1 << 0;
 /// IPI type for memory fence operations.
 pub(crate) const IPI_TYPE_FENCE: u8 = 1 << 1;
-/// IPI type for PMP configuration synchronization.
-pub(crate) const IPI_TYPE_PMP: u8 = 1 << 2;
 
 /// Trait defining interface for inter-processor interrupt device
 #[allow(unused)]
@@ -194,59 +191,6 @@ impl SbiIpi {
         SbiRet::success(0)
     }
 
-    /// Send IPI for PMP configuration synchronous.
-    pub fn send_ipi_by_pmpsync(&self, ctx: pmpm::PmpSyncContext) -> SbiRet {
-        let mut hart_mask = hart_mask_clear(HartMask::all(), current_hartid());
-
-        for hart_id in 0..=self.max_hart_id {
-            if !hart_mask.has_bit(hart_id) {
-                continue;
-            }
-
-            // There are 2 situation to return invalid_param:
-            // 1. We can not get hsm, which usually means this hart_id is bigger than MAX_HART_ID.
-            // 2. BOARD hasn't init or this hart_id is not enabled by device tree.
-            // In the next loop, we'll assume that all of above situation will not happened and
-            // directly send ipi.
-            let Some(hsm) = remote_hsm(hart_id) else {
-                return SbiRet::invalid_param();
-            };
-
-            if unsafe {
-                PLATFORM
-                    .info
-                    .cpu_enabled
-                    .is_none_or(|list| list.get(hart_id).is_none_or(|res| !(*res)))
-            } {
-                return SbiRet::invalid_param();
-            }
-
-            if !hsm.allow_ipi() {
-                hart_mask = hart_mask_clear(hart_mask, hart_id);
-            }
-        }
-
-        let sender = pmpm::local_pmpctx().unwrap();
-        // Send fence operations to target harts
-        for hart_id in 0..=self.max_hart_id {
-            if !hart_mask.has_bit(hart_id) {
-                continue;
-            }
-            sender.add();
-            if let Some(receiver) = pmpm::remote_pmpctx(hart_id) {
-                receiver.set(ctx);
-                if set_ipi_type(hart_id, IPI_TYPE_PMP) == 0 {
-                    self.set_msip(hart_id);
-                }
-            }
-        }
-
-        // Wait for all hart complete handle
-        while !sender.is_sync() {}
-
-        SbiRet::success(0)
-    }
-
     /// Get lower 32 bits of machine time.
     #[inline]
     pub fn get_time(&self) -> usize {

prototyper/prototyper/src/sbi/mod.rs

@@ -14,7 +14,6 @@ pub mod fifo;
 pub mod hart_context;
 pub mod heap;
 pub mod logger;
-pub mod pmpm;
 pub mod trap;
 pub mod trap_stack;
 

prototyper/prototyper/src/sbi/pmpm.rs

@@ -10,7 +10,6 @@ use crate::riscv::current_hartid;
 use crate::sbi::console;
 use crate::sbi::hsm::local_hsm;
 use crate::sbi::ipi;
-use crate::sbi::pmpm;
 use crate::sbi::pmu::pmu_firmware_counter_increment;
 use crate::sbi::rfence;
 
@@ -46,10 +45,6 @@ pub fn msoft_ipi_handler() {
     if (ipi_type & ipi::IPI_TYPE_FENCE) != 0 {
         rfence::rfence_handler();
     }
-    // Handle PMP synchronous operation.
-    if (ipi_type & ipi::IPI_TYPE_PMP) != 0 {
-        pmpm::pmpsync_handler();
-    }
 }
 
 #[inline]