Changeset 4687a26c in mainline for kernel/generic

Timestamp:

2010-11-02T18:29:01Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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 mainline changes.

Location:

kernel/generic

Files:

• include/ddi/ddi.h (modified) (2 diffs)
• include/security/cap.h (modified) (1 diff)
• include/syscall/syscall.h (modified) (1 diff)
• src/ddi/ddi.c (modified) (1 diff)
• src/ipc/kbox.c (modified) (1 diff)
• src/main/kinit.c (modified) (1 diff)
• src/syscall/syscall.c (modified) (1 diff)

kernel/generic/include/ddi/ddi.h

@@ -54 +54 @@
 extern unative_t sys_physmem_map(unative_t, unative_t, unative_t, unative_t);
 extern unative_t sys_iospace_enable(ddi_ioarg_t *);
-extern unative_t sys_preempt_control(int);
+extern unative_t sys_interrupt_enable(int irq, int enable);
 
 /*
@@ -61 +61 @@
 extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t);
 
+
 #endif
 

kernel/generic/include/security/cap.h

@@ -70 +70 @@
 
 /**
- * CAP_PREEMPT_CONTROL allows its holder to disable/enable preemption.
- */
-#define CAP_PREEMPT_CONTROL     (1<<3)
-
-/**
  * CAP_IRQ_REG entitles its holder to register IRQ handlers.
  */
-#define CAP_IRQ_REG             (1<<4) 
+#define CAP_IRQ_REG             (1<<3) 
 
 typedef uint32_t cap_t;

kernel/generic/include/syscall/syscall.h

@@ -80 +80 @@
         SYS_PHYSMEM_MAP,
         SYS_IOSPACE_ENABLE,
-        SYS_PREEMPT_CONTROL,
+        SYS_INTERRUPT_ENABLE,
         
         SYS_SYSINFO_GET_TAG,

kernel/generic/src/ddi/ddi.c

@@ -258 +258 @@
 }
 
-/** Disable or enable preemption.
- *
- * @param enable If non-zero, the preemption counter will be decremented,
- *               leading to potential enabling of preemption. Otherwise
- *               the preemption counter will be incremented, preventing
- *               preemption from occurring.
- *
- * @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))
+/** 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)
+{
+/* FIXME: this needs to be generic code, or better not be in kernel at all. */
+#if 0
+        cap_t task_cap = cap_get(TASK);
+        if (!(task_cap & CAP_IRQ_REG))
                 return EPERM;
-        
-        if (enable)
-                preemption_enable();
-        else
-                preemption_disable();
-        
+                
+        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);
+        }
+        
+#endif
         return 0;
 }

kernel/generic/src/ipc/kbox.c

@@ -107 +107 @@
                 /* Terminate debugging session (if any). */
                 LOG("Terminate debugging session.");
-                irq_spinlock_lock(&TASK->lock, true);
+                mutex_lock(&TASK->udebug.lock);
                 udebug_task_cleanup(TASK);
-                irq_spinlock_unlock(&TASK->lock, true);
+                mutex_unlock(&TASK->udebug.lock);
         } else {
                 LOG("Was not debugger.");

kernel/generic/src/main/kinit.c

@@ -208 +208 @@
                          */
                         cap_set(programs[i].task, CAP_CAP | CAP_MEM_MANAGER |
-                            CAP_IO_MANAGER | CAP_PREEMPT_CONTROL | CAP_IRQ_REG);
+                            CAP_IO_MANAGER | CAP_IRQ_REG);
                         
                         if (!ipc_phone_0)

kernel/generic/src/syscall/syscall.c

@@ -159 +159 @@
         (syshandler_t) sys_physmem_map,
         (syshandler_t) sys_iospace_enable,
-        (syshandler_t) sys_preempt_control,
+        (syshandler_t) sys_interrupt_enable,
         
         /* Sysinfo syscalls */