Unifying the Lunaix's Physical Memory Model (#28)

[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 1e262cc87c158f465deacf6d8ba24d4e904debf4..b91ab0e425c491a79f1e334aa1090d3aa4e728ea 100644 (file)
--- a/lunaix-os/kernel/mm/mmio.c
+++ b/lunaix-os/kernel/mm/mmio.c
@@ -1,6 +1,5 @@
 #include <lunaix/mm/mmio.h>
-#include <lunaix/mm/pmm.h>
-#include <lunaix/mm/vmm.h>
+#include <lunaix/mm/page.h>
 #include <lunaix/spike.h>
 
 void*
@@ -8,24 +7,28 @@ ioremap(ptr_t paddr, u32_t size)
 {
     // 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(pfn(paddr), leaf_count(size), PP_FGLOCKED);
-    }
+    pfn_t start = pfn(paddr);
+    size_t npages = leaf_count(size);
+    
+    // Ensure the range is reservable (not already in use)
+    assert(pmm_onhold_range(start, npages));
 
-    return ptr;
+    return (void*)vmap_range(start, npages, KERNEL_DATA);
 }
 
 void
 iounmap(ptr_t vaddr, u32_t size)
 {
-    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);
+    // FIXME
+    fail("need fix");
 
-        set_pte(ptep, null_pte);
-        if (pte_isloaded(pte))
-            pmm_free_page(pte_paddr(pte));
-    }
+    // 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))
+    //         return_page(ppage_pa(pte_paddr(pte)));
+    // }
 }
\ No newline at end of file