Changeset 2b698d8 in mainline

Timestamp:

2010-10-01T18:57:06Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

49d871ea

Parents:

9d5bb4e

Message:

basic processing of the IPI interrupts from the dorder device

Location:

kernel/arch/mips32

Files:

• include/smp/dorder.h (added)
• src/interrupt.c (modified) (4 diffs)
• src/smp/dorder.c (modified) (1 diff)

kernel/arch/mips32/src/interrupt.c

@@ -38 +38 @@
 #include <arch.h>
 #include <arch/cp0.h>
+#include <arch/smp/dorder.h>
 #include <time/clock.h>
 #include <ipc/sysipc.h>
@@ -48 +49 @@
 function virtual_timer_fnc = NULL;
 static irq_t timer_irq;
+static irq_t dorder_irq;
 
 // TODO: This is SMP unsafe!!!
@@ -149 +151 @@
 }
 
+static irq_ownership_t dorder_claim(irq_t *irq)
+{
+        return IRQ_ACCEPT;
+}
+
+static void dorder_irq_handler(irq_t *irq)
+{
+        dorder_ipi_ack(1 << dorder_cpuid());
+}
+
 /* Initialize basic tables for exception dispatching */
 void interrupt_init(void)
@@ -163 +175 @@
         timer_start();
         cp0_unmask_int(TIMER_IRQ);
+        
+        irq_initialize(&dorder_irq);
+        dorder_irq.devno = device_assign_devno();
+        dorder_irq.inr = DORDER_IRQ;
+        dorder_irq.claim = dorder_claim;
+        dorder_irq.handler = dorder_irq_handler;
+        irq_register(&dorder_irq);
+        
+        cp0_unmask_int(DORDER_IRQ);
 }
 

kernel/arch/mips32/src/smp/dorder.c

@@ -33 +33 @@
  */
 
+#include <typedefs.h>
 #include <smp/ipi.h>
+#include <arch/smp/dorder.h>
+
+#define MSIM_DORDER_ADDRESS  0xB0000004
 
 #ifdef CONFIG_SMP
 
-#define MSIM_DORDER_ADDRESS  0xB0000004
-
 void ipi_broadcast_arch(int ipi)
 {
-        *((volatile unsigned int *) MSIM_DORDER_ADDRESS) = 0x7FFFFFFF;
+        *((volatile uint32_t *) MSIM_DORDER_ADDRESS) = 0x7fffffff;
 }
 
 #endif
 
+uint32_t dorder_cpuid(void)
+{
+        return *((volatile uint32_t *) MSIM_DORDER_ADDRESS);
+}
+
+void dorder_ipi_ack(uint32_t mask)
+{
+        *((volatile uint32_t *) (MSIM_DORDER_ADDRESS + 4)) = mask;
+}
+
 /** @}
  */