feat: try SO bit

Signed-off-by: YdrMaster <[email protected]>
lo-ferris · Oct 10, 2022 · 7a8bc0c · 7a8bc0c
1 parent ae914ce
commit 7a8bc0c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kernel-hal/src/bare/arch/riscv/drivers.rs b/kernel-hal/src/bare/arch/riscv/drivers.rs
@@ -30,6 +30,7 @@ impl IoMapper for IoMapperImpl {
             let flags = MMUFlags::READ
                 | MMUFlags::WRITE
                 | MMUFlags::HUGE_PAGE
+                | MMUFlags::DEVICE
                 | MMUFlags::from_bits_truncate(CachePolicy::UncachedDevice as usize);
             if let Err(err) = pt.map_cont(vaddr, size, paddr, flags) {
                 warn!(

diff --git a/kernel-hal/src/bare/arch/riscv/vm.rs b/kernel-hal/src/bare/arch/riscv/vm.rs
@@ -143,17 +143,20 @@ hal_fn_impl! {
 bitflags::bitflags! {
     /// Possible flags for a page table entry.
     struct PTF: usize {
-        const VALID =       1 << 0;
-        const READABLE =    1 << 1;
-        const WRITABLE =    1 << 2;
-        const EXECUTABLE =  1 << 3;
-        const USER =        1 << 4;
-        const GLOBAL =      1 << 5;
-        const ACCESSED =    1 << 6;
-        const DIRTY =       1 << 7;
-        const RESERVED1 =   1 << 8;
-        const RESERVED2 =   1 << 9;
-        const CACHEABLE =   1 << 62;
+        const VALID =        1 <<  0;
+        const READABLE =     1 <<  1;
+        const WRITABLE =     1 <<  2;
+        const EXECUTABLE =   1 <<  3;
+        const USER =         1 <<  4;
+        const GLOBAL =       1 <<  5;
+        const ACCESSED =     1 <<  6;
+        const DIRTY =        1 <<  7;
+        const RESERVED1 =    1 <<  8;
+        const RESERVED2 =    1 <<  9;
+        #[cfg(feature = "thead-maee")]
+        const CACHEABLE =    1 << 62;
+        #[cfg(feature = "thead-maee")]
+        const STRONG_ORDER = 1 << 63;
     }
 }
 
@@ -163,15 +166,14 @@ impl From<MMUFlags> for PTF {
             return PTF::empty();
         }
         let mut flags = PTF::VALID;
-        if f.contains(MMUFlags::READ) {
-            flags |= PTF::READABLE;
+        if f.contains(MMUFlags::WRITE) {
+            flags |= PTF::READABLE | PTF::WRITABLE;
             #[cfg(feature = "thead-maee")]
             {
                 flags |= PTF::CACHEABLE;
             }
-        }
-        if f.contains(MMUFlags::WRITE) {
-            flags |= PTF::READABLE | PTF::WRITABLE;
+        } else if f.contains(MMUFlags::READ) {
+            flags |= PTF::READABLE;
             #[cfg(feature = "thead-maee")]
             {
                 flags |= PTF::CACHEABLE;
@@ -183,6 +185,10 @@ impl From<MMUFlags> for PTF {
         if f.contains(MMUFlags::USER) {
             flags |= PTF::USER;
         }
+        #[cfg(feature = "thead-maee")]
+        if f.contains(MMUFlags::DEVICE) {
+            flags |= PTF::STRONG_ORDER;
+        }
         flags
     }
 }