A Total Overhaul on the Lunaix's Virtual Memory Model (#26)

[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 ccb57d7b0f248255c30129e495bb36f2860cbcf1..1e262cc87c158f465deacf6d8ba24d4e904debf4 100644 (file)
--- a/lunaix-os/kernel/mm/mmio.c
+++ b/lunaix-os/kernel/mm/mmio.c
@@ -6,12 +6,12 @@
 void*
 ioremap(ptr_t paddr, u32_t size)
 {
-    void* ptr = vmap(paddr, size, PG_PREM_RW | PG_DISABLE_CACHE, 0);
+    // FIXME implement a page policy interface allow to decouple the 
+    //       arch-dependent caching behaviour
+    void* ptr = (void*)vmap(paddr, size, KERNEL_DATA);
 
     if (ptr) {
-        pmm_mark_chunk_occupied(paddr >> PG_SIZE_BITS,
-                                CEIL(size, PG_SIZE_BITS),
-                                PP_FGLOCKED);
+        pmm_mark_chunk_occupied(pfn(paddr), leaf_count(size), PP_FGLOCKED);
     }
 
     return ptr;
@@ -20,8 +20,12 @@ ioremap(ptr_t paddr, u32_t size)
 void
 iounmap(ptr_t vaddr, u32_t size)
 {
-    for (size_t i = 0; i < size; i += PG_SIZE) {
-        ptr_t paddr = vmm_del_mapping(VMS_SELF, vaddr + i);
-        pmm_free_page(paddr);
+    pte_t* ptep = mkptep_va(VMS_SELF, vaddr);
+    for (size_t i = 0; i < size; i += PAGE_SIZE, ptep++) {
+        pte_t pte = pte_at(ptep);
+
+        set_pte(ptep, null_pte);
+        if (pte_isloaded(pte))
+            pmm_free_page(pte_paddr(pte));
     }
 }
\ No newline at end of file