Changeset c621f4aa in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

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

kernel/generic/src/ddi/ddi.c

@@ -46 +46 @@
 #include <mm/frame.h>
 #include <mm/as.h>
-#include <synch/spinlock.h>
+#include <synch/mutex.h>
 #include <syscall/copy.h>
 #include <adt/btree.h>
@@ -52 +52 @@
 #include <align.h>
 #include <errno.h>
+#include <trace.h>
 
 /** This lock protects the parea_btree. */
-SPINLOCK_INITIALIZE(parea_lock);
+static mutex_t parea_lock;
 
 /** B+tree with enabled physical memory areas. */
 static btree_t parea_btree;
 
-/** Initialize DDI. */
+/** Initialize DDI.
+ *
+ */
 void ddi_init(void)
 {
         btree_create(&parea_btree);
+        mutex_initialize(&parea_lock, MUTEX_PASSIVE);
 }
 
@@ -72 +76 @@
 void ddi_parea_register(parea_t *parea)
 {
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&parea_lock);
+        mutex_lock(&parea_lock);
         
         /*
@@ -80 +83 @@
         btree_insert(&parea_btree, (btree_key_t) parea->pbase, parea, NULL);
         
-        spinlock_unlock(&parea_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&parea_lock);
 }
 
@@ -98 +100 @@
  *
  */
-static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, size_t pages, int flags)
+NO_TRACE static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, size_t pages,
+    unsigned int flags)
 {
         ASSERT(TASK);
@@ -115 +118 @@
         backend_data.frames = pages;
         
-        ipl_t ipl = interrupts_disable();
-        
         /* Find the zone of the physical memory */
-        spinlock_lock(&zones.lock);
+        irq_spinlock_lock(&zones.lock, true);
         size_t znum = find_zone(ADDR2PFN(pf), pages, 0);
         
@@ -125 +126 @@
                  * -> assume it is hardware device and allow mapping
                  */
-                spinlock_unlock(&zones.lock);
+                irq_spinlock_unlock(&zones.lock, true);
                 goto map;
         }
@@ -131 +132 @@
         if (zones.info[znum].flags & ZONE_FIRMWARE) {
                 /* Frames are part of firmware */
-                spinlock_unlock(&zones.lock);
+                irq_spinlock_unlock(&zones.lock, true);
                 goto map;
         }
         
         if (zone_flags_available(zones.info[znum].flags)) {
-                /* Frames are part of physical memory, check if the memory
+                /*
+                 * Frames are part of physical memory, check if the memory
                  * region is enabled for mapping.
                  */
-                spinlock_unlock(&zones.lock);
+                irq_spinlock_unlock(&zones.lock, true);
                 
-                spinlock_lock(&parea_lock);
+                mutex_lock(&parea_lock);
                 btree_node_t *nodep;
                 parea_t *parea = (parea_t *) btree_search(&parea_btree,
                     (btree_key_t) pf, &nodep);
                 
-                if ((!parea) || (parea->frames < pages))
+                if ((!parea) || (parea->frames < pages)) {
+                        mutex_unlock(&parea_lock);
                         goto err;
+                }
                 
-                spinlock_unlock(&parea_lock);
+                mutex_unlock(&parea_lock);
                 goto map;
         }
         
+        irq_spinlock_unlock(&zones.lock, true);
+        
 err:
-        spinlock_unlock(&zones.lock);
-        interrupts_restore(ipl);
         return ENOENT;
         
 map:
-        spinlock_lock(&TASK->lock);
-        
         if (!as_area_create(TASK->as, flags, pages * PAGE_SIZE, vp,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data)) {
@@ -167 +169 @@
                  * We report it using ENOMEM.
                  */
-                spinlock_unlock(&TASK->lock);
-                interrupts_restore(ipl);
                 return ENOMEM;
         }
@@ -175 +175 @@
          * Mapping is created on-demand during page fault.
          */
-        
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
         return 0;
 }
@@ -191 +188 @@
  *
  */
-static int ddi_iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
+NO_TRACE static int ddi_iospace_enable(task_id_t id, uintptr_t ioaddr,
+    size_t size)
 {
         /*
@@ -200 +198 @@
                 return EPERM;
         
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&tasks_lock);
+        irq_spinlock_lock(&tasks_lock, true);
         
         task_t *task = task_find_by_id(id);
@@ -211 +208 @@
                  * context.
                  */
-                spinlock_unlock(&tasks_lock);
-                interrupts_restore(ipl);
+                irq_spinlock_unlock(&tasks_lock, true);
                 return ENOENT;
         }
         
         /* Lock the task and release the lock protecting tasks_btree. */
-        spinlock_lock(&task->lock);
-        spinlock_unlock(&tasks_lock);
+        irq_spinlock_exchange(&tasks_lock, &task->lock);
         
         int rc = ddi_iospace_enable_arch(task, ioaddr, size);
         
-        spinlock_unlock(&task->lock);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&task->lock, true);
         
         return rc;