Changeset c6ae4c2 in mainline for uspace/lib/c

Timestamp:

2011-12-16T21:12:52Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c8751452

Parents:

e2718e1

Message:

implement basic DMA memory mapping routines
no persistent locking (pinning) of the DMA memory is currently implemented (this can be dangerous)
no unmapping is implemented
special allocations (< 16 MB, < 4 GB) are not supported yet

Location:

uspace/lib/c

Files:

• generic/as.c (modified) (1 diff)
• generic/ddi.c (modified) (3 diffs)
• include/ddi.h (modified) (1 diff)

uspace/lib/c/generic/as.c

@@ -117 +117 @@
 /** Find mapping to physical address.
  *
- * @param address Virtual address in question (virtual).
- * @param[out] frame Frame address (physical).
- * @return Error code.
- * @retval EOK No error, @p frame holds the translation.
- * @retval ENOENT Mapping not found.
+ * @param      virt Virtual address to find mapping for.
+ * @param[out] phys Physical adress.
+ *
+ * @return EOK on no error.
+ * @retval ENOENT if no mapping was found.
+ *
  */
-int as_get_physical_mapping(const void *address, uintptr_t *frame)
+int as_get_physical_mapping(const void *virt, uintptr_t *phys)
 {
-        uintptr_t tmp_frame;
-        uintptr_t virt = (uintptr_t) address;
-        
-        int rc = (int) __SYSCALL2(SYS_PAGE_FIND_MAPPING,
-            (sysarg_t) virt, (sysarg_t) &tmp_frame);
-        if (rc != EOK) {
-                return rc;
-        }
-        
-        if (frame != NULL) {
-                *frame = tmp_frame;
-        }
-        
-        return EOK;
+        return (int) __SYSCALL2(SYS_PAGE_FIND_MAPPING, (sysarg_t) virt,
+            (sysarg_t) phys);
 }
 

uspace/lib/c/generic/ddi.c

@@ -33 +33 @@
  */
 
+#include <assert.h>
+#include <unistd.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <abi/ddi/arg.h>
@@ -57 +60 @@
  * Caller of this function must have the CAP_MEM_MANAGER capability.
  *
- * @param pf    Physical address of the starting frame.
- * @param vp    Virtual address of the starting page.
+ * @param phys  Physical address of the starting frame.
+ * @param virt  Virtual address of the starting page.
  * @param pages Number of pages to map.
  * @param flags Flags for the new address space area.
@@ -69 +72 @@
  *
  */
-int physmem_map(void *pf, void *vp, size_t pages, unsigned int flags)
+int physmem_map(void *phys, void *virt, size_t pages, unsigned int flags)
 {
-        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp,
-            pages, flags);
+        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) phys,
+            (sysarg_t) virt, pages, flags);
 }
 
-int dmamem_map(dmamem_t *dmamem, size_t pages, unsigned int map_flags,
-    unsigned int dma_flags)
+int dmamem_map(void *virt, size_t size, unsigned int map_flags,
+    unsigned int flags, void **phys)
 {
-        // FIXME TODO
-        return -1;
+        return (int) __SYSCALL5(SYS_DMAMEM_MAP, (sysarg_t) virt,
+            (sysarg_t) size, (sysarg_t) map_flags, (sysarg_t) flags,
+            (sysarg_t) phys);
 }
 
-int dmamem_unmap(dmamem_t *dmamem)
+int dmamem_map_anonymous(size_t size, unsigned int map_flags,
+    unsigned int flags, void **phys, void **virt)
 {
-        // FIXME TODO
-        return -1;
+        *virt = as_get_mappable_page(size);
+        if (*virt == NULL)
+                return ENOMEM;
+        
+        return dmamem_map(*virt, size, map_flags,
+            flags | DMAMEM_FLAGS_ANONYMOUS, phys);
 }
 
-int dmamem_lock(void *virt, void **phys, size_t pages)
+int dmamem_unmap(void *virt, size_t size, unsigned int flags)
 {
-        // FIXME TODO
-        return -1;
+        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, (sysarg_t) size,
+            (sysarg_t) flags);
 }
 
-int dmamem_unlock(void *virt, size_t pages)
+int dmamem_unmap_anonymous(void *virt)
 {
-        // FIXME TODO
-        return -1;
+        return __SYSCALL3(SYS_DMAMEM_UNMAP, (sysarg_t) virt, 0,
+            DMAMEM_FLAGS_ANONYMOUS);
 }
 

uspace/lib/c/include/ddi.h

@@ -40 +40 @@
 #include <task.h>
 
-typedef struct {
-        /** Physical memory */
-        void *phys;
-        
-        /** Virtual memory */
-        void *virt;
-        
-        /** Size in pages */
-        size_t size;
-        
-        /** Mapping flags */
-        unsigned int flags;
-} dmamem_t;
+extern int device_assign_devno(void);
 
-extern int device_assign_devno(void);
 extern int physmem_map(void *, void *, size_t, unsigned int);
-extern int dmamem_map(dmamem_t *, size_t, unsigned int, unsigned int);
-extern int dmamem_unmap(dmamem_t *);
-extern int dmamem_lock(void *, void **, size_t);
-extern int dmamem_unlock(void *, size_t);
+
+extern int dmamem_map(void *, size_t, unsigned int, unsigned int, void **);
+extern int dmamem_map_anonymous(size_t, unsigned int, unsigned int, void **,
+    void **);
+extern int dmamem_unmap(void *, size_t, unsigned int);
+extern int dmamem_unmap_anonymous(void *);
+
 extern int iospace_enable(task_id_t, void *, unsigned long);
 extern int pio_enable(void *, size_t, void **);
+
 extern int register_irq(int, int, int, irq_code_t *);
 extern int unregister_irq(int, int);