 @@ -1,14 +1,14 @@
-/* $NetBSD: podulebus.c,v 1.33 2021/09/11 20:28:03 andvar Exp $ */
+/* $NetBSD: podulebus.c,v 1.34 2022/05/30 09:56:02 andvar Exp $ */
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * 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
 @@ -33,27 +33,27 @@
  * SUCH DAMAGE.
+ *
  * RiscBSD kernel project
+ *
  * podulebus.c
+ *
  * Podule probe and configuration routines
+ *
  * Created      : 07/11/94
  */
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.33 2021/09/11 20:28:03 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.34 2022/05/30 09:56:02 andvar Exp $");
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <machine/io.h>
 #include <machine/intr.h>
 #include <machine/bootconfig.h>
 #include <machine/pmap.h>
 #include <arm/iomd/iomdreg.h>
 #include <arm/iomd/iomdvar.h>
 @@ -389,27 +389,27 @@ podulescan(device_t dev)
+		}
 		poduleexamine(podule, dev, SLOT_POD);
+	}
+}
 /*
  * void podulebusattach(device_t parent, device_t dev, void *aux)
+ *
  * Attach podulebus.
  * This probes all the podules and sets up the podules array with
  * information found in the podule headers.
- * After identifing all the podules, all the children of the podulebus
+ * After identifying all the podules, all the children of the podulebus
  * are probed and attached.
  */
 void
 podulebusattach(device_t parent, device_t self, void *aux)
+{
 	int loop;
 	struct podule_attach_args pa;
 #if 0
 	int easi_time;
 	int bit;
 #endif
 	unsigned int value;

 @@ -1,14 +1,14 @@
-/* $NetBSD: tsreg.h,v 1.10 2021/07/17 23:53:02 thorpej Exp $ */
+/* $NetBSD: tsreg.h,v 1.11 2022/05/30 09:56:02 andvar Exp $ */
 /*-
  * Copyright (c) 1999 by Ross Harvey.  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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -188,27 +188,27 @@
 #define	PCTL_THDIS	__BIT(2)	/* disable TLB anti-thrash (debug) */
 #define	PCTL_CHAINDIS	__BIT(3)	/* disable chaining */
 #define	PCTL_TGTLAT	__BIT(4)	/* target latency timers enable */
 #define	PCTL_HOLE	__BIT(5)	/* 512KB->1M hole enable */
 #define	PCTL_MWIN	__BIT(6)	/* monster window enable */
 #define	PCTL_PRIGRP	__BITS(8,14)	/* arbiter priority group */
 #define	PCTL_PPRI	__BIT(15)	/* arbiter priority group for Pchip */
 #define	PCTL_ECCEN	__BIT(18)	/* ECC enable for DMA and SGTE */
 #define	PCTL_PADM	__BIT(19)	/* PADbus mode */
 #define	PCTL_CDQMAX	__BITS(20,23)	/* see manual */
 #define	PCTL_REV	__BITS(24,31)	/* Pchip revision */
 #define	PCTL_CRQMAX	__BITS(32,35)	/* see manual */
 #define	PCTL_PTPMAX	__BITS(36,39)	/* see manual */
-#define	PCTL_PCLKX	__BITS(40,41)	/* PCI clock freq multipler */
+#define	PCTL_PCLKX	__BITS(40,41)	/* PCI clock freq multiplier */
 #define	PCTL_FDSDIS	__BIT(42)	/* fast DMA start and SGTE disable */
 #define	PCTL_FDWDIS	__BIT(43)	/* fast DMA read cache block disable */
 #define	PCTL_PTEVRFY	__BIT(44)	/* PTE verify for DMA read */
 #define	PCTL_RPP	__BIT(45)	/* remote Pchip present */
 #define	PCTL_PID	__BITS(46,47)	/* Pchip ID */
 #define P_PLAT		0x0340
 	/* reserved	0x0380 */
 #define P_PERROR	0x03c0
 #	define	PER_ERR(r)	TSFIELD((r),  0, 12)
 #	define	PER_ECC(r)	TSFIELD((r), 10, 2)
 #	define	PER_SADR(r)	TSFIELD((r), 16, 34)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.160 2022/03/16 20:31:01 andvar Exp $	*/
+/*	$NetBSD: locore.s,v 1.161 2022/05/30 09:56:02 andvar Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1980, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -685,27 +685,27 @@ ENTRY_NOPROFILE(lev7intr)
 	 * thing to do is to return as quick as possible. That's the
 	 * reason why I do RTE here instead of jra rei.
 	 */
 	rte				| all done
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifing that we need an AST we
+ * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.  A cleanup should only be needed at this
  * point for coprocessor mid-instruction frames (type 9), but we also test
  * for bus error frames (type 10 and 11).
  */
 ASENTRY_NOPROFILE(rei)
 #ifdef DEBUG
 	tstl	_C_LABEL(panicstr)	| have we panicked?
 	jne	Ldorte			| yes, do not make matters worse
 #endif
 	tstl	_C_LABEL(astpending)	| AST pending?

 @@ -1,14 +1,14 @@
-/*	$NetBSD: am335x_prcm.c,v 1.10 2017/08/23 14:14:59 skrll Exp $	*/
+/*	$NetBSD: am335x_prcm.c,v 1.11 2022/05/30 09:56:02 andvar Exp $	*/
 /*
  * TI OMAP Power, Reset, and Clock Management on the AM335x
  */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -24,27 +24,27 @@
  * ``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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am335x_prcm.c,v 1.10 2017/08/23 14:14:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am335x_prcm.c,v 1.11 2022/05/30 09:56:02 andvar Exp $");
 #include "tps65217pmic.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include <sys/pmf.h>
 #include <arm/omap/am335x_prcm.h>
 #include <arm/omap/omap2_reg.h>
 #include <arm/omap/omap2_prcm.h>
 #include <arm/omap/omap_var.h>
 @@ -135,27 +135,27 @@ prcm_mpu_pll_config(u_int mpupll_m)
+{
 	uint32_t clkmode = prcm_read_4(AM335X_PRCM_CM_WKUP, AM335X_PRCM_CM_CLKMODE_DPLL_MPU);
 	uint32_t clksel = prcm_read_4(AM335X_PRCM_CM_WKUP, AM335X_PRCM_CM_CLKSEL_DPLL_MPU);
 	//uint32_t div_m2 = prcm_read_4(AM335X_PRCM_CM_WKUP, AM335X_PRCM_CM_DIV_M2_DPLL_MPU);
 	/* Request the DPLL be put into bypass mode */
 	prcm_write_4(AM335X_PRCM_CM_WKUP, AM335X_PRCM_CM_CLKMODE_DPLL_MPU, AM335X_PRCM_CM_CLKMODE_DPLL_MN_BYP_MODE);
 	/* Wait for it to go into bypass */
 	while (prcm_read_4(AM335X_PRCM_CM_WKUP, AM335X_PRCM_CM_IDLEST_DPLL_MPU) != AM335X_PRCM_CM_IDLEST_DPLL_ST_DPLL_CLK_MN_BYPASS) {
 		/* nothing */
+	}
-	/* Replace multipler */
+	/* Replace multiplier */
 	clksel &= ~AM335X_PRCM_CM_CLKSEL_DPLL_MULT;
 	clksel |= __SHIFTIN(mpupll_m, AM335X_PRCM_CM_CLKSEL_DPLL_MULT);
 	prcm_write_4(AM335X_PRCM_CM_WKUP, AM335X_PRCM_CM_CLKSEL_DPLL_MPU, clksel);
 	/* Exit bypass mode */
 	clkmode |= AM335X_PRCM_CM_CLKMODE_DPLL_LOCK_MODE;
 	prcm_write_4(AM335X_PRCM_CM_WKUP, AM335X_PRCM_CM_CLKMODE_DPLL_MPU, clkmode);
 	/* Wait for the DPLL to lock */
 	while (prcm_read_4(AM335X_PRCM_CM_WKUP, AM335X_PRCM_CM_IDLEST_DPLL_MPU) != AM335X_PRCM_CM_IDLEST_DPLL_ST_DPLL_CLK_LOCKED) {
 		/* nothing */
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.115 2022/03/16 20:31:01 andvar Exp $	*/
+/*	$NetBSD: locore.s,v 1.116 2022/05/30 09:56:03 andvar Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1980, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -759,27 +759,27 @@ ENTRY_NOPROFILE(lev7intr)
 	addql	#1,_C_LABEL(intrcnt)+28	|  add another nmi interrupt
 	rte				|  all done
 #endif /* _ATARIHW_ */
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifing that we need an AST we
+ * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.  A cleanup should only be needed at this
  * point for coprocessor mid-instruction frames (type 9), but we also test
  * for bus error frames (type 10 and 11).
  */
 ASENTRY_NOPROFILE(rei)
 #ifdef DEBUG
 	tstl	_C_LABEL(panicstr)	|  have we panicked?
 	jne	Ldorte			|  yes, do not make matters worse
 #endif
 	tstl	_C_LABEL(astpending)	|  AST pending?

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.33 2018/12/19 13:57:46 maxv Exp $	*/
+/*	$NetBSD: locore.s,v 1.34 2022/05/30 09:56:03 andvar Exp $	*/
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -658,27 +658,27 @@ ENTRY_NOPROFILE(lev7intr)	/* level 7: pa
 	movl	%sp@(FR_SP),%a0		| restore
 	movl	%a0,%usp			|   user SP
 	moveml	%sp@+,#0x7FFF		| and remaining registers
 	addql	#8,%sp			| pop SP and stack adjust
 	jra	_ASM_LABEL(rei)		| all done
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifing that we need an AST we
+ * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 BSS(ssir,1)
 ASENTRY_NOPROFILE(rei)
 	tstl	_C_LABEL(astpending)	| AST pending?
 	jeq	Lchksir			| no, go check for SIR
 Lrei1:
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jne	Lchksir			| no, go check for SIR

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.172 2018/12/19 13:57:47 maxv Exp $	*/
+/*	$NetBSD: locore.s,v 1.173 2022/05/30 09:56:03 andvar Exp $	*/
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * 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
 @@ -969,27 +969,27 @@ ENTRY_NOPROFILE(lev7intr)	/* level 7: pa
 	movl	%a0,%sp@(FR_SP)		|   the user stack pointer
 	jbsr	_C_LABEL(nmihand)	| call handler
 	movl	%sp@(FR_SP),%a0		| restore
 	movl	%a0,%usp		|   user SP
 	moveml	%sp@+,#0x7FFF		| and remaining registers
 	addql	#8,%sp			| pop SP and stack adjust
 	jra	_ASM_LABEL(rei)		| all done
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing
  * ASTs (profiling, scheduling).
- * After identifing that we need an AST we drop the IPL
+ * After identifying that we need an AST we drop the IPL
  * to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 ASENTRY_NOPROFILE(rei)
 	tstl	_C_LABEL(astpending)	| AST pending?
 	jne	1f			| no, done
 	rte
 :
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jeq	2f			| no, done

 @@ -1,14 +1,14 @@
-/* $NetBSD: locore.s,v 1.66 2021/03/31 09:48:14 simonb Exp $ */
+/* $NetBSD: locore.s,v 1.67 2022/05/30 09:56:03 andvar Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -659,27 +659,27 @@ ENTRY_NOPROFILE(lev5intr)
 	INTERRUPT_RESTOREREG
 :
 	subql	#1,_C_LABEL(idepth)
 	jra	_ASM_LABEL(rei)		| all done
 #endif
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifing that we need an AST we
+ * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 ASENTRY_NOPROFILE(rei)
 	tstl	_C_LABEL(astpending)	| AST pending?
 	jne	1f			| no, done
 	rte
 :
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jeq	2f			| no, done

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.174 2021/03/14 03:25:01 rin Exp $	*/
+/*	$NetBSD: locore.s,v 1.175 2022/05/30 09:56:03 andvar Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -808,27 +808,27 @@ ENTRY_NOPROFILE(rtclock_intr)
 	CPUINFO_INCREMENT(CI_NINTR)
 	INTERRUPT_RESTOREREG
 	movw	%d2,%sr			| restore SPL
 	movl	%sp@+,%d2		| restore %d2
 	rts				| go back from whence we came
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifing that we need an AST we
+ * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 ASENTRY_NOPROFILE(rei)
 	tstl	_C_LABEL(astpending)	| AST pending?
 	jeq	.Lchksir		| no, go check for SIR
 .Lrei1:
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jne	.Lchksir		| no, go check for SIR
 	movw	#PSL_LOWIPL,%sr		| lower SPL
 @@ -1005,27 +1005,27 @@ ENTRY(spl0)
+ *
  * The branch target for the loops must be aligned on a half-line (8-byte)
  * boundary to minimize cache effects.  This guarantees both that there
  * will be no prefetch stalls due to cache line burst operations and that
  * the loops will run from a single cache half-line.
  */
 	.align	8			| align to half-line boundary
 					| (use nop instructions if necessary!)
 ALTENTRY(_delay, _delay)
 ENTRY(delay)
 	movl	%sp@(4),%d0		| get microseconds to delay
 	cmpl	#0x40000,%d0		| is it a "large" delay?
 	bls	.Ldelayshort		| no, normal calculation
-	movql	#0x7f,%d1		| adjust for scaled multipler (to
+	movql	#0x7f,%d1		| adjust for scaled multiplier (to
 	addl	%d1,%d0			|   avoid overflow)
 	lsrl	#7,%d0
 	mulul	_C_LABEL(delay_factor),%d0 | calculate number of loop iterations
 	bra	.Ldelaysetup		| go do it!
 .Ldelayshort:
 	mulul	_C_LABEL(delay_factor),%d0 | calculate number of loop iterations
 	lsrl	#7,%d0			| adjust for scaled multiplier
 .Ldelaysetup:
 	jeq	.Ldelayexit		| bail out if nothing to do
 	movql	#0,%d1			| put bits 15-0 in %d1 for the
 	movw	%d0,%d1			|   inner loop, and move bits
 	movw	#0,%d0			|   31-16 to the low-order word
 	subql	#1,%d1			|   of %d0 for the outer loop

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.117 2021/03/31 09:48:14 simonb Exp $	*/
+/*	$NetBSD: locore.s,v 1.118 2022/05/30 09:56:03 andvar Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -969,27 +969,27 @@ ENTRY_NOPROFILE(intrhand_vectored)
 	jbsr	_C_LABEL(isrdispatch_vectored) | call dispatcher
 	addql	#8,%sp
 Lintrhand_exit:
 	INTERRUPT_RESTOREREG
 	subql	#1,_C_LABEL(interrupt_depth)
 	/* FALLTHROUGH to rei */
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling).
- * After identifing that we need an AST we drop the IPL to allow device
+ * After identifying that we need an AST we drop the IPL to allow device
  * interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 ASENTRY_NOPROFILE(rei)
 	tstl	_C_LABEL(astpending)	| AST pending?
 	jeq	Ldorte			| Nope. Just return.
 	btst	#5,%sp@			| Returning to kernel mode?
 	jne	Ldorte			| Yup. Can't do ASTs
 	movw	#PSL_LOWIPL,%sr		| lower SPL
 	clrl	%sp@-			| stack adjust
 	moveml	#0xFFFF,%sp@-		| save all registers

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.67 2021/01/23 15:00:33 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.68 2022/05/30 09:56:03 andvar Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -803,27 +803,27 @@ ENTRY_NOPROFILE(intrhand_vectored)
 	movl	%d0,%sp@-		| push exception vector info
 	movl	%sp@(26),%sp@-		| and PC
 	jbsr	_C_LABEL(isrdispatch_vectored) | call dispatcher
 	lea	%sp@(12),%sp		| pop value args
 	INTERRUPT_RESTOREREG
 	subql	#1,_C_LABEL(idepth)
 	rte
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing
  * ASTs (profiling, scheduling).
- * After identifing that we need an AST we drop the IPL
+ * After identifying that we need an AST we drop the IPL
  * to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 /*
  * news68k has hardware support for AST,
  * so only traps (including system call) and
  * the AST interrupt use this REI function.
  */
 ASENTRY_NOPROFILE(rei)
 	tstl	_C_LABEL(astpending)	| AST pending?

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.67 2021/01/25 13:08:05 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.68 2022/05/30 09:56:03 andvar Exp $	*/
 /*
  * Copyright (c) 1998 Darrin B. Jewell
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -803,27 +803,27 @@ Lintrhand_exit:
 	INTERRUPT_RESTOREREG
 	subql	#1,_C_LABEL(interrupt_depth)
 	/* FALLTHROUGH to rei */
 	jra	_ASM_LABEL(rei)		| all done
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifing that we need an AST we
+ * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 ASENTRY_NOPROFILE(rei)
 	tstl	_C_LABEL(astpending)	| AST pending?
 	jeq	Lchksir			| no, go check for SIR
 Lrei1:
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jne	Lchksir			| no, go check for SIR
 	movw	#PSL_LOWIPL,%sr		| lower SPL

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.120 2018/12/19 13:57:51 maxv Exp $	*/
+/*	$NetBSD: locore.s,v 1.121 2022/05/30 09:56:03 andvar Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -711,27 +711,27 @@ ENTRY_NOPROFILE(lev7intr)
  * floppy ejection trap
  */
 ENTRY_NOPROFILE(fdeject)
 	jra	_ASM_LABEL(rei)
 /*
  * Emulation of VAX REI instruction.
+ *
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
- * do not have to do it here.  After identifing that we need an AST we
+ * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 ASENTRY_NOPROFILE(rei)
 	tstl	_C_LABEL(astpending)	| AST pending?
 	jne	1f			| no, done
 	rte
 :
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	beq	2f			| no, done

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i2o.h,v 1.16 2017/10/28 06:27:32 riastradh Exp $	*/
+/*	$NetBSD: i2o.h,v 1.17 2022/05/30 09:56:04 andvar Exp $	*/
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -712,63 +712,63 @@ struct i2o_param_ddm_identity {
 	u_int8_t	serialnumber[12];
 } __packed;
 /*
  * ================= Block storage class messages =================
  */
 #define	I2O_RBS_BLOCK_READ		0x30
 struct i2o_rbs_block_read {
 	u_int32_t	msgflags;
 	u_int32_t	msgfunc;
 	u_int32_t	msgictx;
 	u_int32_t	msgtctx;
-	u_int32_t	flags;		/* flags, time multipler, read ahead */
+	u_int32_t	flags;		/* flags, time multiplier, read ahead */
 	u_int32_t	datasize;
 	u_int32_t	lowoffset;
 	u_int32_t	highoffset;
 } __packed;
 #define	I2O_RBS_BLOCK_READ_NO_RETRY	0x01
 #define	I2O_RBS_BLOCK_READ_SOLO		0x02
 #define	I2O_RBS_BLOCK_READ_CACHE_READ	0x04
 #define	I2O_RBS_BLOCK_READ_PREFETCH	0x08
 #define	I2O_RBS_BLOCK_READ_CACHE_ONLY	0x10
 #define	I2O_RBS_BLOCK_WRITE             0x31
 struct i2o_rbs_block_write {
 	u_int32_t	msgflags;
 	u_int32_t	msgfunc;
 	u_int32_t	msgictx;
 	u_int32_t	msgtctx;
-	u_int32_t	flags;		/* flags, time multipler */
+	u_int32_t	flags;		/* flags, time multiplier */
 	u_int32_t	datasize;
 	u_int32_t	lowoffset;
 	u_int32_t	highoffset;
 } __packed;
 #define	I2O_RBS_BLOCK_WRITE_NO_RETRY	0x01
 #define	I2O_RBS_BLOCK_WRITE_SOLO	0x02
 #define	I2O_RBS_BLOCK_WRITE_CACHE_NONE	0x04
 #define	I2O_RBS_BLOCK_WRITE_CACHE_WT	0x08
 #define	I2O_RBS_BLOCK_WRITE_CACHE_WB	0x10
 #define	I2O_RBS_CACHE_FLUSH             0x37
 struct i2o_rbs_cache_flush {
 	u_int32_t	msgflags;
 	u_int32_t	msgfunc;
 	u_int32_t	msgictx;
 	u_int32_t	msgtctx;
-	u_int32_t	flags;		/* flags, time multipler */
+	u_int32_t	flags;		/* flags, time multiplier */
 } __packed;
 #define	I2O_RBS_MEDIA_MOUNT		0x41
 struct i2o_rbs_media_mount {
 	u_int32_t	msgflags;
 	u_int32_t	msgfunc;
 	u_int32_t	msgictx;
 	u_int32_t	msgtctx;
 	u_int32_t	mediaid;
 	u_int32_t	loadflags;
 } __packed;
 #define	I2O_RBS_MEDIA_EJECT             0x43

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd1190reg.h,v 1.5 2008/07/02 10:16:20 plunky Exp $	*/
+/*	$NetBSD: cd1190reg.h,v 1.6 2022/05/30 09:56:04 andvar Exp $	*/
 /*-
  * Copyright (c) 1998 Iain Hibbert.
  * 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.
 @@ -158,18 +158,18 @@
 #define CD1190_SR1_IP2		(1<<5) /* IP2 0 to 1 Change */
 #define CD1190_SR1_IP1		(1<<4) /* IP1 0 to 1 Change */
 /* Signal Status Register */
 #define CD1190_SSR		0x0d
 #define CD1190_SSR_WRRD		(1<<7) /* WR/RD Change */
 #define CD1190_SSR_IP3		(1<<6) /* IP3 Change */
 #define CD1190_SSR_IP2		(1<<5) /* IP2 Change */
 #define CD1190_SSR_IP1		(1<<4) /* IP1 Change */
 /* Strobe Width Register */
 #define CD1190_SWR		0x02
-/* Timer Multipler Register */
+/* Timer Multiplier Register */
 #define CD1190_TMR		0x05
 /* Timer Prescale Register */
 #define CD1190_TPR		0x04