Changeset 96cd5b4 in mainline for kernel/generic/src/mm/page.c

Timestamp:

2012-01-04T13:37:10Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

9957a97

Parents:

ecf823a (diff), c520034 (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 with mainline

File:

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

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>
@@ -75 +76 @@
 #include <errno.h>
 #include <align.h>
+#include <macros.h>
+#include <bitops.h>
 
 /** Virtual operations for page subsystem. */
@@ -177 +180 @@
 }
 
+/** Make the mapping shared by all page tables (not address spaces).
+ * 
+ * @param base Starting virtual address of the range that is made global.
+ * @param size Size of the address range that is made global.
+ */
+void page_mapping_make_global(uintptr_t base, size_t size)
+{
+        ASSERT(page_mapping_operations);
+        ASSERT(page_mapping_operations->mapping_make_global);
+        
+        return page_mapping_operations->mapping_make_global(base, 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, 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)
 {