Changeset 24abb85d in mainline for kernel/generic/src

Timestamp:

2017-08-18T23:27:08Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4d76cfc

Parents:

e9d15d9

Message:

Remove SYS_DEVICE_ASSIGN_DEVNO

Location:

kernel/generic/src

Files:

• console/kconsole.c (modified) (1 diff)
• ddi/device.c (deleted)
• ddi/irq.c (modified) (14 diffs)
• ipc/irq.c (modified) (4 diffs)
• ipc/sysipc.c (modified) (2 diffs)
• syscall/syscall.c (modified) (2 diffs)

kernel/generic/src/console/kconsole.c

@@ -55 +55 @@
 #include <str.h>
 #include <sysinfo/sysinfo.h>
-#include <ddi/device.h>
 #include <symtab.h>
 #include <errno.h>

kernel/generic/src/ddi/irq.c

@@ -59 +59 @@
  * Note about the irq_hash_table.
  *
- * The hash table is configured to use two keys: inr and devno.  However, the
- * hash index is computed only from inr. Moreover, if devno is -1, the match is
- * based on the return value of the claim() function instead of on devno.
+ * The hash table is configured to use two keys: inr and mode.  However, the
+ * hash index is computed only from inr. Moreover, if mode is IRQ_HT_MODE_CLAIM,
+ * the match is based also on the return value of the claim(). Otherwise the
+ * the keys do not match.
  */
 
@@ -73 +74 @@
 #include <mem.h>
 #include <arch.h>
-
-#define KEY_INR    0
-#define KEY_DEVNO  1
 
 /** Spinlock protecting the kernel IRQ hash table.
@@ -174 +172 @@
         link_initialize(&irq->notif_cfg.link);
         irq->inr = -1;
-        irq->devno = -1;
         
         irq_initialize_arch(irq);
@@ -190 +187 @@
 {
         sysarg_t key[] = {
-                (sysarg_t) irq->inr,
-                (sysarg_t) irq->devno
+                [IRQ_HT_KEY_INR] = (sysarg_t) irq->inr,
+                [IRQ_HT_KEY_MODE] = (sysarg_t) IRQ_HT_MODE_NO_CLAIM 
         };
         
@@ -208 +205 @@
         link_t *lnk;
         sysarg_t key[] = {
-                (sysarg_t) inr,
-                (sysarg_t) -1    /* Search will use claim() instead of devno */
+                [IRQ_HT_KEY_INR] = (sysarg_t) inr,
+                [IRQ_HT_KEY_MODE] = (sysarg_t) IRQ_HT_MODE_CLAIM
         };
         
@@ -231 +228 @@
         link_t *lnk;
         sysarg_t key[] = {
-                (sysarg_t) inr,
-                (sysarg_t) -1    /* Search will use claim() instead of devno */
+                [IRQ_HT_KEY_INR] = (sysarg_t) inr,
+                [IRQ_HT_KEY_MODE] = (sysarg_t) IRQ_HT_MODE_CLAIM
         };
         
@@ -290 +287 @@
  * be collisions between different INRs.
  *
- * The devno is not used to compute the hash.
- *
- * @param key The first of the keys is inr and the second is devno or -1.
+ * The mode is not used to compute the hash.
+ *
+ * @param key The first of the keys is inr and the second is mode.
  *
  * @return Index into the hash table.
@@ -299 +296 @@
 size_t irq_ht_hash(sysarg_t key[])
 {
-        inr_t inr = (inr_t) key[KEY_INR];
+        inr_t inr = (inr_t) key[IRQ_HT_KEY_INR];
         return inr % buckets;
 }
@@ -308 +305 @@
  * more complex architecture setup in which there are way too many interrupt
  * numbers (i.e. inr's) to arrange the hash table so that collisions occur only
- * among same inrs of different devnos. So the explicit check for inr match must
- * be done.  Second, if devno is -1, the second key (i.e. devno) is not used for
- * the match and the result of the claim() function is used instead.
+ * among same inrs of different devices. So the explicit check for inr match
+ * must be done.  Second, if mode is IRQ_HT_MODE_CLAIM, the result of the
+ * claim() function is used for the match. Otherwise the key does not match.
  *
  * This function assumes interrupts are already disabled.
  *
- * @param key  Keys (i.e. inr and devno).
+ * @param key  Keys (i.e. inr and mode).
  * @param keys This is 2. 
  * @param item The item to compare the key with.
@@ -325 +322 @@
 {
         irq_t *irq = hash_table_get_instance(item, irq_t, link);
-        inr_t inr = (inr_t) key[KEY_INR];
-        devno_t devno = (devno_t) key[KEY_DEVNO];
+        inr_t inr = (inr_t) key[IRQ_HT_KEY_INR];
+        irq_ht_mode_t mode = (irq_ht_mode_t) key[IRQ_HT_KEY_MODE];
         
         bool rv;
         
         irq_spinlock_lock(&irq->lock, false);
-        if (devno == -1) {
+        if (mode == IRQ_HT_MODE_CLAIM) {
                 /* Invoked by irq_dispatch_and_lock(). */
-                rv = ((irq->inr == inr) &&
-                    (irq->claim(irq) == IRQ_ACCEPT));
+                rv = ((irq->inr == inr) && (irq->claim(irq) == IRQ_ACCEPT));
         } else {
                 /* Invoked by irq_find_and_lock(). */
-                rv = ((irq->inr == inr) && (irq->devno == devno));
+                rv = false;
         }
         
@@ -363 +359 @@
  * no collisions between different INRs.
  *
- * @param key The first of the keys is inr and the second is devno or -1.
+ * @param key The first of the keys is inr and the second is mode.
  *
  * @return Index into the hash table.
@@ -370 +366 @@
 size_t irq_lin_hash(sysarg_t key[])
 {
-        inr_t inr = (inr_t) key[KEY_INR];
+        inr_t inr = (inr_t) key[IRQ_HT_KEY_INR];
         return inr;
 }
@@ -385 +381 @@
  * This function assumes interrupts are already disabled.
  *
- * @param key  Keys (i.e. inr and devno).
+ * @param key  Keys (i.e. inr and mode).
  * @param keys This is 2. 
  * @param item The item to compare the key with.
@@ -396 +392 @@
 {
         irq_t *irq = list_get_instance(item, irq_t, link);
-        devno_t devno = (devno_t) key[KEY_DEVNO];
+        irq_ht_mode_t mode = (irq_ht_mode_t) key[IRQ_HT_KEY_MODE];
         bool rv;
         
         irq_spinlock_lock(&irq->lock, false);
-        if (devno == -1) {
+        if (mode == IRQ_HT_MODE_CLAIM) {
                 /* Invoked by irq_dispatch_and_lock() */
                 rv = (irq->claim(irq) == IRQ_ACCEPT);
         } else {
                 /* Invoked by irq_find_and_lock() */
-                rv = (irq->devno == devno);
+                rv = false;
         }
         

kernel/generic/src/ipc/irq.c

@@ -294 +294 @@
  * @param box     Receiving answerbox.
  * @param inr     IRQ number.
- * @param devno   Device number.
  * @param imethod Interface and method to be associated with the
  *                notification.
@@ -303 +302 @@
  *
  */
-int ipc_irq_subscribe(answerbox_t *box, inr_t inr, devno_t devno,
-    sysarg_t imethod, irq_code_t *ucode)
+int ipc_irq_subscribe(answerbox_t *box, inr_t inr, sysarg_t imethod,
+    irq_code_t *ucode)
 {
         sysarg_t key[] = {
-                (sysarg_t) inr,
-                (sysarg_t) devno
+                [IRQ_HT_KEY_INR] = (sysarg_t) inr,
+                [IRQ_HT_KEY_MODE] = (sysarg_t) IRQ_HT_MODE_NO_CLAIM
         };
         
@@ -334 +333 @@
         irq_t *irq = &kobj->irq;
         irq_initialize(irq);
-        irq->devno = devno;
         irq->inr = inr;
         irq->claim = ipc_irq_top_half_claim;
@@ -349 +347 @@
          */
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
-        
-        link_t *hlp = hash_table_find(&irq_uspace_hash_table, key);
-        if (hlp) {
-                irq_t *hirq = hash_table_get_instance(hlp, irq_t, link);
-                
-                /* hirq is locked */
-                irq_spinlock_unlock(&hirq->lock, false);
-                code_free(code);
-                irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
-                
-                kobject_free(TASK, cap);
-                return EEXIST;
-        }
-        
-        /* Locking is not really necessary, but paranoid */
         irq_spinlock_lock(&irq->lock, false);
         irq_spinlock_lock(&box->irq_lock, false);

kernel/generic/src/ipc/sysipc.c

@@ -801 +801 @@
  *
  * @param inr     IRQ number.
- * @param devno   Device number.
  * @param imethod Interface and method to be associated with the notification.
  * @param ucode   Uspace pointer to the top-half pseudocode.
@@ -810 +809 @@
  *
  */
-sysarg_t sys_ipc_irq_subscribe(inr_t inr, devno_t devno, sysarg_t imethod,
-    irq_code_t *ucode)
+sysarg_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod, irq_code_t *ucode)
 {
         if (!(perm_get(TASK) & PERM_IRQ_REG))
                 return EPERM;
         
-        return ipc_irq_subscribe(&TASK->answerbox, inr, devno, imethod, ucode);
+        return ipc_irq_subscribe(&TASK->answerbox, inr, imethod, ucode);
 }
 

kernel/generic/src/syscall/syscall.c

@@ -45 +45 @@
 #include <arch.h>
 #include <debug.h>
-#include <ddi/device.h>
 #include <interrupt.h>
 #include <ipc/sysipc.h>
@@ -175 +174 @@
         
         /* DDI related syscalls. */
-        [SYS_DEVICE_ASSIGN_DEVNO] = (syshandler_t) sys_device_assign_devno,
         [SYS_PHYSMEM_MAP] = (syshandler_t) sys_physmem_map,
         [SYS_PHYSMEM_UNMAP] = (syshandler_t) sys_physmem_unmap,