[src/trunk]: src/sys/arch/alpha Move softintr bits into <machine/intr.h> and ...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a5f35b8e99c
branches:  trunk
changeset: 938896:1a5f35b8e99c
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Sep 19 01:24:31 2020 +0000

description:
Move softintr bits into <machine/intr.h> and define ALPHA_ALL_SOFTINTS
for locore.s

diffstat:

 sys/arch/alpha/alpha/genassym.cf |   5 ++++-
 sys/arch/alpha/alpha/interrupt.c |  14 ++------------
 sys/arch/alpha/include/intr.h    |  12 +++++++++++-
 3 files changed, 17 insertions(+), 14 deletions(-)

diffs (80 lines):

diff -r fb0f7b733901 -r 1a5f35b8e99c sys/arch/alpha/alpha/genassym.cf
--- a/sys/arch/alpha/alpha/genassym.cf  Fri Sep 18 20:44:20 2020 +0000
+++ b/sys/arch/alpha/alpha/genassym.cf  Sat Sep 19 01:24:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.26 2020/09/16 04:07:32 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.27 2020/09/19 01:24:31 thorpej Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -133,6 +133,9 @@
 define ALPHA_PSL_IPL_SOFT_HI   ALPHA_PSL_IPL_SOFT_HI
 define ALPHA_PSL_IPL_HIGH      ALPHA_PSL_IPL_HIGH
 
+# soft interrrupt definitions
+define ALPHA_ALL_SOFTINTS      ALPHA_ALL_SOFTINTS
+
 # pte bits
 define ALPHA_PTE_VALID         ALPHA_PTE_VALID
 define ALPHA_PTE_ASM           ALPHA_PTE_ASM
diff -r fb0f7b733901 -r 1a5f35b8e99c sys/arch/alpha/alpha/interrupt.c
--- a/sys/arch/alpha/alpha/interrupt.c  Fri Sep 18 20:44:20 2020 +0000
+++ b/sys/arch/alpha/alpha/interrupt.c  Sat Sep 19 01:24:31 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.86 2020/09/17 00:48:56 thorpej Exp $ */
+/* $NetBSD: interrupt.c,v 1.87 2020/09/19 01:24:31 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.86 2020/09/17 00:48:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.87 2020/09/19 01:24:31 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -454,16 +454,6 @@
  * Fast soft interrupt support.
  */
 
-#define        SOFTINT_CLOCK_MASK      __BIT(SOFTINT_CLOCK)
-#define        SOFTINT_BIO_MASK        __BIT(SOFTINT_BIO)
-#define        SOFTINT_NET_MASK        __BIT(SOFTINT_NET)
-#define        SOFTINT_SERIAL_MASK     __BIT(SOFTINT_SERIAL)
-
-#define        ALPHA_IPL1_SOFTINTS     (SOFTINT_CLOCK_MASK | SOFTINT_BIO_MASK)
-#define        ALPHA_IPL2_SOFTINTS     (SOFTINT_NET_MASK | SOFTINT_SERIAL_MASK)
-
-#define        ALPHA_ALL_SOFTINTS      (ALPHA_IPL1_SOFTINTS | ALPHA_IPL2_SOFTINTS)
-
 #define        SOFTINT_TO_IPL(si)                                              \
        (ALPHA_PSL_IPL_SOFT_LO + ((ALPHA_IPL2_SOFTINTS >> (si)) & 1))
 
diff -r fb0f7b733901 -r 1a5f35b8e99c sys/arch/alpha/include/intr.h
--- a/sys/arch/alpha/include/intr.h     Fri Sep 18 20:44:20 2020 +0000
+++ b/sys/arch/alpha/include/intr.h     Sat Sep 19 01:24:31 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.77 2020/09/17 00:48:56 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.78 2020/09/19 01:24:31 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -118,6 +118,16 @@
 #define        IPL_SCHED       ALPHA_PSL_IPL_CLOCK
 #define        IPL_HIGH        ALPHA_PSL_IPL_HIGH
 
+#define        SOFTINT_CLOCK_MASK      __BIT(SOFTINT_CLOCK)
+#define        SOFTINT_BIO_MASK        __BIT(SOFTINT_BIO)
+#define        SOFTINT_NET_MASK        __BIT(SOFTINT_NET)
+#define        SOFTINT_SERIAL_MASK     __BIT(SOFTINT_SERIAL)
+
+#define        ALPHA_IPL1_SOFTINTS     (SOFTINT_CLOCK_MASK | SOFTINT_BIO_MASK)
+#define        ALPHA_IPL2_SOFTINTS     (SOFTINT_NET_MASK | SOFTINT_SERIAL_MASK)
+
+#define        ALPHA_ALL_SOFTINTS      (ALPHA_IPL1_SOFTINTS | ALPHA_IPL2_SOFTINTS)
+
 typedef int ipl_t;
 typedef struct {
        uint8_t _psl;