 @@ -1,14 +1,14 @@
-/* $NetBSD: gic_splfuncs.c,v 1.2 2021/09/18 12:25:07 jmcneill Exp $ */
+/* $NetBSD: gic_splfuncs.c,v 1.3 2021/09/20 21:05:14 jmcneill Exp $ */
 /*-
  * Copyright (c) 2021 Jared McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic_splfuncs.c,v 1.2 2021/09/18 12:25:07 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_splfuncs.c,v 1.3 2021/09/20 21:05:14 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/kernel.h>
 #include <sys/lwp.h>
 #include <arm/pic/picvar.h>
 #include <arm/cpu.h>
 #include <arm/cpufunc.h>
 #include <arm/locore.h>
 #include <arm/cortex/gic_splfuncs.h>
 @@ -117,17 +117,17 @@ dohard:
 	pic_do_pending_ints(psw, newipl, NULL);
 	ci->ci_intr_depth--;
 	if ((psw & I32_bit) == 0) {
 		ENABLE_INTERRUPT();
+	}
 dosoft:
 	cpu_dosoftints();
+}
 void
 gic_spl_init(void)
+{
-	_splraise = gic_splraise;
+	pic_splraise = gic_splraise;
-	_spllower = gic_spllower;
+	pic_spllower = gic_spllower;
-	splx = gic_splx;
+	pic_splx = gic_splx;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: fdt_intr.h,v 1.6 2021/08/30 23:20:00 jmcneill Exp $ */
+/* $NetBSD: fdt_intr.h,v 1.7 2021/09/20 21:05:15 jmcneill Exp $ */
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -30,23 +30,27 @@
 #define _ARM_FDT_INTR_H
 #define	ARM_IRQ_HANDLER		_C_LABEL(arm_fdt_irq_handler)
 #define	ARM_FIQ_HANDLER		_C_LABEL(arm_fdt_fiq_handler)
 #ifndef _LOCORE
 #define	__HAVE_PIC_SET_PRIORITY
 #define	__HAVE_PIC_PENDING_INTRS
 #define	PIC_MAXSOURCES		8192
 #define	PIC_MAXMAXSOURCES	(PIC_MAXSOURCES * 2 + 32)
 #define	_splraise	pic_splraise
 #define	_spllower	pic_spllower
 #define	splx		pic_splx
 void	arm_fdt_irq_set_handler(void (*)(void *));
 void	arm_fdt_irq_handler(void *);
 void	arm_fdt_fiq_set_handler(void (*)(void *));
 void	arm_fdt_fiq_handler(void *);
 #include <arm/pic/picvar.h>
 #endif
 #endif /* _ARM_FDT_INTR_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pic_splfuncs.c,v 1.21 2021/08/10 15:31:55 jmcneill Exp $	*/
+/*	$NetBSD: pic_splfuncs.c,v 1.22 2021/09/20 21:05:15 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -17,52 +17,55 @@
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_modular.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.21 2021/08/10 15:31:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.22 2021/09/20 21:05:15 jmcneill Exp $");
 #define _INTR_PRIVATE
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/evcnt.h>
 #include <sys/lwp.h>
 #include <sys/kernel.h>
 #include <dev/cons.h>
 #include <arm/armreg.h>
 #include <arm/cpu.h>
 #include <arm/cpufunc.h>
 #include <arm/locore.h>	/* for compat aarch64 */
 #include <arm/pic/picvar.h>
 static int	pic_default_splraise(int);
 static int	pic_default_spllower(int);
 static void	pic_default_splx(int);
-int (*_splraise)(int) = pic_default_splraise;
+int (*pic_splraise)(int) = pic_default_splraise;
-int (*_spllower)(int) = pic_default_spllower;
+int (*pic_spllower)(int) = pic_default_spllower;
-void (*splx)(int) = pic_default_splx;
+void (*pic_splx)(int) = pic_default_splx;
 static int
 pic_default_splraise(int newipl)
+{
 	struct cpu_info * const ci = curcpu();
 	const int oldipl = ci->ci_cpl;
 	KASSERT(newipl < NIPL);
 	if (newipl > ci->ci_cpl) {
 		pic_set_priority(ci, newipl);
+	}
 	return oldipl;
+}
 @@ -99,13 +102,48 @@ pic_default_splx(int savedipl)
 	    "splx(%d) to a higher ipl than %d", savedipl, ci->ci_cpl);
 	ci->ci_intr_depth++;
 	pic_do_pending_ints(psw, savedipl, NULL);
 	ci->ci_intr_depth--;
 	KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
 	    ci->ci_cpl, savedipl);
 	if ((psw & I32_bit) == 0)
 		ENABLE_INTERRUPT();
 	cpu_dosoftints();
 	KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
 	    ci->ci_cpl, savedipl);
+}
 #ifdef MODULAR
 #ifdef _spllower
 #undef _spllower
 #endif
 int _spllower(int);
 #ifdef _splraise
 #undef _splraise
 #endif
 int _splraise(int);
 #ifdef splx
 #undef splx
 #endif
 void splx(int);
 int
 _spllower(int newipl)
+{
 	return pic_spllower(newipl);
+}
 int
 _splraise(int newipl)
+{
 	return pic_splraise(newipl);
+}
 void
 splx(int savedipl)
+{
 	pic_splx(savedipl);
+}
 #endif /* !MODULAR */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: picvar.h,v 1.35 2021/08/10 15:31:55 jmcneill Exp $	*/
+/*	$NetBSD: picvar.h,v 1.36 2021/09/20 21:05:15 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,29 +30,29 @@
 #ifndef _ARM_PIC_PICVAR_H_
 #define _ARM_PIC_PICVAR_H_
 #ifdef _KERNEL_OPT
 #include "opt_multiprocessor.h"
 #endif
 #ifdef MULTIPROCESSOR
 #include <sys/kcpuset.h>
 #endif
 typedef uint32_t	intr_handle_t;		/* for ACPI */
-extern int	(*_splraise)(int);
+extern int	(*pic_splraise)(int);
-extern int	(*_spllower)(int);
+extern int	(*pic_spllower)(int);
-extern void	(*splx)(int);
+extern void	(*pic_splx)(int);
 const char *
 	intr_typename(int);
 struct pic_softc;
 struct intrsource;
 struct cpu_info;
 #define	IPI_AST			0	/* just get an interrupt */
 #define	IPI_XCALL		1	/* xcall */
 #define	IPI_NOP			2	/* just get an interrupt (armv6) */
 #define	IPI_SHOOTDOWN		3	/* cause a tlb shootdown */
 #define	IPI_DDB			4	/* enter DDB */