Changeset 9970a5a in mainline for kernel/generic/src/mm

Timestamp:

2012-01-27T23:24:27Z (13 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.

Location:

kernel/generic/src/mm

Files:

• backend_elf.c (modified) (1 diff)
• frame.c (modified) (2 diffs)
• km.c (modified) (3 diffs)
• page.c (modified) (3 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -318 +318 @@
                         dirty = true;
                 } else {
-                        frame = KA2PA(base + i * FRAME_SIZE);
+                        pte_t *pte = page_mapping_find(AS_KERNEL,
+                            base + i * FRAME_SIZE, true);
+
+                        ASSERT(pte);
+                        ASSERT(PTE_PRESENT(pte));
+
+                        frame = PTE_GET_FRAME(pte);
                 }       
         } else if (upage >= start_anon) {

kernel/generic/src/mm/frame.c

@@ -924 +924 @@
                                 for (i = 0; i < init.cnt; i++)
                                         if (overlaps(addr, PFN2ADDR(confcount),
-                                            KA2PA(init.tasks[i].addr),
+                                            init.tasks[i].paddr,
                                             init.tasks[i].size)) {
                                                 overlap = true;
@@ -1251 +1251 @@
                 size_t i;
                 for (i = 0; i < init.cnt; i++) {
-                        pfn_t pfn = ADDR2PFN(KA2PA(init.tasks[i].addr));
+                        pfn_t pfn = ADDR2PFN(init.tasks[i].paddr);
                         frame_mark_unavailable(pfn,
                             SIZE2FRAMES(init.tasks[i].size));

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,

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)
 {