Changeset 124bc22 in mainline for kernel/arch/mips32/include

Timestamp:

2019-04-04T18:08:51Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d97627

Parents:

e064102

Message:

Reorganize interrupt and IRQ handling on mips32

This allows msim to use MIPS CPU interrupt numbers as IRQ numbers and
Malta to use ISA IRQ numbers as IRQ numbers. Common code can still
register MIPS CPU interrupts by their respective numbers.

Location:

kernel/arch/mips32/include/arch

Files:

• exception.h (modified) (1 diff)
• mach/malta/malta.h (modified) (2 diffs)
• machine_func.h (modified) (1 diff)

kernel/arch/mips32/include/arch/exception.h

@@ -57 +57 @@
 #define EXC_VCED   31
 
+#define INT_SW0    0
+#define INT_SW1    1
+#define INT_HW0    2
+#define INT_HW1    3
+#define INT_HW2    4
+#define INT_HW3    5
+#define INT_HW4    6
+#define INT_TIMER  7
+
+#define INTERRUPTS    8
+#define HW_INTERRUPTS (INTERRUPTS - 3)
+
+typedef void (* int_handler_t)(unsigned int);
+extern int_handler_t int_handler[];
+
 extern void exception(istate_t *istate);
 extern void tlb_refill_entry(void);

kernel/arch/mips32/include/arch/mach/malta/malta.h

@@ -39 +39 @@
 #include <arch/machine_func.h>
 #include <arch/mm/page.h>
+#include <typedefs.h>
 
 #define MALTA_PCI_BASE          PA2KSEG1(0x18000000UL)
@@ -47 +48 @@
 
 #define TTY_BASE                (MALTA_PCI_BASE + 0x3f8)
-#define TTY_CPU_INT             2
 #define TTY_ISA_IRQ             4
 
-#define GT64120_PCI0_INTACK     (MALTA_GT64120_BASE + 0xc34)
+#define GT64120_PCI0_INTACK     ((ioport32_t *) (MALTA_GT64120_BASE + 0xc34))
 
 extern struct mips32_machine_ops malta_machine_ops;

kernel/arch/mips32/include/arch/machine_func.h

@@ -43 +43 @@
 
 #include <typedefs.h>
+#include <stdbool.h>
 
 struct mips32_machine_ops {