Changeset 70922c2 in mainline for kernel/generic/src/mm/page.c

Timestamp:

2012-02-01T00:09:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ffcc5776

Parents:

cb3dbb63 (diff), 3d4750f (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:

Mainline changes.

File:

• kernel/generic/src/mm/page.c (modified) (4 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>
@@ -76 +75 @@
 #include <errno.h>
 #include <align.h>
-#include <macros.h>
-#include <bitops.h>
 
 /** Virtual operations for page subsystem. */
@@ -85 +82 @@
 {
         page_arch_init();
-}
-
-/** Map memory structure
- *
- * Identity-map memory structure
- * considering possible crossings
- * of page boundaries.
- *
- * @param addr Address of the structure.
- * @param size Size of the structure.
- *
- */
-void map_structure(uintptr_t addr, size_t size)
-{
-        size_t length = size + (addr - (addr & ~(PAGE_SIZE - 1)));
-        size_t cnt = length / PAGE_SIZE + (length % PAGE_SIZE > 0);
-        
-        size_t i;
-        for (i = 0; i < cnt; i++)
-                page_mapping_insert(AS_KERNEL, addr + i * PAGE_SIZE,
-                    addr + i * PAGE_SIZE, PAGE_NOT_CACHEABLE | PAGE_WRITE);
-        
-        /* Repel prefetched accesses to the old mapping. */
-        memory_barrier();
 }
 
@@ -193 +166 @@
 }
 
-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)
 {