Merge branch 'master' into iso-9660

[lunaix-os.git] / lunaix-os / kernel / mm / mmio.c

diff --git a/lunaix-os/kernel/mm/mmio.c b/lunaix-os/kernel/mm/mmio.c
index f6d53686eb5836baae85475fee15c04873c65b0a..a52dc1bf93251138ccde1670aad6058765dd5d54 100644 (file)
--- a/lunaix-os/kernel/mm/mmio.c
+++ b/lunaix-os/kernel/mm/mmio.c
@@ -1,11 +1,19 @@
 #include <lunaix/mm/mmio.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/mm/mmio.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>

+#include <lunaix/spike.h>

 
 void*
 ioremap(uintptr_t paddr, uint32_t size)
 {
 
 void*
 ioremap(uintptr_t paddr, uint32_t size)
 {

-    return vmm_vmap(paddr, size, PG_PREM_RW, PP_FGPERSIST);
+    void* ptr = vmm_vmap(paddr, size, PG_PREM_RW | PG_DISABLE_CACHE);
+    if (ptr) {
+        pmm_mark_chunk_occupied(KERNEL_PID,
+                                paddr >> PG_SIZE_BITS,
+                                CEIL(size, PG_SIZE_BITS),
+                                PP_FGLOCKED);
+    }
+    return ptr;

 }
 
 void*
 }
 
 void*