Change IoMem creation to unsafe

framework/jinux-frame/src/arch/x86/mmio.rs

@@ -1,19 +0,0 @@
-use acpi::PciConfigRegions;
-
-pub fn start_address() -> usize {
-    let start = PciConfigRegions::new(
-        &*crate::arch::x86::kernel::acpi::ACPI_TABLES
-            .get()
-            .unwrap()
-            .lock(),
-    )
-    .unwrap();
-
-    // all zero to get the start address
-    start.physical_address(0, 0, 0, 0).unwrap() as usize
-}
-
-pub fn end_address() -> usize {
-    // 4G-20M
-    0xFEC0_0000
-}

framework/jinux-frame/src/arch/x86/mod.rs

@@ -5,7 +5,6 @@ pub mod iommu;
 pub(crate) mod irq;
 mod kernel;
 pub(crate) mod mm;
-pub(crate) mod mmio;
 pub(crate) mod timer;
 
 use alloc::fmt;

framework/jinux-frame/src/bus/pci/cfg_space.rs

@@ -154,12 +154,13 @@ impl MemoryBar {
         // length
         let size = !(len_encoded & !0xF).wrapping_add(1);
         let prefetchable = if raw & 0b1000 == 0 { false } else { true };
+        // The BAR is located in I/O memory region
         Ok(MemoryBar {
             base,
             size,
             prefetchable,
             address_length,
-            io_memory: IoMem::new((base as usize)..((base + size as u64) as usize)).unwrap(),
+            io_memory: unsafe { IoMem::new((base as usize)..((base + size as u64) as usize)) },
         })
     }
 }

framework/jinux-frame/src/io_mem.rs

@@ -1,26 +1,11 @@
 use core::{mem::size_of, ops::Range};
 use pod::Pod;
-use spin::Once;
 
 use crate::{
-    vm::{HasPaddr, Paddr, Vaddr, VmIo},
+    vm::{paddr_to_vaddr, HasPaddr, Paddr, Vaddr, VmIo},
-    Error,
+    Error, Result,
 };
 
-static CHECKER: Once<MmioChecker> = Once::new();
-
-pub(crate) fn init() {
-    CHECKER.call_once(|| MmioChecker {
-        start: crate::arch::mmio::start_address(),
-        end: crate::arch::mmio::end_address(),
-    });
-    log::info!(
-        "MMIO start: 0x{:x}, end: 0x{:x}",
-        CHECKER.get().unwrap().start,
-        CHECKER.get().unwrap().end
-    );
-}
-
 #[derive(Debug, Clone)]
 pub struct IoMem {
     virtual_address: Vaddr,
@@ -67,18 +52,39 @@ impl HasPaddr for IoMem {
 }
 
 impl IoMem {
-    pub fn new(range: Range<Paddr>) -> Option<IoMem> {
+    /// # Safety
-        if CHECKER.get().unwrap().check(&range) {
+    ///
-            Some(IoMem {
+    /// User must ensure the range is in the I/O memory region.
-                virtual_address: crate::vm::paddr_to_vaddr(range.start),
+    pub(crate) unsafe fn new(range: Range<Paddr>) -> IoMem {
+        IoMem {
+            virtual_address: paddr_to_vaddr(range.start),
             limit: range.len(),
-            })
-        } else {
-            None
         }
     }
 
-    fn check_range(&self, offset: usize, len: usize) -> crate::Result<()> {
+    pub fn paddr(&self) -> Paddr {
+        crate::vm::vaddr_to_paddr(self.virtual_address).unwrap()
+    }
+
+    pub fn length(&self) -> usize {
+        self.limit
+    }
+
+    pub fn resize(&mut self, range: Range<Paddr>) -> Result<()> {
+        let start_vaddr = paddr_to_vaddr(range.start);
+        if start_vaddr < self.virtual_address || start_vaddr >= self.virtual_address + self.limit {
+            return Err(Error::InvalidArgs);
+        }
+        let end_vaddr = start_vaddr + range.len();
+        if end_vaddr <= self.virtual_address || end_vaddr > self.virtual_address + self.limit {
+            return Err(Error::InvalidArgs);
+        }
+        self.virtual_address = start_vaddr;
+        self.limit = range.len();
+        Ok(())
+    }
+
+    fn check_range(&self, offset: usize, len: usize) -> Result<()> {
         let sum = offset.checked_add(len).ok_or(Error::InvalidArgs)?;
         if sum > self.limit {
             log::error!(
@@ -92,15 +98,3 @@ impl IoMem {
         }
     }
 }
-
-struct MmioChecker {
-    start: Paddr,
-    end: Paddr,
-}
-
-impl MmioChecker {
-    /// Check whether the physical address is in MMIO region.
-    fn check(&self, range: &Range<Paddr>) -> bool {
-        range.start >= self.start && range.end < self.end
-    }
-}

framework/jinux-frame/src/lib.rs

@@ -52,7 +52,6 @@ pub fn init() {
     vm::init();
     trap::init();
     arch::after_all_init();
-    io_mem::init();
     bus::init();
     register_irq_common_callback();
     invoke_c_init_funcs();