Changeset d4673296 in mainline for kernel/generic

Timestamp:

2012-01-27T21:12:25Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

adec5b45

Parents:

4dee0cb

Message:

Move hw_map() to km.c

Location:

kernel/generic

Files:

• include/mm/km.h (modified) (1 diff)
• include/mm/page.h (modified) (1 diff)
• src/mm/km.c (modified) (2 diffs)
• src/mm/page.c (modified) (3 diffs)

kernel/generic/include/mm/km.h

@@ -49 +49 @@
 extern bool km_is_non_identity(uintptr_t);
 
+extern uintptr_t hw_map(uintptr_t, size_t);
+
 extern uintptr_t km_temporary_page_get(uintptr_t *, frame_flags_t);
 extern void km_temporary_page_put(uintptr_t);

kernel/generic/include/mm/page.h

@@ -66 +66 @@
 extern void map_structure(uintptr_t, size_t);
 
-extern uintptr_t hw_map(uintptr_t, size_t);
-
 extern int page_find_mapping(uintptr_t, void **);
 extern sysarg_t sys_page_find_mapping(uintptr_t, void *);

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 hw_map(uintptr_t physaddr, size_t size)
+{
+        uintptr_t virtaddr;
+        size_t asize;
+        size_t align;
+        pfn_t i;
+
+        asize = ALIGN_UP(size, PAGE_SIZE);
+        align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
+        virtaddr = km_page_alloc(asize, max(PAGE_SIZE, align));
+
+        page_table_lock(AS_KERNEL, true);
+        for (i = 0; i < ADDR2PFN(asize); i++) {
+                uintptr_t addr = PFN2ADDR(i);
+                page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr,
+                    PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        }
+        page_table_unlock(AS_KERNEL, true);
+        
+        return virtaddr;
+}
+
 
 /** Unmap kernen non-identity page.

kernel/generic/src/mm/page.c

@@ -65 +65 @@
 #include <arch/mm/asid.h>
 #include <mm/as.h>
-#include <mm/km.h>
 #include <mm/frame.h>
 #include <arch/barrier.h>
@@ -76 +75 @@
 #include <errno.h>
 #include <align.h>
-#include <macros.h>
-#include <bitops.h>
 
 /** Virtual operations for page subsystem. */
@@ -193 +190 @@
 }
 
-uintptr_t hw_map(uintptr_t physaddr, size_t size)
-{
-        uintptr_t virtaddr;
-        size_t asize;
-        size_t align;
-        pfn_t i;
-
-        asize = ALIGN_UP(size, PAGE_SIZE);
-        align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
-        virtaddr = km_page_alloc(asize, max(PAGE_SIZE, align));
-
-        page_table_lock(AS_KERNEL, true);
-        for (i = 0; i < ADDR2PFN(asize); i++) {
-                uintptr_t addr = PFN2ADDR(i);
-                page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr,
-                    PAGE_NOT_CACHEABLE | PAGE_WRITE);
-        }
-        page_table_unlock(AS_KERNEL, true);
-        
-        return virtaddr;
-}
-
 int page_find_mapping(uintptr_t virt, void **phys)
 {