Changes in kernel/generic/src/ddi/ddi.c [a422bc5:da1bafb] in mainline

File:

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

kernel/generic/src/ddi/ddi.c

@@ -59 +59 @@
 static btree_t parea_btree;
 
-/** Initialize DDI. */
+/** Initialize DDI.
+ *
+ */
 void ddi_init(void)
 {
@@ -97 +99 @@
  *
  */
-static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, size_t pages, int flags)
+static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, size_t pages,
+    unsigned int flags)
 {
         ASSERT(TASK);
@@ -114 +117 @@
         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);
         
@@ -124 +125 @@
                  * -> assume it is hardware device and allow mapping
                  */
-                spinlock_unlock(&zones.lock);
+                irq_spinlock_unlock(&zones.lock, true);
                 goto map;
         }
@@ -130 +131 @@
         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);
                 
                 mutex_lock(&parea_lock);
@@ -154 +156 @@
         }
         
-        spinlock_unlock(&zones.lock);
+        irq_spinlock_unlock(&zones.lock, true);
+        
 err:
-        interrupts_restore(ipl);
         return ENOENT;
         
 map:
-        interrupts_restore(ipl);
-
         if (!as_area_create(TASK->as, flags, pages * PAGE_SIZE, vp,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data)) {
@@ -196 +196 @@
                 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);
@@ -207 +206 @@
                  * 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;