Second Extended Filesystem (ext2) and other improvements (#33)

[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..dbb1870afe9083437f7656d177fe579542184618 100644 (file)
--- a/lunaix-os/kernel/mm/mmio.c
+++ b/lunaix-os/kernel/mm/mmio.c
@@ -1,31 +1,26 @@
 #include <lunaix/mm/mmio.h>
 #include <lunaix/mm/mmio.h>

-#include <lunaix/mm/pmm.h>
-#include <lunaix/mm/vmm.h>
+#include <lunaix/mm/page.h>

 #include <lunaix/spike.h>
 
 #include <lunaix/spike.h>
 

-void*
+ptr_t

 ioremap(ptr_t paddr, u32_t size)
 {
     // FIXME implement a page policy interface allow to decouple the 
     //       arch-dependent caching behaviour
 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;
+    ptr_t addr = vmap_range(start, npages, KERNEL_DATA);
+    return addr + va_offset(paddr);

 }
 
 void
 iounmap(ptr_t vaddr, u32_t size)
 {
 }
 
 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);
-
-        set_pte(ptep, null_pte);
-        if (pte_isloaded(pte))
-            pmm_free_page(pte_paddr(pte));
-    }
+    assert(vaddr >= VMAP && vaddr < VMAP_END);
+    vunmap_range(pfn(vaddr), leaf_count(size));

 }
\ No newline at end of file
 }
\ No newline at end of file