Thu Oct 7 12:52:27 2021 UTC ()

KNF. No functional change.


(msaitoh)

diff -r1.82 -r1.83 src/sys/arch/x86/x86/bus_dma.c
diff -r1.45 -r1.46 src/sys/arch/x86/x86/bus_space.c
diff -r1.33 -r1.34 src/sys/arch/x86/x86/consinit.c
diff -r1.37 -r1.38 src/sys/arch/x86/x86/coretemp.c
diff -r1.201 -r1.202 src/sys/arch/x86/x86/cpu.c
diff -r1.19 -r1.20 src/sys/arch/x86/x86/cpu_rng.c
diff -r1.11 -r1.12 src/sys/arch/x86/x86/db_memrw.c
diff -r1.11 -r1.12 src/sys/arch/x86/x86/linux_trap.c
diff -r1.11 -r1.12 src/sys/arch/x86/x86/powernow.c
diff -r1.21 -r1.22 src/sys/arch/x86/x86/efi.c
diff -r1.26 -r1.27 src/sys/arch/x86/x86/errata.c
diff -r1.32 -r1.33 src/sys/arch/x86/x86/est.c
diff -r1.121 -r1.122 src/sys/arch/x86/x86/identcpu.c
diff -r1.24 -r1.25 src/sys/arch/x86/x86/intel_busclock.c
diff -r1.155 -r1.156 src/sys/arch/x86/x86/intr.c
diff -r1.64 -r1.65 src/sys/arch/x86/x86/ioapic.c
diff -r1.85 -r1.86 src/sys/arch/x86/x86/lapic.c
diff -r1.6 -r1.7 src/sys/arch/x86/x86/mp.c
diff -r1.107 -r1.108 src/sys/arch/x86/x86/mpacpi.c
diff -r1.70 -r1.71 src/sys/arch/x86/x86/mpbios.c
diff -r1.31 -r1.32 src/sys/arch/x86/x86/mtrr_i686.c
diff -r1.7 -r1.8 src/sys/arch/x86/x86/multiboot2.c
diff -r1.411 -r1.412 src/sys/arch/x86/x86/pmap.c
diff -r1.41 -r1.42 src/sys/arch/x86/x86/procfs_machdep.c
diff -r1.35 -r1.36 src/sys/arch/x86/x86/spectre.c
diff -r1.39 -r1.40 src/sys/arch/x86/x86/svs.c
diff -r1.56 -r1.57 src/sys/arch/x86/x86/sys_machdep.c
diff -r1.18 -r1.19 src/sys/arch/x86/x86/syscall.c
diff -r1.18 -r1.19 src/sys/arch/x86/x86/x86_tlb.c
diff -r1.8 -r1.9 src/sys/arch/x86/x86/viac7temp.c
diff -r1.84 -r1.85 src/sys/arch/x86/x86/x86_autoconf.c
diff -r1.2 -r1.3 src/sys/arch/x86/x86/x86_ipmi.c
diff -r1.148 -r1.149 src/sys/arch/x86/x86/x86_machdep.c

--- src/sys/arch/x86/x86/bus_dma.c 2020/03/14 18:08:38	1.82
+++ src/sys/arch/x86/x86/bus_dma.c 2021/10/07 12:52:27	1.83

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_dma.c,v 1.82 2020/03/14 18:08:38 ad Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.83 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2007, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility NASA Ames Research Center, and 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
 @@ -21,27 +21,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: bus_dma.c,v 1.82 2020/03/14 18:08:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.83 2021/10/07 12:52:27 msaitoh Exp $");
 /*
  * The following is included because _bus_dma_uiomove is derived from
  * uiomove() in kern_subr.c.
  */
 /*
  * Copyright (c) 1982, 1986, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
 @@ -202,28 +202,28 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t,
 	struct pglist mlist;
 	int curseg, error;
 	bus_size_t uboundary;
 	/* Always round the size. */
 	size = round_page(size);
 	KASSERT(boundary >= PAGE_SIZE || boundary == 0);
 	/*
 	 * Allocate pages from the VM system.
 	 * We accept boundaries < size, splitting in multiple segments
 	 * if needed. uvm_pglistalloc does not, so compute an appropriate
-         * boundary: next power of 2 >= size
+	 * boundary: next power of 2 >= size
-         */
+	 */
 	if (boundary == 0)
 		uboundary = 0;
 	else {
 		uboundary = boundary;
 		while (uboundary < size)
 			uboundary = uboundary << 1;
+	}
 	error = uvm_pglistalloc(size, low, high, alignment, uboundary,
 	    &mlist, nsegs, (flags & BUS_DMA_NOWAIT) == 0);
 	if (error)
 		return (error);
 @@ -1162,28 +1162,28 @@ _bus_dmamem_unmap(bus_dma_tag_t t, void
 	pt_entry_t *pte, opte;
 	vaddr_t va, sva, eva;
 #ifdef DIAGNOSTIC
 	if ((u_long)kva & PGOFSET)
 		panic("_bus_dmamem_unmap");
 #endif
 	size = round_page(size);
 	sva = (vaddr_t)kva;
 	eva = sva + size;
 	/*
-         * mark pages cacheable again.
+	 * mark pages cacheable again.
-         */
+	 */
 	for (va = sva; va < eva; va += PAGE_SIZE) {
 		pte = kvtopte(va);
 		opte = *pte;
 		if ((opte & PTE_PCD) != 0)
 			pmap_pte_clearbits(pte, PTE_PCD);
+	}
 	pmap_remove(pmap_kernel(), (vaddr_t)kva, (vaddr_t)kva + size);
 	pmap_update(pmap_kernel());
 	uvm_km_free(kernel_map, (vaddr_t)kva, size, UVM_KMF_VAONLY);
+}
 /*
  * Common function for mmap(2)'ing DMA-safe memory.  May be called by

--- src/sys/arch/x86/x86/bus_space.c 2020/04/25 15:26:18	1.45
+++ src/sys/arch/x86/x86/bus_space.c 2021/10/07 12:52:27	1.46

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.45 2020/04/25 15:26:18 bouyer Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.46 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * 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
 @@ -21,53 +21,53 @@
  * ``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: bus_space.c,v 1.45 2020/04/25 15:26:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.46 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/kmem.h>
 #include <uvm/uvm_extern.h>
 #include <dev/isa/isareg.h>
 #include <sys/bus.h>
 #include <machine/pio.h>
 #include <machine/isa_machdep.h>
 #ifdef XEN
 #include <xen/hypervisor.h>
 #endif
 /*
  * Macros for sanity-checking the aligned-ness of pointers passed to
  * bus space ops.  These are not strictly necessary on the x86, but
  * could lead to performance improvements, and help catch problems
  * with drivers that would creep up on other architectures.
  */
 #ifdef BUS_SPACE_DEBUG
 #define	BUS_SPACE_ALIGNED_ADDRESS(p, t)				\
 	((((u_long)(p)) & (sizeof(t)-1)) == 0)
 #define	BUS_SPACE_ADDRESS_SANITY(p, t, d)				\
 ({									\
 	if (BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) {			\
 		printf("%s 0x%lx not aligned to %zu bytes %s:%d\n",	\
 		    d, (u_long)(p), sizeof(t), __FILE__, __LINE__);	\
 	}								\
 	(void) 0;							\
 })
 #else
 #define	BUS_SPACE_ADDRESS_SANITY(p,t,d)	(void) 0

--- src/sys/arch/x86/x86/consinit.c 2020/05/02 16:44:36	1.33
+++ src/sys/arch/x86/x86/consinit.c 2021/10/07 12:52:27	1.34

 @@ -1,14 +1,14 @@
-/*	$NetBSD: consinit.c,v 1.33 2020/05/02 16:44:36 bouyer Exp $	*/
+/*	$NetBSD: consinit.c,v 1.34 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 1998
  *	Matthias Drochner.  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: consinit.c,v 1.33 2020/05/02 16:44:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.34 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_kgdb.h"
 #include "opt_puc.h"
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <machine/bootinfo.h>
 #include <arch/x86/include/genfb_machdep.h>
 @@ -267,20 +267,20 @@ dokbd:
 		nullcninit(0);
 		return;
+	}
 #endif
 	panic("invalid console device %s", consinfo->devname);
+}
 #ifdef KGDB
 void
 kgdb_port_init(void)
+{
 #if (NCOM > 0)
-	if(!strcmp(kgdb_devname, "com")) {
+	if (!strcmp(kgdb_devname, "com")) {
 		com_kgdb_attach(x86_bus_space_io, comkgdbaddr, comkgdbrate,
 		    COM_FREQ, COM_TYPE_NORMAL, comkgdbmode);
+	}
 #endif
+}
 #endif

--- src/sys/arch/x86/x86/coretemp.c 2020/03/27 09:47:03	1.37
+++ src/sys/arch/x86/x86/coretemp.c 2021/10/07 12:52:27	1.38

 @@ -1,14 +1,14 @@
-/* $NetBSD: coretemp.c,v 1.37 2020/03/27 09:47:03 msaitoh Exp $ */
+/* $NetBSD: coretemp.c,v 1.38 2021/10/07 12:52:27 msaitoh Exp $ */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jukka Ruohonen.
+ *
  * 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
 @@ -51,27 +51,27 @@
  * 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.
+ *
  * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.4 2007/10/15 20:00:21 netchild Exp $
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.37 2020/03/27 09:47:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.38 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <sys/module.h>
 #include <sys/xcall.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <machine/cpuvar.h>
 #include <machine/cpufunc.h>
 #include <machine/cputypes.h>
 #include <machine/specialreg.h>
 @@ -324,27 +324,27 @@ notee:
 static void
 coretemp_refresh(struct sysmon_envsys *sme, envsys_data_t *edata)
+{
 	struct coretemp_softc *sc = sme->sme_cookie;
 	uint64_t xc;
 	xc = xc_unicast(0, coretemp_refresh_xcall, sc, edata, sc->sc_ci);
 	xc_wait(xc);
+}
 static void
 coretemp_refresh_xcall(void *arg0, void *arg1)
+{
-        struct coretemp_softc *sc = arg0;
+	struct coretemp_softc *sc = arg0;
 	envsys_data_t *edata = arg1;
 	uint64_t msr;
 	msr = rdmsr(MSR_THERM_STATUS);
 	if ((msr & MSR_THERM_STATUS_VALID) == 0)
 		edata->state = ENVSYS_SINVALID;
 	else {
 		/*
 		 * The temperature is computed by
 		 * subtracting the reading by Tj(max).
 		 */
 		edata->value_cur = sc->sc_tjmax;

--- src/sys/arch/x86/x86/cpu.c 2021/08/07 16:19:08	1.201
+++ src/sys/arch/x86/x86/cpu.c 2021/10/07 12:52:27	1.202

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.201 2021/08/07 16:19:08 thorpej Exp $	*/
+/*	$NetBSD: cpu.c,v 1.202 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 2000-2020 NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld of RedBack Networks Inc, and 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.
 @@ -52,27 +52,27 @@
  * 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 AUTHOR AND 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: cpu.c,v 1.201 2021/08/07 16:19:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.202 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "opt_multiprocessor.h"
 #include "opt_svs.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include "acpica.h"
 #include "hpet.h"
 #include <sys/param.h>
 @@ -1331,27 +1331,27 @@ cpu_get_tsc_freq(struct cpu_info *ci)
 		 * freq from CPUID by calling cpu_tsc_freq_cpuid().
 		 * The function also set lapic_per_second variable if it's
 		 * known. This is required for Intel's Comet Lake and newer
 		 * processors to set LAPIC timer correctly.
 		 */
 		if (ci->ci_data.cpu_cc_freq == 0)
 			freq = freq_from_cpuid = cpu_tsc_freq_cpuid(ci);
 #if NHPET > 0
 		if (freq == 0)
 			freq = hpet_tsc_freq();
 #endif
 		if (freq == 0) {
 			/*
 			 * Work out the approximate overhead involved below.
 			 * Discard the result of the first go around the
 			 * loop.
 			 */
 			overhead = 0;
 			for (int i = 0; i <= 8; i++) {
 				t0 = cpu_counter();
 				delay_func(0);
 				t1 = cpu_counter();
 				if (i > 0) {
 					overhead += (t1 - t0);
+				}
+			}
 			overhead >>= 3;

--- src/sys/arch/x86/x86/cpu_rng.c 2020/07/30 17:26:23	1.19
+++ src/sys/arch/x86/x86/cpu_rng.c 2021/10/07 12:52:27	1.20

 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu_rng.c,v 1.19 2020/07/30 17:26:23 riastradh Exp $ */
+/* $NetBSD: cpu_rng.c,v 1.20 2021/10/07 12:52:27 msaitoh Exp $ */
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Thor Lancelot Simon.
+ *
  * 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.
 @@ -144,27 +144,27 @@ cpu_rng_rdseed(uint64_t *out)
 	/*
 	 * XXX The Intel DRNG SIG recommends (Sec. 5.3.1 `Retry
 	 * recommendations', p. 22) that we consider retrying up to 100
 	 * times, separated by PAUSE, but offers no guarantees about
 	 * success after that many retries.  In particular, userland
 	 * threads could starve the kernel by issuing RDSEED.
 	 */
 #ifdef __i386__
 	uint32_t lo, hi;
 	__asm __volatile("rdseed %0; setc %1" : "=r"(lo), "=qm"(rndsts));
-        if (rndsts != 1)
+	if (rndsts != 1)
 		return 0;
 	__asm __volatile("rdseed %0; setc %1" : "=r"(hi), "=qm"(rndsts));
 	if (rndsts != 1)
 		return 0;
 	*out = (uint64_t)lo | ((uint64_t)hi << 32);
 	explicit_memset(&lo, 0, sizeof(lo));
 	explicit_memset(&hi, 0, sizeof(hi));
 #else
 	__asm __volatile("rdseed %0; setc %1" : "=r"(*out), "=qm"(rndsts));
 #endif
 	if (rndsts != 1)
 		return 0;

--- src/sys/arch/x86/x86/db_memrw.c 2019/04/21 06:37:21	1.11
+++ src/sys/arch/x86/x86/db_memrw.c 2021/10/07 12:52:27	1.12

 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_memrw.c,v 1.11 2019/04/21 06:37:21 maxv Exp $	*/
+/*	$NetBSD: db_memrw.c,v 1.12 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by 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.
 @@ -38,32 +38,32 @@
  * the page writable, do the write, then restore the PTE.
  * For writes outside the text segment, and all reads,
  * just do the access -- if it causes a fault, the debugger
  * will recover with a longjmp to an appropriate place.
+ *
  * ALERT!  If you want to access device registers with a
  * specific size, then the read/write functions have to
  * make sure to do the correct sized pointer access.
+ *
  * Modified for i386 from hp300 version by
  * Jason R. Thorpe <thorpej@zembu.com>.
+ *
  * Basic copy to amd64 by fvdl.
+ *
  * i386 and amd64 merge by jym.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.11 2019/04/21 06:37:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.12 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <machine/db_machdep.h>
 #include <ddb/db_access.h>
 #include <ddb/db_output.h>
 static int
 db_validate_address(vaddr_t addr)
+{

--- src/sys/arch/x86/x86/linux_trap.c 2012/02/19 21:06:35	1.11
+++ src/sys/arch/x86/x86/linux_trap.c 2021/10/07 12:52:27	1.12

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_trap.c,v 1.11 2012/02/19 21:06:35 rmind Exp $	*/
+/*	$NetBSD: linux_trap.c,v 1.12 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
  */
 /*
  * x86 Trap and System call handling
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_trap.c,v 1.11 2012/02/19 21:06:35 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_trap.c,v 1.12 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 #include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/syscall.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 @@ -87,88 +87,88 @@ struct linux_user_desc {
 #define LINUX_T_INVALID_TSS		10
 #define LINUX_T_SEG_NOT_PRESENT		11
 #define LINUX_T_STACK_SEG_FAULT		12
 #define LINUX_T_GENERAL_PROT_FAULT	13
 #define LINUX_T_PAGE_FAULT		14
 #define LINUX_T_SPURIOUS_INTERRUPT	15
 #define LINUX_T_COPROC_ERROR		16
 #define LINUX_T_ALIGN_CHECK		17
 #define LINUX_T_MACHINE_CHECK		18	/* XXX */
 #define LINUX_T_SIMD_COPROC_ERROR	19	/* XXX */
 /* Note 255 is bogus */
 static const int trapno_to_x86_vec[] = {
- 	LINUX_T_INVALID_OP,		/*  0 T_PRIVINFLT */
+	LINUX_T_INVALID_OP,		/*  0 T_PRIVINFLT */
- 	LINUX_T_INT3,			/*  1 T_BPTFLT */
+	LINUX_T_INT3,			/*  1 T_BPTFLT */
- 	LINUX_T_COPROC_ERROR,		/*  2 T_ARITHTRAP */
+	LINUX_T_COPROC_ERROR,		/*  2 T_ARITHTRAP */
- 	LINUX_T_SPURIOUS_INTERRUPT,	/*  3 T_ASTFLT XXX: ??? */
+	LINUX_T_SPURIOUS_INTERRUPT,	/*  3 T_ASTFLT XXX: ??? */
- 	LINUX_T_GENERAL_PROT_FAULT,	/*  4 T_PROTFLT */
+	LINUX_T_GENERAL_PROT_FAULT,	/*  4 T_PROTFLT */
- 	LINUX_T_DEBUG,			/*  5 T_TRCTRAP */
+	LINUX_T_DEBUG,			/*  5 T_TRCTRAP */
- 	LINUX_T_PAGE_FAULT,		/*  6 T_PAGEFLT */
+	LINUX_T_PAGE_FAULT,		/*  6 T_PAGEFLT */
- 	LINUX_T_ALIGN_CHECK,		/*  7 T_ALIGNFLT */
+	LINUX_T_ALIGN_CHECK,		/*  7 T_ALIGNFLT */
- 	LINUX_T_DIVIDE,			/*  8 T_DIVIDE */
+	LINUX_T_DIVIDE,			/*  8 T_DIVIDE */
- 	LINUX_T_NMI,			/*  9 T_NMI */
+	LINUX_T_NMI,			/*  9 T_NMI */
- 	LINUX_T_OVERFLOW,		/* 10 T_OFLOW */
+	LINUX_T_OVERFLOW,		/* 10 T_OFLOW */
- 	LINUX_T_BOUNDS,			/* 11 T_BOUND */
+	LINUX_T_BOUNDS,			/* 11 T_BOUND */
- 	LINUX_T_DEVICE_NOT_AVAIL,	/* 12 T_DNA */
+	LINUX_T_DEVICE_NOT_AVAIL,	/* 12 T_DNA */
- 	LINUX_T_DOUBLE_FAULT,		/* 13 T_DOUBLEFLT */
+	LINUX_T_DOUBLE_FAULT,		/* 13 T_DOUBLEFLT */
- 	LINUX_T_COPROC_SEG_OVERRUN,	/* 14 T_FPOPFLT */
+	LINUX_T_COPROC_SEG_OVERRUN,	/* 14 T_FPOPFLT */
- 	LINUX_T_INVALID_TSS,		/* 15 T_TSSFLT */
+	LINUX_T_INVALID_TSS,		/* 15 T_TSSFLT */
- 	LINUX_T_SEG_NOT_PRESENT,	/* 16 T_SEGNPFLT */
+	LINUX_T_SEG_NOT_PRESENT,	/* 16 T_SEGNPFLT */
- 	LINUX_T_STACK_SEG_FAULT,	/* 17 T_STKFLT */
+	LINUX_T_STACK_SEG_FAULT,	/* 17 T_STKFLT */
- 	LINUX_T_MACHINE_CHECK		/* 18 T_RESERVED XXX: ??? */
+	LINUX_T_MACHINE_CHECK		/* 18 T_RESERVED XXX: ??? */
 };
 /* For the nmi and reserved below linux does not post a signal. */
 static const int linux_x86_vec_to_sig[] = {
 	SIGFPE,				/*  0 LINUX_T_DIVIDE */
 	SIGTRAP,			/*  1 LINUX_T_DEBUG */
 /*nmi*/	SIGSEGV,			/*  2 LINUX_T_NMI */
 	SIGTRAP,			/*  3 LINUX_T_INT3 */
- 	SIGSEGV,			/*  4 LINUX_T_OVERFLOW */
+	SIGSEGV,			/*  4 LINUX_T_OVERFLOW */
 	SIGSEGV,			/*  5 LINUX_T_BOUNDS */
 	SIGILL,				/*  6 LINUX_T_INVALIDOP */
 	SIGSEGV,			/*  7 LINUX_T_DEVICE_NOT_AVAIL */
- 	SIGSEGV,			/*  8 LINUX_T_DOUBLE_FAULT */
+	SIGSEGV,			/*  8 LINUX_T_DOUBLE_FAULT */
 	SIGFPE,				/*  9 LINUX_T_COPROC_SEG_OVERRUN */
 	SIGSEGV,			/* 10 LINUX_T_INVALID_TSS */
 	SIGBUS,				/* 11 LINUX_T_SEG_NOT_PRESENT */
- 	SIGBUS,				/* 12 LINUX_T_STACK_SEG_FAULT */
+	SIGBUS,				/* 12 LINUX_T_STACK_SEG_FAULT */
 	SIGSEGV,			/* 13 LINUX_T_GENERAL_PROT_FAULT */
 	SIGSEGV,			/* 14 LINUX_T_PAGE_FAULT */
 /*resv*/SIGSEGV,			/* 15 LINUX_T_SPURIOUS_INTERRUPT */
- 	SIGFPE,				/* 16 LINUX_T_COPROC_ERROR */
+	SIGFPE,				/* 16 LINUX_T_COPROC_ERROR */
 	SIGSEGV,			/* 17 LINUX_T_ALIGN_CHECK */
 	SIGSEGV				/* 18 LINUX_T_MACHINE_CHECK */
 };
 void
 linux_trapsignal(struct lwp *l, ksiginfo_t *ksi)
+{
 	ksiginfo_t nksi;
 	switch (ksi->ksi_signo) {
 	case SIGILL:
 	case SIGTRAP:
 	case SIGIOT:
 	case SIGBUS:
 	case SIGFPE:
 	case SIGSEGV:
 		KASSERT(KSI_TRAP_P(ksi));
 		if (ksi->ksi_trap < __arraycount(trapno_to_x86_vec)) {
 			nksi = *ksi;
 			nksi.ksi_trap = trapno_to_x86_vec[ksi->ksi_trap];
 			if (nksi.ksi_trap < __arraycount(linux_x86_vec_to_sig)) {
 				nksi.ksi_signo
 				    = linux_x86_vec_to_sig[nksi.ksi_trap];
 			} else {
 				uprintf("Unhandled sig type %d\n",
 				    ksi->ksi_trap);
+			}
 			ksi = &nksi;
 		} else {
 			uprintf("Unhandled trap type %d\n", ksi->ksi_trap);
+		}
 		/*FALLTHROUGH*/
 	default:
 		trapsignal(l, ksi);

--- src/sys/arch/x86/x86/powernow.c 2020/10/25 16:39:00	1.11
+++ src/sys/arch/x86/x86/powernow.c 2021/10/07 12:52:27	1.12

 @@ -1,14 +1,14 @@
-/*	$NetBSD: powernow.c,v 1.11 2020/10/25 16:39:00 nia Exp $ */
+/*	$NetBSD: powernow.c,v 1.12 2021/10/07 12:52:27 msaitoh Exp $ */
 /*	$OpenBSD: powernow-k8.c,v 1.8 2006/06/16 05:58:50 gwk Exp $ */
 /*-
  * Copyright (c) 2004, 2006, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juan Romero Pardines and Martin Vegiard.
+ *
  * 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
 @@ -47,27 +47,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: powernow.c,v 1.11 2020/10/25 16:39:00 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powernow.c,v 1.12 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <dev/isa/isareg.h>
 #include <x86/cpuvar.h>
 #include <x86/cputypes.h>
 #include <x86/cpu_msr.h>
 @@ -85,27 +85,27 @@ static int powernow_k7_fidtomult[32] = {
 , 75, 80, 85, 90, 95, 100, 105,
 , 190, 40, 200, 130, 135, 140, 210,
 , 225, 160, 165, 170, 180, -1, -1
 };
 /*
  * The following CPUs do not have same CPUID signature
  * in the PST tables, but they have correct FID/VID values.
  */
 static struct powernow_k7_quirk {
 	uint32_t rcpusig;	/* Correct cpu signature */
 	uint32_t pcpusig;	/* PST cpu signature */
 } powernow_k7_quirk[] = {
-	{ 0x680, 0x780 }, 	/* Reported by Olaf 'Rhialto' Seibert */
+	{ 0x680, 0x780 },	/* Reported by Olaf 'Rhialto' Seibert */
 	{ 0x6a0, 0x781 },	/* Reported by Eric Schnoebelen */
 	{ 0x6a0, 0x7a0 },	/* Reported by Nino Dehne */
 	{ 0, 0 }
 };
 #endif	/* __i386__ */
 struct powernow_softc {
 	device_t		   sc_dev;
 	struct cpu_info		  *sc_ci;
 	struct sysctllog	  *sc_log;
 	struct powernow_cpu_state *sc_state;
 	const char		  *sc_tech;
 @@ -483,27 +483,27 @@ powernow_k7_states(device_t self, unsign
 			for (maxpst = 0; maxpst < psb->n_pst; maxpst++) {
 				pst = (struct powernow_pst_s*) p;
 				/*
 				 * Some models do not have same CPUID
 				 * signature in the PST table. Accept to
 				 * report frequencies via a quirk table
 				 * and fid/vid match.
 				 */
 				DPRINTF(("%s: cpusig=0x%x pst->sig:0x%x\n",
 				    __func__, cpusig, pst->signature));
 				cpusig_ok = powernow_k7_check(cpusig,
-				                              pst->signature);
+							      pst->signature);
 				if ((cpusig_ok != false &&
 				    (fid == pst->fid && vid == pst->vid))) {
 					DPRINTF(("%s: pst->signature ok\n",
 					    __func__));
 					if (abs(cstate->fsb - pst->pll) > 5)
 						continue;
 					cstate->n_states = pst->n_states;
 					return (powernow_k7_decode_pst(sc,
 					    p + sizeof(struct powernow_pst_s),
 					    cstate->n_states));
+				}
 @@ -744,27 +744,27 @@ powernow_k8_states(device_t self, unsign
 		if (psb->version != 0x14) {
 			DPRINTF(("%s: psb->version != 0x14\n", __func__));
 			return 0;
+		}
 		cstate->vst = psb->ttime;
 		cstate->rvo = PN8_PSB_TO_RVO(psb->reserved);
 		cstate->irt = PN8_PSB_TO_IRT(psb->reserved);
 		cstate->mvs = PN8_PSB_TO_MVS(psb->reserved);
 		cstate->low = PN8_PSB_TO_BATT(psb->reserved);
 		p += sizeof(struct powernow_psb_s);
-		for(i = 0; i < psb->n_pst; ++i) {
+		for (i = 0; i < psb->n_pst; ++i) {
 			pst = (struct powernow_pst_s *)p;
 			cstate->pll = pst->pll;
 			cstate->n_states = pst->n_states;
 			if (cpusig == pst->signature &&
 			    pst->fid == fid && pst->vid == vid) {
 				DPRINTF(("%s: cpusig = sig\n", __func__));
 				return (powernow_k8_decode_pst(cstate,
 				    p+= sizeof(struct powernow_pst_s)));

--- src/sys/arch/x86/x86/Attic/efi.c 2019/12/10 02:06:07	1.21
+++ src/sys/arch/x86/x86/Attic/efi.c 2021/10/07 12:52:27	1.22

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efi.c,v 1.21 2019/12/10 02:06:07 manu Exp $	*/
+/*	$NetBSD: efi.c,v 1.22 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * 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,78 +17,78 @@
  * ``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: efi.c,v 1.21 2019/12/10 02:06:07 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.22 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/kmem.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/uuid.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootinfo.h>
 #include <x86/bus_defs.h>
 #include <x86/bus_funcs.h>
 #include <x86/efi.h>
 #include <dev/mm.h>
 #if NPCI > 0
 #include <dev/pci/pcivar.h> /* for pci_mapreg_map_enable_decode */
 #endif
 const struct uuid EFI_UUID_ACPI20 = EFI_TABLE_ACPI20;
 const struct uuid EFI_UUID_ACPI10 = EFI_TABLE_ACPI10;
 const struct uuid EFI_UUID_SMBIOS = EFI_TABLE_SMBIOS;
 const struct uuid EFI_UUID_SMBIOS3 = EFI_TABLE_SMBIOS3;
-static vaddr_t 	efi_getva(paddr_t);
+static vaddr_t	efi_getva(paddr_t);
-static void 	efi_relva(paddr_t, vaddr_t);
+static void	efi_relva(paddr_t, vaddr_t);
 struct efi_cfgtbl *efi_getcfgtblhead(void);
-void 		efi_aprintcfgtbl(void);
+void		efi_aprintcfgtbl(void);
-void 		efi_aprintuuid(const struct uuid *);
+void		efi_aprintuuid(const struct uuid *);
-bool 		efi_uuideq(const struct uuid *, const struct uuid *);
+bool		efi_uuideq(const struct uuid *, const struct uuid *);
 static bool efi_is32x64 = false;
 static paddr_t efi_systbl_pa;
 static struct efi_systbl *efi_systbl_va = NULL;
 static struct efi_cfgtbl *efi_cfgtblhead_va = NULL;
 static struct efi_e820memmap {
 	struct btinfo_memmap bim;
 	struct bi_memmap_entry entry[VM_PHYSSEG_MAX - 1];
 } efi_e820memmap;
 /*
  * Map a physical address (PA) to a newly allocated virtual address (VA).
  * The VA must be freed using efi_relva().
  */
 static vaddr_t
 efi_getva(paddr_t pa)
+{
 	vaddr_t va;
 	int rv;
 	rv = _x86_memio_map(x86_bus_space_mem, pa,
 	    PAGE_SIZE, 0, (bus_space_handle_t *)&va);
 	if (rv != 0) {
 		aprint_debug("efi: unable to allocate va\n");
 		return 0;
+	}
 	return va;
+}
 /*
  * Free a virtual address (VA) allocated using efi_getva().
  */
 static void
 efi_relva(paddr_t pa, vaddr_t va)
 @@ -395,27 +395,27 @@ efi_init(void)
 	if (efi_getsystbl() == NULL) {
 		aprint_debug("efi: missing or invalid systbl\n");
 		bootmethod_efi = false;
 		return;
+	}
 	if (efi_getcfgtblhead() == NULL) {
 		aprint_debug("efi: missing or invalid cfgtbl\n");
 		efi_relva(efi_systbl_pa, (vaddr_t) efi_systbl_va);
 		bootmethod_efi = false;
 		return;
+	}
 	bootmethod_efi = true;
 #if NPCI > 0
 	pci_mapreg_map_enable_decode = true; /* PR port-amd64/53286 */
 #endif
+}
 bool
 efi_probe(void)
+{
 	return bootmethod_efi;
+}
 int
 efi_getbiosmemtype(uint32_t type, uint64_t attr)

--- src/sys/arch/x86/x86/errata.c 2019/05/18 07:49:31	1.26
+++ src/sys/arch/x86/x86/errata.c 2021/10/07 12:52:27	1.27

 @@ -1,14 +1,14 @@
-/*	$NetBSD: errata.c,v 1.26 2019/05/18 07:49:31 maxv Exp $	*/
+/*	$NetBSD: errata.c,v 1.27 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2007 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.
 @@ -35,27 +35,27 @@
  * This currently only handles AMD CPUs, and is generalised because
  * there are quite a few problems that the BIOS can patch via MSR,
  * but it is not known if the OS can patch these yet.  The list is
  * expected to grow over time.
+ *
  * The data here are from: Revision Guide for AMD Athlon 64 and
  * AMD Opteron Processors, Publication #25759, Revision: 3.69,
  * Issue Date: September 2006
+ *
  * XXX This should perhaps be integrated with the identcpu code.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.26 2019/05/18 07:49:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.27 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/specialreg.h>
 #include <x86/cpuvar.h>
 #include <x86/cputypes.h>
 typedef struct errata {
 	u_short		e_num;
 @@ -117,27 +117,27 @@ static const uint8_t x86_errata_set5[] =
 };
 static const uint8_t x86_errata_set6[] = {
 	SH_C0, SH_CG, DH_CG, CH_CG, OINK
 };
 static const uint8_t x86_errata_set7[] = {
 	SH_C0, SH_CG, DH_CG, CH_CG, SH_D0, DH_D0, CH_D0, OINK
 };
 static const uint8_t x86_errata_set8[] = {
 	BH_E4, CH_CG, CH_CG, CH_D0, CH_D0, DH_CG, DH_CG, DH_CG,
 	DH_D0, DH_D0, DH_E3, DH_E3, DH_E6, DH_E6, JH_E1, JH_E6,
 	JH_E6, SH_B0, SH_B3, SH_C0, SH_C0, SH_CG, SH_CG, SH_CG,
 	SH_D0, SH_D0, SH_D0, SH_E4, SH_E4, SH_E5, OINK
 };
 static const uint8_t x86_errata_set9[] = {
 	DR_BA, DR_B2, OINK
 };
 static const uint8_t x86_errata_set10[] = {
 	DR_BA, DR_B2, DR_B3, OINK
 };
 static const uint8_t x86_errata_set11[] = {
 	DR_BA, DR_B2, DR_B3, RB_C2, RB_C3, BL_C2, BL_C3, DA_C2,
 @@ -351,42 +351,42 @@ static errata_t errata[] = {
 		x86_errata_setmsr, LS_CFG2_ERRATA_1091
 	},
 #endif
 	/*
 	 * 1095: Potential Violation of Read Ordering In Lock Operation
 	 * In SMT (Simultaneous Multithreading) Mode
 	 */
+	{
 , FALSE, MSR_LS_CFG, x86_errata_set13,
 		x86_errata_setmsr, LS_CFG_ERRATA_1095
 	},
 };
 static bool
 x86_errata_testmsr(struct cpu_info *ci, errata_t *e)
+{
 	uint64_t val;
 	(void)ci;
 	val = rdmsr_locked(e->e_data1);
 	if ((val & e->e_data2) != 0)
 		return FALSE;
 	e->e_reported = TRUE;
 	return TRUE;
+}
 static bool
 x86_errata_setmsr(struct cpu_info *ci, errata_t *e)
+{
 	uint64_t val;
 	(void)ci;
 	val = rdmsr_locked(e->e_data1);
 	if ((val & e->e_data2) != 0)
 		return FALSE;
 	wrmsr_locked(e->e_data1, val | e->e_data2);
 	aprint_debug_dev(ci->ci_dev, "erratum %d patched\n",
 	    e->e_num);

--- src/sys/arch/x86/x86/est.c 2020/10/25 16:39:00	1.32
+++ src/sys/arch/x86/x86/est.c 2021/10/07 12:52:27	1.33

 @@ -1,14 +1,14 @@
-/*	$NetBSD: est.c,v 1.32 2020/10/25 16:39:00 nia Exp $	*/
+/*	$NetBSD: est.c,v 1.33 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * 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. The name of the author may not be used to endorse or promote products
 @@ -66,27 +66,27 @@
  * - Intel Pentium M Processor Datasheet.
  *   Table 5, Voltage and Current Specifications.
  *   http://www.intel.com/design/mobile/datashts/252612.htm
+ *
  * - Intel Pentium M Processor on 90 nm Process with 2-MB L2 Cache Datasheet
  *   Table 3-4, 3-5, 3-6, Voltage and Current Specifications.
  *   http://www.intel.com/design/mobile/datashts/302189.htm
+ *
  * - Linux cpufreq patches, speedstep-centrino.c.
  *   Encoding of MSR_PERF_CTL and MSR_PERF_STATUS.
  *   http://www.codemonkey.org.uk/projects/cpufreq/cpufreq-2.4.22-pre6-1.gz
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.32 2020/10/25 16:39:00 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.33 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <x86/cpuvar.h>
 #include <x86/cputypes.h>
 #include <x86/cpu_msr.h>
 #include <x86/est.h>
 #include <x86/specialreg.h>
 @@ -1196,30 +1196,30 @@ est_tables(device_t self)
 		aprint_normal_dev(self, "idlo = 0x%x\n", idlo);
 		aprint_normal_dev(self, "lo  %4d mV, %4d MHz\n",
 		    MSR2MV(idlo), MSR2MHZ(idlo, sc->sc_bus_clock));
 		aprint_normal_dev(self, "raw %4d   , %4d    \n",
 		    (idlo & 0xff), ((idlo >> 8) & 0xff));
 		aprint_normal_dev(self, "idhi = 0x%x\n", idhi);
 		aprint_normal_dev(self, "hi  %4d mV, %4d MHz\n",
 		    MSR2MV(idhi), MSR2MHZ(idhi, sc->sc_bus_clock));
 		aprint_normal_dev(self, "raw %4d   , %4d    \n",
 		    (idhi & 0xff), ((idhi >> 8) & 0xff));
 		aprint_normal_dev(self, "cur  = 0x%x\n", cur);
 #endif
-                /*
+		/*
-                 * Generate a fake table with the power states we know,
+		 * Generate a fake table with the power states we know,
 		 * interpolating the voltages and frequencies between the
-		 * high and low values.  The (milli)voltages are always
+		 * high and low values.	 The (milli)voltages are always
 		 * rounded up when computing the table.
                  */
 		minfreq = MSR2FREQINC(idlo);
 		maxfreq = MSR2FREQINC(idhi);
 		minvolt = MSR2VOLTINC(idlo);
 		maxvolt = MSR2VOLTINC(idhi);
 		freqinc = maxfreq - minfreq;
 		voltinc = maxvolt - minvolt;
 		/* Avoid diving by zero. */
 		if (freqinc == 0)
 			return false;

--- src/sys/arch/x86/x86/identcpu.c 2021/04/12 02:23:01	1.121
+++ src/sys/arch/x86/x86/identcpu.c 2021/10/07 12:52:27	1.122

 @@ -1,14 +1,14 @@
-/*	$NetBSD: identcpu.c,v 1.121 2021/04/12 02:23:01 mrg Exp $	*/
+/*	$NetBSD: identcpu.c,v 1.122 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden,  and 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.
 @@ -20,27 +20,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: identcpu.c,v 1.121 2021/04/12 02:23:01 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.122 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <crypto/aes/aes_impl.h>
 #include <crypto/aes/arch/x86/aes_ni.h>
 #include <crypto/aes/arch/x86/aes_sse2.h>
 #include <crypto/aes/arch/x86/aes_ssse3.h>
 #include <crypto/aes/arch/x86/aes_via.h>
 @@ -538,27 +538,27 @@ cpu_probe_winchip(struct cpu_info *ci)
 	/* WinChip C6 */
 	if (CPUID_TO_MODEL(ci->ci_signature) == 4)
 		ci->ci_feat_val[0] &= ~CPUID_TSC;
+}
 static void
 cpu_probe_c3(struct cpu_info *ci)
+{
 	u_int family, model, stepping, descs[4], lfunc, msr;
 	struct x86_cache_info *cai;
 	if (cpu_vendor != CPUVENDOR_IDT ||
 	    CPUID_TO_FAMILY(ci->ci_signature) < 6)
-	    	return;
+		return;
 	family = CPUID_TO_FAMILY(ci->ci_signature);
 	model = CPUID_TO_MODEL(ci->ci_signature);
 	stepping = CPUID_TO_STEPPING(ci->ci_signature);
 	/* Determine the largest extended function value. */
 	x86_cpuid(0x80000000, descs);
 	lfunc = descs[0];
 	if (family == 6) {
 		/*
 		 * VIA Eden ESP.
+		 *
 @@ -576,27 +576,27 @@ cpu_probe_c3(struct cpu_info *ci)
+	}
 	if (family > 6 || model > 0x9 || (model == 0x9 && stepping >= 3)) {
 		/* VIA Nehemiah or Esther. */
 		x86_cpuid(0xc0000000, descs);
 		lfunc = descs[0];
 		if (lfunc >= 0xc0000001) {	/* has ACE, RNG */
 		    int rng_enable = 0, ace_enable = 0;
 		    x86_cpuid(0xc0000001, descs);
 		    lfunc = descs[3];
 		    ci->ci_feat_val[4] = lfunc;
 		    /* Check for and enable RNG */
 		    if (lfunc & CPUID_VIA_HAS_RNG) {
-		    	if (!(lfunc & CPUID_VIA_DO_RNG)) {
+			if (!(lfunc & CPUID_VIA_DO_RNG)) {
 			    rng_enable++;
 			    ci->ci_feat_val[4] |= CPUID_VIA_DO_RNG;
+			}
+		    }
 		    /* Check for and enable ACE (AES-CBC) */
 		    if (lfunc & CPUID_VIA_HAS_ACE) {
 			if (!(lfunc & CPUID_VIA_DO_ACE)) {
 			    ace_enable++;
 			    ci->ci_feat_val[4] |= CPUID_VIA_DO_ACE;
+			}
+		    }
 		    /* Check for and enable SHA */
 		    if (lfunc & CPUID_VIA_HAS_PHE) {
 @@ -1125,27 +1125,27 @@ static const struct vm_name_guest vm_sys
 	{ "VirtualBox", VM_GUEST_VIRTUALBOX },		/* Sun xVM VirtualBox */
 	{ "Parallels Virtual Platform", VM_GUEST_VM },	/* Parallels VM */
 	{ "KVM", VM_GUEST_VM },				/* KVM */
 };
 void
 identify_hypervisor(void)
+{
 	u_int regs[6];
 	char hv_vendor[12];
 	const char *p;
 	int i;
-	switch(vm_guest) {
+	switch (vm_guest) {
 	case VM_GUEST_XENPV:
 	case VM_GUEST_XENPVH:
 		/* guest type already known, no bios info */
 		return;
 	default:
 		break;
+	}
 	/*
 	 * [RFC] CPUID usage for interaction between Hypervisors and Linux.
 	 * http://lkml.org/lkml/2008/10/1/246
+	 *
 	 * KB1009458: Mechanisms to determine if software is running in

--- src/sys/arch/x86/x86/intel_busclock.c 2015/07/02 05:11:50	1.24
+++ src/sys/arch/x86/x86/intel_busclock.c 2021/10/07 12:52:27	1.25

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_busclock.c,v 1.24 2015/07/02 05:11:50 msaitoh Exp $	*/
+/*	$NetBSD: intel_busclock.c,v 1.25 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden,  and 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.
 @@ -20,27 +20,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: intel_busclock.c,v 1.24 2015/07/02 05:11:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_busclock.c,v 1.25 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <machine/specialreg.h>
 #include <machine/pio.h>
 #include <x86/cpuvar.h>
 #include <x86/cpufunc.h>
 #include <x86/est.h>
 @@ -85,27 +85,27 @@ viac7_get_bus_clock(struct cpu_info *ci)
 	return ((ci->ci_data.cpu_cc_freq + 10000000) / 10000000 * 10000000) /
 		 mult / 10000;
+}
 int
 p3_get_bus_clock(struct cpu_info *ci)
+{
 	uint64_t msr;
 	int bus, bus_clock = 0;
 	uint32_t model;
 	model = CPUID_TO_MODEL(ci->ci_signature);
 	switch (model) {
 	case 0x9: /* Pentium M (130 nm, Banias) */
 		bus_clock = 10000;
 		break;
 	case 0xc: /* Core i7, Atom, model 1 */
 		/*
 		 * Newer CPUs will GP when attemping to access MSR_FSB_FREQ.
 		 * In the long-term, use ACPI instead of all this.
 		 */
 		if (rdmsr_safe(MSR_FSB_FREQ, &msr) == EFAULT) {
 			aprint_debug_dev(ci->ci_dev,
 			    "unable to determine bus speed");
 			goto print_msr;

--- src/sys/arch/x86/x86/intr.c 2021/08/09 21:20:50	1.155
+++ src/sys/arch/x86/x86/intr.c 2021/10/07 12:52:27	1.156

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.c,v 1.155 2021/08/09 21:20:50 andvar Exp $	*/
+/*	$NetBSD: intr.c,v 1.156 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran, and 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.
 @@ -123,27 +123,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)isa.c	7.2 (Berkeley) 5/13/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.155 2021/08/09 21:20:50 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.156 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_acpi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 @@ -448,27 +448,27 @@ intr_allocate_slot_cpu(struct cpu_info *
 	if (pic == &i8259_pic) {
 		KASSERT(CPU_IS_PRIMARY(ci));
 		slot = pin;
 	} else {
 		int start = 0;
 		int max = MAX_INTR_SOURCES;
 		slot = -1;
 		/* avoid reserved slots for legacy interrupts. */
 		if (CPU_IS_PRIMARY(ci) && msipic_is_msi_pic(pic))
 			start = NUM_LEGACY_IRQS;
 		/* don't step over Xen's slots */
 		if (vm_guest == VM_GUEST_XENPVH)
 			max = SIR_XENIPL_VM;
 		/*
 		 * intr_allocate_slot has checked for an existing mapping.
 		 * Now look for a free slot.
 		 */
 		for (i = start; i < max ; i++) {
 			if (ci->ci_isources[i] == NULL) {
 				slot = i;
 				break;
+			}
+		}
 		if (slot == -1) {
 			return EBUSY;
+		}
 @@ -545,27 +545,27 @@ intr_allocate_slot(struct pic *pic, int
 		error = intr_allocate_slot_cpu(ci, pic, pin, &slot, chained);
 	} else {
 		/*
 		 * Find least loaded AP/BP and try to allocate there.
 		 */
 		ci = NULL;
 		for (CPU_INFO_FOREACH(cii, lci)) {
 			if ((lci->ci_schedstate.spc_flags & SPCF_NOINTR) != 0) {
 				continue;
+			}
 #if 0
 			if (ci == NULL ||
 			    ci->ci_nintrhand > lci->ci_nintrhand) {
-			    	ci = lci;
+				ci = lci;
+			}
 #else
 			ci = &cpu_info_primary;
 #endif
+		}
 		KASSERT(ci != NULL);
 		error = intr_allocate_slot_cpu(ci, pic, pin, &slot, chained);
 		/*
 		 * If that did not work, allocate anywhere.
 		 */
 		if (error != 0) {
 			for (CPU_INFO_FOREACH(cii, ci)) {
 @@ -928,27 +928,27 @@ intr_establish_xname(int legacy_irq, str
 		intr_hwunmask_xcall(ih, NULL);
 	} else {
 		where = xc_unicast(0, intr_hwunmask_xcall, ih, NULL, ci);
 		xc_wait(where);
+	}
 	mutex_exit(&cpu_lock);
 	if (bootverbose || cpu_index(ci) != 0)
 		aprint_verbose("allocated pic %s type %s pin %d level %d to "
 		    "%s slot %d idt entry %d\n",
 		    pic->pic_name, type == IST_EDGE ? "edge" : "level", pin,
 		    level, device_xname(ci->ci_dev), slot, idt_vec);
-	return (ih);
+	return ih;
+}
 void *
 intr_establish(int legacy_irq, struct pic *pic, int pin, int type, int level,
 	       int (*handler)(void *), void *arg, bool known_mpsafe)
+{
 	return intr_establish_xname(legacy_irq, pic, pin, type,
 	    level, handler, arg, known_mpsafe, "unknown");
+}
 /*
  * Called on bound CPU to handle intr_mask() / intr_unmask().
 @@ -1894,27 +1894,28 @@ intr_set_affinity(struct intrsource *isp
 		DPRINTF(("failed to allocate interrupt slot for PIC %s intrid "
 			"%s\n", isp->is_pic->pic_name, isp->is_intrid));
 		return err;
+	}
 	old_idtvec = isp->is_idtvec;
 	if (isp->is_idtvec > 0 && idt_vec_is_pcpu()) {
 		new_idtvec = idt_vec_alloc(&newci->ci_idtvec,
 		    APIC_LEVEL(ih->ih_level), IDT_INTR_HIGH);
 		if (new_idtvec == 0)
 			return EBUSY;
 		DPRINTF(("interrupt from cpu%d vec %d to cpu%d vec %d\n",
-		    cpu_index(oldci), old_idtvec, cpu_index(newci), new_idtvec));
+		    cpu_index(oldci), old_idtvec, cpu_index(newci),
 			new_idtvec));
 	} else {
 		new_idtvec = isp->is_idtvec;
+	}
 	/* Prevent intr_unmask() from reenabling the source at the hw. */
 	isp->is_distribute_pending = true;
 	pin = isp->is_pin;
 	(*pic->pic_hwmask)(pic, pin); /* for ci_ipending check */
 	while (oldci->ci_ipending & (1 << oldslot)) {
 		(void)kpause("intrdist", false, 1, &cpu_lock);
+	}
 @@ -2094,27 +2095,27 @@ interrupt_get_count(const char *intrid,
 	return count;
+}
 /*
  * MI interface for subr_interrupt.c
  */
 void
 interrupt_get_assigned(const char *intrid, kcpuset_t *cpuset)
+{
 	struct intrsource *isp;
 	mutex_enter(&cpu_lock);
 	isp = intr_get_io_intrsource(intrid);
 	if (isp != NULL)
 		isp->is_pic->pic_intr_get_assigned(intrid, cpuset);
 	mutex_exit(&cpu_lock);
+}
 /*
  * MI interface for subr_interrupt.c
  */
 void
 interrupt_get_available(kcpuset_t *cpuset)
+{
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;

--- src/sys/arch/x86/x86/ioapic.c 2020/04/25 15:26:18	1.64
+++ src/sys/arch/x86/x86/ioapic.c 2021/10/07 12:52:27	1.65

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: ioapic.c,v 1.64 2020/04/25 15:26:18 bouyer Exp $	*/
+/*	$NetBSD: ioapic.c,v 1.65 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc, and by Andrew Doran.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -54,27 +54,27 @@
  * 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 AUTHOR AND 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: ioapic.c,v 1.64 2020/04/25 15:26:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.65 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <uvm/uvm_extern.h>
 #include <machine/isa_machdep.h> /* XXX intrhand */
 @@ -102,28 +102,28 @@ __KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1
 int     ioapic_match(device_t, cfdata_t, void *);
 void    ioapic_attach(device_t, device_t, void *);
 extern int x86_mem_add_mapping(bus_addr_t, bus_size_t,
     int, bus_space_handle_t *); /* XXX XXX */
 void ioapic_hwmask(struct pic *, int);
 void ioapic_hwunmask(struct pic *, int);
 bool ioapic_trymask(struct pic *, int);
 static void ioapic_addroute(struct pic *, struct cpu_info *, int, int, int);
 static void ioapic_delroute(struct pic *, struct cpu_info *, int, int, int);
-struct ioapic_softc *ioapics;	 /* head of linked list */
+struct ioapic_softc *ioapics;	/* head of linked list */
-int nioapics = 0;	   	 /* number attached */
+int nioapics = 0;		/* number attached */
 static int ioapic_vecbase;
 static inline u_long
 ioapic_lock(struct ioapic_softc *sc)
+{
 	u_long flags;
 	flags = x86_read_psl();
 	x86_disable_intr();
 	__cpu_simple_lock(&sc->sc_pic.pic_lock);
 	return flags;
+}
 @@ -412,27 +412,27 @@ apic_set_redir(struct ioapic_softc *sc,
 	uint32_t redhi;
 	int delmode;
 	struct ioapic_pin *pp;
 	struct mp_intr_map *map;
 	pp = &sc->sc_pins[pin];
 	map = pp->ip_map;
 	redlo = map == NULL ? IOAPIC_REDLO_MASK : map->redir;
 	redhi = 0;
 	delmode = (redlo & IOAPIC_REDLO_DEL_MASK) >> IOAPIC_REDLO_DEL_SHIFT;
 	if (delmode == IOAPIC_REDLO_DEL_FIXED ||
 	    delmode == IOAPIC_REDLO_DEL_LOPRI) {
-	    	if (pp->ip_type == IST_NONE) {
+		if (pp->ip_type == IST_NONE) {
 			redlo |= IOAPIC_REDLO_MASK;
 		} else {
 			redhi = (ci->ci_cpuid << IOAPIC_REDHI_DEST_SHIFT);
 			redlo |= (idt_vec & 0xff);
 			redlo |= IOAPIC_REDLO_DEL_FIXED
 			    << IOAPIC_REDLO_DEL_SHIFT;
 			redlo &= ~IOAPIC_REDLO_DSTMOD;
 			/* XXX derive this bit from BIOS info */
 			if (pp->ip_type == IST_LEVEL)
 				redlo |= IOAPIC_REDLO_LEVEL;
 			else
 				redlo &= ~IOAPIC_REDLO_LEVEL;

--- src/sys/arch/x86/x86/lapic.c 2020/10/27 08:57:11	1.85
+++ src/sys/arch/x86/x86/lapic.c 2021/10/07 12:52:27	1.86

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lapic.c,v 1.85 2020/10/27 08:57:11 ryo Exp $	*/
+/*	$NetBSD: lapic.c,v 1.86 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2000, 2008, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,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: lapic.c,v 1.85 2020/10/27 08:57:11 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.86 2021/10/07 12:52:27 msaitoh Exp $");
 #include "acpica.h"
 #include "ioapic.h"
 #include "opt_acpi.h"
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_multiprocessor.h"
 #include "opt_ntp.h"
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 @@ -88,28 +88,28 @@ extern vector Xintr_x2apic_ddbipi;
 extern int ddb_vec;
 #endif
 #endif
 #endif
 #include <dev/vmt/vmtreg.h>	/* for vmt_hvcall() */
 #include <dev/vmt/vmtvar.h>	/* for vmt_hvcall() */
 /* Referenced from vector.S */
 void		lapic_clockintr(void *, struct intrframe *);
 static void	lapic_delay(unsigned int);
 static uint32_t lapic_gettick(void);
-static void 	lapic_setup_bsp(paddr_t);
+static void	lapic_setup_bsp(paddr_t);
-static void 	lapic_map(paddr_t);
+static void	lapic_map(paddr_t);
 static void lapic_hwmask(struct pic *, int);
 static void lapic_hwunmask(struct pic *, int);
 static void lapic_setup(struct pic *, struct cpu_info *, int, int, int);
 /* Make it public to call via ddb */
 void	lapic_dump(void);
 struct pic local_pic = {
 	.pic_name = "lapic",
 	.pic_type = PIC_LAPIC,
 	.pic_lock = __SIMPLELOCK_UNLOCKED,
 	.pic_hwmask = lapic_hwmask,
 	.pic_hwunmask = lapic_hwunmask,
 @@ -879,27 +879,27 @@ i82489_ipi(int vec, int target, int dl)
 	i82489_icr_wait();
 	if ((target & LAPIC_DEST_MASK) == 0)
 		i82489_writereg(LAPIC_ICRHI, target << LAPIC_ID_SHIFT);
 	i82489_writereg(LAPIC_ICRLO,
 	    (target & LAPIC_DEST_MASK) | vec | dl | LAPIC_LEVEL_ASSERT);
 #ifdef DIAGNOSTIC
 	i82489_icr_wait();
 	result = (i82489_readreg(LAPIC_ICRLO) & LAPIC_DLSTAT_BUSY) ? EBUSY : 0;
 #else
 	/* Don't wait - if it doesn't go, we're in big trouble anyway. */
-        result = 0;
+	result = 0;
 #endif
 	splx(s);
 	return result;
+}
 static int
 x2apic_ipi_init(int target)
+{
 	x2apic_write_icr(target, LAPIC_DLMODE_INIT | LAPIC_LEVEL_ASSERT);
 	delay_func(10000);

--- src/sys/arch/x86/x86/mp.c 2021/08/07 16:19:08	1.6
+++ src/sys/arch/x86/x86/mp.c 2021/10/07 12:52:27	1.7

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mp.c,v 1.6 2021/08/07 16:19:08 thorpej Exp $	*/
+/*	$NetBSD: mp.c,v 1.7 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * 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
 @@ -26,27 +26,27 @@
  * 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 WASABI SYSTEMS, INC
  * 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: mp.c,v 1.6 2021/08/07 16:19:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.7 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_multiprocessor.h"
 #include "opt_acpi.h"
 #include "acpica.h"
 #include "ioapic.h"
 #include "pchb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 @@ -71,27 +71,27 @@ __KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.6 2
 #include <dev/pci/ppbreg.h>
 #endif
 #if NIOAPIC > 0 || NACPICA > 0
 static int intr_scan_bus(int, int, intr_handle_t *);
 #if NPCI > 0
 static int intr_find_pcibridge(int, pcitag_t *, pci_chipset_tag_t *);
 #endif
 #endif
 #if NPCI > 0
 int
 mp_pci_scan(device_t self, struct pcibus_attach_args *pba,
-	        cfprint_t print)
+    cfprint_t print)
+{
 	int i, cnt;
 	struct mp_bus *mpb;
 	cnt = 0;
 	for (i = 0; i < mp_nbus; i++) {
 		mpb = &mp_busses[i];
 		if (mpb->mb_name == NULL)
 			continue;
 		if (strcmp(mpb->mb_name, "pci") == 0 && mpb->mb_dev == NULL) {
 			pba->pba_bus = i;
 			mpb->mb_dev = config_found(self, pba, print,
 			    CFARGS(.iattr = "pcibus"));

--- src/sys/arch/x86/x86/mpacpi.c 2021/08/07 16:19:08	1.107
+++ src/sys/arch/x86/x86/mpacpi.c 2021/10/07 12:52:27	1.108

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mpacpi.c,v 1.107 2021/08/07 16:19:08 thorpej Exp $	*/
+/*	$NetBSD: mpacpi.c,v 1.108 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * 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
 @@ -26,27 +26,27 @@
  * 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 WASABI SYSTEMS, INC
  * 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: mpacpi.c,v 1.107 2021/08/07 16:19:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.108 2021/10/07 12:52:27 msaitoh Exp $");
 #include "acpica.h"
 #include "opt_acpi.h"
 #include "opt_ddb.h"
 #include "opt_mpbios.h"
 #include "opt_multiprocessor.h"
 #include "pchb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 @@ -142,38 +142,38 @@ static int mpacpi_intr_index;
 static paddr_t mpacpi_lapic_base = LAPIC_BASE;
 int mpacpi_step;
 int mpacpi_force;
 static int
 mpacpi_cpuprint(void *aux, const char *pnp)
+{
 	struct cpu_attach_args *caa = aux;
 	if (pnp)
 		aprint_normal("cpu at %s", pnp);
 	aprint_normal(" apid %d", caa->cpu_number);
-	return (UNCONF);
+	return UNCONF;
+}
 static int
 mpacpi_ioapicprint(void *aux, const char *pnp)
+{
 	struct apic_attach_args *aaa = aux;
 	if (pnp)
 		aprint_normal("ioapic at %s", pnp);
 	aprint_normal(" apid %d", aaa->apic_id);
-	return (UNCONF);
+	return UNCONF;
+}
 /*
  * Handle special interrupt sources and overrides from the MADT.
  * This is a callback function for acpi_madt_walk() (see acpi.c).
  */
 static ACPI_STATUS
 mpacpi_nonpci_intr(ACPI_SUBTABLE_HEADER *hdrp, void *aux)
+{
 	int *index = aux, pin, lindex;
 	struct mp_intr_map *mpi;
 	ACPI_MADT_NMI_SOURCE *ioapic_nmi;
 	ACPI_MADT_LOCAL_APIC_NMI *lapic_nmi;
 @@ -554,27 +554,27 @@ mpacpi_find_pcibusses(struct acpi_softc
 	TAILQ_INIT(&mpacpi_pcibusses);
 	mpacpi_pci_walk(sc->sc_root);
 	return 0;
+}
 /*
  * Find all static PRT entries for a PCI bus.
  */
 static int
 mpacpi_pciroute(struct mpacpi_pcibus *mpr)
+{
 	ACPI_PCI_ROUTING_TABLE *ptrp;
-        ACPI_HANDLE linkdev;
+	ACPI_HANDLE linkdev;
 	char *p;
 	struct mp_intr_map *mpi, *iter;
 	struct mp_bus *mpb;
 	struct pic *pic;
 	unsigned dev;
 	int pin;
 	if (mp_verbose)
 		printf("mpacpi: configuring PCI bus %d int routing\n",
 		    mpr->mpr_bus);
 	mpb = &mp_busses[mpr->mpr_bus];
 @@ -880,27 +880,27 @@ mpacpi_print_intr(struct mp_intr_map *mp
 		    acpi_pci_link_name(mpi->linkdev), busname);
 	else
 		printf("%s: pin %d attached to %s",
 		    sc ? sc->pic_name : "local apic",
 		    pin, busname);
 	if (mpi->bus != NULL) {
 		if (mpi->bus->mb_idx != -1)
 			printf("%d", mpi->bus->mb_idx);
 		(*(mpi->bus->mb_intr_print))(mpi->bus_pin);
+	}
 	snprintb(buf, sizeof(buf), inttype_fmt, mpi->type);
 	printf(" (type %s", buf);
 	snprintb(buf, sizeof(buf), flagtype_fmt, mpi->flags);
 	printf(" flags %s)\n", buf);
+}
 int
 mpacpi_find_interrupts(void *self)
+{
 #if NIOAPIC > 0
 	ACPI_STATUS rv;
 #endif
 	struct acpi_softc *acpi = self;
 @@ -1050,34 +1050,34 @@ mpacpi_findintr_linkdev(struct mp_intr_m
 		return ENOENT;
 	if (irq != line) {
 		aprint_error("%s: mpacpi_findintr_linkdev:"
 		    " irq mismatch (%d vs %d)\n",
 		    acpi_pci_link_name(mip->linkdev), irq, line);
 		return ENOENT;
+	}
 	/*
 	 * Convert ACPICA values to MPS values
 	 */
 	if (pol == ACPI_ACTIVE_LOW)
 		pol = MPS_INTPO_ACTLO;
 	else
 		pol = MPS_INTPO_ACTHI;
 	if (trig == ACPI_EDGE_SENSITIVE)
 		trig = MPS_INTTR_EDGE;
 	else
 		trig = MPS_INTTR_LEVEL;
 	mip->flags = pol | (trig << 2);
 	mip->global_int = irq;
 	pic = intr_findpic(irq);
 	if (pic == NULL)
 		return ENOENT;
 	mip->ioapic = pic;
 	pin = irq - pic->pic_vecbase;
 	if (pic->pic_type == PIC_IOAPIC) {
 #if NIOAPIC > 0
 		mip->redir = (IOAPIC_REDLO_DEL_FIXED <<IOAPIC_REDLO_DEL_SHIFT);
 		if (pol ==  MPS_INTPO_ACTLO)
 			mip->redir |= IOAPIC_REDLO_ACTLO;

--- src/sys/arch/x86/x86/mpbios.c 2021/08/07 16:19:08	1.70
+++ src/sys/arch/x86/x86/mpbios.c 2021/10/07 12:52:27	1.71

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mpbios.c,v 1.70 2021/08/07 16:19:08 thorpej Exp $	*/
+/*	$NetBSD: mpbios.c,v 1.71 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -86,27 +86,27 @@
  * 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.
  */
 /*
  * The Intel MP-stuff is just one way of x86 SMP systems
  * so only Intel MP specific stuff is here.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.70 2021/08/07 16:19:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.71 2021/10/07 12:52:27 msaitoh Exp $");
 #include "acpica.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include "opt_acpi.h"
 #include "opt_mpbios.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 @@ -139,44 +139,44 @@ int mpbios_ncpu;
 int mpbios_nioapic;
 #include "pci.h"
 #if NPCI > 0
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #endif
 #include "locators.h"
 /* descriptions of MP basetable entries */
 struct mpbios_baseentry {
-	uint8_t  	type;
+	uint8_t		type;
-	uint8_t  	length;
+	uint8_t		length;
 	uint16_t	count;
-	const char    	*name;
+	const char	*name;
 };
 static const char *loc_where[] = {
 	"extended bios data area",
 	"last page of base memory",
 	"bios"
 };
 struct mp_map
+{
-	vaddr_t 	baseva;
+	vaddr_t		baseva;
-	int	 	vsize;
+	int		vsize;
-	paddr_t 	pa;
+	paddr_t		pa;
-	paddr_t 	pg;
+	paddr_t		pg;
 	int		psize;
 };
 struct dflt_conf_entry {
 	const char	*bus_type[2];
 	int		flags;
 };
 int mp_cpuprint(void *, const char *);
 int mp_ioapicprint(void *, const char *);
 static const void *mpbios_search(device_t, paddr_t, int,
     struct mp_map *);
 static inline int mpbios_cksum(const void *,int);
 @@ -189,27 +189,27 @@ static void mp_print_pci_intr (int intr)
 #ifdef X86_MPBIOS_SUPPORT_EISA
 static void mp_print_eisa_intr (int intr);
 static void mp_cfg_eisa_intr(const struct mpbios_int *, uint32_t *);
 #endif
 static void mp_cfg_isa_intr(const struct mpbios_int *, uint32_t *);
 static void mp_print_isa_intr(int intr);
 static void mpbios_dflt_conf_cpu(device_t);
 static void mpbios_dflt_conf_bus(device_t, const struct dflt_conf_entry *);
 static void mpbios_dflt_conf_ioapic(device_t);
 static void mpbios_dflt_conf_int(device_t, const struct dflt_conf_entry *,
-                                 const int *);
+				 const int *);
 static void mpbios_cpu(const uint8_t *, device_t);
 static void mpbios_bus(const uint8_t *, device_t);
 static void mpbios_ioapic(const uint8_t *, device_t);
 static void mpbios_int(const uint8_t *, int, struct mp_intr_map *);
 static const void *mpbios_map(paddr_t, int, struct mp_map *);
 static void mpbios_unmap(struct mp_map *);
 /*
  * globals to help us bounce our way through parsing the config table.
  */
 @@ -218,38 +218,38 @@ static struct mp_map mp_fp_map;
 const struct mpbios_cth	*mp_cth;
 const struct mpbios_fps	*mp_fps;
 int mpbios_scanned;
 int
 mp_cpuprint(void *aux, const char *pnp)
+{
 	struct cpu_attach_args *caa = aux;
 	if (pnp)
 		aprint_normal("cpu at %s", pnp);
 	aprint_normal(" apid %d", caa->cpu_number);
-	return (UNCONF);
+	return UNCONF;
+}
 int
 mp_ioapicprint(void *aux, const char *pnp)
+{
 	struct apic_attach_args *aaa = aux;
 	if (pnp)
 		aprint_normal("ioapic at %s", pnp);
 	aprint_normal(" apid %d", aaa->apic_id);
-	return (UNCONF);
+	return UNCONF;
+}
 /*
  * Map a chunk of memory read-only and return an appropriately
  * const'ed pointer.
  */
 static const void *
 mpbios_map(paddr_t pa, int len, struct mp_map *handle)
+{
 	paddr_t pgpa = x86_trunc_page(pa);
 	paddr_t endpa = x86_round_page(pa + len);
 	vaddr_t va = uvm_km_alloc(kernel_map, endpa - pgpa, 0, UVM_KMF_VAONLY);
 @@ -275,32 +275,32 @@ inline static void
 mpbios_unmap(struct mp_map *handle)
+{
 	pmap_kremove(handle->baseva, handle->vsize);
 	pmap_update(pmap_kernel());
 	uvm_km_free(kernel_map, handle->baseva, handle->vsize, UVM_KMF_VAONLY);
+}
 /*
  * Look for an Intel MP spec table, indicating SMP capable hardware.
  */
 int
 mpbios_probe(device_t self)
+{
-	paddr_t  	ebda, memtop;
+	paddr_t		ebda, memtop;
 	paddr_t		cthpa;
 	int		cthlen;
 	const uint8_t	*mpbios_page;
-	int 		scan_loc;
+	int		scan_loc;
 	struct		mp_map t;
 	/* If MP is disabled, don't use MPBIOS or the ioapics. */
 	if ((boothowto & RB_MD1) != 0)
 		return 0;
 	/* see if EBDA exists */
 	mpbios_page = mpbios_map(0, PAGE_SIZE, &t);
 	ebda = *(const uint16_t *)(&mpbios_page[0x40e]);
 	ebda <<= 4;
 @@ -540,27 +540,27 @@ static const uint8_t dflt_lint_tab[2] =
  *	mp_ncpus = 1
+ *
  * determines:
  *	cpu_apic_address (common to all CPUs)
  *	ioapic_address[N]
  *	mp_naps
  *	mp_nbus
  *	mp_napics
  *	nintrs
  */
 void
 mpbios_scan(device_t self, int *ncpup)
+{
-	const uint8_t 	*position, *end;
+	const uint8_t	*position, *end;
 	size_t          i;
 	int		count;
 	int		type;
 	int		intr_cnt, cur_intr;
 #if NLAPIC > 0
 	paddr_t		lapic_base;
 #endif
 	const struct dflt_conf_entry *dflt_conf;
 	const int *dflt_bus_irq;
 	const struct mpbios_int *iep;
 	struct mpbios_int ie;
 	aprint_normal_dev(self, "Intel MP Specification ");
 @@ -622,44 +622,44 @@ mpbios_scan(device_t self, int *ncpup)
 			mpbios_dflt_conf_ioapic(self);
 		/*
 		 * Walk the table once, counting items.
 		 */
 		mp_nbus = 0;
 		for (i = 0; i < __arraycount(dflt_conf->bus_type); i++) {
 			if (dflt_conf->bus_type[i] != NULL)
 				mp_nbus++;
+		}
 		KASSERT(mp_nbus != 0);
 		mp_busses = kmem_zalloc(sizeof(struct mp_bus) * mp_nbus,
-		                        KM_SLEEP);
+					KM_SLEEP);
 		KASSERT(mp_busses != NULL);
 		/* INTIN0 */
 		intr_cnt = (dflt_conf->flags & INTIN0_NC) ? 0 : 1;
 		/* INTINx */
 		for (i = 0; i < __arraycount(dflt_bus_irq_tab[0]); i++) {
 			if (dflt_bus_irq[i] >= 0)
 				intr_cnt++;
+		}
 		KASSERT(intr_cnt != 0);
 		/* LINTINx */
 		for (i = 0; i < __arraycount(dflt_lint_tab); i++)
 			intr_cnt++;
 		mp_intrs = kmem_zalloc(sizeof(struct mp_intr_map) * intr_cnt,
-		                       KM_SLEEP);
+				       KM_SLEEP);
 		KASSERT(mp_intrs != NULL);
 		mp_nintr = intr_cnt;
 		/*
 		 * Re-walk the table, recording info of interest.
 		 */
 		mpbios_dflt_conf_bus(self, dflt_conf);
 		mpbios_dflt_conf_int(self, dflt_conf, dflt_bus_irq);
 	} else {
 		/*
 		 * should not happen; mp_probe returns 0 in this case,
 		 * but..
 		 */
 @@ -867,51 +867,51 @@ mpbios_dflt_conf_ioapic(device_t self)
 	struct mpbios_ioapic mpio;
 	/* mpio.type is irrelevant for mpbios_ioapic(). */
 	mpio.apic_id = DFLT_IOAPIC_ID;
 	/* XXX Let ioapic driver read real APIC version... */
 	mpio.apic_version = 0;
 	mpio.apic_flags = IOAPICENTRY_FLAG_EN;
 	mpio.apic_address = (uint32_t)IOAPIC_BASE_DEFAULT;
 	mpbios_ioapic((uint8_t *)&mpio, self);
+}
 static void
 mpbios_dflt_conf_int(device_t self, const struct dflt_conf_entry *dflt_conf,
-                     const int *dflt_bus_irq)
+		     const int *dflt_bus_irq)
+{
 	struct   mpbios_int mpi;
 	size_t   i;
 	int      cur_intr;
 	uint16_t level_inv;
 	cur_intr = 0;
 	/*
 	 * INTIN0
 	 */
 	/*
 	 * 8259A INTR is connected to INTIN0 for default configs 1-6, but not
 	 * for default config 7 (sec. 5.3).
 	 */
 	if ((dflt_conf->flags & INTIN0_NC) == 0) {
 		/* mpi.type is irrelevant for mpbios_int(). */
 		mpi.int_type = MPS_INTTYPE_ExtINT;
 		mpi.int_flags = 0;
 		mpi.src_bus_id = 0;
 		mpi.src_bus_irq = 0;
 		mpi.dst_apic_id = DFLT_IOAPIC_ID;
 		mpi.dst_apic_int = 0;
 		mpbios_int((u_int8_t *)&mpi, MPS_MCT_IOINT,
-		           &mp_intrs[cur_intr++]);
+			   &mp_intrs[cur_intr++]);
+	}
 	/*
 	 * INTINx
 	 */
 	/* mpi.type is irrelevant for mpbios_int(). */
 	mpi.int_type = MPS_INTTYPE_INT;
 	/*
 	 * PCI interrupt lines appear as (E)ISA interrupt lines/on bus 0
 	 * (sec. 5.2).
 	 */
 	mpi.src_bus_id = 0;
 	mpi.dst_apic_id = DFLT_IOAPIC_ID;
 @@ -928,48 +928,48 @@ mpbios_dflt_conf_int(device_t self, cons
 		level_inv = 0;
 #endif
 	} else if (dflt_conf->flags & MCA_INV) {
 		/* MCA systems have fixed inverters. */
 		level_inv = 0xffffU;
 	} else
 		level_inv = 0;
 	for (i = 0; i < __arraycount(dflt_bus_irq_tab[0]); i++) {
 		if (dflt_bus_irq[i] >= 0) {
 			mpi.src_bus_irq = (uint8_t)dflt_bus_irq[i];
 			if (level_inv & (1U << mpi.src_bus_irq))
 				mpi.int_flags = (MPS_INTTR_LEVEL << 2)
-				                | MPS_INTPO_ACTHI;
+						| MPS_INTPO_ACTHI;
 			else
 				mpi.int_flags = 0; /* conforms to bus spec. */
 			mpi.dst_apic_int = (uint8_t)i;
 			mpbios_int((u_int8_t *)&mpi, MPS_MCT_IOINT,
-			           &mp_intrs[cur_intr++]);
+				   &mp_intrs[cur_intr++]);
+		}
+	}
 	/*
 	 * LINTINx
 	 */
 	/* mpi.type is irrelevant for mpbios_int(). */
 	mpi.int_flags = 0;
 	mpi.src_bus_id = 0;
 	mpi.src_bus_irq = 0;
 	mpi.dst_apic_id = MPS_ALL_APICS;
 	for (i = 0; i < __arraycount(dflt_lint_tab); i++) {
 		mpi.int_type = dflt_lint_tab[i];
 		mpi.dst_apic_int = (uint8_t)i;
 		mpbios_int((u_int8_t *)&mpi, MPS_MCT_LINT,
-		           &mp_intrs[cur_intr++]);
+			   &mp_intrs[cur_intr++]);
+	}
+}
 /*
  * The following functions conspire to compute base ioapic redirection
  * table entry for a given interrupt line.
+ *
  * Fill in: trigger mode, polarity, and possibly delivery mode.
  */
 static void
 mp_cfg_special_intr(const struct mpbios_int *entry, uint32_t *redir)
+{

--- src/sys/arch/x86/x86/mtrr_i686.c 2020/01/31 08:21:11	1.31
+++ src/sys/arch/x86/x86/mtrr_i686.c 2021/10/07 12:52:27	1.32

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mtrr_i686.c,v 1.31 2020/01/31 08:21:11 maxv Exp $ */
+/*	$NetBSD: mtrr_i686.c,v 1.32 2021/10/07 12:52:27 msaitoh Exp $ */
 /*-
  * Copyright (c) 2000, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld.
+ *
  * 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.
 @@ -20,27 +20,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: mtrr_i686.c,v 1.31 2020/01/31 08:21:11 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtrr_i686.c,v 1.32 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <uvm/uvm_extern.h>
 @@ -480,28 +480,28 @@ i686_mtrr_validate(struct mtrr *mtrrp, s
 	 */
 	if (p == NULL && (mtrrp->flags & MTRR_PRIVATE))
 		return EINVAL;
 	high = mtrrp->base + mtrrp->len;
 	/*
 	 * Check for bad types.
 	 */
 	if ((mtrrp->type == MTRR_TYPE_UNDEF1 || mtrrp->type == MTRR_TYPE_UNDEF2
 	    || mtrrp->type > MTRR_TYPE_WB) && (mtrrp->flags & MTRR_VALID))
 		return EINVAL;
 	/*
 	 * If write-combining is requested, make sure that the WC feature
 	 * is supported by the processor.
 	 */
 	if (mtrrp->type == MTRR_TYPE_WC &&
 	    !(i686_mtrr_cap & MTRR_I686_CAP_WC_MASK))
 		return ENODEV;
 	/*
 	 * Only use fixed ranges < 1M.
 	 */
 	if ((mtrrp->flags & MTRR_FIXED) && high > 0x100000)
 		return EINVAL;
 	/*
 @@ -629,29 +629,29 @@ i686_mtrr_setone(struct mtrr *mtrrp, str
 			continue;
+		}
 		curlow = mtrr_var[i].base;
 		curhigh = curlow + mtrr_var[i].len - 1;
 		if (low == curlow && high == curhigh &&
 		    (!(mtrr_var[i].flags & MTRR_PRIVATE) ||
 		     ((mtrrp->flags & MTRR_PRIVATE) && (p != NULL) &&
 		      (mtrr_var[i].owner == p->p_pid)))) {
 			freep = &mtrr_var[i];
 			break;
+		}
 		if (((high >= curlow && high < curhigh) ||
 		    (low >= curlow && low < curhigh)) &&
-	 	    (i686_mtrr_conflict(mtrr_var[i].type, mtrrp->type) ||
+		    (i686_mtrr_conflict(mtrr_var[i].type, mtrrp->type) ||
 		     ((mtrr_var[i].flags & MTRR_PRIVATE) &&
- 		      (!(mtrrp->flags & MTRR_PRIVATE) || (p == NULL) ||
+		      (!(mtrrp->flags & MTRR_PRIVATE) || (p == NULL) ||
 		       (mtrr_var[i].owner != p->p_pid))))) {
 			return EBUSY;
+		}
+	}
 	if (freep == NULL)
 		return EBUSY;
 	mtrrp->flags &= ~MTRR_CANTSET;
 	*freep = *mtrrp;
 	freep->owner = (mtrrp->flags & MTRR_PRIVATE) ? p->p_pid : 0;
 	return 0;
+}

--- src/sys/arch/x86/x86/multiboot2.c 2021/10/03 18:47:16	1.7
+++ src/sys/arch/x86/x86/multiboot2.c 2021/10/07 12:52:27	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: multiboot2.c,v 1.7 2021/10/03 18:47:16 fcambus Exp $	*/
+/*	$NetBSD: multiboot2.c,v 1.8 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal.
+ *
  * 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.
 @@ -20,27 +20,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: multiboot2.c,v 1.7 2021/10/03 18:47:16 fcambus Exp $");
+__KERNEL_RCSID(0, "$NetBSD: multiboot2.c,v 1.8 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_multiboot.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cdefs_elf.h>
 #include <sys/boot_flag.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/optstr.h>
 #include <sys/ksyms.h>
 #include <sys/common_ansi.h>
 #include <sys/intr.h>
 @@ -62,63 +62,63 @@ typedef Elf_Word locore_Elf_Word;
 typedef Elf_Addr locore_Elf_Addr;
 #endif
 #if !defined(MULTIBOOT)
 #  error "MULTIBOOT not defined; this cannot happen."
 #endif
 /*
  * This is an attempt to get an early debug output. It
  * requires EFI Boot Services, and it does not work anyway:
  * it causes EFI to try to handle interrupts while the kernel
  * already took that over, hence we get a reboot.
  */
-#define BS_PRINT(efisystbl, wstring) 					\
+#define BS_PRINT(efisystbl, wstring)					\
 	efi_systbl->st_coutif->ei_outputstring(efi_systbl->st_coutif,	\
 	    (efi_char *)__UNCONST(wstring))
 struct multiboot_symbols {
 	uint32_t s_symstart;
 	uint32_t s_symsize;
 	uint32_t s_strstart;
 	uint32_t s_strsize;
 };
 void multiboot2_copy_syms(struct multiboot_tag_elf_sections *,
 			  struct multiboot_symbols *,
 			  bool *, int **, void *, vaddr_t);
 /*
  * Because of clashes between multiboot.h and multiboot2.h we
  * cannot include both, and we need to redefine here:
  */
 void            multiboot2_pre_reloc(char *);
 void            multiboot2_post_reloc(void);
 void            multiboot2_print_info(void);
 bool            multiboot2_ksyms_addsyms_elf(void);
 extern int              biosbasemem;
 extern int              biosextmem;
 #ifdef __i386__
 extern int              biosmem_implicit;
 #endif
 extern int              boothowto;
 extern struct bootinfo  bootinfo;
 extern int              end;
 extern int *            esym;
 extern char             start;
 /*
  * There is no way to perform dynamic allocation
  * at this time, hence we need to waste memory,
  * with the hope data will fit.
  */
 char multiboot_info[16384] = "\0\0\0\0";
 bool multiboot2_enabled = false;
 bool has_syms = false;
 struct multiboot_symbols Multiboot_Symbols;
 #define RELOC(type, x) ((type)((vaddr_t)(x) - KERNBASE))
 static void
 efi_exit_bs(struct efi_systbl *efi_systbl, void *efi_ih)
+{
 	struct efi_bs *efi_bs;
 @@ -159,27 +159,27 @@ efi_exit_bs(struct efi_systbl *efi_systb
 		panic("EFI AllocatePool failed");
 	if (efi_bs->bs_getmemorymap(&bufsize, desc, &key, &size, &vers) != 0)
 		panic("EFI GetMemoryMap failed");
 exit_bs:
 	if (efi_bs->bs_exitbootservices(efi_ih, key) != 0)
 		panic("EFI ExitBootServices failed");
 	return;
+}
 void
 multiboot2_copy_syms(struct multiboot_tag_elf_sections *mbt_elf,
 		     struct multiboot_symbols *ms,
 		     bool *has_symsp, int **esymp, void *endp,
 		     vaddr_t kernbase)
+{
 	int i;
 	locore_Elf_Shdr *symtabp, *strtabp;
 	locore_Elf_Word symsize, strsize;
 	locore_Elf_Addr symaddr, straddr;
 	locore_Elf_Addr symstart, strstart;
 	locore_Elf_Addr cp1src, cp1dst;
 	locore_Elf_Word cp1size;
 	locore_Elf_Addr cp2src, cp2dst;
 	locore_Elf_Word cp2size;
 @@ -219,35 +219,35 @@ multiboot2_copy_syms(struct multiboot_ta
 	/*
 	 * Copy the symbol and string tables just after the kernel's
 	 * end address, in this order.  Only the contents of these ELF
 	 * sections are copied; headers are discarded.  esym is later
 	 * updated to point to the lowest "free" address after the tables
 	 * so that they are mapped appropriately when enabling paging.
+	 *
 	 * We need to be careful to not overwrite valid data doing the
 	 * copies, hence all the different cases below.  We can assume
 	 * that if the tables start before the kernel's end address,
 	 * they will not grow over this address.
 	 */
-        if ((void *)(uintptr_t)symaddr < endp &&
+	if ((void *)(uintptr_t)symaddr < endp &&
 	    (void *)(uintptr_t)straddr < endp) {
 		cp1src = symaddr; cp1size = symsize;
 		cp2src = straddr; cp2size = strsize;
-        } else if ((void *)(uintptr_t)symaddr > endp &&
+	} else if ((void *)(uintptr_t)symaddr > endp &&
 		   (void *)(uintptr_t)straddr < endp) {
 		cp1src = symaddr; cp1size = symsize;
 		cp2src = straddr; cp2size = strsize;
-        } else if ((void *)(uintptr_t)symaddr < endp &&
+	} else if ((void *)(uintptr_t)symaddr < endp &&
 		   (void *)(uintptr_t)straddr > endp) {
 		cp1src = straddr; cp1size = strsize;
 		cp2src = symaddr; cp2size = symsize;
 	} else {
 		/* symaddr and straddr are both over end */
 		if (symaddr < straddr) {
 			cp1src = symaddr; cp1size = symsize;
 			cp2src = straddr; cp2size = strsize;
 		} else {
 			cp1src = straddr; cp1size = strsize;
 			cp2src = symaddr; cp2size = symsize;
+		}
+	}
 @@ -322,43 +322,43 @@ multiboot2_pre_reloc(char *mbi)
 #endif
 		case MULTIBOOT_TAG_TYPE_EFI_BS:
 #if notyet
 			has_bs = true;
 #endif
 			break;
 		default:
 			break;
+		}
+	}
 	/* Broken */
 	if (has_bs)
 		efi_exit_bs(efi_systbl, efi_ih);
 	if (mbt_elf)
 		multiboot2_copy_syms(mbt_elf,
 		    RELOC(struct multiboot_symbols *, &Multiboot_Symbols),
 		    RELOC(bool *, &has_syms),
 		    RELOC(int **, &esym),
 		    RELOC(void *, &end),
 		    KERNBASE);
 	return;
+}
 static struct btinfo_common *
 bootinfo_init(int type, int len)
+{
 	int i;
 	struct bootinfo *bip = (struct bootinfo *)&bootinfo;
 	vaddr_t data;
 	data = (vaddr_t)&bip->bi_data;
 	for (i = 0; i < bip->bi_nentries; i++) {
 		struct btinfo_common *tmp;
 		tmp = (struct btinfo_common *)data;
 		data += tmp->len;
+	}
 	if (data + len < (vaddr_t)&bip->bi_data + sizeof(bip->bi_data)) {
 		/* Initialize the common part */
 		struct btinfo_common *item = (struct btinfo_common *)data;
 @@ -381,58 +381,58 @@ bootinfo_add(struct btinfo_common *item,
 	/* Copy the data after the common part over */
 	memcpy(&bip[1], &item[1], len - sizeof(*item));
+}
 static void
 mbi_cmdline(struct multiboot_tag_string *mbt)
+{
 	char *cmdline = mbt->string;
 	struct btinfo_console bic;
 	struct btinfo_rootdevice bir;
 	char *cl;
 	if (optstr_get(cmdline, "console", bic.devname, sizeof(bic.devname))) {
-                if (strncmp(bic.devname, "com", sizeof(bic.devname)) == 0) {
+		if (strncmp(bic.devname, "com", sizeof(bic.devname)) == 0) {
-                        char opt[10];
+			char opt[10];
-                        if (optstr_get(cmdline, "console_speed",
+			if (optstr_get(cmdline, "console_speed",
-                        	       opt, sizeof(opt)))
+				       opt, sizeof(opt)))
-                                bic.speed = strtoul(opt, NULL, 10);
+				bic.speed = strtoul(opt, NULL, 10);
-                        else
+			else
-                                bic.speed = 0; /* Use default speed. */
+				bic.speed = 0; /* Use default speed. */
-                        if (optstr_get(cmdline, "console_addr",
+			if (optstr_get(cmdline, "console_addr",
-                        	       opt, sizeof(opt))) {
+				       opt, sizeof(opt))) {
-                                if (opt[0] == '0' && opt[1] == 'x')
+				if (opt[0] == '0' && opt[1] == 'x')
-                                        bic.addr = strtoul(opt + 2, NULL, 16);
+					bic.addr = strtoul(opt + 2, NULL, 16);
-                                else
+				else
-                                        bic.addr = strtoul(opt, NULL, 10);
+					bic.addr = strtoul(opt, NULL, 10);
-                        } else {
+			} else {
-                                bic.addr = 0; /* Use default address. */
+				bic.addr = 0; /* Use default address. */
+			}
-                        bootinfo_add((struct btinfo_common *)&bic,
+			bootinfo_add((struct btinfo_common *)&bic,
-                        	     BTINFO_CONSOLE, sizeof(bic));
+				     BTINFO_CONSOLE, sizeof(bic));
+		}
 		if (strncmp(bic.devname, "pc", sizeof(bic.devname)) == 0)
-                        bootinfo_add((struct btinfo_common *)&bic,
+			bootinfo_add((struct btinfo_common *)&bic,
-                        	     BTINFO_CONSOLE, sizeof(bic));
+				     BTINFO_CONSOLE, sizeof(bic));
+	}
 	if (optstr_get(cmdline, "root", bir.devname, sizeof(bir.devname)))
-                bootinfo_add((struct btinfo_common *)&bir, BTINFO_ROOTDEVICE,
+		bootinfo_add((struct btinfo_common *)&bir, BTINFO_ROOTDEVICE,
-                    sizeof(bir));
+		    sizeof(bir));
 	/*
 	 * Parse boot flags (-s and friends)
 	 */
 	cl = cmdline;
 	/* Skip kernel file name. */
 	while (*cl != '\0' && *cl != ' ')
 		cl++;
 	while (*cl == ' ')
 		cl++;
 	/* Check if there are flags and set 'howto' accordingly. */
 @@ -482,54 +482,54 @@ mbi_modules(char *mbi, uint32_t mbi_size
 		strncpy(bie->path, mbt->cmdline, sizeof(bie->path));
 		bie->type = BI_MODULE_ELF;
 		bie->len = mbt->mod_end - mbt->mod_start;
 		bie->base = mbt->mod_start;
 		bie++;
+	}
+}
 static void
 mbi_basic_meminfo(struct multiboot_tag_basic_meminfo *mbt)
+{
-        /* Make sure we don't override user-set variables. */
+	/* Make sure we don't override user-set variables. */
-        if (biosbasemem == 0) {
+	if (biosbasemem == 0) {
-                biosbasemem = mbt->mem_lower;
+		biosbasemem = mbt->mem_lower;
 #ifdef __i386__
-                biosmem_implicit = 1;
+		biosmem_implicit = 1;
 #endif
+	}
-        if (biosextmem == 0) {
+	if (biosextmem == 0) {
-                biosextmem = mbt->mem_upper;
+		biosextmem = mbt->mem_upper;
 #ifdef __i386__
-                biosmem_implicit = 1;
+		biosmem_implicit = 1;
 #endif
+	}
 	return;
+}
 static void
 mbi_bootdev(struct multiboot_tag_bootdev *mbt)
+{
 	struct btinfo_bootdisk bid;
 	bid.labelsector = -1;
 	bid.biosdev = mbt->biosdev;
 	bid.partition = mbt->slice;
 	bootinfo_add((struct btinfo_common *)&bid,
-           BTINFO_BOOTDISK, sizeof(bid));
+	   BTINFO_BOOTDISK, sizeof(bid));
+}
 static void
 mbi_mmap(struct multiboot_tag_mmap *mbt)
+{
 	struct btinfo_memmap *bim;
 	int num;
 	char *cp;
 	if (mbt->entry_version != 0)
 		return;
 	/* Determine size */
 @@ -584,55 +584,53 @@ mbi_mmap(struct multiboot_tag_mmap *mbt)
 static void
 mbi_vbe(struct multiboot_tag_vbe *mbt, struct btinfo_framebuffer *bif)
+{
 	bif->vbemode = mbt->vbe_mode;
 	return;
+}
 static void
 mbi_framebuffer(struct multiboot_tag_framebuffer *mbt,
      struct btinfo_framebuffer *bif)
+{
 	bif->physaddr = mbt->common.framebuffer_addr;
 	bif->width = mbt->common.framebuffer_width;
 	bif->height = mbt->common.framebuffer_height;
 	bif->depth = mbt->common.framebuffer_bpp;
 	bif->stride = mbt->common.framebuffer_pitch;
 	return;
+}
 static void
 mbi_efi32(struct multiboot_tag_efi32 *mbt)
+{
 	struct btinfo_efi bie;
 	bie.systblpa = mbt->pointer;
 	bie.flags = BI_EFI_32BIT;
-	bootinfo_add((struct btinfo_common *)&bie,
+	bootinfo_add((struct btinfo_common *)&bie, BTINFO_EFI, sizeof(bie));
            BTINFO_EFI, sizeof(bie));
+}
 static void
 mbi_efi64(struct multiboot_tag_efi64 *mbt)
+{
 	struct btinfo_efi bie;
 	bie.systblpa = mbt->pointer;
-	bootinfo_add((struct btinfo_common *)&bie,
+	bootinfo_add((struct btinfo_common *)&bie, BTINFO_EFI, sizeof(bie));
            BTINFO_EFI, sizeof(bie));
+}
 static void
 mbi_efi_mmap(struct multiboot_tag_efi_mmap *mbt)
+{
 	struct btinfo_efimemmap *bie;
 	size_t bie_len;
 	if (mbt->descr_vers != 0)
 		return;
 	bie_len = sizeof(*bie) + mbt->size - sizeof(*mbt);
 	bie = (struct btinfo_efimemmap *)bootinfo_init(BTINFO_EFIMEMMAP,
 @@ -662,27 +660,27 @@ multiboot2_post_reloc(void)
 	mbi_size = *(uint32_t *)multiboot_info;
 	if (mbi_size < 2 * sizeof(uint32_t))
 		goto out;
 	bootinfo.bi_nentries = 0;
 	memset(&fbinfo, 0, sizeof(fbinfo));
 	for (cp = mbi + (2 * sizeof(uint32_t));
 	     cp - mbi < mbi_size;
 	     cp += roundup(mbt->size, MULTIBOOT_INFO_ALIGN)) {
 		mbt = (struct multiboot_tag *)cp;
-		switch(mbt->type) {
+		switch (mbt->type) {
 		case MULTIBOOT_TAG_TYPE_CMDLINE:
 			mbi_cmdline((void *)mbt);
 			break;
 		case MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME:
 			break;
 		case MULTIBOOT_TAG_TYPE_MMAP:
 			mbi_mmap((void *)mbt);
 			break;
 		case MULTIBOOT_TAG_TYPE_MODULE:
 			module_count++;
 			break;
 		case MULTIBOOT_TAG_TYPE_BASIC_MEMINFO:
 			mbi_basic_meminfo((void *)mbt);
 @@ -716,47 +714,47 @@ multiboot2_post_reloc(void)
 			break;
 		case MULTIBOOT_TAG_TYPE_EFI_BS:
 		case MULTIBOOT_TAG_TYPE_EFI32_IH:
 		case MULTIBOOT_TAG_TYPE_EFI64_IH:
 		case MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR:
 		case MULTIBOOT_TAG_TYPE_END:
 		default:
 			break;
+		}
+	}
 	if (has_fbinfo)
 		bootinfo_add((struct btinfo_common *)&fbinfo,
-       		    BTINFO_FRAMEBUFFER, sizeof(fbinfo));
+		    BTINFO_FRAMEBUFFER, sizeof(fbinfo));
 	if (module_count > 0)
 		mbi_modules(mbi, mbi_size, module_count);
 out:
 	return;
+}
 #ifdef DEBUG
 static void
 mbi_hexdump(char *addr, size_t len)
+{
 	int i,j;
 	for (i = 0; i < len; i += 16) {
 		printf("  %p ", addr + i);
 		for (j = 0; j < 16 && i + j < len; j++) {
 			char *cp = addr + i + j;
 			printf("%s%s%x",
 			       (i+j) % 4 ? "" : " ",
 			       (unsigned char)*cp < 0x10 ? "0" : "",
 			       (unsigned char)*cp);
+		}
 		printf("\n");
+	}
 	return;
+}
 #endif
 static const char *
 mbi_tag_name(uint32_t type)
 @@ -884,30 +882,30 @@ multiboot2_print_info(void)
 		case MULTIBOOT_TAG_TYPE_MMAP: {
 			struct multiboot_tag_mmap *memmap;
 			multiboot_memory_map_t *mmap;
 			uint32_t entry_size;
 			uint32_t entry_version;
 			memmap = (struct multiboot_tag_mmap *)mbt;
 			entry_size = memmap->entry_size;
 			entry_version = memmap->entry_version;
 			printf ("entry version = %d\n", entry_version);
 			if (entry_version != 0)
 				break;
 			for (mmap = ((struct multiboot_tag_mmap *)mbt)->entries;
-		 	    (char *)mmap - (char *)mbt < mbt->size;
+			    (char *)mmap - (char *)mbt < mbt->size;
-		 	    mmap = (void *)((char *)mmap + entry_size))
+			    mmap = (void *)((char *)mmap + entry_size))
 				printf("  0x%016"PRIx64" @ 0x%016"PRIx64" "
 				    "type 0x%x\n",
 				    (uint64_t)mmap->len, (uint64_t)mmap->addr,
 				    mmap->type);
 			break;
+		}
 		case MULTIBOOT_TAG_TYPE_FRAMEBUFFER: {
 			struct multiboot_tag_framebuffer *fb = (void *)mbt;
 			printf ("%dx%dx%d @ 0x%"PRIx64"\n",
 			    fb->common.framebuffer_width,
 			    fb->common.framebuffer_height,
 			    fb->common.framebuffer_bpp,
 @@ -942,27 +940,27 @@ multiboot2_print_info(void)
 			    ((struct multiboot_tag_apm *)mbt)->dseg_len);
 			break;
 		case MULTIBOOT_TAG_TYPE_EFI32:
 			printf("0x%x\n",
 			    ((struct multiboot_tag_efi32 *)mbt)->pointer);
 			break;
 		case MULTIBOOT_TAG_TYPE_EFI64:
 			printf("0x%"PRIx64"\n", (uint64_t)
 			    ((struct multiboot_tag_efi64 *)mbt)->pointer);
 			break;
 		case MULTIBOOT_TAG_TYPE_SMBIOS:
 			printf("major = %d, minor = %d\n",
 			    ((struct multiboot_tag_smbios *)mbt)->major,
-		 	    ((struct multiboot_tag_smbios *)mbt)->minor);
+			    ((struct multiboot_tag_smbios *)mbt)->minor);
 #ifdef DEBUG
 			mbi_hexdump((char *)mbt, mbt->size);
 #endif
 			break;
 		case MULTIBOOT_TAG_TYPE_ACPI_OLD:
 			printf("\n");
 #ifdef DEBUG
 			mbi_hexdump((char *)mbt, mbt->size);
 #endif
 			break;
 		case MULTIBOOT_TAG_TYPE_ACPI_NEW:
 			printf("\n");
 #ifdef DEBUG
 @@ -975,27 +973,27 @@ multiboot2_print_info(void)
 			mbi_hexdump((char *)mbt, mbt->size);
 #endif
 			break;
 		case MULTIBOOT_TAG_TYPE_EFI_MMAP:
 			printf("\n");
 #ifdef DEBUG
 			mbi_hexdump((char *)mbt, mbt->size);
 #endif
 			break;
 		case MULTIBOOT_TAG_TYPE_EFI_BS:
 			printf("\n");
 			break;
 		case MULTIBOOT_TAG_TYPE_EFI32_IH:
 			printf("0x%"PRIx32"\n",
 			    ((struct multiboot_tag_efi32_ih *)mbt)->pointer);
 			break;
 		case MULTIBOOT_TAG_TYPE_EFI64_IH:
 			printf("0x%"PRIx64"\n", (uint64_t)
 			    ((struct multiboot_tag_efi64_ih *)mbt)->pointer);
 			break;
 		case MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR: {
 			struct multiboot_tag_load_base_addr *ld = (void *)mbt;
 			printf("0x%x\n", ld->load_base_addr);
 			break;
+		}
 		case MULTIBOOT_TAG_TYPE_END:
 			printf("\n");

--- src/sys/arch/x86/x86/pmap.c 2021/08/02 12:56:23	1.411
+++ src/sys/arch/x86/x86/pmap.c 2021/10/07 12:52:27	1.412

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.411 2021/08/02 12:56:23 andvar Exp $	*/
+/*	$NetBSD: pmap.c,v 1.412 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 2008, 2010, 2016, 2017, 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran, and by Maxime Villard.
+ *
  * 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.
 @@ -120,27 +120,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: pmap.c,v 1.411 2021/08/02 12:56:23 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.412 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #include "opt_svs.h"
 #include "opt_kaslr.h"
 #define	__MUTEX_PRIVATE	/* for assertions */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 @@ -222,27 +222,27 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.4
  *    page is mapped in.    this is critical for page based operations
  *    such as pmap_page_protect() [change protection on _all_ mappings
  *    of a page]
  */
 /*
  * Locking
+ *
  * We have the following locks that we must deal with, listed in the order
  * that they are acquired:
+ *
  * pg->uobject->vmobjlock, pg->uanon->an_lock
+ *
- * 	For managed pages, these per-object locks are taken by the VM system
+ *	For managed pages, these per-object locks are taken by the VM system
  *	before calling into the pmap module - either a read or write hold.
  *	The lock hold prevent pages from changing identity while the pmap is
  *	operating on them.  For example, the same lock is held across a call
  *	to pmap_remove() and the following call to pmap_update(), so that a
  *	page does not gain a new identity while its TLB visibility is stale.
+ *
  * pmap->pm_lock
+ *
  *	This lock protects the fields in the pmap structure including the
  *	non-kernel PDEs in the PDP, the PTEs, and PTPs and connected data
  *	structures.  For modifying unmanaged kernel PTEs it is not needed as
  *	kernel PDEs are never freed, and the kernel is expected to be self
  *	consistent (and the lock can't be taken for unmanaged kernel PTEs,
 @@ -2877,27 +2877,27 @@ pmap_create(void)
 	pmap->pm_extract = NULL;
 	pmap->pm_remove = NULL;
 	pmap->pm_sync_pv = NULL;
 	pmap->pm_pp_remove_ent = NULL;
 	pmap->pm_write_protect = NULL;
 	pmap->pm_unwire = NULL;
 	pmap->pm_tlb_flush = NULL;
 	pmap->pm_data = NULL;
 	/* init the LDT */
 	pmap->pm_ldt = NULL;
 	pmap->pm_ldt_sel = GSYSSEL(GLDT_SEL, SEL_KPL);
-	return (pmap);
+	return pmap;
+}
 /*
  * pmap_check_ptps: verify that none of the pmap's page table objects
  * have any pages allocated to them.
  */
 static void
 pmap_check_ptps(struct pmap *pmap)
+{
 	int i;
 	for (i = 0; i < PTP_LEVELS - 1; i++) {
 		KASSERTMSG(pmap->pm_obj[i].uo_npages == 0,
 @@ -3275,30 +3275,30 @@ retry:
 			uvm_km_free(kernel_map, (vaddr_t)new_ldt,
 			    MAX_USERLDT_SIZE, UVM_KMF_WIRED);
 			printf("WARNING: %s: unable to allocate LDT selector\n",
 			    __func__);
 			return;
+		}
 	} else {
 		/* Wasn't anything there after all. */
 		new_ldt = NULL;
 		sel = -1;
 		mutex_enter(&cpu_lock);
+	}
- 	/*
+	/*
 	 * Now that we have cpu_lock, ensure the LDT status is the same.
 	 */
- 	if (pmap1->pm_ldt != NULL) {
+	if (pmap1->pm_ldt != NULL) {
 		if (new_ldt == NULL) {
 			/* A wild LDT just appeared. */
 			mutex_exit(&cpu_lock);
 			goto retry;
+		}
 		/* Copy the LDT data and install it in pmap2 */
 		memcpy(new_ldt, pmap1->pm_ldt, MAX_USERLDT_SIZE);
 		pmap2->pm_ldt = new_ldt;
 		pmap2->pm_ldt_sel = sel;
 		mutex_exit(&cpu_lock);
 	} else {
 		if (new_ldt != NULL) {
 @@ -3424,27 +3424,27 @@ pmap_activate(struct lwp *l)
+}
 #if defined(XENPV) && defined(__x86_64__)
 #define	KASSERT_PDIRPA(pmap) \
 	KASSERT(pmap_pdirpa(pmap, 0) == ci->ci_xen_current_user_pgd || \
 	    pmap == pmap_kernel())
 #elif defined(PAE)
 #define	KASSERT_PDIRPA(pmap) \
 	KASSERT(pmap_pdirpa(pmap, 0) == pmap_pte2pa(ci->ci_pae_l3_pdir[0]))
 #elif !defined(XENPV)
 #define	KASSERT_PDIRPA(pmap) \
 	KASSERT(pmap_pdirpa(pmap, 0) == pmap_pte2pa(rcr3()))
 #else
-#define	KASSERT_PDIRPA(pmap) 	KASSERT(true)	/* nothing to do */
+#define	KASSERT_PDIRPA(pmap)	KASSERT(true)	/* nothing to do */
 #endif
 /*
  * pmap_reactivate: try to regain reference to the pmap.
+ *
  * => Must be called with kernel preemption disabled.
  */
 static void
 pmap_reactivate(struct pmap *pmap)
+{
 	struct cpu_info * const ci = curcpu();
 	const cpuid_t cid = cpu_index(ci);
 @@ -4135,27 +4135,27 @@ pmap_remove_locked(struct pmap *pmap, va
 			if (result && ptp && ptp->wire_count <= 1)
 				pmap_free_ptp(pmap, ptp, va, ptes, pdes);
+		}
 	} else for (/* null */ ; va < eva ; va = blkendva) {
 		/* determine range of block */
 		blkendva = x86_round_pdr(va+1);
 		if (blkendva > eva)
 			blkendva = eva;
 		if (!pmap_pdes_valid(va, pdes, &pde, &lvl)) {
 			/* Skip a range corresponding to an invalid pde. */
 			blkendva = (va & ptp_frames[lvl - 1]) + nbpd[lvl - 1];
- 			continue;
+			continue;
+		}
 		KASSERT(lvl == 1);
 		/* Get PTP if non-kernel mapping. */
 		if (pmap != pmap_kernel()) {
 			ptp = pmap_find_ptp(pmap, va, 1);
 			KASSERTMSG(ptp != NULL, "%s: unmanaged PTP detected",
 			    __func__);
 		} else {
 			/* Never free kernel PTPs. */
 			ptp = NULL;
+		}
 @@ -4313,27 +4313,27 @@ pmap_pp_remove(struct pmap_page *pp, pad
 	bool locked;
 	/*
 	 * Do an unlocked check to see if the page has no mappings, eg when
 	 * pmap_remove_all() was called before amap_wipeout() for a process
 	 * private amap - common.  The page being removed must be on the way
 	 * out, so we don't have to worry about concurrent attempts to enter
 	 * it (otherwise the caller either doesn't care or has screwed up).
 	 */
 	sum = (uintptr_t)atomic_load_relaxed(&pp->pp_pte.pte_va);
 	sum |= (uintptr_t)atomic_load_relaxed(&pp->pp_pte.pte_ptp);
 	sum |= (uintptr_t)atomic_load_relaxed(&pp->pp_pvlist.lh_first);
 	if (sum == 0) {
-	    	return;
+		return;
+	}
 	kpreempt_disable();
 	for (;;) {
 		struct pmap *pmap;
 		struct pv_entry *pve;
 		pt_entry_t opte;
 		vaddr_t va;
 		mutex_spin_enter(&pp->pp_lock);
 		if ((pvpte = pv_pte_first(pp)) == NULL) {
 			mutex_spin_exit(&pp->pp_lock);
 			break;
 @@ -4816,27 +4816,27 @@ pmap_enter_ma(struct pmap *pmap, vaddr_t
 	KASSERTMSG(va != (vaddr_t)PDP_BASE, "%s: trying to map va=%#"
 	    PRIxVADDR " over PDP!", __func__, va);
 	KASSERTMSG(va < VM_MIN_KERNEL_ADDRESS ||
 	    pmap_valid_entry(pmap->pm_pdir[pl_i(va, PTP_LEVELS)]),
 	    "%s: missing kernel PTP for va=%#" PRIxVADDR, __func__, va);
 #ifdef XENPV
 	KASSERT(domid == DOMID_SELF || pa == 0);
 #endif
 	npte = ma | protection_codes[prot] | PTE_P;
 	npte |= pmap_pat_flags(flags);
 	if (wired)
-	        npte |= PTE_WIRED;
+		npte |= PTE_WIRED;
 	if (va < VM_MAXUSER_ADDRESS)
 		npte |= PTE_U;
 	if (pmap == pmap_kernel())
 		npte |= pmap_pg_g;
 	if (flags & VM_PROT_ALL) {
 		npte |= PTE_A;
 		if (flags & VM_PROT_WRITE) {
 			KASSERT((npte & PTE_W) != 0);
 			npte |= PTE_D;
+		}
+	}
 @@ -4891,29 +4891,29 @@ pmap_enter_ma(struct pmap *pmap, vaddr_t
 	 * Look up the old PV entry at this VA (if any), and insert a new PV
 	 * entry if required for the new mapping.  Temporarily track the old
 	 * and new mappings concurrently.  Only after the old mapping is
 	 * evicted from the pmap will we remove its PV entry.  Otherwise,
 	 * our picture of modified/accessed state for either page could get
 	 * out of sync (we need any P->V operation for either page to stall
 	 * on pmap->pm_lock until done here).
 	 */
 	new_pve = NULL;
 	old_pve = NULL;
 	samepage = false;
 	new_embedded = false;
-    	if (new_pp != NULL) {
+	if (new_pp != NULL) {
-    		error = pmap_enter_pv(pmap, new_pp, ptp, va, &new_pve,
+		error = pmap_enter_pv(pmap, new_pp, ptp, va, &new_pve,
-    		    &old_pve, &samepage, &new_embedded, tree);
+		    &old_pve, &samepage, &new_embedded, tree);
 		/*
 		 * If a new pv_entry was needed and none was available, we
 		 * can go no further.
 		 */
 		if (error != 0) {
 			if (flags & PMAP_CANFAIL) {
 				if (getptp) {
 					pmap_unget_ptp(pmap, &pt);
+				}
 				mutex_exit(&pmap->pm_lock);
 				return error;
+			}
 @@ -6145,29 +6145,29 @@ pmap_ept_enter(struct pmap *pmap, vaddr_
 	 * Look up the old PV entry at this VA (if any), and insert a new PV
 	 * entry if required for the new mapping.  Temporarily track the old
 	 * and new mappings concurrently.  Only after the old mapping is
 	 * evicted from the pmap will we remove its PV entry.  Otherwise,
 	 * our picture of modified/accessed state for either page could get
 	 * out of sync (we need any P->V operation for either page to stall
 	 * on pmap->pm_lock until done here).
 	 */
 	new_pve = NULL;
 	old_pve = NULL;
 	samepage = false;
 	new_embedded = false;
-    	if (new_pp != NULL) {
+	if (new_pp != NULL) {
-    		error = pmap_enter_pv(pmap, new_pp, ptp, va, &new_pve,
+		error = pmap_enter_pv(pmap, new_pp, ptp, va, &new_pve,
-    		    &old_pve, &samepage, &new_embedded, tree);
+		    &old_pve, &samepage, &new_embedded, tree);
 		/*
 		 * If a new pv_entry was needed and none was available, we
 		 * can go no further.
 		 */
 		if (error != 0) {
 			if (flags & PMAP_CANFAIL) {
 				if (getptp) {
 					pmap_unget_ptp(pmap, &pt);
+				}
 				mutex_exit(&pmap->pm_lock);
 				return error;
+			}
 @@ -6472,27 +6472,27 @@ pmap_ept_remove(struct pmap *pmap, vaddr
 	for (/* null */ ; va < eva ; va = blkendva) {
 		int lvl;
 		/* determine range of block */
 		blkendva = x86_round_pdr(va+1);
 		if (blkendva > eva)
 			blkendva = eva;
 		lvl = pmap_ept_pdes_invalid(pmap, va, &pde);
 		if (lvl != 0) {
 			/* Skip a range corresponding to an invalid pde. */
 			blkendva = (va & ptp_frames[lvl - 1]) + nbpd[lvl - 1];
- 			continue;
+			continue;
+		}
 		/* PA of the PTP */
 		ptppa = pmap_pte2pa(pde);
 		ptp = pmap_find_ptp(pmap, va, 1);
 		KASSERTMSG(ptp != NULL, "%s: unmanaged PTP detected",
 		    __func__);
 		ptes = (pt_entry_t *)PMAP_DIRECT_MAP(ptppa);
 		pmap_ept_remove_ptes(pmap, ptp, (vaddr_t)&ptes[pl1_pi(va)], va,
 		    blkendva);

--- src/sys/arch/x86/x86/procfs_machdep.c 2021/07/10 17:33:28	1.41
+++ src/sys/arch/x86/x86/procfs_machdep.c 2021/10/07 12:52:27	1.42

 @@ -1,14 +1,14 @@
-/*	$NetBSD: procfs_machdep.c,v 1.41 2021/07/10 17:33:28 msaitoh Exp $ */
+/*	$NetBSD: procfs_machdep.c,v 1.42 2021/10/07 12:52:27 msaitoh Exp $ */
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden and Jason R. Thorpe for
  * Wasabi Systems, Inc.
+ *
  * 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.
 @@ -32,27 +32,27 @@
  * 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.
  */
 /*
  * NOTE: We simply use the primary CPU's cpuid_level and tsc_freq
  * here.  Might want to change this later.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.41 2021/07/10 17:33:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.42 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 #include <miscfs/procfs/procfs.h>
 #include <machine/cpu.h>
 #include <machine/reg.h>
 #include <machine/specialreg.h>
 #include <x86/cputypes.h>
 @@ -270,27 +270,27 @@ procfs_getonecpufeatures(struct cpu_info
 	size_t last = *left;
 	size_t diff;
 	u_int descs[4];
 	procfs_getonefeatreg(ci->ci_feat_val[0], x86_features[0], p, left);
 	diff = last - *left;
 	procfs_getonefeatreg(ci->ci_feat_val[2], x86_features[1], p + diff,
 	    left);
 	diff = last - *left;
 	/* x86_features[2] is for Transmeta */
 	/* x86_features[3] is Linux defined mapping */
 	procfs_getonefeatreg(ci->ci_feat_val[1], x86_features[4], p + diff,
 	    left);
 	diff = last - *left;
 	procfs_getonefeatreg(ci->ci_feat_val[4], x86_features[5], p + diff,
 	    left);
 	diff = last - *left;
 	procfs_getonefeatreg(ci->ci_feat_val[3], x86_features[6], p + diff,
 	    left);
 	diff = last - *left;
 	/* x86_features[7] is Linux defined mapping */

--- src/sys/arch/x86/x86/spectre.c 2020/05/02 11:37:17	1.35
+++ src/sys/arch/x86/x86/spectre.c 2021/10/07 12:52:27	1.36

 @@ -1,14 +1,14 @@
-/*	$NetBSD: spectre.c,v 1.35 2020/05/02 11:37:17 maxv Exp $	*/
+/*	$NetBSD: spectre.c,v 1.36 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 2018-2019 NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * 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.
  */
 /*
  * Mitigations for the SpectreV2, SpectreV4, MDS and TAA CPU flaws.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.35 2020/05/02 11:37:17 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.36 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_spectre.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <machine/cpufunc.h>
 #include <machine/cpuvar.h>
 #include <machine/specialreg.h>
 #include <machine/frameasm.h>
 @@ -430,27 +430,27 @@ v4_detect_method(void)
 		case 0x15:
 			v4_mitigation_method = V4_MITIGATION_AMD_NONARCH_F15H;
 			return;
 		case 0x16:
 			v4_mitigation_method = V4_MITIGATION_AMD_NONARCH_F16H;
 			return;
 		case 0x17:
 			v4_mitigation_method = V4_MITIGATION_AMD_NONARCH_F17H;
 			return;
 		default:
 			if (cpu_info_primary.ci_max_ext_cpuid < 0x80000008) {
 				break;
+			}
-	 		x86_cpuid(0x80000008, descs);
+			x86_cpuid(0x80000008, descs);
 			if (descs[1] & CPUID_CAPEX_SSB_NO) {
 				/* Not vulnerable to SpectreV4. */
 				v4_mitigation_method = V4_MITIGATION_AMD_SSB_NO;
 				return;
+			}
 			break;
+		}
+	}
 	v4_mitigation_method = V4_MITIGATION_NONE;
+}

--- src/sys/arch/x86/x86/svs.c 2020/07/19 07:35:08	1.39
+++ src/sys/arch/x86/x86/svs.c 2021/10/07 12:52:27	1.40

 @@ -1,14 +1,14 @@
-/*	$NetBSD: svs.c,v 1.39 2020/07/19 07:35:08 maxv Exp $	*/
+/*	$NetBSD: svs.c,v 1.40 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * 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.
 @@ -20,27 +20,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: svs.c,v 1.39 2020/07/19 07:35:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.40 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_svs.h"
 #include "opt_user_ldt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
 #include <sys/kauth.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <sys/reboot.h>
 @@ -50,27 +50,27 @@ __KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.39
 #include <machine/gdt.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_page.h>
 /*
  * Separate Virtual Space
+ *
  * A per-cpu L4 page is maintained in ci_svs_updirpa. During each context
  * switch to a user pmap, the lower half of updirpa is populated with the
  * entries containing the userland pages.
+ *
  * ~~~~~~~~~~ The UTLS Page ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
  * We use a special per-cpu page that we call UTLS, for User Thread Local
  * Storage. Each CPU has one UTLS page. This page has two VAs:
+ *
  *  o When the user page tables are loaded in CR3, the VA to access this
  *    page is &pcpuarea->utls, defined as SVS_UTLS in assembly. This VA is
  *    _constant_ across CPUs, but in the user page tables this VA points to
  *    the physical page of the UTLS that is _local_ to the CPU.
+ *
  *  o When the kernel page tables are loaded in CR3, the VA to access this
  *    page is ci->ci_svs_utls.
+ *
  * +----------------------------------------------------------------------+
  * | CPU0 Local Data                                      (Physical Page) |
 @@ -128,27 +128,27 @@ __KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.39
  * In the pcpu_area structure, pointed to by the "pcpuarea" variable, each CPU
  * has a two-page rsp0 entry (pcpuarea->ent[cid].rsp0). These two pages do
  * _not_ have associated physical addresses. They are only two VAs.
+ *
  * The first page is unmapped and acts as a redzone. The second page is
  * dynamically kentered into the highest page of the real per-lwp kernel stack;
  * but pay close attention, it is kentered _only_ in the user page tables.
  * That is to say, the VA of this second page is mapped when the user page
  * tables are loaded, but not mapped when the kernel page tables are loaded.
+ *
  * During a context switch, svs_lwp_switch() gets called first. This function
  * does the kenter job described above, not in the kernel page tables (that
  * are currently loaded), but in the user page tables (that are not loaded).
+ *
  *           VIRTUAL ADDRESSES                     PHYSICAL ADDRESSES
+ *
  * +-----------------------------+
  * |      KERNEL PAGE TABLES     |
  * |    +-------------------+    |                +-------------------+
  * |    | pcb_rsp0 (page 0) | ------------------> | pcb_rsp0 (page 0) |
  * |    +-------------------+    |                +-------------------+
  * |    | pcb_rsp0 (page 1) | ------------------> | pcb_rsp0 (page 1) |
  * |    +-------------------+    |                +-------------------+
  * |    | pcb_rsp0 (page 2) | ------------------> | pcb_rsp0 (page 2) |
  * |    +-------------------+    |                +-------------------+
  * |    | pcb_rsp0 (page 3) | ------------------> | pcb_rsp0 (page 3) |
  * |    +-------------------+    |            +-> +-------------------+

--- src/sys/arch/x86/x86/sys_machdep.c 2020/06/19 16:20:22	1.56
+++ src/sys/arch/x86/x86/sys_machdep.c 2021/10/07 12:52:27	1.57

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_machdep.c,v 1.56 2020/06/19 16:20:22 maxv Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.57 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*
  * Copyright (c) 1998, 2007, 2009, 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, by Andrew Doran, and by Maxime Villard.
+ *
  * 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.
 @@ -20,27 +20,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: sys_machdep.c,v 1.56 2020/06/19 16:20:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.57 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_mtrr.h"
 #include "opt_user_ldt.h"
 #include "opt_compat_netbsd.h"
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 @@ -424,27 +424,27 @@ x86_get_ioperm(struct lwp *l, void *args
+}
 static int
 x86_set_ioperm(struct lwp *l, void *args, register_t *retval)
+{
 #ifdef IOPERM
 	struct cpu_info *ci;
 	int error;
 	struct pcb *pcb = lwp_getpcb(l);
 	struct x86_set_ioperm_args ua;
 	void *new;
 	void *old;
-  	error = kauth_authorize_machdep(l->l_cred, KAUTH_MACHDEP_IOPERM_SET,
+	error = kauth_authorize_machdep(l->l_cred, KAUTH_MACHDEP_IOPERM_SET,
 	    NULL, NULL, NULL, NULL);
 	if (error)
 		return error;
 	if ((error = copyin(args, &ua, sizeof(ua))) != 0)
 		return error;
 	new = kmem_alloc(IOMAPSIZE, KM_SLEEP);
 	error = copyin(ua.iomap, new, IOMAPSIZE);
 	if (error) {
 		kmem_free(new, IOMAPSIZE);
 		return error;
+	}
 @@ -469,27 +469,27 @@ x86_set_ioperm(struct lwp *l, void *args
 #endif
+}
 static int
 x86_get_mtrr(struct lwp *l, void *args, register_t *retval)
+{
 #ifdef MTRR
 	struct x86_get_mtrr_args ua;
 	int error, n;
 	if (mtrr_funcs == NULL)
 		return ENOSYS;
- 	error = kauth_authorize_machdep(l->l_cred, KAUTH_MACHDEP_MTRR_GET,
+	error = kauth_authorize_machdep(l->l_cred, KAUTH_MACHDEP_MTRR_GET,
 	    NULL, NULL, NULL, NULL);
 	if (error)
 		return error;
 	error = copyin(args, &ua, sizeof ua);
 	if (error != 0)
 		return error;
 	error = copyin(ua.n, &n, sizeof n);
 	if (error != 0)
 		return error;
 	KERNEL_LOCK(1, NULL);
 @@ -504,27 +504,27 @@ x86_get_mtrr(struct lwp *l, void *args,
 #endif
+}
 static int
 x86_set_mtrr(struct lwp *l, void *args, register_t *retval)
+{
 #ifdef MTRR
 	int error, n;
 	struct x86_set_mtrr_args ua;
 	if (mtrr_funcs == NULL)
 		return ENOSYS;
- 	error = kauth_authorize_machdep(l->l_cred, KAUTH_MACHDEP_MTRR_SET,
+	error = kauth_authorize_machdep(l->l_cred, KAUTH_MACHDEP_MTRR_SET,
 	    NULL, NULL, NULL, NULL);
 	if (error)
 		return error;
 	error = copyin(args, &ua, sizeof ua);
 	if (error != 0)
 		return error;
 	error = copyin(ua.n, &n, sizeof n);
 	if (error != 0)
 		return error;
 	KERNEL_LOCK(1, NULL);
 @@ -616,27 +616,27 @@ x86_set_sdbase(void *arg, char which, lw
 		base = (vaddr_t)arg;
 	} else {
 		int error = copyin(arg, &base, sizeof(base));
 		if (error != 0)
 			return error;
+	}
 	if (base >= VM_MAXUSER_ADDRESS)
 		return EINVAL;
 	pcb = lwp_getpcb(l);
 	kpreempt_disable();
-	switch(which) {
+	switch (which) {
 	case 'f':
 		pcb->pcb_fs = base;
 		if (l == curlwp)
 			wrmsr(MSR_FSBASE, pcb->pcb_fs);
 		break;
 	case 'g':
 		pcb->pcb_gs = base;
 		if (l == curlwp)
 			wrmsr(MSR_KERNELGSBASE, pcb->pcb_gs);
 		break;
 	default:
 		panic("x86_set_sdbase");
+	}
 @@ -672,73 +672,74 @@ x86_get_sdbase(void *arg, char which)
+{
 #ifdef i386
 	return x86_get_sdbase32(arg, which);
 #else
 	vaddr_t base;
 	struct pcb *pcb;
 	if (curproc->p_flag & PK_32) {
 		return x86_get_sdbase32(arg, which);
+	}
 	pcb = lwp_getpcb(curlwp);
-	switch(which) {
+	switch (which) {
 	case 'f':
 		base = pcb->pcb_fs;
 		break;
 	case 'g':
 		base = pcb->pcb_gs;
 		break;
 	default:
 		panic("x86_get_sdbase");
+	}
 	return copyout(&base, arg, sizeof(base));
 #endif
+}
 int
-sys_sysarch(struct lwp *l, const struct sys_sysarch_args *uap, register_t *retval)
+sys_sysarch(struct lwp *l, const struct sys_sysarch_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(int) op;
 		syscallarg(void *) parms;
 	} */
 	int error = 0;
-	switch(SCARG(uap, op)) {
+	switch (SCARG(uap, op)) {
 	case X86_IOPL:
 		error = x86_iopl(l, SCARG(uap, parms), retval);
 		break;
 #ifdef i386
 	/*
 	 * On amd64, this is done via netbsd32_sysarch.
 	 */
 	case X86_GET_LDT:
 		error = x86_get_ldt(l, SCARG(uap, parms), retval);
 		break;
 	case X86_SET_LDT:
 		error = x86_set_ldt(l, SCARG(uap, parms), retval);
 		break;
 #endif
 	case X86_GET_IOPERM:
 		error = x86_get_ioperm(l, SCARG(uap, parms), retval);
 		break;
 	case X86_SET_IOPERM:
 		error = x86_set_ioperm(l, SCARG(uap, parms), retval);
 		break;
 	case X86_GET_MTRR:
 		error = x86_get_mtrr(l, SCARG(uap, parms), retval);
 		break;
 	case X86_SET_MTRR:
 		error = x86_set_mtrr(l, SCARG(uap, parms), retval);
 		break;
 	case X86_SET_FSBASE:
 		error = x86_set_sdbase(SCARG(uap, parms), 'f', curlwp, false);
 		break;
 @@ -760,16 +761,16 @@ sys_sysarch(struct lwp *l, const struct
 		break;
+	}
 	return error;
+}
 int
 cpu_lwp_setprivate(lwp_t *l, void *addr)
+{
 #ifdef __x86_64__
 	if ((l->l_proc->p_flag & PK_32) == 0) {
 		return x86_set_sdbase(addr, 'f', l, true);
+	}
 #endif
 	return x86_set_sdbase(addr, 'g', l, true);
+}

--- src/sys/arch/x86/x86/syscall.c 2019/04/06 11:54:21	1.18
+++ src/sys/arch/x86/x86/syscall.c 2021/10/07 12:52:27	1.19

 @@ -1,14 +1,14 @@
-/*	$NetBSD: syscall.c,v 1.18 2019/04/06 11:54:21 kamil Exp $	*/
+/*	$NetBSD: syscall.c,v 1.19 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1998, 2000, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * 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.
 @@ -20,27 +20,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: syscall.c,v 1.18 2019/04/06 11:54:21 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.19 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/signal.h>
 #include <sys/ktrace.h>
 #include <sys/syscall.h>
 #include <sys/syscallvar.h>
 #include <sys/syscall_stats.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 @@ -66,27 +66,27 @@ md_child_return(struct lwp *l)
 	userret(l);
+}
 /*
  * Process the tail end of a posix_spawn() for the child.
  */
 void
 cpu_spawn_return(struct lwp *l)
+{
 	userret(l);
+}
 /*
  * syscall(frame):
  *	System call request from POSIX system call gate interface to kernel.
  *	Like trap(), argument is call by reference.
  */
 #ifdef KDTRACE_HOOKS
 void syscall(struct trapframe *);
 #else
 static
 #endif
 void
 syscall(struct trapframe *frame)
+{

--- src/sys/arch/x86/x86/x86_tlb.c 2020/03/22 00:16:16	1.18
+++ src/sys/arch/x86/x86/x86_tlb.c 2021/10/07 12:52:27	1.19

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_tlb.c,v 1.18 2020/03/22 00:16:16 ad Exp $	*/
+/*	$NetBSD: x86_tlb.c,v 1.19 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2008-2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran and Mindaugas Rasiukevicius.
+ *
  * 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.
 @@ -30,27 +30,27 @@
  */
 /*
  * x86 pmap(9) module: TLB shootdowns.
+ *
  * TLB shootdowns are hard interrupts that operate outside the SPL framework.
  * They do not need to be blocked, provided that the pmap module gets the
  * order of events correct.  The calls are made by poking the LAPIC directly.
  * The interrupt handler is short and does one of the following: invalidate
  * a set of pages, all user TLB entries or the entire TLB.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_tlb.c,v 1.18 2020/03/22 00:16:16 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_tlb.c,v 1.19 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <uvm/uvm.h>
 #include <machine/cpuvar.h>
 #ifdef XENPV
 #include <xen/xenpmap.h>
 @@ -89,38 +89,38 @@ typedef struct {
 #define	TP_GET_COUNT(tp)	((tp)->tp_store[TP_COUNT] & PAGE_MASK)
 #define	TP_GET_USERPMAP(tp)	((tp)->tp_store[TP_USERPMAP] & 1)
 #define	TP_GET_GLOBAL(tp)	((tp)->tp_store[TP_GLOBAL] & 1)
 #define	TP_GET_DONE(tp)		(atomic_load_relaxed(&(tp)->tp_store[TP_DONE]) & 1)
 #define	TP_GET_VA(tp, i)	((tp)->tp_store[(i)] & ~PAGE_MASK)
 #define	TP_INC_COUNT(tp)	((tp)->tp_store[TP_COUNT]++)
 #define	TP_SET_ALLVA(tp)	((tp)->tp_store[TP_COUNT] |= TP_ALLVA)
 #define	TP_SET_VA(tp, c, va)	((tp)->tp_store[(c)] |= ((va) & ~PAGE_MASK))
 #define	TP_SET_USERPMAP(tp)	((tp)->tp_store[TP_USERPMAP] |= 1)
 #define	TP_SET_GLOBAL(tp)	((tp)->tp_store[TP_GLOBAL] |= 1)
-#define	TP_SET_DONE(tp) \
+#define	TP_SET_DONE(tp)							     \
-do { \
+	do {								     \
-	uintptr_t v = atomic_load_relaxed(&(tp)->tp_store[TP_DONE]); \
+		uintptr_t v = atomic_load_relaxed(&(tp)->tp_store[TP_DONE]); \
-	atomic_store_relaxed(&(tp)->tp_store[TP_DONE], v | 1); \
+		atomic_store_relaxed(&(tp)->tp_store[TP_DONE], v | 1);	     \
-} while (/* CONSTCOND */ 0);
+	} while (/* CONSTCOND */ 0);
 #define	TP_CLEAR(tp)		memset(__UNVOLATILE(tp), 0, sizeof(*(tp)));
 /*
  * TLB shootdown state.
  */
-static volatile pmap_tlb_packet_t * volatile pmap_tlb_packet __cacheline_aligned;
+static volatile pmap_tlb_packet_t *volatile pmap_tlb_packet __cacheline_aligned;
 static volatile u_int		pmap_tlb_pendcount	__cacheline_aligned;
 static struct evcnt		pmap_tlb_evcnt		__cacheline_aligned;
 /*
  * TLB shootdown statistics.
  */
 #ifdef TLBSTATS
 static struct evcnt		tlbstat_local[TLBSHOOT__MAX];
 static struct evcnt		tlbstat_remote[TLBSHOOT__MAX];
 static struct evcnt		tlbstat_kernel[TLBSHOOT__MAX];
 static struct evcnt		tlbstat_single_req;
 static struct evcnt		tlbstat_single_issue;
 static const char *		tlbstat_name[ ] = {
 @@ -422,27 +422,27 @@ pmap_tlb_shootnow(void)
 			x86_pause();
 		} while (atomic_load_relaxed(&pmap_tlb_packet) != NULL);
 		s = splvm();
 		/*
 		 * An interrupt might have done the shootdowns for
 		 * us while we spun.
 		 */
 		if (TP_GET_COUNT(tp) == 0) {
 			splx(s);
 			return;
+		}
+	}
 	/*
 	 * Ownership of the global pointer provides serialization of the
 	 * update to the count and the event counter.  With those values
 	 * updated, start shootdowns on remote CPUs.
 	 */
 	pmap_tlb_pendcount = rcpucount;
 	pmap_tlb_evcnt.ev_count++;
 	pmap_tlb_processpacket(ts, target);
 	/*
 	 * Clear out the local CPU's buffer for the next user.  Once done,
 	 * we can drop the IPL.
 	 */

--- src/sys/arch/x86/x86/viac7temp.c 2014/08/10 16:44:34	1.8
+++ src/sys/arch/x86/x86/viac7temp.c 2021/10/07 12:52:27	1.9

 @@ -1,14 +1,14 @@
-/* $NetBSD: viac7temp.c,v 1.8 2014/08/10 16:44:34 tls Exp $ */
+/* $NetBSD: viac7temp.c,v 1.9 2021/10/07 12:52:27 msaitoh Exp $ */
 /*-
  * Copyright (c) 2009 Jared D. 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,45 +17,45 @@
  * ``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: viac7temp.c,v 1.8 2014/08/10 16:44:34 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viac7temp.c,v 1.9 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/xcall.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <machine/cpuvar.h>
 #include <machine/cpufunc.h>
 #include <machine/cputypes.h>
 #include <machine/specialreg.h>
 struct viac7temp_softc {
 	device_t		 sc_dev;
 	struct cpu_info		*sc_ci;
-	struct sysmon_envsys 	*sc_sme;
+	struct sysmon_envsys	*sc_sme;
-	envsys_data_t 		 sc_sensor;
+	envsys_data_t		 sc_sensor;
 };
 static int	viac7temp_match(device_t, cfdata_t, void *);
 static void	viac7temp_attach(device_t, device_t, void *);
 static int	viac7temp_detach(device_t, int);
 static void	viac7temp_refresh(struct sysmon_envsys *, envsys_data_t *);
 static void	viac7temp_refresh_xcall(void *, void *);
 CFATTACH_DECL_NEW(viac7temp, sizeof(struct viac7temp_softc),
     viac7temp_match, viac7temp_attach, viac7temp_detach, NULL);
 static int
 viac7temp_match(device_t parent, cfdata_t cf, void *aux)

--- src/sys/arch/x86/x86/x86_autoconf.c 2020/07/09 22:45:54	1.84
+++ src/sys/arch/x86/x86/x86_autoconf.c 2021/10/07 12:52:27	1.85

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_autoconf.c,v 1.84 2020/07/09 22:45:54 jdolecek Exp $	*/
+/*	$NetBSD: x86_autoconf.c,v 1.85 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.84 2020/07/09 22:45:54 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.85 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
 #include <sys/disk.h>
 #include <sys/proc.h>
 #include <sys/md5.h>
 #include <sys/kauth.h>
 @@ -85,28 +85,28 @@ static void
 dmatch(const char *func, device_t dv, const char *method)
+{
 	printf("WARNING: %s: double match for boot device (%s:%s %s:%s)\n",
 	    func, booted_method, device_xname(booted_device),
 	    method, device_xname(dv));
+}
 static int
 is_valid_disk(device_t dv)
+{
 	if (device_class(dv) != DV_DISK)
-		return (0);
+		return 0;
 	return (device_is_a(dv, "dk") ||
 		device_is_a(dv, "sd") ||
 		device_is_a(dv, "wd") ||
 		device_is_a(dv, "ld") ||
 		device_is_a(dv, "xbd") ||
 		device_is_a(dv, "ed"));
+}
 /*
  * XXX Ugly bit of code.  But, this is the only safe time that the
  * match between BIOS disks and native disks can be done.
  */
 static void
 @@ -282,75 +282,75 @@ match_bootdisk(device_t dv, struct btinf
 		DPRINTF(("%s: dk %s\n", __func__, device_xname(dv)));
 		return 0;
+	}
 	/*
 	 * A disklabel is required here.  The boot loader doesn't refuse
 	 * to boot from a disk without a label, but this is normally not
 	 * wanted.
 	 */
 	if (bid->labelsector == -1) {
 		DPRINTF(("%s: no label %s\n", __func__, device_xname(dv)));
 		return 0;
+	}
 	if ((tmpvn = opendisk(dv)) == NULL) {
 		DPRINTF(("%s: can't open %s\n", __func__, device_xname(dv)));
 		return 0;
+	}
 	error = VOP_IOCTL(tmpvn, DIOCGDINFO, &label, FREAD, NOCRED);
 	if (error) {
 		/*
 		 * XXX Can't happen -- open() would have errored out
 		 * or faked one up.
 		 */
 		printf("%s: can't get label for dev %s (%d)\n", __func__,
 		    device_xname(dv), error);
 		goto closeout;
+	}
 	/* Compare with our data. */
 	if (label.d_type == bid->label.type &&
 	    label.d_checksum == bid->label.checksum &&
 	    strncmp(label.d_packname, bid->label.packname, 16) == 0)
 		found = 1;
 	DPRINTF(("%s: %s found=%d\n", __func__, device_xname(dv), found));
  closeout:
 	VOP_CLOSE(tmpvn, FREAD, NOCRED);
 	vput(tmpvn);
-	return (found);
+	return found;
+}
 /*
  * Attempt to find the device from which we were booted.  If we can do so,
  * and not instructed not to do so, change rootdev to correspond to the
  * load device.
  */
 static void
 findroot(void)
+{
 	struct btinfo_rootdevice *biv;
 	struct btinfo_bootdisk *bid;
 	struct btinfo_bootwedge *biw;
 	struct btinfo_biosgeom *big;
 	device_t dv;
 	deviter_t di;
 	static char bootspecbuf[sizeof(biv->devname)+1];
 	if (booted_device)
 		return;
 	if (lookup_bootinfo(BTINFO_NETIF) != NULL) {
 		/*
 		 * We got netboot interface information, but device_register()
 		 * failed to match it to a configured device.  Boot disk
 		 * information cannot be present at the same time, so give
 		 * up.
 		 */
 		printf("%s: netboot interface not found.\n", __func__);
 		return;
+	}
 	if ((biv = lookup_bootinfo(BTINFO_ROOTDEVICE)) != NULL) {
 		for (dv = deviter_first(&di, DEVITER_F_ROOT_FIRST);
 @@ -399,27 +399,27 @@ findroot(void)
 		 * boot device.
 		 */
 		for (dv = deviter_first(&di, DEVITER_F_ROOT_FIRST);
 		     dv != NULL;
 		     dv = deviter_next(&di)) {
 			if (is_valid_disk(dv)) {
 				/*
 				 * Don't trust BIOS device numbers, try
 				 * to match the information passed by the
 				 * boot loader instead.
 				 */
 				if ((biw->biosdev & 0x80) == 0 ||
 				    match_bootwedge(dv, biw) == 0)
-				    	continue;
+					continue;
 				goto bootwedge_found;
+			}
 			continue;
  bootwedge_found:
 			if (booted_device) {
 				dmatch(__func__, dv, "bootinfo/bootwedge");
 				continue;
+			}
 			booted_device = dv;
 			booted_method = "bootinfo/bootwedge";
 			booted_partition = bid != NULL ? bid->partition : 0;
 			booted_nblks = biw->nblks;
 @@ -446,39 +446,39 @@ findroot(void)
 		     dv = deviter_next(&di)) {
 			if (device_is_a(dv, "fd") &&
 			    device_class(dv) == DV_DISK) {
 				/*
 				 * Assume the configured unit number matches
 				 * the BIOS device number.  (This is the old
 				 * behavior.)  Needs some ideas how to handle
 				 * the BIOS's "swap floppy drive" options.
 				 */
 				/* XXX device_unit() abuse */
 				if ((bid->biosdev & 0x80) != 0 ||
 				    device_unit(dv) != bid->biosdev)
-				    	continue;
+					continue;
 				goto bootdisk_found;
+			}
 			if (is_valid_disk(dv)) {
 				/*
 				 * Don't trust BIOS device numbers, try
 				 * to match the information passed by the
 				 * boot loader instead.
 				 */
 				if ((bid->biosdev & 0x80) == 0 ||
 				    match_bootdisk(dv, bid) == 0)
-				    	continue;
+					continue;
 				goto bootdisk_found;
+			}
 			continue;
  bootdisk_found:
 			if (booted_device) {
 				dmatch(__func__, dv, "bootinfo/bootdisk");
 				continue;
+			}
 			booted_device = dv;
 			booted_method = "bootinfo/bootdisk";
 			booted_partition = bid->partition;
 			booted_nblks = 0;

--- src/sys/arch/x86/x86/x86_ipmi.c 2021/07/21 23:16:09	1.2
+++ src/sys/arch/x86/x86/x86_ipmi.c 2021/10/07 12:52:27	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_ipmi.c,v 1.2 2021/07/21 23:16:09 jmcneill Exp $ */
+/*	$NetBSD: x86_ipmi.c,v 1.3 2021/10/07 12:52:27 msaitoh Exp $ */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * 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.
+ *
 @@ -42,27 +42,27 @@
  * 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 AUTHORS 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: x86_ipmi.c,v 1.2 2021/07/21 23:16:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_ipmi.c,v 1.3 2021/10/07 12:52:27 msaitoh Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/pmf.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <dev/smbiosvar.h>
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
 @@ -135,56 +135,56 @@ ipmi_smbios_probe(struct smbios_ipmi *pi
 		ia->iaa_if_iotype = 'i';
 		ia->iaa_if_iobase = pipmi->smipmi_base_address & ~0x1;
 	} else {
 		ia->iaa_if_iotype = 'm';
 		ia->iaa_if_iobase = pipmi->smipmi_base_address & ~0xF;
+	}
 	if (pipmi->smipmi_base_flags & SMIPMI_FLAG_ODDOFFSET)
 		ia->iaa_if_iobase++;
 	platform = pmf_get_platform("system-product");
 	if (platform != NULL &&
 	    strcmp(platform, "ProLiant MicroServer") == 0 &&
 	    pipmi->smipmi_base_address != 0) {
-                ia->iaa_if_iospacing = 1;
+		ia->iaa_if_iospacing = 1;
-                ia->iaa_if_iobase = pipmi->smipmi_base_address & ~0x7;
+		ia->iaa_if_iobase = pipmi->smipmi_base_address & ~0x7;
-                ia->iaa_if_iotype = 'i';
+		ia->iaa_if_iotype = 'i';
-                return;
+		return;
+	}
 	if (pipmi->smipmi_base_flags == 0x7f) {
 		/* IBM 325 eServer workaround */
 		ia->iaa_if_iospacing = 1;
 		ia->iaa_if_iobase = pipmi->smipmi_base_address;
 		ia->iaa_if_iotype = 'i';
 		return;
+	}
+}
 /* Scan memory for signature */
 static void *
 scan_sig(long start, long end, int skip, int len, const void *data)
+{
 	void *va;
 	while (start < end) {
 		va = ISA_HOLE_VADDR(start);
 		if (memcmp(va, data, len) == 0)
-			return (va);
+			return va;
 		start += skip;
+	}
-	return (NULL);
+	return NULL;
+}
 int
 ipmi_probe(struct ipmi_attach_args *ia)
+{
 	struct dmd_ipmi *pipmi;
 	struct smbtable tbl;
 	tbl.cookie = 0;
 	if (smbios_find_table(SMBIOS_TYPE_IPMIDEV, &tbl))
 		ipmi_smbios_probe(tbl.tblhdr, ia);
 	else {

--- src/sys/arch/x86/x86/x86_machdep.c 2021/02/19 03:28:53	1.148
+++ src/sys/arch/x86/x86/x86_machdep.c 2021/10/07 12:52:27	1.149

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_machdep.c,v 1.148 2021/02/19 03:28:53 christos Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.149 2021/10/07 12:52:27 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
  * Copyright (c) 2005, 2008, 2009, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, and 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
 @@ -21,27 +21,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: x86_machdep.c,v 1.148 2021/02/19 03:28:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.149 2021/10/07 12:52:27 msaitoh Exp $");
 #include "opt_modular.h"
 #include "opt_physmem.h"
 #include "opt_splash.h"
 #include "opt_kaslr.h"
 #include "opt_svs.h"
 #include "opt_xen.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kcore.h>
 #include <sys/errno.h>
 @@ -273,27 +273,27 @@ module_init_md(void)
 		case BI_MODULE_FS:
 			aprint_debug("File-system image path=%s len=%d pa=%x\n",
 			    bi->path, bi->len, bi->base);
 			KASSERT(trunc_page(bi->base) == bi->base);
 #if defined(MEMORY_DISK_HOOKS) && defined(MEMORY_DISK_DYNAMIC)
 			md_root_setconf(
 #ifdef KASLR
 			    (void *)PMAP_DIRECT_MAP((uintptr_t)bi->base),
 #else
 			    (void *)((uintptr_t)bi->base + KERNBASE),
 #endif
 			    bi->len);
 #endif
 			break;
 		default:
 			aprint_debug("Skipping non-ELF module\n");
 			break;
+		}
+	}
+}
 #endif	/* MODULAR */
 void
 cpu_need_resched(struct cpu_info *ci, struct lwp *l, int flags)
+{
 	KASSERT(kpreempt_disabled());
 @@ -694,27 +694,27 @@ x86_parse_clusters(struct btinfo_memmap
 		default:
 			continue;
+		}
 		/* If the segment is smaller than a page, skip it. */
 		if (size < PAGE_SIZE)
 			continue;
 		seg_start = addr;
 		seg_end = addr + size;
 		/*
 		 * XXX XXX: Avoid the ISA I/O MEM.
+		 *
 		 * Some laptops (for example, Toshiba Satellite2550X) report
 		 * this area as valid.
 		 */
 		if (seg_start < IOM_END && seg_end > IOM_BEGIN) {
 			printf("WARNING: memory map entry overlaps "
 			    "with ``Compatibility Holes'': "
 			    "0x%"PRIx64"/0x%"PRIx64"/0x%x\n", seg_start,
 			    seg_end - seg_start, type);
 			if (x86_add_cluster(seg_start, IOM_BEGIN, type) == -1)
 				break;
 			if (x86_add_cluster(IOM_END, seg_end, type) == -1)
 				break;
 @@ -833,27 +833,27 @@ x86_load_region(uint64_t seg_start, uint
+	}
+}
 #ifdef XEN
 static void
 x86_add_xen_clusters(void)
+{
 	if (hvm_start_info->memmap_entries > 0) {
 		struct hvm_memmap_table_entry *map_entry;
 		map_entry = (void *)((uintptr_t)hvm_start_info->memmap_paddr + KERNBASE);
 		for (int i = 0; i < hvm_start_info->memmap_entries; i++) {
 			if (map_entry[i].size < PAGE_SIZE)
 				continue;
-			switch(map_entry[i].type) {
+			switch (map_entry[i].type) {
 			case XEN_HVM_MEMMAP_TYPE_RAM:
 				x86_add_cluster(map_entry[i].addr,
 				    map_entry[i].size, BIM_Memory);
 				break;
 			case XEN_HVM_MEMMAP_TYPE_ACPI:
 				x86_add_cluster(map_entry[i].addr,
 				    map_entry[i].size, BIM_ACPI);
 				break;
+			}
+		}
 	} else {
 		struct xen_memory_map memmap;
 		static struct _xen_mmap {
 @@ -1040,53 +1040,53 @@ init_x86_vm(paddr_t pa_kend)
 		 *             [pa_kstart            pa_kend]
 		 *  [seg_start              seg_end]
 		 */
 		if (seg_start < pa_kstart &&
 		    pa_kstart < seg_end &&
 		    seg_end < pa_kend) {
 #ifdef DEBUG_MEMLOAD
 			printf("discard trailing kernel overlap "
 			    "%" PRIxPADDR " - %" PRIx64 "\n",
 			    pa_kstart, seg_end);
 #endif
 			seg_end = pa_kstart;
+		}
 		/* First hunk */
 		if (seg_start != seg_end) {
 			x86_load_region(seg_start, seg_end);
+		}
 		/* Second hunk */
 		if (seg_start1 != seg_end1) {
 			x86_load_region(seg_start1, seg_end1);
+		}
+	}
 	return 0;
+}
 #endif /* !XENPV */
 void
 init_x86_msgbuf(void)
+{
 	/* Message buffer is located at end of core. */
 	psize_t sz = round_page(MSGBUFSIZE);
 	psize_t reqsz = sz;
 	uvm_physseg_t x;
- search_again:
+search_again:
-        for (x = uvm_physseg_get_first();
+	for (x = uvm_physseg_get_first();
 	     uvm_physseg_valid_p(x);
 	     x = uvm_physseg_get_next(x)) {
 		if (ctob(uvm_physseg_get_avail_end(x)) == avail_end)
 			break;
+	}
 	if (uvm_physseg_valid_p(x) == false)
 		panic("init_x86_msgbuf: can't find end of memory");
 	/* Shrink so it'll fit in the last segment. */
 	if (uvm_physseg_get_avail_end(x) - uvm_physseg_get_avail_start(x) < atop(sz))
 		sz = ctob(uvm_physseg_get_avail_end(x) - uvm_physseg_get_avail_start(x));
 @@ -1216,37 +1216,37 @@ x86_startup(void)
+{
 #if !defined(XENPV)
 	nmi_init();
 #endif
+}
 const char *
 get_booted_kernel(void)
+{
 	const struct btinfo_bootpath *bibp = lookup_bootinfo(BTINFO_BOOTPATH);
 	return bibp ? bibp->bootpath : NULL;
+}
 /*
  * machine dependent system variables.
  */
 static int
 sysctl_machdep_booted_kernel(SYSCTLFN_ARGS)
+{
 	struct btinfo_bootpath *bibp;
 	struct sysctlnode node;
 	bibp = lookup_bootinfo(BTINFO_BOOTPATH);
-	if(!bibp)
+	if (!bibp)
 		return ENOENT; /* ??? */
 	node = *rnode;
 	node.sysctl_data = bibp->bootpath;
 	node.sysctl_size = sizeof(bibp->bootpath);
 	return sysctl_lookup(SYSCTLFN_CALL(&node));
+}
 static int
 sysctl_machdep_bootmethod(SYSCTLFN_ARGS)
+{
 	struct sysctlnode node;
 	char buf[5];
 @@ -1503,32 +1503,32 @@ cpu_initclocks(void)
 	/*
 	 * Re-calibrate TSC on boot CPU using most accurate time source,
 	 * thus making accurate TSC available for x86_initclock_func().
 	 */
 	cpu_get_tsc_freq(curcpu());
 	/* Now start the clocks on this CPU (the boot CPU). */
 	(*x86_initclock_func)();
+}
 int
 x86_cpu_is_lcall(const void *ip)
+{
-        static const uint8_t lcall[] = { 0x9a, 0, 0, 0, 0 };
+	static const uint8_t lcall[] = { 0x9a, 0, 0, 0, 0 };
 	int error;
-        const size_t sz = sizeof(lcall) + 2;
+	const size_t sz = sizeof(lcall) + 2;
-        uint8_t tmp[sizeof(lcall) + 2];
+	uint8_t tmp[sizeof(lcall) + 2];
 	if ((error = copyin(ip, tmp, sz)) != 0)
 		return error;
 	if (memcmp(tmp, lcall, sizeof(lcall)) != 0 || tmp[sz - 1] != 0)
 		return EINVAL;
 	switch (tmp[sz - 2]) {
-        case (uint8_t)0x07: /* NetBSD */
+	case (uint8_t)0x07: /* NetBSD */
 	case (uint8_t)0x87: /* BSD/OS */
 		return 0;
 	default:
 		return EINVAL;
+	}
+}