Changes in kernel/generic/src/mm/km.c [03cdd2b:f7f47a7] in mainline

File:

• kernel/generic/src/mm/km.c (modified) (3 diffs)

kernel/generic/src/mm/km.c

@@ -46 +46 @@
 #include <debug.h>
 #include <arch.h>
-#include <align.h>
-#include <macros.h>
-#include <bitops.h>
 
 static ra_arena_t *km_ni_arena;
@@ -124 +121 @@
 }
 
-static uintptr_t
-km_map_aligned(uintptr_t paddr, size_t size, unsigned int flags)
-{
-        uintptr_t vaddr;
-        size_t align;
-        uintptr_t offs;
-
-        ASSERT(ALIGN_DOWN(paddr, FRAME_SIZE) == paddr);
-        ASSERT(ALIGN_UP(size, FRAME_SIZE) == size);
-
-        align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
-        vaddr = km_page_alloc(size, max(PAGE_SIZE, align));
-
-        page_table_lock(AS_KERNEL, true);
-        for (offs = 0; offs < size; offs += PAGE_SIZE) {
-                page_mapping_insert(AS_KERNEL, vaddr + offs, paddr + offs,
-                    flags);
-        }
-        page_table_unlock(AS_KERNEL, true);
-        
-        return vaddr;
-}
-
-static void km_unmap_aligned(uintptr_t vaddr, size_t size)
-{
-        uintptr_t offs;
-        ipl_t ipl;
-
-        ASSERT(ALIGN_DOWN(vaddr, PAGE_SIZE) == vaddr);
-        ASSERT(ALIGN_UP(size, PAGE_SIZE) == size);
-
-        page_table_lock(AS_KERNEL, true);
-
-        ipl = tlb_shootdown_start(TLB_INVL_ASID, ASID_KERNEL, 0, 0);
-
-        for (offs = 0; offs < size; offs += PAGE_SIZE)
-                page_mapping_remove(AS_KERNEL, vaddr + offs);
-
-        tlb_invalidate_asid(ASID_KERNEL);
-
-        as_invalidate_translation_cache(AS_KERNEL, 0, -1);
-        tlb_shootdown_finalize(ipl);
-        page_table_unlock(AS_KERNEL, true);
-
-        km_page_free(vaddr, size);
-}
-
-/** Map a piece of physical address space into the virtual address space.
- *
- * @param paddr         Physical address to be mapped. May be unaligned.
- * @param size          Size of area starting at paddr to be mapped.
- * @param flags         Protection flags to be used for the mapping.
- *
- * @return New virtual address mapped to paddr.
- */
-uintptr_t km_map(uintptr_t paddr, size_t size, unsigned int flags)
-{
-        uintptr_t page;
-        size_t offs; 
-
-        offs = paddr - ALIGN_DOWN(paddr, FRAME_SIZE); 
-        page = km_map_aligned(ALIGN_DOWN(paddr, FRAME_SIZE),
-            ALIGN_UP(size + offs, FRAME_SIZE), flags);
-
-        return page + offs;
-}
-
-/** Unmap a piece of virtual address space.
- *
- * @param vaddr         Virtual address to be unmapped. May be unaligned, but
- *                      it must a value previously returned by km_map().
- * @param size          Size of area starting at vaddr to be unmapped.
- */
-void km_unmap(uintptr_t vaddr, size_t size)
-{
-        size_t offs; 
-
-        offs = vaddr - ALIGN_DOWN(vaddr, PAGE_SIZE); 
-        km_unmap_aligned(ALIGN_DOWN(vaddr, PAGE_SIZE),
-            ALIGN_UP(size + offs, PAGE_SIZE));
-}
-
-/** Unmap kernel non-identity page.
+/** Unmap kernen non-identity page.
  *
  * @param[in] page      Non-identity page to be unmapped.
@@ -250 +165 @@
             FRAME_HIGHMEM | FRAME_ATOMIC | flags); 
         if (frame) {
-                page = km_map(frame, PAGE_SIZE,
-                    PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
+                page = km_page_alloc(PAGE_SIZE, PAGE_SIZE);
                 ASSERT(page);   // FIXME
+                page_table_lock(AS_KERNEL, true);
+                page_mapping_insert(AS_KERNEL, page, frame,
+                    PAGE_CACHEABLE | PAGE_READ | PAGE_WRITE);
+                page_table_unlock(AS_KERNEL, true);
         } else {
                 frame = (uintptr_t) frame_alloc_noreserve(ONE_FRAME,