Changes in kernel/generic/src/mm/page.c [6645a14:404be7c] in mainline

File:

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

kernel/generic/src/mm/page.c

@@ -53 +53 @@
  * We assume that the other processors are either not using the mapping yet
  * (i.e. during the bootstrap) or are executing the TLB shootdown code.  While
- * we don't care much about the former case, the processors in the latter case
+ * we don't care much about the former case, the processors in the latter case 
  * will do an implicit serialization by virtue of running the TLB shootdown
  * interrupt handler.
@@ -65 +65 @@
 #include <arch/mm/asid.h>
 #include <mm/as.h>
+#include <mm/km.h>
 #include <mm/frame.h>
 #include <arch/barrier.h>
@@ -177 +178 @@
 }
 
-int page_find_mapping(uintptr_t virt, void **phys)
+uintptr_t hw_map(uintptr_t physaddr, size_t size)
+{
+        uintptr_t virtaddr;
+        size_t asize;
+        pfn_t i;
+
+        asize = ALIGN_UP(size, PAGE_SIZE);
+        virtaddr = km_page_alloc(asize, PAGE_SIZE);
+
+        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;
+}
+
+
+/** Syscall wrapper for getting mapping of a virtual page.
+ * 
+ * @retval EOK Everything went find, @p uspace_frame and @p uspace_node
+ *             contains correct values.
+ * @retval ENOENT Virtual address has no mapping.
+ */
+sysarg_t sys_page_find_mapping(uintptr_t virt_address,
+    uintptr_t *uspace_frame)
 {
         mutex_lock(&AS->lock);
         
-        pte_t *pte = page_mapping_find(AS, virt, false);
-        if ((!PTE_VALID(pte)) || (!PTE_PRESENT(pte))) {
+        pte_t *pte = page_mapping_find(AS, virt_address, false);
+        if (!PTE_VALID(pte) || !PTE_PRESENT(pte)) {
                 mutex_unlock(&AS->lock);
-                return ENOENT;
+                
+                return (sysarg_t) ENOENT;
         }
         
-        *phys = (void *) PTE_GET_FRAME(pte) +
-            (virt - ALIGN_DOWN(virt, PAGE_SIZE));
+        uintptr_t phys_address = PTE_GET_FRAME(pte);
         
         mutex_unlock(&AS->lock);
         
+        int rc = copy_to_uspace(uspace_frame,
+            &phys_address, sizeof(phys_address));
+        if (rc != EOK) {
+                return (sysarg_t) rc;
+        }
+        
         return EOK;
 }
 
-/** Syscall wrapper for getting mapping of a virtual page.
- *
- * @return EOK on success.
- * @return ENOENT if no virtual address mapping found.
- *
- */
-sysarg_t sys_page_find_mapping(uintptr_t virt, void *phys_ptr)
-{
-        void *phys;
-        int rc = page_find_mapping(virt, &phys);
-        if (rc != EOK)
-                return rc;
-        
-        rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
-        return (sysarg_t) rc;
-}
-
 /** @}
  */