arch/riscv/pmp: Removed unnecessary PMPUserMPUConfig

Signed-off-by: Ioan-Cristian CÎRSTEA <ioan.cirstea@oxidos.io>

Author: IoanCristianCirstea

arch/riscv/src/pmp.rs

@@ -2,15 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 // Copyright Tock Contributors 2022.
 
-use core::cell::Cell;
 use core::fmt;
-use core::num::NonZeroUsize;
 
 use kernel::memory_management::pages::Page4KiB;
 use kernel::memory_management::permissions::Permissions;
 use kernel::memory_management::regions::PhysicalProtectedAllocatedRegion;
 use kernel::platform::mmu::Asid;
-use kernel::utilities::cells::{MapCell, OptionalCell};
+use kernel::utilities::cells::MapCell;
 use kernel::utilities::registers::{register_bitfields, LocalRegisterCopy};
 
 use crate::csr;
@@ -763,60 +761,6 @@ pub trait TORUserPMP<const MAX_REGIONS: usize> {
     fn disable_user_pmp(&self);
 }
 
-/// Struct storing userspace memory protection regions for the [`PMPUserMPU`].
-pub struct PMPUserMPUConfig<const MAX_REGIONS: usize> {
-    /// PMP config identifier, as generated by the issuing PMP implementation.
-    id: NonZeroUsize,
-    /// Indicates if the configuration has changed since the last time it was
-    /// written to hardware.
-    is_dirty: Cell<bool>,
-    /// Array of MPU regions. Each region requires two physical PMP entries.
-    regions: [(TORUserPMPCFG, *const u8, *const u8); MAX_REGIONS],
-    /// Which region index (into the `regions` array above) is used
-    /// for app memory (if it has been configured).
-    app_memory_region: OptionalCell<usize>,
-}
-
-impl<const MAX_REGIONS: usize> fmt::Display for PMPUserMPUConfig<MAX_REGIONS> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // Ternary operator shortcut function, to avoid bulky formatting...
-        fn t<T>(cond: bool, a: T, b: T) -> T {
-            if cond {
-                a
-            } else {
-                b
-            }
-        }
-
-        write!(
-            f,
-            " PMPUserMPUConfig {{\r\n  id: {},\r\n  is_dirty: {},\r\n  app_memory_region: {:?},\r\n  regions:\r\n",
-            self.id,
-            self.is_dirty.get(),
-            self.app_memory_region.get()
-        )?;
-
-        for (i, (tor_user_pmpcfg, start, end)) in self.regions.iter().enumerate() {
-            let pmpcfg = tor_user_pmpcfg.get_reg();
-            write!(
-                f,
-                "     #{:02}: start={:#010X}, end={:#010X}, cfg={:#04X} ({}) (-{}{}{})\r\n",
-                i,
-                *start as usize,
-                *end as usize,
-                pmpcfg.get(),
-                t(pmpcfg.is_set(pmpcfg_octet::a), "TOR", "OFF"),
-                t(pmpcfg.is_set(pmpcfg_octet::r), "r", "-"),
-                t(pmpcfg.is_set(pmpcfg_octet::w), "w", "-"),
-                t(pmpcfg.is_set(pmpcfg_octet::x), "x", "-"),
-            )?;
-        }
-
-        write!(f, " }}\r\n")?;
-        Ok(())
-    }
-}
-
 /// Adapter from a generic PMP implementation exposing TOR-type regions to the
 /// Tock [`mpu::MPU`] trait. See [`TORUserPMP`].
 pub struct PMPUserMPU<const MAX_REGIONS: usize, P: TORUserPMP<MAX_REGIONS> + 'static> {