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

File:

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

kernel/generic/src/ddi/ddi.c

@@ -46 +46 @@
 #include <mm/frame.h>
 #include <mm/as.h>
-#include <synch/mutex.h>
+#include <synch/spinlock.h>
 #include <syscall/copy.h>
 #include <adt/btree.h>
@@ -54 +54 @@
 
 /** This lock protects the parea_btree. */
-static mutex_t parea_lock;
+SPINLOCK_INITIALIZE(parea_lock);
 
 /** B+tree with enabled physical memory areas. */
@@ -63 +63 @@
 {
         btree_create(&parea_btree);
-        mutex_initialize(&parea_lock, MUTEX_PASSIVE);
 }
 
@@ -73 +72 @@
 void ddi_parea_register(parea_t *parea)
 {
-        mutex_lock(&parea_lock);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&parea_lock);
         
         /*
@@ -80 +80 @@
         btree_insert(&parea_btree, (btree_key_t) parea->pbase, parea, NULL);
         
-        mutex_unlock(&parea_lock);
+        spinlock_unlock(&parea_lock);
+        interrupts_restore(ipl);
 }
 
@@ -140 +141 @@
                 spinlock_unlock(&zones.lock);
                 
-                mutex_lock(&parea_lock);
+                spinlock_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)) {
-                        mutex_unlock(&parea_lock);
+                if ((!parea) || (parea->frames < pages))
                         goto err;
-                }
                 
-                mutex_unlock(&parea_lock);
+                spinlock_unlock(&parea_lock);
                 goto map;
         }
         
+err:
         spinlock_unlock(&zones.lock);
-err:
         interrupts_restore(ipl);
         return ENOENT;
         
 map:
-        interrupts_restore(ipl);
-
+        spinlock_lock(&TASK->lock);
+        
         if (!as_area_create(TASK->as, flags, pages * PAGE_SIZE, vp,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data)) {
@@ -168 +167 @@
                  * We report it using ENOMEM.
                  */
+                spinlock_unlock(&TASK->lock);
+                interrupts_restore(ipl);
                 return ENOMEM;
         }
@@ -174 +175 @@
          * Mapping is created on-demand during page fault.
          */
+        
+        spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
         return 0;
 }
@@ -283 +287 @@
 }
 
+/** Disable or enable specified interrupts.
+ * 
+ * @param irq the interrupt to be enabled/disabled.
+ * @param enable if true enable the interrupt, disable otherwise.
+ * 
+ * @retutn Zero on success, error code otherwise.
+ */
+unative_t sys_interrupt_enable(int irq, int enable)
+{       
+        cap_t task_cap = cap_get(TASK);
+        if (!(task_cap & CAP_PREEMPT_CONTROL) || !(task_cap & CAP_IRQ_REG))
+                return EPERM;
+                
+        if (irq < 0 || irq > 16) {
+                return EINVAL;
+        }
+        
+        uint16_t irq_mask = (uint16_t)(1 << irq);
+        if (enable) {
+                trap_virtual_enable_irqs(irq_mask);
+        } else {
+                trap_virtual_disable_irqs(irq_mask);
+        }
+        
+        return 0;       
+}
+
 /** @}
  */