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

Timestamp:

2019-03-31T16:44:21Z (6 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

Files:

• interrupt.c (modified) (4 diffs)
• mach/msim/dorder.c (moved) (moved from kernel/arch/mips32/src/smp/dorder.c ) (2 diffs)
• mach/msim/msim.c (modified) (2 diffs)
• mm/frame.c (modified) (3 diffs)

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>
@@ -45 +44 @@
 #define TIMER_IRQ   7
 
-#ifdef MACHINE_msim
-#define DORDER_IRQ  5
-#endif
-
 function virtual_timer_fnc = NULL;
 static irq_t timer_irq;
-
-#ifdef MACHINE_msim
-static irq_t dorder_irq;
-#endif
 
 // TODO: This is SMP unsafe!!!
@@ -156 +147 @@
 }
 
-#ifdef MACHINE_msim
-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());
-}
-#endif
-
 /* Initialize basic tables for exception dispatching */
 void interrupt_init(void)
@@ -181 +160 @@
         timer_start();
         cp0_unmask_int(TIMER_IRQ);
-
-#ifdef MACHINE_msim
-        irq_initialize(&dorder_irq);
-        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);
-#endif
 }
 

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);
 }

kernel/arch/mips32/src/mm/frame.c

@@ -41 +41 @@
 #include <config.h>
 #ifdef MACHINE_msim
-#include <arch/drivers/msim.h>
+#include <arch/mach/msim/msim.h>
 #endif
 #include <arch/arch.h>
@@ -57 +57 @@
 
 #define ZERO_PAGE_VALUE_KSEG1(frame) \
-        (((volatile uint32_t *) (0xa0000000 + (frame << ZERO_PAGE_WIDTH)))[ZERO_PAGE_OFFSET])
+        (((volatile uint32_t *) PA2KSEG1(frame << ZERO_PAGE_WIDTH))[ZERO_PAGE_OFFSET])
 
 #define MAX_REGIONS  32
@@ -80 +80 @@
 #ifdef MACHINE_msim
         /* MSIM device (dprinter) */
-        if (frame == (KA2PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH))
+        if (frame == (KSEG12PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH))
                 return false;
 
         /* MSIM device (dkeyboard) */
-        if (frame == (KA2PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH))
+        if (frame == (KSEG12PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH))
                 return false;
 #endif