Changeset 9970a5a in mainline for kernel/generic/src/mm/km.c

Timestamp:

2012-01-27T23:24:27Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7b3b571, fe56c08a

Parents:

d81eaf94 (diff), 221c9ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/mm.

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;
@@ -120 +123 @@
         ra_free(km_ni_arena, page, size);
 }
+
+uintptr_t km_map(uintptr_t paddr, size_t size, unsigned int flags)
+{
+        uintptr_t vaddr;
+        size_t asize;
+        size_t align;
+        uintptr_t offs;
+
+        asize = ALIGN_UP(size, PAGE_SIZE);
+        align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
+        vaddr = km_page_alloc(asize, max(PAGE_SIZE, align));
+
+        page_table_lock(AS_KERNEL, true);
+        for (offs = 0; offs < asize; offs += PAGE_SIZE) {
+                page_mapping_insert(AS_KERNEL, vaddr + offs, paddr + offs,
+                    flags);
+        }
+        page_table_unlock(AS_KERNEL, true);
+        
+        return vaddr;
+}
+
 
 /** Unmap kernen non-identity page.
@@ -165 +190 @@
             FRAME_HIGHMEM | FRAME_ATOMIC | flags); 
         if (frame) {
-                page = km_page_alloc(PAGE_SIZE, PAGE_SIZE);
+                page = km_map(frame, PAGE_SIZE,
+                    PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
                 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,