[src/trunk]: src/sys/arch/alpha Enable __HAVE_FAST_SOFTINTS and garbage-colle...

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

details:   https://anonhg.NetBSD.org/src/rev/26316f395752
branches:  trunk
changeset: 955102:26316f395752
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Sep 19 03:02:07 2020 +0000

description:
Enable __HAVE_FAST_SOFTINTS and garbage-collect the #ifdefs.

diffstat:

 sys/arch/alpha/alpha/interrupt.c |  22 ++--------------------
 sys/arch/alpha/include/types.h   |   4 ++--
 2 files changed, 4 insertions(+), 22 deletions(-)

diffs (84 lines):

diff -r 78c0a2b5f012 -r 26316f395752 sys/arch/alpha/alpha/interrupt.c
--- a/sys/arch/alpha/alpha/interrupt.c  Sat Sep 19 01:43:20 2020 +0000
+++ b/sys/arch/alpha/alpha/interrupt.c  Sat Sep 19 03:02:07 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.87 2020/09/19 01:24:31 thorpej Exp $ */
+/* $NetBSD: interrupt.c,v 1.88 2020/09/19 03:02:07 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.87 2020/09/19 01:24:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.88 2020/09/19 03:02:07 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -460,8 +460,6 @@
 #define        SOFTINTS_ELIGIBLE(ipl)                                          \
        ((ALPHA_ALL_SOFTINTS << ((ipl) << 1)) & ALPHA_ALL_SOFTINTS)
 
-#ifdef __HAVE_FAST_SOFTINTS
-
 /* Validate some assumptions the code makes. */
 __CTASSERT(SOFTINT_TO_IPL(SOFTINT_CLOCK) == ALPHA_PSL_IPL_SOFT_LO);
 __CTASSERT(SOFTINT_TO_IPL(SOFTINT_BIO) == ALPHA_PSL_IPL_SOFT_LO);
@@ -516,17 +514,6 @@
        *machdep = si_bit;
 }
 
-#else /* ! __HAVE_FAST_SOFTINTS */
-
-/* Temporary stub for alpha_softint_switchto(). */
-void
-softint_dispatch(struct lwp * const pinned __unused, int const s __unused)
-{
-       panic("softint_dispatch");
-}
-
-#endif /* __HAVE_FAST_SOFTINTS */
-
 /*
  * Helper macro.
  *
@@ -552,7 +539,6 @@
 void
 alpha_softint_dispatch(int const ipl)
 {
-#ifdef __HAVE_FAST_SOFTINTS
        struct lwp * const l = curlwp;
        struct cpu_info * const ci = l->l_cpu;
        unsigned long ssir;
@@ -570,12 +556,8 @@
                DOSOFTINT(BIO);
                DOSOFTINT(CLOCK);
        }
-#else
-       panic("alpha_softint_dispatch");
-#endif /* __HAVE_FAST_SOFTINTS */
 }
 
-
 /*
  * spllower:
  *
diff -r 78c0a2b5f012 -r 26316f395752 sys/arch/alpha/include/types.h
--- a/sys/arch/alpha/include/types.h    Sat Sep 19 01:43:20 2020 +0000
+++ b/sys/arch/alpha/include/types.h    Sat Sep 19 03:02:07 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.58 2020/09/16 04:07:32 thorpej Exp $ */
+/* $NetBSD: types.h,v 1.59 2020/09/19 03:02:07 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -78,7 +78,7 @@
 #define        __HAVE_MM_MD_DIRECT_MAPPED_IO
 #define        __HAVE_MM_MD_DIRECT_MAPPED_PHYS
 #define        __HAVE_CPU_DATA_FIRST
-/* #define __HAVE_FAST_SOFTINTS -- not yet */
+#define        __HAVE_FAST_SOFTINTS
 #define        __HAVE_CPU_UAREA_ROUTINES
 #define        __HAVE_CPU_LWP_SETPRIVATE
 #define        __HAVE___LWP_GETPRIVATE_FAST