Changeset f5dd4a1 in mainline for kernel/arch/mips32/src/mach/msim

Timestamp:

2019-03-31T16:44:21Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f27e21d

Parents:

68d8736

Message:

Move most of msim-specific stuff under mach/msim

Location:

kernel/arch/mips32/src/mach/msim

Files:

• dorder.c (moved) (moved from kernel/arch/mips32/src/smp/dorder.c ) (2 diffs)
• msim.c (modified) (2 diffs)

kernel/arch/mips32/src/mach/msim/dorder.c

@@ -33 +33 @@
  */
 
+#include <arch/mach/msim/dorder.h>
+#include <arch/mach/msim/msim.h>
 #include <stdint.h>
 #include <smp/ipi.h>
-#include <arch/smp/dorder.h>
+#include <interrupt.h>
 
-#define MSIM_DORDER_ADDRESS  0xB0000100
+static irq_t dorder_irq;
 
 #ifdef CONFIG_SMP
@@ -47 +49 @@
 
 #endif
+
+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());
+}
+
+void dorder_init(void)
+{
+        irq_initialize(&dorder_irq);
+        dorder_irq.inr = MSIM_DORDER_IRQ;
+        dorder_irq.claim = dorder_claim;
+        dorder_irq.handler = dorder_irq_handler;
+        irq_register(&dorder_irq);
+
+        cp0_unmask_int(MSIM_DORDER_IRQ);
+}
 
 uint32_t dorder_cpuid(void)

kernel/arch/mips32/src/mach/msim/msim.c

@@ -35 +35 @@
 
 #include <arch/mach/msim/msim.h>
+#include <arch/mach/msim/dorder.h>
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
-#include <arch/drivers/msim.h>
 #include <genarch/drivers/dsrln/dsrlnin.h>
 #include <genarch/drivers/dsrln/dsrlnout.h>
@@ -62 +62 @@
 void msim_init(void)
 {
+        dorder_init();
         cp0_unmask_int(MSIM_DDISK_IRQ);
 }