 @@ -1,14 +1,14 @@
-/* $NetBSD: genfb_machdep.h,v 1.3 2011/02/09 13:24:23 jmcneill Exp $ */
+/* $NetBSD: genfb_machdep.h,v 1.3.60.1 2019/12/08 13:09:28 martin 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.
 @@ -19,19 +19,20 @@
  * 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.
  */
 #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: genfb_machdep.c,v 1.13 2019/05/19 07:43:17 mlelstv Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.13.2.1 2019/12/08 13:09:28 martin 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,27 +21,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.
  */
 /*
  * Early attach support for raster consoles
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.13 2019/05/19 07:43:17 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.13.2.1 2019/12/08 13:09:28 martin 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>
 @@ -126,43 +126,39 @@ x86_genfb_mtrr_init(uint64_t physaddr, u
 	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_cnattach(void)
+x86_genfb_init(void)
+{
-	static int ncalls = 0;
+	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;
 	long defattr;
 	int err;
-	/* XXX jmcneill
+	if (inited)
-	 *  Defer console initialization until UVM is initialized
+		return attached;
-	 */
+	inited = 1;
 	++ncalls;
 	if (ncalls < 3)
 		return -1;
 	memset(&x86_genfb_console_screen, 0, sizeof(x86_genfb_console_screen));
 	fbinfo = lookup_bootinfo(BTINFO_FRAMEBUFFER);
 	if (fbinfo == NULL || fbinfo->physaddr == 0)
 		return 0;
 	err = _x86_memio_map(t, (bus_addr_t)fbinfo->physaddr,
 	    fbinfo->height * fbinfo->stride,
 	    BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE, &h);
 	if (err) {
 		aprint_error("x86_genfb_cnattach: couldn't map framebuffer\n");
 		return 0;
 @@ -196,25 +192,52 @@ x86_genfb_cnattach(void)
 	} else
 		ri->ri_bits = bits;
 	ri->ri_flg = RI_CENTER | RI_FULLCLEAR | RI_CLEAR;
 	rasops_init(ri, ri->ri_height / 8, ri->ri_width / 8);
 	ri->ri_caps = WSSCREEN_WSCOLORS;
 	rasops_reconfig(ri, ri->ri_height / ri->ri_font->fontheight,
 	    ri->ri_width / ri->ri_font->fontwidth);
 	x86_genfb_stdscreen.nrows = ri->ri_rows;
 	x86_genfb_stdscreen.ncols = ri->ri_cols;
 	x86_genfb_stdscreen.textops = &ri->ri_ops;
 	x86_genfb_stdscreen.capabilities = ri->ri_caps;
 	attached = 1;
 	return 1;
+}
 int
 x86_genfb_cnattach(void)
+{
 	static int ncalls = 0;
 	struct rasops_info *ri = &x86_genfb_console_screen.scr_ri;
 	long defattr;
 	/* XXX jmcneill
 	 *  Defer console initialization until UVM is initialized
 	 */
 	++ncalls;
 	if (ncalls < 3)
 		return -1;
 	if (!x86_genfb_init())
 		return 0;
 	ri->ri_ops.allocattr(ri, 0, 0, 0, &defattr);
 	wsdisplay_preattach(&x86_genfb_stdscreen, ri, 0, 0, defattr);
 	return 1;
+}
 #else	/* NWSDISPLAY > 0 && NGENFB > 0 */
 int
 x86_genfb_init(void)
+{
 	return 0;
+}
 int
 x86_genfb_cnattach(void)
+{
 	return 0;
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hyperv.c,v 1.4 2019/06/03 09:51:04 nonaka Exp $	*/
+/*	$NetBSD: hyperv.c,v 1.4.4.1 2019/12/08 13:09:28 martin 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/Azuree
  */
 #include <sys/cdefs.h>
 #ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.4 2019/06/03 09:51:04 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.4.4.1 2019/12/08 13:09:28 martin 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
 @@ -60,27 +60,27 @@ __FBSDID("$FreeBSD: head/sys/dev/hyperv/
 #include <sys/timetc.h>
 #include <uvm/uvm_extern.h>
 #include <machine/autoconf.h>
 #include <machine/bootinfo.h>
 #include <machine/cpufunc.h>
 #include <machine/cputypes.h>
 #include <machine/cpuvar.h>
 #include <machine/cpu_counter.h>
 #include <x86/efi.h>
 #include <dev/wsfb/genfbvar.h>
-#include <arch/x86/include/genfb_machdep.h>
+#include <x86/genfb_machdep.h>
 #include <x86/x86/hypervreg.h>
 #include <x86/x86/hypervvar.h>
 #include <dev/hyperv/vmbusvar.h>
 #include <dev/hyperv/genfb_vmbusvar.h>
 #ifdef DDB
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 #endif
 struct hyperv_softc {
 @@ -1093,26 +1093,29 @@ populate_fbinfo(device_t dev, prop_dicti
 device_t
 device_hyperv_register(device_t dev, void *aux)
+{
 #if NVMBUS > 0
 	device_t parent = device_parent(dev);
 	if (parent && device_is_a(parent, "vmbus") && !x86_found_console) {
 		struct vmbus_attach_args *aa = aux;
 		if (memcmp(aa->aa_type, &hyperv_guid_video,
 		    sizeof(*aa->aa_type)) == 0) {
 			prop_dictionary_t dict = device_properties(dev);
 			/* Initialize genfb for serial console */
 			x86_genfb_init();
 			/*
 			 * framebuffer drivers other than genfb can work
 			 * without the address property
 			 */
 			populate_fbinfo(dev, dict);
 #if 1 && NWSDISPLAY > 0 && NGENFB > 0
 			/* XXX */
 			if (device_is_a(dev, "genfb")) {
 				prop_dictionary_set_bool(dict, "is_console",
 				    genfb_is_console());
 			} else
 #endif