Changeset 691eb52 in mainline

Timestamp:

2009-02-24T13:30:47Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c0855a0

Parents:

5b0ae4be

Message:

switch between the preference of kernel/uspace IRQ hash table

Location:

kernel

Files:

• arch/ia32/src/ia32.c (modified) (1 diff)
• generic/include/console/console.h (modified) (1 diff)
• generic/src/console/console.c (modified) (1 diff)
• generic/src/ddi/irq.c (modified) (4 diffs)
• generic/src/ipc/irq.c (modified) (1 diff)

kernel/arch/ia32/src/ia32.c

@@ -165 +165 @@
         ega_redraw();
 #endif
-        
 }
 

kernel/generic/include/console/console.h

@@ -42 +42 @@
 extern chardev_t *stdout;
 
+extern bool silent;
+
 extern void klog_init(void);
 extern void klog_update(void);

kernel/generic/src/console/console.c

@@ -66 +66 @@
 static size_t klog_uspace = 0;
 
-/**< Silent output */
-static bool silent = false;
+/**< Silence output */
+bool silent = false;
 
 /**< Kernel log spinlock */

kernel/generic/src/ddi/irq.c

@@ -73 +73 @@
 #include <arch/types.h>
 #include <synch/spinlock.h>
+#include <console/console.h>
 #include <memstr.h>
 #include <arch.h>
@@ -194 +195 @@
 }
 
-/** Dispatch the IRQ.
- *
- * We assume this function is only called from interrupt
- * context (i.e. that interrupts are disabled prior to
- * this call).
- *
- * This function attempts to lookup a fitting IRQ
- * structure. In case of success, return with interrupts
- * disabled and holding the respective structure.
- *
- * @param inr Interrupt number (aka inr or irq).
- *
- * @return IRQ structure of the respective device or NULL.
- */
-irq_t *irq_dispatch_and_lock(inr_t inr)
+/** Search and lock the uspace IRQ hash table.
+ *
+ */
+static irq_t *irq_dispatch_and_lock_uspace(inr_t inr)
 {
         link_t *lnk;
         unative_t key[] = {
                 (unative_t) inr,
-                (unative_t) -1          /* search will use claim() instead of devno */
+                (unative_t) -1    /* search will use claim() instead of devno */
         };
         
-        /*
-         * Try uspace handlers first.
-         */
         spinlock_lock(&irq_uspace_hash_table_lock);
         lnk = hash_table_find(&irq_uspace_hash_table, key);
@@ -229 +216 @@
         }
         spinlock_unlock(&irq_uspace_hash_table_lock);
-
-        /*
-         * Fallback to kernel handlers.
-         */
+        
+        return NULL;
+}
+
+/** Search and lock the kernel IRQ hash table.
+ *
+ */
+static irq_t *irq_dispatch_and_lock_kernel(inr_t inr)
+{
+        link_t *lnk;
+        unative_t key[] = {
+                (unative_t) inr,
+                (unative_t) -1    /* search will use claim() instead of devno */
+        };
+        
         spinlock_lock(&irq_kernel_hash_table_lock);
         lnk = hash_table_find(&irq_kernel_hash_table, key);
@@ -243 +241 @@
         }
         spinlock_unlock(&irq_kernel_hash_table_lock);
-
-        return NULL;    
+        
+        return NULL;
+}
+
+/** Dispatch the IRQ.
+ *
+ * We assume this function is only called from interrupt
+ * context (i.e. that interrupts are disabled prior to
+ * this call).
+ *
+ * This function attempts to lookup a fitting IRQ
+ * structure. In case of success, return with interrupts
+ * disabled and holding the respective structure.
+ *
+ * @param inr Interrupt number (aka inr or irq).
+ *
+ * @return IRQ structure of the respective device or NULL.
+ */
+irq_t *irq_dispatch_and_lock(inr_t inr)
+{
+        irq_t *irq;
+        
+        /*
+         * If the kernel console is silenced,
+         * then try first the uspace handlers,
+         * eventually fall back to kernel handlers.
+         *
+         * If the kernel console is active,
+         * then do it the other way around.
+         */
+        if (silent) {
+                irq = irq_dispatch_and_lock_uspace(inr);
+                if (irq)
+                        return irq;
+                return irq_dispatch_and_lock_kernel(inr);
+        }
+        
+        irq = irq_dispatch_and_lock_kernel(inr);
+        if (irq)
+                return irq;
+        return irq_dispatch_and_lock_uspace(inr);
 }
 

kernel/generic/src/ipc/irq.c

@@ -164 +164 @@
         irq->inr = inr;
         irq->claim = ipc_irq_top_half_claim;
-        irq->handler = ipc_irq_top_half_handler;        
+        irq->handler = ipc_irq_top_half_handler;
         irq->notif_cfg.notify = true;
         irq->notif_cfg.answerbox = box;