raspi: fix wrong memory flag of spintable

arceos-org · Jul 24, 2023 · 1cb5662 · 1cb5662
1 parent 195485d
commit 1cb5662
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/modules/axconfig/.gitignore b/modules/axconfig/.gitignore
diff --git a/modules/axhal/src/mem.rs b/modules/axhal/src/mem.rs
@@ -14,12 +14,14 @@ bitflags::bitflags! {
         const WRITE         = 1 << 1;
         /// Executable.
         const EXECUTE       = 1 << 2;
-        /// Device memory.
+        /// Device memory. (e.g., MMIO regions)
         const DEVICE        = 1 << 4;
+        /// Uncachable memory. (e.g., framebuffer)
+        const UNCACHED      = 1 << 5;
         /// Reserved memory, do not use for allocation.
-        const RESERVED      = 1 << 5;
+        const RESERVED      = 1 << 6;
         /// Free memory for allocation.
-        const FREE          = 1 << 6;
+        const FREE          = 1 << 7;
     }
 }
 

diff --git a/modules/axhal/src/paging.rs b/modules/axhal/src/paging.rs
@@ -23,6 +23,9 @@ impl From<MemRegionFlags> for MappingFlags {
         if f.contains(MemRegionFlags::DEVICE) {
             ret |= Self::DEVICE;
         }
+        if f.contains(MemRegionFlags::UNCACHED) {
+            ret |= Self::UNCACHED;
+        }
         ret
     }
 }

diff --git a/modules/axhal/src/platform/aarch64_raspi/mem.rs b/modules/axhal/src/platform/aarch64_raspi/mem.rs
@@ -35,7 +35,7 @@ pub(crate) fn extern_memory_region_at(idx: usize) -> Option<MemRegion> {
         Some(MemRegion {
             paddr: 0x0.into(),
             size: 0x1000,
-            flags: MemRegionFlags::FREE | MemRegionFlags::READ | MemRegionFlags::WRITE,
+            flags: MemRegionFlags::READ | MemRegionFlags::WRITE,
             name: "spintable",
         })
     } else {