Changes in kernel/generic/src/ddi/ddi.c [c6ae4c2:c0699467] in mainline

File:

• kernel/generic/src/ddi/ddi.c (modified) (10 diffs)

kernel/generic/src/ddi/ddi.c

@@ -45 +45 @@
 #include <mm/frame.h>
 #include <mm/as.h>
-#include <mm/page.h>
 #include <synch/mutex.h>
 #include <syscall/copy.h>
@@ -53 +52 @@
 #include <errno.h>
 #include <trace.h>
-#include <bitops.h>
 
 /** This lock protects the parea_btree. */
@@ -89 +87 @@
 /** Map piece of physical memory into virtual address space of current task.
  *
- * @param phys  Physical address of the starting frame.
- * @param virt  Virtual address of the starting page.
+ * @param pf    Physical address of the starting frame.
+ * @param vp    Virtual address of the starting page.
  * @param pages Number of pages to map.
  * @param flags Address space area flags for the mapping.
  *
- * @return EOK on success.
- * @return EPERM if the caller lacks capabilities to use this syscall.
- * @return EBADMEM if phys or virt is not page aligned.
- * @return ENOENT if there is no task matching the specified ID or
- *         the physical address space is not enabled for mapping.
- * @return ENOMEM if there was a problem in creating address space area.
- *
- */
-NO_TRACE static int ddi_physmem_map(uintptr_t phys, uintptr_t virt, size_t pages,
+ * @return 0 on success, EPERM if the caller lacks capabilities to use this
+ *         syscall, EBADMEM if pf or vf is not page aligned, ENOENT if there
+ *         is no task matching the specified ID or the physical address space
+ *         is not enabled for mapping and ENOMEM if there was a problem in
+ *         creating address space area.
+ *
+ */
+NO_TRACE static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, size_t pages,
     unsigned int flags)
 {
         ASSERT(TASK);
         
-        if ((phys % FRAME_SIZE) != 0)
+        if ((pf % FRAME_SIZE) != 0)
                 return EBADMEM;
         
-        if ((virt % PAGE_SIZE) != 0)
+        if ((vp % PAGE_SIZE) != 0)
                 return EBADMEM;
         
@@ -121 +118 @@
         
         mem_backend_data_t backend_data;
-        backend_data.base = phys;
+        backend_data.base = pf;
         backend_data.frames = pages;
         
@@ -132 +129 @@
         btree_node_t *nodep;
         parea_t *parea = (parea_t *) btree_search(&parea_btree,
-            (btree_key_t) phys, &nodep);
+            (btree_key_t) pf, &nodep);
         
         if ((parea != NULL) && (parea->frames >= pages)) {
@@ -152 +149 @@
         
         irq_spinlock_lock(&zones.lock, true);
-        size_t znum = find_zone(ADDR2PFN(phys), pages, 0);
+        size_t znum = find_zone(ADDR2PFN(pf), pages, 0);
         
         if (znum == (size_t) -1) {
@@ -185 +182 @@
         
 map:
-        if (!as_area_create(TASK->as, flags, FRAMES2SIZE(pages), virt,
+        if (!as_area_create(TASK->as, flags, pages * PAGE_SIZE, vp,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data)) {
                 /*
@@ -256 +253 @@
 /** Wrapper for SYS_PHYSMEM_MAP syscall.
  *
- * @param phys  Physical base address to map
- * @param virt  Destination virtual address
+ * @param phys_base Physical base address to map
+ * @param virt_base Destination virtual address
  * @param pages Number of pages
  * @param flags Flags of newly mapped pages
@@ -264 +261 @@
  *
  */
-sysarg_t sys_physmem_map(uintptr_t phys, uintptr_t virt,
-    size_t pages, unsigned int flags)
-{
-        return (sysarg_t)
-            ddi_physmem_map(ALIGN_DOWN(phys, FRAME_SIZE),
-            ALIGN_DOWN(virt, PAGE_SIZE), pages, flags);
+sysarg_t sys_physmem_map(sysarg_t phys_base, sysarg_t virt_base,
+    sysarg_t pages, sysarg_t flags)
+{
+        return (sysarg_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
+            FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
+            (size_t) pages, (int) flags);
 }
 
@@ -290 +287 @@
 }
 
-NO_TRACE static int dmamem_map(uintptr_t virt, size_t size,
-    unsigned int map_flags, unsigned int flags, void **phys)
-{
-        ASSERT(TASK);
-        
-        if ((flags & DMAMEM_FLAGS_ANONYMOUS) == 0) {
-                // TODO: implement locking of non-anonymous mapping
-                return page_find_mapping(virt, phys);
-        } else {
-                // TODO: implement locking
-                
-                if ((virt % PAGE_SIZE) != 0)
-                        return EBADMEM;
-                
-                size_t pages = SIZE2FRAMES(size);
-                uint8_t order;
-                
-                /* We need the 2^order >= pages */
-                if (pages == 1)
-                        order = 0;
-                else
-                        order = fnzb(pages - 1) + 1;
-                
-                *phys = frame_alloc_noreserve(order, 0);
-                if (*phys == NULL)
-                        return ENOMEM;
-                
-                mem_backend_data_t backend_data;
-                backend_data.base = (uintptr_t) *phys;
-                backend_data.frames = pages;
-                
-                if (!as_area_create(TASK->as, map_flags, size, virt,
-                    AS_AREA_ATTR_NONE, &phys_backend, &backend_data)) {
-                        frame_free_noreserve((uintptr_t) *phys);
-                        return ENOMEM;
-                }
-                
-                return EOK;
-        }
-}
-
-NO_TRACE static int dmamem_unmap(uintptr_t virt, size_t size,
-    unsigned int flags)
-{
-        // TODO: implement unlocking & unmap
-        return EOK;
-}
-
-sysarg_t sys_dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
-    unsigned int flags, void *phys_ptr)
-{
-        void *phys;
-        int rc = dmamem_map(virt, size, map_flags, flags, &phys);
-        if (rc != EOK)
-                return rc;
-        
-        rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
-        if (rc != EOK) {
-                dmamem_unmap(virt, size, flags);
-                return rc;
-        }
-        
-        return EOK;
-}
-
-sysarg_t sys_dmamem_unmap(uintptr_t virt, size_t size, unsigned int flags)
-{
-        return dmamem_unmap(virt, size, flags);
-}
-
 /** @}
  */