Changeset 95c4776 in mainline for kernel/arch/sparc64/include/trap/interrupt.h

Timestamp:

2010-02-21T19:02:16Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

af56e9b

Parents:

c2efbb4

Message:

Merging SMP (unstable)

File:

• kernel/arch/sparc64/include/trap/interrupt.h (modified) (4 diffs)

kernel/arch/sparc64/include/trap/interrupt.h

@@ -32 +32 @@
 /** 
  * @file
- * @brief This file contains interrupt vector trap handler.
+ * @brief This file contains level N interrupt and inter-processor interrupt
+ * trap handler.
  */
-
-#ifndef KERN_sparc64_TRAP_INTERRUPT_H_
-#define KERN_sparc64_TRAP_INTERRUPT_H_
-
-#include <arch/trap/trap_table.h>
-#include <arch/stack.h>
-
-/* IMAP register bits */
-#define IGN_MASK        0x7c0
-#define INO_MASK        0x1f
-#define IMAP_V_MASK     (1ULL << 31)
-
-#define IGN_SHIFT       6
-
-
-/* Interrupt ASI registers. */
-#define ASI_INTR_W                      0x77
-#define ASI_INTR_DISPATCH_STATUS        0x48
-#define ASI_INTR_R                      0x7f
-#define ASI_INTR_RECEIVE                0x49
-
-/* VA's used with ASI_INTR_W register. */
-#if defined (US)
-#define ASI_UDB_INTR_W_DATA_0   0x40
-#define ASI_UDB_INTR_W_DATA_1   0x50
-#define ASI_UDB_INTR_W_DATA_2   0x60
-#elif defined (US3)
-#define VA_INTR_W_DATA_0        0x40
-#define VA_INTR_W_DATA_1        0x48
-#define VA_INTR_W_DATA_2        0x50
-#define VA_INTR_W_DATA_3        0x58
-#define VA_INTR_W_DATA_4        0x60
-#define VA_INTR_W_DATA_5        0x68
-#define VA_INTR_W_DATA_6        0x80
-#define VA_INTR_W_DATA_7        0x88
-#endif
-#define VA_INTR_W_DISPATCH      0x70
-
-/* VA's used with ASI_INTR_R register. */
-#if defined(US)
-#define ASI_UDB_INTR_R_DATA_0   0x40
-#define ASI_UDB_INTR_R_DATA_1   0x50
-#define ASI_UDB_INTR_R_DATA_2   0x60
-#elif defined (US3)
-#define VA_INTR_R_DATA_0        0x40
-#define VA_INTR_R_DATA_1        0x48
-#define VA_INTR_R_DATA_2        0x50
-#define VA_INTR_R_DATA_3        0x58
-#define VA_INTR_R_DATA_4        0x60
-#define VA_INTR_R_DATA_5        0x68
-#define VA_INTR_R_DATA_6        0x80
-#define VA_INTR_R_DATA_7        0x88
-#endif
-
-/* Shifts in the Interrupt Vector Dispatch virtual address. */
-#define INTR_VEC_DISPATCH_MID_SHIFT     14
-
-/* Bits in the Interrupt Dispatch Status register. */
-#define INTR_DISPATCH_STATUS_NACK       0x2
-#define INTR_DISPATCH_STATUS_BUSY       0x1
+#ifndef KERN_sparc64_INTERRUPT_TRAP_H_
+#define KERN_sparc64_INTERRUPT_TRAP_H_
 
 #define TT_INTERRUPT_LEVEL_1                    0x41
@@ -111 +54 @@
 #define TT_INTERRUPT_LEVEL_15                   0x4f
 
-#define TT_INTERRUPT_VECTOR_TRAP                0x60
+#define INTERRUPT_LEVEL_N_HANDLER_SIZE          TRAP_TABLE_ENTRY_SIZE
 
-#define INTERRUPT_LEVEL_N_HANDLER_SIZE          TRAP_TABLE_ENTRY_SIZE
-#define INTERRUPT_VECTOR_TRAP_HANDLER_SIZE      TRAP_TABLE_ENTRY_SIZE
+/* IMAP register bits */
+#define IGN_MASK        0x7c0
+#define INO_MASK        0x1f
+#define IMAP_V_MASK     (1ULL << 31)
+
+#define IGN_SHIFT       6
+
 
 #ifdef __ASM__
@@ -121 +69 @@
         PREEMPTIBLE_HANDLER exc_dispatch
 .endm
-
-.macro INTERRUPT_VECTOR_TRAP_HANDLER
-        PREEMPTIBLE_HANDLER interrupt
-.endm
-#endif /* __ASM__ */
+#endif
 
 #ifndef __ASM__
@@ -134 +78 @@
 #endif /* !def __ASM__ */
 
+
+#if defined (SUN4U)
+#include <arch/trap/sun4u/interrupt.h>
+#elif defined (SUN4V)
+#include <arch/trap/sun4v/interrupt.h>
+#endif
+
 #endif