Changeset 43752b6 in mainline

Timestamp:

2006-06-11T17:03:02Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

dd054bc2

Parents:

0b917dd

Message:

Modified ipc/irq to be able to pass up to 3 arguments to userspace.

Location:

generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• include/ipc/irq.h (modified) (2 diffs)
• src/console/klog.c (modified) (1 diff)
• src/ipc/irq.c (modified) (8 diffs)
• src/ipc/sysipc.c (modified) (1 diff)

generic/include/ipc/ipc.h

@@ -122 +122 @@
  */
 #define IPC_M_PHONE_HUNGUP      3
-/** Interrupt notification */
-#define IPC_M_INTERRUPT         4
 
 /** Send as_area over IPC 

generic/include/ipc/irq.h

@@ -58 +58 @@
         void *addr;
         unsigned long long value; 
+        int dstarg;
 } irq_cmd_t;
 
@@ -72 +73 @@
 extern int ipc_irq_register(answerbox_t *box, int irq, irq_code_t *ucode);
 extern void ipc_irq_send_notif(int irq);
-extern void ipc_irq_send_msg(int irq, __native a2, __native a3);
+extern void ipc_irq_send_msg(int irq, __native a1, __native a2, __native a3);
 extern void ipc_irq_unregister(answerbox_t *box, int irq);
 extern void irq_ipc_bind_arch(__native irq);

generic/src/console/klog.c

@@ -79 +79 @@
                         goto out;
         }
-        ipc_irq_send_msg(IPC_IRQ_KLOG, klogpos, ret);
+        ipc_irq_send_msg(IPC_IRQ_KLOG, klogpos, ret, 0);
         klogpos += ret;
         if (klogpos >= klogsize)

generic/src/ipc/irq.c

@@ -35 +35 @@
  *
  * The structure of a notification message is as follows:
- * - METHOD: IPC_M_INTERRUPT
- * - ARG1: interrupt number
- * - ARG2: payload modified by a 'top-half' handler
- * - ARG3: interrupt counter (may be needed to assure correct order
+ * - METHOD: interrupt number
+ * - ARG1: payload modified by a 'top-half' handler
+ * - ARG2: payload
+ * - ARG3: payload
+ * - in_phone_hash: interrupt counter (may be needed to assure correct order
  *         in multithreaded drivers)
  */
@@ -67 +68 @@
 {
         int i;
+        __native dstval = 0;
         
         if (!code)
@@ -74 +76 @@
                 switch (code->cmds[i].cmd) {
                 case CMD_MEM_READ_1:
-                        IPC_SET_ARG2(call->data, *((__u8 *)code->cmds[i].addr));
+                        dstval = *((__u8 *)code->cmds[i].addr);
                         break;
                 case CMD_MEM_READ_2:
-                        IPC_SET_ARG2(call->data, *((__u16 *)code->cmds[i].addr));
+                        dstval = *((__u16 *)code->cmds[i].addr);
                         break;
                 case CMD_MEM_READ_4:
-                        IPC_SET_ARG2(call->data, *((__u32 *)code->cmds[i].addr));
+                        dstval = *((__u32 *)code->cmds[i].addr);
                         break;
                 case CMD_MEM_READ_8:
-                        IPC_SET_ARG2(call->data, *((__u64 *)code->cmds[i].addr));
+                        dstval = *((__u64 *)code->cmds[i].addr);
                         break;
                 case CMD_MEM_WRITE_1:
@@ -99 +101 @@
 #if defined(ia32) || defined(amd64)
                 case CMD_PORT_READ_1:
-                        IPC_SET_ARG2(call->data, inb((long)code->cmds[i].addr));
+                        dstval = inb((long)code->cmds[i].addr);
                         break;
                 case CMD_PORT_WRITE_1:
@@ -107 +109 @@
 #if defined(ia64) 
                 case CMD_IA64_GETCHAR:
-                        IPC_SET_ARG2(call->data, _getc(&ski_uconsole));
+                        dstval = _getc(&ski_uconsole);
                         break;
 #endif
 #if defined(ppc32)
                 case CMD_PPC32_GETCHAR:
-                        IPC_SET_ARG2(call->data, cuda_get_scancode());
+                        dstval = cuda_get_scancode();
                         break;
 #endif
                 default:
                         break;
+                }
+                if (code->cmds[i].dstarg && code->cmds[i].dstarg < 4) {
+                        call->data.args[code->cmds[i].dstarg] = dstval;
                 }
         }
@@ -225 +230 @@
  *
  */
-void ipc_irq_send_msg(int irq, __native a2, __native a3)
+void ipc_irq_send_msg(int irq, __native a1, __native a2, __native a3)
 {
         call_t *call;
@@ -239 +244 @@
                 }
                 call->flags |= IPC_CALL_NOTIF;
-                IPC_SET_METHOD(call->data, IPC_M_INTERRUPT);
-                IPC_SET_ARG1(call->data, irq);
+                IPC_SET_METHOD(call->data, irq);
+                IPC_SET_ARG1(call->data, a1);
                 IPC_SET_ARG2(call->data, a2);
                 IPC_SET_ARG3(call->data, a3);
+                /* Put a counter to the message */
+                call->private = atomic_preinc(&irq_conns[mq].counter);
                 
                 send_call(mq, call);
@@ -268 +275 @@
                 }
                 call->flags |= IPC_CALL_NOTIF;
-                IPC_SET_METHOD(call->data, IPC_M_INTERRUPT);
-                IPC_SET_ARG1(call->data, irq);
-                IPC_SET_ARG3(call->data, atomic_preinc(&irq_conns[mq].counter));
+                /* Put a counter to the message */
+                call->private = atomic_preinc(&irq_conns[mq].counter);
+                /* Set up args */
+                IPC_SET_METHOD(call->data, irq);
 
                 /* Execute code to handle irq */

generic/src/ipc/sysipc.c

@@ -519 +519 @@
         if (call->flags & IPC_CALL_NOTIF) {
                 ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
-                STRUCT_TO_USPACE(&calldata->args, &call->data.args);
+
+                /* Set in_phone_hash to the interrupt counter */
+                call->data.phone = (void *)call->private;
+                
+                STRUCT_TO_USPACE(calldata, &call->data);
+
                 ipc_call_free(call);