WebSVN – HelenOS – Diff – /branches/dynload/kernel/generic/src/ddi/ddi.c

 #include <security/cap.h>
 #include <mm/frame.h>
 #include <mm/as.h>
 #include <synch/spinlock.h>
 #include <syscall/copy.h>
-#include <adt/btree.h>
+#include <adt/list.h>
 #include <arch.h>
 #include <align.h>
 #include <errno.h>
 /** This lock protects the parea_btree. */
 SPINLOCK_INITIALIZE(parea_lock);
-/** B+tree with enabled physical memory areas. */
+/** List with enabled physical memory areas. */
+static LIST_INITIALIZE(parea_head);
+/** Physical memory area for devices. */
-static btree_t parea_btree;
+static parea_t dev_area;
 /** Initialize DDI. */
 void ddi_init(void)
+{
+    hw_area(&dev_area.pbase, &dev_area.frames);
-    btree_create(&parea_btree);
+    ddi_parea_register(&dev_area);
+}
 /** Enable piece of physical memory for mapping by physmem_map().
+ *
  * @param parea Pointer to physical area structure.
  * create disjunct physical memory areas.
  */
 void ddi_parea_register(parea_t *parea)
+{
     ipl_t ipl;
     ipl = interrupts_disable();
     spinlock_lock(&parea_lock);
     /*
      * TODO: we should really check for overlaps here.
-     * However, we should be safe because the kernel is pretty sane and
+     * However, we should be safe because the kernel is pretty sane.
-     * memory of different devices doesn't overlap.
      */
+    link_initialize(&parea->link);
-    btree_insert(&parea_btree, (btree_key_t) parea->pbase, parea, NULL);
+    list_append(&parea->link, &parea_head);
     spinlock_unlock(&parea_lock);
     interrupts_restore(ipl);
+}
 /** Map piece of physical memory into virtual address space of current task.
+ *
  * @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 0 on success, EPERM if the caller lacks capabilities to use this
  *  syscall, 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.
  */
-static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, count_t pages, int flags)
+static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, pfn_t pages, int flags)
+{
     ipl_t ipl;
     cap_t caps;
     mem_backend_data_t backend_data;
     backend_data.base = pf;
     backend_data.frames = pages;
     /*
      * Make sure the caller is authorised to make this syscall.
      */
     caps = cap_get(TASK);
     if (!(caps & CAP_MEM_MANAGER))
         return EPERM;
     ipl = interrupts_disable();
     /*
      * Check if the physical memory area is enabled for mapping.
-     * If the architecture supports virtually indexed caches, intercept
-     * attempts to create an illegal address alias.
      */
     spinlock_lock(&parea_lock);
-    parea_t *parea;
+    bool fnd = false;
-    btree_node_t *nodep;
+    link_t *cur;
-    parea = (parea_t *) btree_search(&parea_btree, (btree_key_t) pf, &nodep);
+    for (cur = parea_head.next; cur != &parea_head; cur = cur->next) {
-    if (!parea || parea->frames < pages || ((flags & AS_AREA_CACHEABLE) &&
+        parea_t *parea = list_get_instance(cur, parea_t, link);
-        !parea->cacheable) || (!(flags & AS_AREA_CACHEABLE) &&
+        if ((parea->pbase <= pf) && (ADDR2PFN(pf - parea->pbase) + pages <= parea->frames)) {
+            fnd = true;
+            break;
+        }
+    }
-        parea->cacheable)) {
+    spinlock_unlock(&parea_lock);
+    if (!fnd) {
         /*
-         * This physical memory area cannot be mapped.
+         * Physical memory area cannot be mapped.
          */
-        spinlock_unlock(&parea_lock);
         interrupts_restore(ipl);
         return ENOENT;
+    }
-    spinlock_unlock(&parea_lock);
     spinlock_lock(&TASK->lock);
     if (!as_area_create(TASK->as, flags, pages * PAGE_SIZE, vp, AS_AREA_ATTR_NONE,
         &phys_backend, &backend_data)) {
         /*
 unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base,
     unative_t pages, unative_t flags)
+{
     return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
         FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
-        (count_t) pages, (int) flags);
+        (pfn_t) pages, (int) flags);
+}
 /** Wrapper for SYS_ENABLE_IOSPACE syscall.
+ *
  * @param uspace_io_arg User space address of DDI argument structure.
+ *
  * @return Zero on success or EPERM if callers capabilities are not sufficient.
  */
 unative_t sys_preempt_control(int enable)
+{
-        if (!cap_get(TASK) & CAP_PREEMPT_CONTROL)
+    if (!cap_get(TASK) & CAP_PREEMPT_CONTROL)
-                return EPERM;
+        return EPERM;
-        if (enable)
+    if (enable)
-                preemption_enable();
+        preemption_enable();
-        else
+    else
-                preemption_disable();
+        preemption_disable();
-        return 0;
+    return 0;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dynload/kernel/generic/src/ddi/ddi.c – Rev 2927 → 4343