diff --git a/sys/arch/x86/x86/consinit.c b/sys/arch/x86/x86/consinit.c
index 859778cd09f3..5eececf29a8a 100644
--- a/sys/arch/x86/x86/consinit.c
+++ b/sys/arch/x86/x86/consinit.c
@@ -199,6 +199,8 @@ consinit(void)
 				initted = 0;	/* defer */
 				return;
 			}
+			printf("%s: genfb console at 0x%llx\n", __func__,
+			    (unsigned long long)fbinfo->physaddr);
 			genfb_cnattach();
 			goto dokbd;
 		}
@@ -206,16 +208,25 @@ consinit(void)
 #endif
 #if (NVGA > 0)
 		if (!vga_cnattach(x86_bus_space_io, x86_bus_space_mem,
-				  -1, 1))
+				  -1, 1)) {
+			printf("%s: vga console at iot=%p memt=%p\n",
+			    __func__, x86_bus_space_io, x86_bus_space_mem);
 			goto dokbd;
+		}
 #endif
 #if (NEGA > 0)
-		if (!ega_cnattach(x86_bus_space_io, x86_bus_space_mem))
+		if (!ega_cnattach(x86_bus_space_io, x86_bus_space_mem)) {
+			printf("%s: ega console at iot=%p memt=%p\n",
+			    __func__, x86_bus_space_io, x86_bus_space_mem);
 			goto dokbd;
+		}
 #endif
 #if (NPCDISPLAY > 0)
-		if (!pcdisplay_cnattach(x86_bus_space_io, x86_bus_space_mem))
+		if (!pcdisplay_cnattach(x86_bus_space_io, x86_bus_space_mem)) {
+			printf("%s: pcdisplay console at iot=%p memt=%p\n",
+			    __func__, x86_bus_space_io, x86_bus_space_mem);
 			goto dokbd;
+		}
 #endif
 		if (0) goto dokbd; /* XXX stupid gcc */
 dokbd:
@@ -258,6 +269,8 @@ dokbd:
 				 COM_FREQ, COM_TYPE_NORMAL, comcnmode);
 		if (rv != 0)
 			panic("can't init serial console @%x", consinfo->addr);
+		printf("%s: com console at 0x%x (I/O speed %d)\n", __func__,
+		    addr, speed);
 		return;
 	}
 #endif
diff --git a/sys/dev/pci/puccn.c b/sys/dev/pci/puccn.c
index ab0acdc0c597..12da1c104233 100644
--- a/sys/dev/pci/puccn.c
+++ b/sys/dev/pci/puccn.c
@@ -74,6 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.14 2014/03/05 05:56:04 msaitoh Exp $");
 cons_decl(com);
 
 static bus_addr_t puccnbase;
+static int puccnbus, puccndev, puccnfunc;
 static bus_space_tag_t puctag;
 static int puccnflags;
 
@@ -201,6 +202,9 @@ resume_scan:
 	if (cn)
 		cn->cn_pri = CN_REMOTE;
 #endif
+	puccnbus = bus;
+	puccndev = dev;
+	puccnfunc = func;
 	return base;
 }
 
@@ -234,13 +238,21 @@ puc_cnprobe(struct consdev *cn)
 int
 puc_cninit(struct consdev *cn)
 {
+	int error;
 
 	if (puccnbase == 0)
-		return -1;
+		return ENXIO;
 
-	return comcnattach(puctag, puccnbase, CONSPEED,
+	error = comcnattach(puctag, puccnbase, CONSPEED,
 	    puccnflags & PUC_COM_CLOCKMASK, COM_TYPE_NORMAL,
 	    CONMODE);
+	if (error)
+		return error;
+
+	printf("%s: puc console at 0x%"PRIxBUSADDR
+	    " (pci bus %d dev %d func %d flags 0x%x)\n",
+	    __func__, puccnbase, puccnbus, puccndev, puccnfunc, puccnflags);
+	return 0;
 }
 
 /* comcngetc, comcnputc, comcnpollc provided by dev/ic/com.c */
diff --git a/sys/external/bsd/drm2/drm/drmfb.c b/sys/external/bsd/drm2/drm/drmfb.c
index f71bee4c525b..7e0865b5ecaa 100644
--- a/sys/external/bsd/drm2/drm/drmfb.c
+++ b/sys/external/bsd/drm2/drm/drmfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: drmfb.c,v 1.16 2022/09/01 17:54:47 riastradh Exp $	*/
+/*	$NetBSD: drmfb.c,v 1.14 2022/02/18 18:31:18 wiz Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.16 2022/09/01 17:54:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.14 2022/02/18 18:31:18 wiz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -87,15 +87,14 @@ drmfb_attach(struct drmfb_softc *sc, const struct drmfb_attach_args *da)
 	struct drm_connector_list_iter conn_iter;
 	struct drm_connector *connector;
 	const prop_dictionary_t dict = device_properties(da->da_dev);
-	const device_t parent = device_parent(da->da_dev);
-	const prop_dictionary_t pdict = device_properties(parent);
 #if NVGA > 0
 	struct drm_device *const dev = da->da_fb_helper->dev;
 #endif
 	static const struct genfb_ops zero_genfb_ops;
 	struct genfb_ops genfb_ops = zero_genfb_ops;
+	enum { CONS_VGA, CONS_GENFB, CONS_NONE } what_was_cons;
 	bool is_console;
-	int error __diagused;
+	int error;
 
 	/* genfb requires this.  */
 	KASSERTMSG((void *)&sc->sc_genfb == device_private(da->da_dev),
@@ -115,35 +114,49 @@ drmfb_attach(struct drmfb_softc *sc, const struct drmfb_attach_args *da)
 	prop_dictionary_set_uint64(dict, "mode_callback",
 	    (uint64_t)(uintptr_t)&drmfb_genfb_mode_callback);
 
-	/*
-	 * Determine whether MD firmware logic has set the console to
-	 * go through this device.
-	 */
-	if (prop_dictionary_get_bool(pdict, "is_console", &is_console)) {
-		/* nothing */
-	} else if (genfb_is_console() && genfb_is_enabled()) {
-		is_console = true;
-	} else {
-		is_console = false;
-	}
-
 #if NVGA > 0
-	/*
-	 * Whether or not we were told to be the console, if the
-	 * console was configured to go through a vga resource that we
-	 * now own and that vga(4) is not going to take over, kick out
-	 * the vga console before we take over as genfb console.
-	 */
 	if ((da->da_params->dp_is_vga_console != NULL) &&
 	    (*da->da_params->dp_is_vga_console)(dev)) {
-		vga_cndetach();
-		if (da->da_params->dp_disable_vga)
-			(*da->da_params->dp_disable_vga)(dev);
-		is_console = true;
+		device_printf(da->da_dev, "vga console\n");
 	}
 #endif
 
-	prop_dictionary_set_bool(dict, "is_console", is_console);
+	if (prop_dictionary_get_bool(
+		device_properties(device_parent(da->da_dev)),
+		"is_console", &is_console)) {
+		device_printf(device_parent(da->da_dev), "is_console is %d\n",
+		    is_console);
+	} else {
+		device_printf(device_parent(da->da_dev),
+		    "is_console is unset\n");
+	}
+
+	if (!prop_dictionary_get_bool(dict, "is_console", &is_console)) {
+		device_printf(da->da_dev, "is_console is unset\n");
+		/* XXX Whattakludge!  */
+#if NVGA > 0
+		if ((da->da_params->dp_is_vga_console != NULL) &&
+		    (*da->da_params->dp_is_vga_console)(dev)) {
+			what_was_cons = CONS_VGA;
+			prop_dictionary_set_bool(dict, "is_console", true);
+			vga_cndetach();
+			if (da->da_params->dp_disable_vga)
+				(*da->da_params->dp_disable_vga)(dev);
+		} else
+#endif
+		if (genfb_is_console() && genfb_is_enabled()) {
+			device_printf(da->da_dev, "genfb console enabled\n");
+			what_was_cons = CONS_GENFB;
+			prop_dictionary_set_bool(dict, "is_console", true);
+		} else {
+			device_printf(da->da_dev, "inconsolable\n");
+			what_was_cons = CONS_NONE;
+			prop_dictionary_set_bool(dict, "is_console", false);
+		}
+	} else {
+		device_printf(da->da_dev, "is_console is %d\n", is_console);
+		what_was_cons = CONS_NONE;
+	}
 
 	/* Make the first EDID we find available to wsfb */
 	drm_connector_list_iter_begin(da->da_fb_helper->dev, &conn_iter);
@@ -167,10 +180,28 @@ drmfb_attach(struct drmfb_softc *sc, const struct drmfb_attach_args *da)
 	KERNEL_LOCK(1, NULL);
 	error = genfb_attach(&sc->sc_genfb, &genfb_ops);
 	KERNEL_UNLOCK_ONE(NULL);
-	KASSERTMSG(error == 0, "genfb_attach failed, error=%d", error);
+	if (error) {
+		aprint_error_dev(sc->sc_da.da_dev,
+		    "failed to attach genfb: %d\n", error);
+		goto fail0;
+	}
 
 	/* Success!  */
 	return 0;
+
+fail0:	KASSERT(error);
+	/* XXX Restore console...  */
+	switch (what_was_cons) {
+	case CONS_VGA:
+		break;
+	case CONS_GENFB:
+		break;
+	case CONS_NONE:
+		break;
+	default:
+		break;
+	}
+	return error;
 }
 
 int