 @@ -1,14 +1,14 @@
-/* $NetBSD: genfb_machdep.h,v 1.4 2019/11/30 05:28:28 nonaka Exp $ */
+/* $NetBSD: genfb_machdep.h,v 1.5 2021/01/28 01:57:31 jmcneill 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.
 @@ -21,18 +21,17 @@
  * 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.
  */
 #ifndef _X86_GENFB_MACHDEP_H
 #define _X86_GENFB_MACHDEP_H
 int	x86_genfb_init(void);
 int	x86_genfb_cnattach(void);
 void	x86_genfb_mtrr_init(uint64_t, uint32_t);
 void	x86_genfb_set_console_dev(device_t);
 void	x86_genfb_ddb_trap_callback(int);
 #endif /* !_X86_GENFB_MACHDEP_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_machdep.c,v 1.87 2020/05/04 15:55:56 jdolecek Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.88 2021/01/28 01:57:31 jmcneill Exp $	*/
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * 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
 @@ -63,27 +63,27 @@
 /*
  * Machine-specific functions for PCI autoconfiguration.
+ *
  * On PCs, there are two methods of generating PCI configuration cycles.
  * We try to detect the appropriate mechanism for this machine and set
  * up a few function pointers to access the correct method directly.
+ *
  * The configuration method can be hard-coded in the config file by
  * using `options PCI_CONF_MODE=N', where `N' is the configuration mode
  * as defined in section 3.6.4.1, `Generating Configuration Cycles'.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.87 2020/05/04 15:55:56 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.88 2021/01/28 01:57:31 jmcneill Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/kmem.h>
 #include <uvm/uvm_extern.h>
 @@ -1008,28 +1008,26 @@ x86_genfb_set_mapreg(void *opaque, int i
 	outb(IO_VGA + VGA_DAC_PALETTE, (uint8_t)b >> 2);
+}
 static bool
 x86_genfb_setmode(struct genfb_softc *sc, int newmode)
+{
 #if NGENFB > 0
 # if NACPICA > 0 && defined(VGA_POST)
 	static int curmode = WSDISPLAYIO_MODE_EMUL;
 # endif
 	switch (newmode) {
 	case WSDISPLAYIO_MODE_EMUL:
 		x86_genfb_mtrr_init(sc->sc_fboffset,
 		    sc->sc_height * sc->sc_stride);
 # if NACPICA > 0 && defined(VGA_POST)
 		if (curmode != newmode) {
 			if (vga_posth != NULL && acpi_md_vesa_modenum != 0) {
 				vga_post_set_vbe(vga_posth,
 				    acpi_md_vesa_modenum);
+			}
+		}
 # endif
 		break;
+	}
 # if NACPICA > 0 && defined(VGA_POST)
 	curmode = newmode;

 @@ -1,14 +1,14 @@
-/* $NetBSD: genfb_machdep.c,v 1.15 2019/11/30 05:28:28 nonaka Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.16 2021/01/28 01:57:31 jmcneill 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.
 @@ -21,41 +21,38 @@
  * 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.
  */
 /*
  * Early attach support for raster consoles
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.15 2019/11/30 05:28:28 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.16 2021/01/28 01:57:31 jmcneill Exp $");
 #include "opt_mtrr.h"
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/lwp.h>
 #include <sys/bus.h>
 #include <machine/bootinfo.h>
 #include <machine/mtrr.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wsfont/wsfont.h>
 #include <dev/wscons/wsdisplay_vconsvar.h>
 #include <dev/wsfb/genfbvar.h>
 #include <arch/x86/include/genfb_machdep.h>
 #include "wsdisplay.h"
 #include "genfb.h"
 #include "acpica.h"
 @@ -89,62 +86,26 @@ x86_genfb_set_console_dev(device_t dev)
 void
 x86_genfb_ddb_trap_callback(int where)
+{
 	if (x86_genfb_console_dev == NULL)
 		return;
 	if (where) {
 		genfb_enable_polling(x86_genfb_console_dev);
 	} else {
 		genfb_disable_polling(x86_genfb_console_dev);
+	}
+}
 void
 x86_genfb_mtrr_init(uint64_t physaddr, uint32_t size)
 #if notyet
 #ifdef MTRR
 	struct mtrr mtrr;
 	int error, n;
 	if (mtrr_funcs == NULL) {
 		aprint_debug("%s: no mtrr funcs\n", __func__);
 		return;
 	mtrr.base = physaddr;
 	mtrr.len = size;
 	mtrr.type = MTRR_TYPE_WC;
 	mtrr.flags = MTRR_VALID;
 	mtrr.owner = 0;
 	aprint_debug("%s: 0x%" PRIx64 "-0x%" PRIx64 "\n", __func__,
 	    mtrr.base, mtrr.base + mtrr.len - 1);
 	n = 1;
 	KERNEL_LOCK(1, NULL);
 	error = mtrr_set(&mtrr, &n, curlwp->l_proc, MTRR_GETSET_KERNEL);
 	if (n != 0)
 		mtrr_commit();
 	KERNEL_UNLOCK_ONE(NULL);
 	aprint_debug("%s: mtrr_set returned %d\n", __func__, error);
 #else
 	aprint_debug("%s: kernel lacks MTRR option\n", __func__);
 #endif
 #endif
 int
 x86_genfb_init(void)
+{
 	static int inited, attached;
 	struct rasops_info *ri = &x86_genfb_console_screen.scr_ri;
 	const struct btinfo_framebuffer *fbinfo;
 	bus_space_tag_t t = x86_bus_space_mem;
 	bus_space_handle_t h;
 	void *bits;
 	int err;
 	if (inited)
 		return attached;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hyperv.c,v 1.12 2020/10/12 12:11:03 ryoon Exp $	*/
+/*	$NetBSD: hyperv.c,v 1.13 2021/01/28 01:57:31 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2012 Citrix 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 unmodified, this list of conditions, and the following
  *    disclaimer.
 @@ -23,27 +23,27 @@
  * 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.
  */
 /**
  * Implements low-level interactions with Hyper-V/Azure
  */
 #include <sys/cdefs.h>
 #ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.12 2020/10/12 12:11:03 ryoon Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.13 2021/01/28 01:57:31 jmcneill Exp $");
 #endif
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/sys/dev/hyperv/vmbus/hyperv.c 331757 2018-03-30 02:25:12Z emaste $");
 #endif
 #ifdef _KERNEL_OPT
 #include "lapic.h"
 #include "genfb.h"
 #include "opt_ddb.h"
 #include "vmbus.h"
 #include "wsdisplay.h"
 #endif
 @@ -1046,34 +1046,26 @@ hyperv_modcmd(modcmd_t cmd, void *aux)
 	return rv;
+}
 #if NVMBUS > 0
 /*
  * genfb at vmbus
  */
 static struct genfb_pmf_callback pmf_cb;
 static struct genfb_mode_callback mode_cb;
 static bool
 x86_genfb_setmode(struct genfb_softc *sc, int newmode)
+{
 #if NGENFB > 0
 	switch (newmode) {
 	case WSDISPLAYIO_MODE_EMUL:
 		x86_genfb_mtrr_init(sc->sc_fboffset,
 		    sc->sc_height * sc->sc_stride);
 		break;
 #endif
 	return true;
+}
 static bool
 x86_genfb_suspend(device_t dev, const pmf_qual_t *qual)
+{
 	return true;
+}
 static bool
 x86_genfb_resume(device_t dev, const pmf_qual_t *qual)
+{
 #if NGENFB > 0