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

Timestamp:

2012-01-27T22:19:12Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ccd0aa

Parents:

d4673296

Message:

Rename hw_map() to km_map() and add protection flags argument
to make it more generic.

File:

• kernel/generic/src/mm/km.c (modified) (1 diff)

kernel/generic/src/mm/km.c

@@ -124 +124 @@
 }
 
-uintptr_t hw_map(uintptr_t physaddr, size_t size)
-{
-        uintptr_t virtaddr;
+uintptr_t km_map(uintptr_t paddr, size_t size, unsigned int flags)
+{
+        uintptr_t vaddr;
         size_t asize;
         size_t align;
-        pfn_t i;
+        uintptr_t offs;
 
         asize = ALIGN_UP(size, PAGE_SIZE);
         align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
-        virtaddr = km_page_alloc(asize, max(PAGE_SIZE, align));
+        vaddr = 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);
+        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 virtaddr;
+        return vaddr;
 }