 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.h,v 1.1 2024/01/14 22:32:32 thorpej Exp $	*/
+/*	$NetBSD: intr.h,v 1.2 2024/01/15 02:13:16 thorpej Exp $	*/
 /*-
  * Copyright (c) 2023, 2024 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -39,26 +39,38 @@
  * Logical interrupt priority levels -- these are distinct from
  * the hardware interrupt priority levels of the m68k.
  */
 #define	IPL_NONE	0
 #define	IPL_SOFTCLOCK	1	/* clock software interrupts */
 #define	IPL_SOFTBIO	2	/* block device software interrupts */
 #define	IPL_SOFTNET	3	/* network software interrupts */
 #define	IPL_SOFTSERIAL	4	/* serial device software interrupts */
 #define	IPL_VM		5	/* all interrupts that can allocate memory */
 #define	IPL_SCHED	6	/* scheduler / hard clock interrupts */
 #define	IPL_HIGH	7	/* blocks all interrupts */
 #define	NIPL		8
 /*
  * Abstract ISR priorities.  These allow sorting of latency-sensitive
  * devices earlier on the shared auto-vectored interrupt lists.
  */
 #define	ISRPRI_BIO		0	/* a block I/O device */
 #define	ISRPRI_MISC		0	/* misc. devices */
 #define	ISRPRI_NET		1	/* a network interface */
 #define	ISRPRI_TTY		2	/* a serial port */
 #define	ISRPRI_DISPLAY		2	/* display devices / framebuffers */
 #define	ISRPRI_TTYNOBUF		3	/* a particularly bad serial port */
 #define	ISRPRI_AUDIO		4	/* audio devices */
 #if defined(_KERNEL) || defined(_KMEMUSER)
 typedef struct {
 	uint16_t _psl;		/* physical manifestation of logical IPL_* */
 } ipl_cookie_t;
 #endif
 #ifdef _KERNEL
 extern int idepth;		/* interrupt depth */
 extern const uint16_t ipl2psl_table[NIPL];
 typedef int ipl_t;		/* logical IPL_* value */
 static inline bool
 @@ -98,26 +110,27 @@ splraiseipl(ipl_cookie_t icookie)
 #define	spl0()		_spl0()
 #define	splx(s)		_splx(s)
 #ifdef _M68K_INTR_PRIVATE
 #include <sys/queue.h>
 struct m68k_intrhand {
 	LIST_ENTRY(m68k_intrhand)	ih_link;
 	int				(*ih_func)(void *);
 	void				*ih_arg;
 	struct evcnt			*ih_evcnt;
 	int				ih_ipl;	/* m68k IPL, not IPL_* */
 	int				ih_vec;
 	int				ih_isrpri;
 };
 LIST_HEAD(m68k_intrhand_list, m68k_intrhand);
 struct m68k_ih_allocfuncs {
 	struct m68k_intrhand *	(*alloc)(int km_flag);
 	void			(*free)(struct m68k_intrhand *);
 };
 #else
 struct m68k_ih_allocfuncs;
 #endif /* _M68K_INTR_PRIVATE */
 struct evcnt;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: m68k_intr.c,v 1.3 2024/01/15 00:37:08 thorpej Exp $	*/
+/*	$NetBSD: m68k_intr.c,v 1.4 2024/01/15 02:13:16 thorpej Exp $	*/
 /*-
  * Copyright (c) 1996, 2023, 2024 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Glass, Gordon W. Ross, and Jason R. Thorpe.
+ *
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * Common interrupt handling for m68k platforms.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.3 2024/01/15 00:37:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.4 2024/01/15 02:13:16 thorpej Exp $");
 #define	_M68K_INTR_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/vmmeter.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <sys/bus.h>
 #include <sys/once.h>
 #include <sys/intr.h>
 @@ -198,27 +198,27 @@ m68k_intr_init(const struct m68k_ih_allo
 	for (i = 0; i < NAUTOVECTORS; i++) {
 		LIST_INIT(&m68k_intrhands_autovec[i]);
+	}
+}
 /*
  * m68k_intr_establish --
  *	Establish an interrupt handler at the specified vector.
  *	XXX We don't do anything with isrpri yet.
  *	XXX We don't do anything with the flags yet.
  */
 void *
 m68k_intr_establish(int (*func)(void *), void *arg, struct evcnt *ev,
-    int vec, int ipl, int isrpri __unused, int flags __unused)
+    int vec, int ipl, int isrpri, int flags __unused)
+{
 	struct m68k_intrhand *ih;
 	int s;
 	/*
 	 * If a platform doesn't want special behavior, we don't
 	 * require them to call m68k_intr_init(); we just handle
 	 * it here.
+	 *
 	 * XXX m68k_intr_init() might be called really early, so
 	 * XXX can't use a once control.
 	 */
 	if (__predict_false(ih_allocfuncs == NULL)) {
 @@ -232,46 +232,71 @@ m68k_intr_establish(int (*func)(void *),
 #ifdef __HAVE_M68K_INTR_VECTORED
 	KASSERT(vec >= 0);
 	KASSERT(vec < NVECTORS);
 #else
 	KASSERT(vec == 0);
 #endif /* __HAVE_M68K_INTR_VECTORED */
 	ih = m68k_ih_alloc();
 	ih->ih_func = func;
 	ih->ih_arg = arg;
 	ih->ih_vec = vec;
 	ih->ih_ipl = ipl;
 	ih->ih_isrpri = isrpri;
 	if ((ih->ih_evcnt = ev) == NULL) {
 		ih->ih_evcnt = &bitbucket;
+	}
 #ifdef __HAVE_M68K_INTR_VECTORED
 	if (vec != 0) {
 		if (vec_get_entry(vec) != INTR_FREEVEC) {
 			m68k_ih_free(ih);
 			return NULL;
+		}
 		if (! m68k_intrvec_add(ih)) {
 			m68k_ih_free(ih);
 			return NULL;
+		}
 		return ih;
+	}
 #endif
 	/*
 	 * Some devices are particularly sensitive to interrupt
 	 * handling latency.  Unbuffered serial ports, for example,
 	 * can lose data if their interrupts aren't handled with
 	 * reasonable speed.  For this reason, we sort interrupt
 	 * handlers by an abstract "ISR" priority, inserting higher-
 	 * priority interrupts before lower-priority interrupts.
 	 */
 	struct m68k_intrhand_list * const list = &m68k_intrhands_autovec[ipl];
 	struct m68k_intrhand *curih;
 	s = splhigh();
-	LIST_INSERT_HEAD(&m68k_intrhands_autovec[ipl], ih, ih_link);
+	if (LIST_EMPTY(list)) {
 		LIST_INSERT_HEAD(list, ih, ih_link);
 		goto done;
+	}
 	for (curih = LIST_FIRST(list);
 	     LIST_NEXT(curih, ih_link) != NULL;
 	     curih = LIST_NEXT(curih, ih_link)) {
 		if (ih->ih_isrpri > curih->ih_isrpri) {
 			LIST_INSERT_BEFORE(curih, ih, ih_link);
 			goto done;
+		}
+	}
 	LIST_INSERT_AFTER(curih, ih, ih_link);
  done:
 	splx(s);
 	return ih;
+}
 /*
  * m68k_intr_disestablish --
  *	Remove an interrupt handler.  Returns true if the handler
  *	list for this vector is now empty.
  */
 bool
 m68k_intr_disestablish(void *v)
+{