--- a/usr/src/boot/Makefile.version	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/Makefile.version	Mon Dec 09 14:15:34 2019 +0000
@@ -33,4 +33,4 @@
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2019.12.03.1
+BOOT_VERSION = $(LOADER_VERSION)-2019.12.05.1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/boot/sys/boot/common/mb_header.S	Mon Dec 09 14:15:34 2019 +0000
@@ -0,0 +1,43 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2018 Toomas Soome <tsoome@me.com>
+ */
+
+	.file	"mb_header.S"
+
+/*
+ * Provide fake multiboot header to support versioning and partition
+ * start. The fake MB header is used by versioning code located in
+ * usr/src/cmd/boot/common. Since the BIOS bootblock is stored on raw disk,
+ * this fake header is used to store the location of the version info block.
+ * Additionally we use it to store partition start_sector, so we can identify
+ * our root file system partition. Note we are using LBA64 here.
+ */
+
+#define	ASM_FILE
+#include <sys/multiboot.h>
+
+		.globl mb_header, start_sector
+		.text
+
+		.align 4
+mb_header:
+		.long	MULTIBOOT_HEADER_MAGIC
+		.long	MULTIBOOT_AOUT_KLUDGE
+		.long	-(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_AOUT_KLUDGE)
+		.long	0                       /* header_addr */
+		.long	0                       /* load_addr */
+		.long	0                       /* load_end_addr */
+start_sector:	.long	0			/* partition LBA */
+		.long	0
+

--- a/usr/src/boot/sys/boot/common/multiboot.S	Fri Dec 06 12:00:18 2019 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * This file and its contents are supplied under the terms of the
- * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms of version
- * 1.0 of the CDDL.
- *
- * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy of the CDDL is also available via the Internet at
- * http://www.illumos.org/license/CDDL.
- */
-
-/*
- * Copyright 2018 Toomas Soome <tsoome@me.com>
- */
-
-	.file	"multiboot.s"
-
-/*
- * Provide fake multiboot header to support versioning and partition
- * start. The fake MB header is used by versioning code located in
- * usr/src/cmd/boot/common. Since the BIOS bootblock is stored on raw disk,
- * this fake header is used to store the location of the version info block.
- * Additionally we use it to store partition start_sector, so we can identify
- * our root file system partition. Note we are using LBA64 here.
- */
-
-#define	ASM_FILE
-#include <sys/multiboot.h>
-
-		.globl mb_header, start_sector
-		.text
-
-		.align 4
-mb_header:
-		.long	MULTIBOOT_HEADER_MAGIC
-		.long	MULTIBOOT_AOUT_KLUDGE
-		.long	-(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_AOUT_KLUDGE)
-		.long	0                       /* header_addr */
-		.long	0                       /* load_addr */
-		.long	0                       /* load_end_addr */
-start_sector:	.long	0			/* partition LBA */
-		.long	0
-

--- a/usr/src/boot/sys/boot/efi/loader/Makefile.com	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/sys/boot/efi/loader/Makefile.com	Mon Dec 09 14:15:34 2019 +0000
@@ -34,7 +34,7 @@
 	framebuffer.c \
 	main.c \
 	memmap.c \
-	multiboot.S \
+	mb_header.S \
 	multiboot2.c \
 	self_reloc.c \
 	smbios.c \
@@ -53,7 +53,7 @@
 	framebuffer.o \
 	main.o \
 	memmap.o \
-	multiboot.o \
+	mb_header.o \
 	multiboot2.o \
 	self_reloc.o \
 	smbios.o \
@@ -186,9 +186,6 @@
 %.o:	../../../common/linenoise/%.c
 	$(COMPILE.c) $<
 
-%.o: ../../../i386/libi386/%.c
-	$(COMPILE.c) $<
-
 %.o: $(SRC)/common/font/%.c
 	$(COMPILE.c) $<
 

--- a/usr/src/boot/sys/boot/efi/loader/amd64/Makefile	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/sys/boot/efi/loader/amd64/Makefile	Mon Dec 09 14:15:34 2019 +0000
@@ -31,3 +31,6 @@
 CLEANFILES +=	machine x86 $(EFIPROG)
 
 $(OBJS):	machine x86
+
+%.o: ../../../i386/libi386/%.c
+	$(COMPILE.c) $<

--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd64	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd64	Mon Dec 09 14:15:34 2019 +0000
@@ -9,7 +9,7 @@
   .hash : { *(.hash) }  /* this MUST come first! */
   . = ALIGN(4096);
   .text		: {
-    multiboot.o(.text)
+    mb_header.o(.text)
     *(.text .stub .text.* .gnu.linkonce.t.*)
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)

--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/ldscript.i386	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/sys/boot/efi/loader/arch/i386/ldscript.i386	Mon Dec 09 14:15:34 2019 +0000
@@ -9,7 +9,7 @@
   . = SIZEOF_HEADERS;
   . = ALIGN(4096);
   .text		: {
-    multiboot.o(.text)
+    mb_header.o(.text)
     *(.text .stub .text.* .gnu.linkonce.t.*)
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)

--- a/usr/src/boot/sys/boot/efi/loader/comconsole.c	Fri Dec 06 12:00:18 2019 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,694 +0,0 @@
-/*
- * Copyright (c) 1998 Michael Smith (msmith@freebsd.org)
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 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>
-
-#include <stand.h>
-#include <sys/errno.h>
-#include <bootstrap.h>
-#include <stdbool.h>
-
-#include <efi.h>
-#include <efilib.h>
-
-#include "loader_efi.h"
-
-static EFI_GUID serial = SERIAL_IO_PROTOCOL;
-
-#define	COMC_TXWAIT	0x40000		/* transmit timeout */
-
-#ifndef	COMSPEED
-#define	COMSPEED	9600
-#endif
-
-#define	PNP0501		0x501		/* 16550A-compatible COM port */
-
-struct serial {
-	uint64_t	baudrate;
-	uint8_t		databits;
-	EFI_PARITY_TYPE	parity;
-	EFI_STOP_BITS_TYPE stopbits;
-	uint8_t		ignore_cd;	/* boolean */
-	uint8_t		rtsdtr_off;	/* boolean */
-	int		ioaddr;		/* index in handles array */
-	SERIAL_IO_INTERFACE *sio;
-};
-
-static void	comc_probe(struct console *);
-static int	comc_init(struct console *, int);
-static void	comc_putchar(struct console *, int);
-static int	comc_getchar(struct console *);
-static int	comc_ischar(struct console *);
-static int	comc_ioctl(struct console *, int, void *);
-static void	comc_devinfo(struct console *);
-static bool	comc_setup(struct console *);
-static char	*comc_asprint_mode(struct serial *);
-static int	comc_parse_mode(struct serial *, const char *);
-static int	comc_mode_set(struct env_var *, int, const void *);
-static int	comc_cd_set(struct env_var *, int, const void *);
-static int	comc_rtsdtr_set(struct env_var *, int, const void *);
-
-struct console ttya = {
-	.c_name = "ttya",
-	.c_desc = "serial port a",
-	.c_flags = 0,
-	.c_probe = comc_probe,
-	.c_init = comc_init,
-	.c_out = comc_putchar,
-	.c_in = comc_getchar,
-	.c_ready = comc_ischar,
-	.c_ioctl = comc_ioctl,
-	.c_devinfo = comc_devinfo,
-	.c_private = NULL
-};
-
-struct console ttyb = {
-	.c_name = "ttyb",
-	.c_desc = "serial port b",
-	.c_flags = 0,
-	.c_probe = comc_probe,
-	.c_init = comc_init,
-	.c_out = comc_putchar,
-	.c_in = comc_getchar,
-	.c_ready = comc_ischar,
-	.c_ioctl = comc_ioctl,
-	.c_devinfo = comc_devinfo,
-	.c_private = NULL
-};
-
-struct console ttyc = {
-	.c_name = "ttyc",
-	.c_desc = "serial port c",
-	.c_flags = 0,
-	.c_probe = comc_probe,
-	.c_init = comc_init,
-	.c_out = comc_putchar,
-	.c_in = comc_getchar,
-	.c_ready = comc_ischar,
-	.c_ioctl = comc_ioctl,
-	.c_devinfo = comc_devinfo,
-	.c_private = NULL
-};
-
-struct console ttyd = {
-	.c_name = "ttyd",
-	.c_desc = "serial port d",
-	.c_flags = 0,
-	.c_probe = comc_probe,
-	.c_init = comc_init,
-	.c_out = comc_putchar,
-	.c_in = comc_getchar,
-	.c_ready = comc_ischar,
-	.c_ioctl = comc_ioctl,
-	.c_devinfo = comc_devinfo,
-	.c_private = NULL
-};
-
-static EFI_STATUS
-efi_serial_init(EFI_HANDLE **handlep, int *nhandles)
-{
-	UINTN bufsz = 0;
-	EFI_STATUS status;
-	EFI_HANDLE *handles;
-
-	/*
-	 * get buffer size
-	 */
-	*nhandles = 0;
-	handles = NULL;
-	status = BS->LocateHandle(ByProtocol, &serial, NULL, &bufsz, handles);
-	if (status != EFI_BUFFER_TOO_SMALL)
-		return (status);
-
-	if ((handles = malloc(bufsz)) == NULL)
-		return (ENOMEM);
-
-	*nhandles = (int)(bufsz / sizeof (EFI_HANDLE));
-	/*
-	 * get handle array
-	 */
-	status = BS->LocateHandle(ByProtocol, &serial, NULL, &bufsz, handles);
-	if (EFI_ERROR(status)) {
-		free(handles);
-		*nhandles = 0;
-	} else
-		*handlep = handles;
-	return (status);
-}
-
-/*
- * Find serial device number from device path.
- * Return -1 if not found.
- */
-static int
-efi_serial_get_index(EFI_DEVICE_PATH *devpath)
-{
-	ACPI_HID_DEVICE_PATH  *acpi;
-
-	while (!IsDevicePathEnd(devpath)) {
-		if (DevicePathType(devpath) == ACPI_DEVICE_PATH &&
-		    DevicePathSubType(devpath) == ACPI_DP) {
-
-			acpi = (ACPI_HID_DEVICE_PATH *)devpath;
-			if (acpi->HID == EISA_PNP_ID(PNP0501)) {
-				return (acpi->UID);
-			}
-		}
-
-		devpath = NextDevicePathNode(devpath);
-	}
-	return (-1);
-}
-
-/*
- * The order of handles from LocateHandle() is not known, we need to
- * iterate handles, pick device path for handle, and check the device
- * number.
- */
-static EFI_HANDLE
-efi_serial_get_handle(int port)
-{
-	EFI_STATUS status;
-	EFI_HANDLE *handles, handle;
-	EFI_DEVICE_PATH *devpath;
-	int index, nhandles;
-
-	if (port == -1)
-		return (NULL);
-
-	handles = NULL;
-	nhandles = 0;
-	status = efi_serial_init(&handles, &nhandles);
-	if (EFI_ERROR(status))
-		return (NULL);
-
-	handle = NULL;
-	for (index = 0; index < nhandles; index++) {
-		devpath = efi_lookup_devpath(handles[index]);
-		if (port == efi_serial_get_index(devpath)) {
-			handle = (handles[index]);
-			break;
-		}
-	}
-
-	/*
-	 * In case we did fail to identify the device by path, use port as
-	 * array index. Note, we did check port == -1 above.
-	 */
-	if (port < nhandles && handle == NULL)
-		handle = handles[port];
-
-	free(handles);
-	return (handle);
-}
-
-static void
-comc_probe(struct console *cp)
-{
-	EFI_STATUS status;
-	EFI_HANDLE handle;
-	struct serial *port;
-	char name[20];
-	char value[20];
-	char *env;
-
-	/* are we already set up? */
-	if (cp->c_private != NULL)
-		return;
-
-	cp->c_private = malloc(sizeof (struct serial));
-	port = cp->c_private;
-	port->baudrate = COMSPEED;
-
-	port->ioaddr = -1;	/* invalid port */
-	if (strcmp(cp->c_name, "ttya") == 0)
-		port->ioaddr = 0;
-	else if (strcmp(cp->c_name, "ttyb") == 0)
-		port->ioaddr = 1;
-	else if (strcmp(cp->c_name, "ttyc") == 0)
-		port->ioaddr = 2;
-	else if (strcmp(cp->c_name, "ttyd") == 0)
-		port->ioaddr = 3;
-
-	port->databits = 8;		/* 8,n,1 */
-	port->parity = NoParity;	/* 8,n,1 */
-	port->stopbits = OneStopBit;	/* 8,n,1 */
-	port->ignore_cd = 1;		/* ignore cd */
-	port->rtsdtr_off = 0;		/* rts-dtr is on */
-	port->sio = NULL;
-
-	handle = efi_serial_get_handle(port->ioaddr);
-
-	if (handle != NULL) {
-		status = BS->OpenProtocol(handle, &serial,
-		    (void**)&port->sio, IH, NULL,
-		    EFI_OPEN_PROTOCOL_GET_PROTOCOL);
-
-		if (EFI_ERROR(status))
-			port->sio = NULL;
-	}
-
-	snprintf(name, sizeof (name), "%s-mode", cp->c_name);
-	env = getenv(name);
-
-	if (env != NULL)
-		(void) comc_parse_mode(port, env);
-
-	env = comc_asprint_mode(port);
-
-	if (env != NULL) {
-		unsetenv(name);
-		env_setenv(name, EV_VOLATILE, env, comc_mode_set, env_nounset);
-		free(env);
-	}
-
-	snprintf(name, sizeof (name), "%s-ignore-cd", cp->c_name);
-	env = getenv(name);
-	if (env != NULL) {
-		if (strcmp(env, "true") == 0)
-			port->ignore_cd = 1;
-		else if (strcmp(env, "false") == 0)
-			port->ignore_cd = 0;
-	}
-
-	snprintf(value, sizeof (value), "%s",
-	    port->ignore_cd? "true" : "false");
-	unsetenv(name);
-	env_setenv(name, EV_VOLATILE, value, comc_cd_set, env_nounset);
-
-	snprintf(name, sizeof (name), "%s-rts-dtr-off", cp->c_name);
-	env = getenv(name);
-	if (env != NULL) {
-		if (strcmp(env, "true") == 0)
-			port->rtsdtr_off = 1;
-		else if (strcmp(env, "false") == 0)
-			port->rtsdtr_off = 0;
-	}
-
-	snprintf(value, sizeof (value), "%s",
-	    port->rtsdtr_off? "true" : "false");
-	unsetenv(name);
-	env_setenv(name, EV_VOLATILE, value, comc_rtsdtr_set, env_nounset);
-
-	cp->c_flags = 0;
-	if (comc_setup(cp))
-		cp->c_flags = C_PRESENTIN | C_PRESENTOUT;
-}
-
-static int
-comc_init(struct console *cp, int arg __attribute((unused)))
-{
-
-	if (comc_setup(cp))
-		return (CMD_OK);
-
-	cp->c_flags = 0;
-	return (CMD_ERROR);
-}
-
-static void
-comc_putchar(struct console *cp, int c)
-{
-	int wait;
-	EFI_STATUS status;
-	UINTN bufsz = 1;
-	char cb = c;
-	struct serial *sp = cp->c_private;
-
-	if (sp->sio == NULL)
-		return;
-
-	for (wait = COMC_TXWAIT; wait > 0; wait--) {
-		status = sp->sio->Write(sp->sio, &bufsz, &cb);
-		if (status != EFI_TIMEOUT)
-			break;
-	}
-}
-
-static int
-comc_getchar(struct console *cp)
-{
-	EFI_STATUS status;
-	UINTN bufsz = 1;
-	char c;
-	struct serial *sp = cp->c_private;
-
-	if (sp->sio == NULL || !comc_ischar(cp))
-		return (-1);
-
-	status = sp->sio->Read(sp->sio, &bufsz, &c);
-	if (EFI_ERROR(status) || bufsz == 0)
-		return (-1);
-
-	return (c);
-}
-
-static int
-comc_ischar(struct console *cp)
-{
-	EFI_STATUS status;
-	uint32_t control;
-	struct serial *sp = cp->c_private;
-
-	if (sp->sio == NULL)
-		return (0);
-
-	status = sp->sio->GetControl(sp->sio, &control);
-	if (EFI_ERROR(status))
-		return (0);
-
-	return (!(control & EFI_SERIAL_INPUT_BUFFER_EMPTY));
-}
-
-static int
-comc_ioctl(struct console *cp __unused, int cmd __unused, void *data __unused)
-{
-	return (ENOTTY);
-}
-
-static void
-comc_devinfo(struct console *cp)
-{
-	struct serial *port = cp->c_private;
-	EFI_HANDLE handle;
-	EFI_DEVICE_PATH *dp;
-	CHAR16 *text;
-
-	handle = efi_serial_get_handle(port->ioaddr);
-	if (handle == NULL) {
-		printf("\tdevice is not present");
-		return;
-	}
-
-	dp = efi_lookup_devpath(handle);
-	if (dp == NULL)
-		return;
-
-	text = efi_devpath_name(dp);
-	if (text == NULL)
-		return;
-
-	printf("\t%S", text);
-	efi_free_devpath_name(text);
-}
-
-static char *
-comc_asprint_mode(struct serial *sp)
-{
-	char par, *buf;
-	char *stop;
-
-	if (sp == NULL)
-		return (NULL);
-
-	switch (sp->parity) {
-	case NoParity:
-		par = 'n';
-		break;
-	case EvenParity:
-		par = 'e';
-		break;
-	case OddParity:
-		par = 'o';
-		break;
-	case MarkParity:
-		par = 'm';
-		break;
-	case SpaceParity:
-		par = 's';
-		break;
-	default:
-		par = 'n';
-		break;
-	}
-
-	switch (sp->stopbits) {
-	case OneStopBit:
-		stop = "1";
-		break;
-	case TwoStopBits:
-		stop = "2";
-		break;
-	case OneFiveStopBits:
-		stop = "1.5";
-		break;
-	default:
-		stop = "1";
-		break;
-	}
-
-	asprintf(&buf, "%ju,%d,%c,%s,-", sp->baudrate, sp->databits, par, stop);
-	return (buf);
-}
-
-static int
-comc_parse_mode(struct serial *sp, const char *value)
-{
-	unsigned long n;
-	uint64_t baudrate;
-	uint8_t databits = 8;
-	int parity = NoParity;
-	int stopbits = OneStopBit;
-	char *ep;
-
-	if (value == NULL || *value == '\0')
-		return (CMD_ERROR);
-
-	errno = 0;
-	n = strtoul(value, &ep, 10);
-	if (errno != 0 || *ep != ',')
-		return (CMD_ERROR);
-	baudrate = n;
-
-	ep++;
-	n = strtoul(ep, &ep, 10);
-	if (errno != 0 || *ep != ',')
-		return (CMD_ERROR);
-
-	switch (n) {
-	case 5: databits = 5;
-		break;
-	case 6: databits = 6;
-		break;
-	case 7: databits = 7;
-		break;
-	case 8: databits = 8;
-		break;
-	default:
-		return (CMD_ERROR);
-	}
-
-	ep++;
-	switch (*ep++) {
-	case 'n': parity = NoParity;
-		break;
-	case 'e': parity = EvenParity;
-		break;
-	case 'o': parity = OddParity;
-		break;
-	case 'm': parity = MarkParity;
-		break;
-	case 's': parity = SpaceParity;
-		break;
-	default:
-		return (CMD_ERROR);
-	}
-
-	if (*ep == ',')
-		ep++;
-	else
-		return (CMD_ERROR);
-
-	switch (*ep++) {
-	case '1': stopbits = OneStopBit;
-		if (ep[0] == '.' && ep[1] == '5') {
-			ep += 2;
-			stopbits = OneFiveStopBits;
-		}
-		break;
-	case '2': stopbits = TwoStopBits;
-		break;
-	default:
-		return (CMD_ERROR);
-	}
-
-	/* handshake is ignored, but we check syntax anyhow */
-	if (*ep == ',')
-		ep++;
-	else
-		return (CMD_ERROR);
-
-	switch (*ep++) {
-	case '-':
-	case 'h':
-	case 's':
-		break;
-	default:
-		return (CMD_ERROR);
-	}
-
-	if (*ep != '\0')
-		return (CMD_ERROR);
-
-	sp->baudrate = baudrate;
-	sp->databits = databits;
-	sp->parity = parity;
-	sp->stopbits = stopbits;
-	return (CMD_OK);
-}
-
-static struct console *
-get_console(char *name)
-{
-	struct console *cp = NULL;
-
-	switch (name[3]) {
-	case 'a': cp = &ttya;
-		break;
-	case 'b': cp = &ttyb;
-		break;
-	case 'c': cp = &ttyc;
-		break;
-	case 'd': cp = &ttyd;
-		break;
-	}
-	return (cp);
-}
-
-static int
-comc_mode_set(struct env_var *ev, int flags, const void *value)
-{
-	struct console *cp;
-
-	if (value == NULL)
-		return (CMD_ERROR);
-
-	if ((cp = get_console(ev->ev_name)) == NULL)
-		return (CMD_ERROR);
-
-	if (comc_parse_mode(cp->c_private, value) == CMD_ERROR)
-		return (CMD_ERROR);
-
-	(void) comc_setup(cp);
-
-	env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
-
-	return (CMD_OK);
-}
-
-static int
-comc_cd_set(struct env_var *ev, int flags, const void *value)
-{
-	struct console *cp;
-	struct serial *sp;
-
-	if (value == NULL)
-		return (CMD_ERROR);
-
-	if ((cp = get_console(ev->ev_name)) == NULL)
-		return (CMD_ERROR);
-
-	sp = cp->c_private;
-	if (strcmp(value, "true") == 0)
-		sp->ignore_cd = 1;
-	else if (strcmp(value, "false") == 0)
-		sp->ignore_cd = 0;
-	else
-		return (CMD_ERROR);
-
-	(void) comc_setup(cp);
-
-	env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
-
-	return (CMD_OK);
-}
-
-static int
-comc_rtsdtr_set(struct env_var *ev, int flags, const void *value)
-{
-	struct console *cp;
-	struct serial *sp;
-
-	if (value == NULL)
-		return (CMD_ERROR);
-
-	if ((cp = get_console(ev->ev_name)) == NULL)
-		return (CMD_ERROR);
-
-	sp = cp->c_private;
-	if (strcmp(value, "true") == 0)
-		sp->rtsdtr_off = 1;
-	else if (strcmp(value, "false") == 0)
-		sp->rtsdtr_off = 0;
-	else
-		return (CMD_ERROR);
-
-	(void) comc_setup(cp);
-
-	env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
-
-	return (CMD_OK);
-}
-
-/*
- * In case of error, we also reset ACTIVE flags, so the console
- * framefork will try alternate consoles.
- */
-static bool
-comc_setup(struct console *cp)
-{
-	EFI_STATUS status;
-	UINT32 control;
-	struct serial *sp = cp->c_private;
-
-	/* port is not usable */
-	if (sp->sio == NULL)
-		return (false);
-
-	status = sp->sio->Reset(sp->sio);
-	if (EFI_ERROR(status))
-		return (false);
-
-	status = sp->sio->SetAttributes(sp->sio, sp->baudrate, 0, 0, sp->parity,
-	    sp->databits, sp->stopbits);
-	if (EFI_ERROR(status))
-		return (false);
-
-	status = sp->sio->GetControl(sp->sio, &control);
-	if (EFI_ERROR(status))
-		return (false);
-	if (sp->rtsdtr_off) {
-		control &= ~(EFI_SERIAL_REQUEST_TO_SEND |
-		    EFI_SERIAL_DATA_TERMINAL_READY);
-	} else {
-		control |= EFI_SERIAL_REQUEST_TO_SEND;
-	}
-
-	(void) sp->sio->SetControl(sp->sio, control);
-
-	/* Mark this port usable. */
-	cp->c_flags |= (C_PRESENTIN | C_PRESENTOUT);
-	return (true);
-}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/boot/sys/boot/efi/loader/efiserialio.c	Mon Dec 09 14:15:34 2019 +0000
@@ -0,0 +1,700 @@
+/*
+ * Copyright (c) 1998 Michael Smith (msmith@freebsd.org)
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 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.
+ */
+
+/*
+ * We do not use this implementation with x86 till we can fix two issues:
+ * 1. Reliably identify the serial ports in correct order.
+ * 2. Ensure we get properly working reads from serial io.
+ */
+
+#include <sys/cdefs.h>
+
+#include <stand.h>
+#include <sys/errno.h>
+#include <bootstrap.h>
+#include <stdbool.h>
+
+#include <efi.h>
+#include <efilib.h>
+
+#include "loader_efi.h"
+
+static EFI_GUID serial = SERIAL_IO_PROTOCOL;
+
+#define	COMC_TXWAIT	0x40000		/* transmit timeout */
+
+#ifndef	COMSPEED
+#define	COMSPEED	9600
+#endif
+
+#define	PNP0501		0x501		/* 16550A-compatible COM port */
+
+struct serial {
+	uint64_t	baudrate;
+	uint8_t		databits;
+	EFI_PARITY_TYPE	parity;
+	EFI_STOP_BITS_TYPE stopbits;
+	uint8_t		ignore_cd;	/* boolean */
+	uint8_t		rtsdtr_off;	/* boolean */
+	int		ioaddr;		/* index in handles array */
+	SERIAL_IO_INTERFACE *sio;
+};
+
+static void	comc_probe(struct console *);
+static int	comc_init(struct console *, int);
+static void	comc_putchar(struct console *, int);
+static int	comc_getchar(struct console *);
+static int	comc_ischar(struct console *);
+static int	comc_ioctl(struct console *, int, void *);
+static void	comc_devinfo(struct console *);
+static bool	comc_setup(struct console *);
+static char	*comc_asprint_mode(struct serial *);
+static int	comc_parse_mode(struct serial *, const char *);
+static int	comc_mode_set(struct env_var *, int, const void *);
+static int	comc_cd_set(struct env_var *, int, const void *);
+static int	comc_rtsdtr_set(struct env_var *, int, const void *);
+
+struct console ttya = {
+	.c_name = "ttya",
+	.c_desc = "serial port a",
+	.c_flags = 0,
+	.c_probe = comc_probe,
+	.c_init = comc_init,
+	.c_out = comc_putchar,
+	.c_in = comc_getchar,
+	.c_ready = comc_ischar,
+	.c_ioctl = comc_ioctl,
+	.c_devinfo = comc_devinfo,
+	.c_private = NULL
+};
+
+struct console ttyb = {
+	.c_name = "ttyb",
+	.c_desc = "serial port b",
+	.c_flags = 0,
+	.c_probe = comc_probe,
+	.c_init = comc_init,
+	.c_out = comc_putchar,
+	.c_in = comc_getchar,
+	.c_ready = comc_ischar,
+	.c_ioctl = comc_ioctl,
+	.c_devinfo = comc_devinfo,
+	.c_private = NULL
+};
+
+struct console ttyc = {
+	.c_name = "ttyc",
+	.c_desc = "serial port c",
+	.c_flags = 0,
+	.c_probe = comc_probe,
+	.c_init = comc_init,
+	.c_out = comc_putchar,
+	.c_in = comc_getchar,
+	.c_ready = comc_ischar,
+	.c_ioctl = comc_ioctl,
+	.c_devinfo = comc_devinfo,
+	.c_private = NULL
+};
+
+struct console ttyd = {
+	.c_name = "ttyd",
+	.c_desc = "serial port d",
+	.c_flags = 0,
+	.c_probe = comc_probe,
+	.c_init = comc_init,
+	.c_out = comc_putchar,
+	.c_in = comc_getchar,
+	.c_ready = comc_ischar,
+	.c_ioctl = comc_ioctl,
+	.c_devinfo = comc_devinfo,
+	.c_private = NULL
+};
+
+static EFI_STATUS
+efi_serial_init(EFI_HANDLE **handlep, int *nhandles)
+{
+	UINTN bufsz = 0;
+	EFI_STATUS status;
+	EFI_HANDLE *handles;
+
+	/*
+	 * get buffer size
+	 */
+	*nhandles = 0;
+	handles = NULL;
+	status = BS->LocateHandle(ByProtocol, &serial, NULL, &bufsz, handles);
+	if (status != EFI_BUFFER_TOO_SMALL)
+		return (status);
+
+	if ((handles = malloc(bufsz)) == NULL)
+		return (ENOMEM);
+
+	*nhandles = (int)(bufsz / sizeof (EFI_HANDLE));
+	/*
+	 * get handle array
+	 */
+	status = BS->LocateHandle(ByProtocol, &serial, NULL, &bufsz, handles);
+	if (EFI_ERROR(status)) {
+		free(handles);
+		*nhandles = 0;
+	} else
+		*handlep = handles;
+	return (status);
+}
+
+/*
+ * Find serial device number from device path.
+ * Return -1 if not found.
+ */
+static int
+efi_serial_get_index(EFI_DEVICE_PATH *devpath)
+{
+	ACPI_HID_DEVICE_PATH  *acpi;
+
+	while (!IsDevicePathEnd(devpath)) {
+		if (DevicePathType(devpath) == ACPI_DEVICE_PATH &&
+		    DevicePathSubType(devpath) == ACPI_DP) {
+
+			acpi = (ACPI_HID_DEVICE_PATH *)devpath;
+			if (acpi->HID == EISA_PNP_ID(PNP0501)) {
+				return (acpi->UID);
+			}
+		}
+
+		devpath = NextDevicePathNode(devpath);
+	}
+	return (-1);
+}
+
+/*
+ * The order of handles from LocateHandle() is not known, we need to
+ * iterate handles, pick device path for handle, and check the device
+ * number.
+ */
+static EFI_HANDLE
+efi_serial_get_handle(int port)
+{
+	EFI_STATUS status;
+	EFI_HANDLE *handles, handle;
+	EFI_DEVICE_PATH *devpath;
+	int index, nhandles;
+
+	if (port == -1)
+		return (NULL);
+
+	handles = NULL;
+	nhandles = 0;
+	status = efi_serial_init(&handles, &nhandles);
+	if (EFI_ERROR(status))
+		return (NULL);
+
+	handle = NULL;
+	for (index = 0; index < nhandles; index++) {
+		devpath = efi_lookup_devpath(handles[index]);
+		if (port == efi_serial_get_index(devpath)) {
+			handle = (handles[index]);
+			break;
+		}
+	}
+
+	/*
+	 * In case we did fail to identify the device by path, use port as
+	 * array index. Note, we did check port == -1 above.
+	 */
+	if (port < nhandles && handle == NULL)
+		handle = handles[port];
+
+	free(handles);
+	return (handle);
+}
+
+static void
+comc_probe(struct console *cp)
+{
+	EFI_STATUS status;
+	EFI_HANDLE handle;
+	struct serial *port;
+	char name[20];
+	char value[20];
+	char *env;
+
+	/* are we already set up? */
+	if (cp->c_private != NULL)
+		return;
+
+	cp->c_private = malloc(sizeof (struct serial));
+	port = cp->c_private;
+	port->baudrate = COMSPEED;
+
+	port->ioaddr = -1;	/* invalid port */
+	if (strcmp(cp->c_name, "ttya") == 0)
+		port->ioaddr = 0;
+	else if (strcmp(cp->c_name, "ttyb") == 0)
+		port->ioaddr = 1;
+	else if (strcmp(cp->c_name, "ttyc") == 0)
+		port->ioaddr = 2;
+	else if (strcmp(cp->c_name, "ttyd") == 0)
+		port->ioaddr = 3;
+
+	port->databits = 8;		/* 8,n,1 */
+	port->parity = NoParity;	/* 8,n,1 */
+	port->stopbits = OneStopBit;	/* 8,n,1 */
+	port->ignore_cd = 1;		/* ignore cd */
+	port->rtsdtr_off = 0;		/* rts-dtr is on */
+	port->sio = NULL;
+
+	handle = efi_serial_get_handle(port->ioaddr);
+
+	if (handle != NULL) {
+		status = BS->OpenProtocol(handle, &serial,
+		    (void**)&port->sio, IH, NULL,
+		    EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+
+		if (EFI_ERROR(status))
+			port->sio = NULL;
+	}
+
+	snprintf(name, sizeof (name), "%s-mode", cp->c_name);
+	env = getenv(name);
+
+	if (env != NULL)
+		(void) comc_parse_mode(port, env);
+
+	env = comc_asprint_mode(port);
+
+	if (env != NULL) {
+		unsetenv(name);
+		env_setenv(name, EV_VOLATILE, env, comc_mode_set, env_nounset);
+		free(env);
+	}
+
+	snprintf(name, sizeof (name), "%s-ignore-cd", cp->c_name);
+	env = getenv(name);
+	if (env != NULL) {
+		if (strcmp(env, "true") == 0)
+			port->ignore_cd = 1;
+		else if (strcmp(env, "false") == 0)
+			port->ignore_cd = 0;
+	}
+
+	snprintf(value, sizeof (value), "%s",
+	    port->ignore_cd? "true" : "false");
+	unsetenv(name);
+	env_setenv(name, EV_VOLATILE, value, comc_cd_set, env_nounset);
+
+	snprintf(name, sizeof (name), "%s-rts-dtr-off", cp->c_name);
+	env = getenv(name);
+	if (env != NULL) {
+		if (strcmp(env, "true") == 0)
+			port->rtsdtr_off = 1;
+		else if (strcmp(env, "false") == 0)
+			port->rtsdtr_off = 0;
+	}
+
+	snprintf(value, sizeof (value), "%s",
+	    port->rtsdtr_off? "true" : "false");
+	unsetenv(name);
+	env_setenv(name, EV_VOLATILE, value, comc_rtsdtr_set, env_nounset);
+
+	cp->c_flags = 0;
+	if (comc_setup(cp))
+		cp->c_flags = C_PRESENTIN | C_PRESENTOUT;
+}
+
+static int
+comc_init(struct console *cp, int arg __attribute((unused)))
+{
+
+	if (comc_setup(cp))
+		return (CMD_OK);
+
+	cp->c_flags = 0;
+	return (CMD_ERROR);
+}
+
+static void
+comc_putchar(struct console *cp, int c)
+{
+	int wait;
+	EFI_STATUS status;
+	UINTN bufsz = 1;
+	char cb = c;
+	struct serial *sp = cp->c_private;
+
+	if (sp->sio == NULL)
+		return;
+
+	for (wait = COMC_TXWAIT; wait > 0; wait--) {
+		status = sp->sio->Write(sp->sio, &bufsz, &cb);
+		if (status != EFI_TIMEOUT)
+			break;
+	}
+}
+
+static int
+comc_getchar(struct console *cp)
+{
+	EFI_STATUS status;
+	UINTN bufsz = 1;
+	char c;
+	struct serial *sp = cp->c_private;
+
+	if (sp->sio == NULL || !comc_ischar(cp))
+		return (-1);
+
+	status = sp->sio->Read(sp->sio, &bufsz, &c);
+	if (EFI_ERROR(status) || bufsz == 0)
+		return (-1);
+
+	return (c);
+}
+
+static int
+comc_ischar(struct console *cp)
+{
+	EFI_STATUS status;
+	uint32_t control;
+	struct serial *sp = cp->c_private;
+
+	if (sp->sio == NULL)
+		return (0);
+
+	status = sp->sio->GetControl(sp->sio, &control);
+	if (EFI_ERROR(status))
+		return (0);
+
+	return (!(control & EFI_SERIAL_INPUT_BUFFER_EMPTY));
+}
+
+static int
+comc_ioctl(struct console *cp __unused, int cmd __unused, void *data __unused)
+{
+	return (ENOTTY);
+}
+
+static void
+comc_devinfo(struct console *cp)
+{
+	struct serial *port = cp->c_private;
+	EFI_HANDLE handle;
+	EFI_DEVICE_PATH *dp;
+	CHAR16 *text;
+
+	handle = efi_serial_get_handle(port->ioaddr);
+	if (handle == NULL) {
+		printf("\tdevice is not present");
+		return;
+	}
+
+	dp = efi_lookup_devpath(handle);
+	if (dp == NULL)
+		return;
+
+	text = efi_devpath_name(dp);
+	if (text == NULL)
+		return;
+
+	printf("\t%S", text);
+	efi_free_devpath_name(text);
+}
+
+static char *
+comc_asprint_mode(struct serial *sp)
+{
+	char par, *buf;
+	char *stop;
+
+	if (sp == NULL)
+		return (NULL);
+
+	switch (sp->parity) {
+	case NoParity:
+		par = 'n';
+		break;
+	case EvenParity:
+		par = 'e';
+		break;
+	case OddParity:
+		par = 'o';
+		break;
+	case MarkParity:
+		par = 'm';
+		break;
+	case SpaceParity:
+		par = 's';
+		break;
+	default:
+		par = 'n';
+		break;
+	}
+
+	switch (sp->stopbits) {
+	case OneStopBit:
+		stop = "1";
+		break;
+	case TwoStopBits:
+		stop = "2";
+		break;
+	case OneFiveStopBits:
+		stop = "1.5";
+		break;
+	default:
+		stop = "1";
+		break;
+	}
+
+	asprintf(&buf, "%ju,%d,%c,%s,-", sp->baudrate, sp->databits, par, stop);
+	return (buf);
+}
+
+static int
+comc_parse_mode(struct serial *sp, const char *value)
+{
+	unsigned long n;
+	uint64_t baudrate;
+	uint8_t databits = 8;
+	int parity = NoParity;
+	int stopbits = OneStopBit;
+	char *ep;
+
+	if (value == NULL || *value == '\0')
+		return (CMD_ERROR);
+
+	errno = 0;
+	n = strtoul(value, &ep, 10);
+	if (errno != 0 || *ep != ',')
+		return (CMD_ERROR);
+	baudrate = n;
+
+	ep++;
+	n = strtoul(ep, &ep, 10);
+	if (errno != 0 || *ep != ',')
+		return (CMD_ERROR);
+
+	switch (n) {
+	case 5: databits = 5;
+		break;
+	case 6: databits = 6;
+		break;
+	case 7: databits = 7;
+		break;
+	case 8: databits = 8;
+		break;
+	default:
+		return (CMD_ERROR);
+	}
+
+	ep++;
+	switch (*ep++) {
+	case 'n': parity = NoParity;
+		break;
+	case 'e': parity = EvenParity;
+		break;
+	case 'o': parity = OddParity;
+		break;
+	case 'm': parity = MarkParity;
+		break;
+	case 's': parity = SpaceParity;
+		break;
+	default:
+		return (CMD_ERROR);
+	}
+
+	if (*ep == ',')
+		ep++;
+	else
+		return (CMD_ERROR);
+
+	switch (*ep++) {
+	case '1': stopbits = OneStopBit;
+		if (ep[0] == '.' && ep[1] == '5') {
+			ep += 2;
+			stopbits = OneFiveStopBits;
+		}
+		break;
+	case '2': stopbits = TwoStopBits;
+		break;
+	default:
+		return (CMD_ERROR);
+	}
+
+	/* handshake is ignored, but we check syntax anyhow */
+	if (*ep == ',')
+		ep++;
+	else
+		return (CMD_ERROR);
+
+	switch (*ep++) {
+	case '-':
+	case 'h':
+	case 's':
+		break;
+	default:
+		return (CMD_ERROR);
+	}
+
+	if (*ep != '\0')
+		return (CMD_ERROR);
+
+	sp->baudrate = baudrate;
+	sp->databits = databits;
+	sp->parity = parity;
+	sp->stopbits = stopbits;
+	return (CMD_OK);
+}
+
+static struct console *
+get_console(char *name)
+{
+	struct console *cp = NULL;
+
+	switch (name[3]) {
+	case 'a': cp = &ttya;
+		break;
+	case 'b': cp = &ttyb;
+		break;
+	case 'c': cp = &ttyc;
+		break;
+	case 'd': cp = &ttyd;
+		break;
+	}
+	return (cp);
+}
+
+static int
+comc_mode_set(struct env_var *ev, int flags, const void *value)
+{
+	struct console *cp;
+
+	if (value == NULL)
+		return (CMD_ERROR);
+
+	if ((cp = get_console(ev->ev_name)) == NULL)
+		return (CMD_ERROR);
+
+	if (comc_parse_mode(cp->c_private, value) == CMD_ERROR)
+		return (CMD_ERROR);
+
+	(void) comc_setup(cp);
+
+	env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
+
+	return (CMD_OK);
+}
+
+static int
+comc_cd_set(struct env_var *ev, int flags, const void *value)
+{
+	struct console *cp;
+	struct serial *sp;
+
+	if (value == NULL)
+		return (CMD_ERROR);
+
+	if ((cp = get_console(ev->ev_name)) == NULL)
+		return (CMD_ERROR);
+
+	sp = cp->c_private;
+	if (strcmp(value, "true") == 0)
+		sp->ignore_cd = 1;
+	else if (strcmp(value, "false") == 0)
+		sp->ignore_cd = 0;
+	else
+		return (CMD_ERROR);
+
+	(void) comc_setup(cp);
+
+	env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
+
+	return (CMD_OK);
+}
+
+static int
+comc_rtsdtr_set(struct env_var *ev, int flags, const void *value)
+{
+	struct console *cp;
+	struct serial *sp;
+
+	if (value == NULL)
+		return (CMD_ERROR);
+
+	if ((cp = get_console(ev->ev_name)) == NULL)
+		return (CMD_ERROR);
+
+	sp = cp->c_private;
+	if (strcmp(value, "true") == 0)
+		sp->rtsdtr_off = 1;
+	else if (strcmp(value, "false") == 0)
+		sp->rtsdtr_off = 0;
+	else
+		return (CMD_ERROR);
+
+	(void) comc_setup(cp);
+
+	env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
+
+	return (CMD_OK);
+}
+
+/*
+ * In case of error, we also reset ACTIVE flags, so the console
+ * framefork will try alternate consoles.
+ */
+static bool
+comc_setup(struct console *cp)
+{
+	EFI_STATUS status;
+	UINT32 control;
+	struct serial *sp = cp->c_private;
+
+	/* port is not usable */
+	if (sp->sio == NULL)
+		return (false);
+
+	status = sp->sio->Reset(sp->sio);
+	if (EFI_ERROR(status))
+		return (false);
+
+	status = sp->sio->SetAttributes(sp->sio, sp->baudrate, 0, 0, sp->parity,
+	    sp->databits, sp->stopbits);
+	if (EFI_ERROR(status))
+		return (false);
+
+	status = sp->sio->GetControl(sp->sio, &control);
+	if (EFI_ERROR(status))
+		return (false);
+	if (sp->rtsdtr_off) {
+		control &= ~(EFI_SERIAL_REQUEST_TO_SEND |
+		    EFI_SERIAL_DATA_TERMINAL_READY);
+	} else {
+		control |= EFI_SERIAL_REQUEST_TO_SEND;
+	}
+
+	(void) sp->sio->SetControl(sp->sio, control);
+
+	/* Mark this port usable. */
+	cp->c_flags |= (C_PRESENTIN | C_PRESENTOUT);
+	return (true);
+}

--- a/usr/src/boot/sys/boot/efi/loader/i386/Makefile	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/sys/boot/efi/loader/i386/Makefile	Mon Dec 09 14:15:34 2019 +0000
@@ -31,3 +31,6 @@
 CLEANFILES +=	machine x86 $(EFIPROG)
 
 $(OBJS):	machine x86
+
+%.o: ../../../i386/libi386/%.c
+	$(COMPILE.c) $<

--- a/usr/src/boot/sys/boot/efi/loader/main.c	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/sys/boot/efi/loader/main.c	Mon Dec 09 14:15:34 2019 +0000
@@ -81,7 +81,7 @@
 	EFI_DEVICE_PATH *devpath, *dp, *node;
 	HARDDRIVE_DEVICE_PATH *hd;
 	bool ret;
-	extern UINT64 start_sector;	/* from multiboot.S */
+	extern UINT64 start_sector;	/* from mb_header.S */
 
 	/* This check is true for chainloader case. */
 	if (h == img->DeviceHandle)

--- a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile	Mon Dec 09 14:15:34 2019 +0000
@@ -62,7 +62,7 @@
 
 install: all $(ROOTBOOTPROG)
 
-OBJS =	multiboot.o zfsboot.o sio.o cons.o devopen.o \
+OBJS =	mb_header.o zfsboot.o sio.o cons.o devopen.o \
 	part.o disk.o bcache.o zfs_cmd.o
 
 part.o := CPPFLAGS += -I$(ZLIB)
@@ -108,8 +108,8 @@
 %.o:	../../common/%.c
 	$(COMPILE.c) $<
 
-multiboot.o: ../../common/multiboot.S
-	$(COMPILE.S) ../../common/multiboot.S
+%.o: ../../common/%.S
+	$(COMPILE.S) $<
 
 clobber: clean
 

--- a/usr/src/boot/sys/boot/i386/isoboot/Makefile	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/sys/boot/i386/isoboot/Makefile	Mon Dec 09 14:15:34 2019 +0000
@@ -56,7 +56,7 @@
 
 install: all $(ROOTBOOTPROG)
 
-OBJS= multiboot.o isoboot.o sio.o drv.o cons.o gptldr.o
+OBJS= mb_header.o isoboot.o sio.o drv.o cons.o gptldr.o
 
 CLEANFILES += isoboot
 

--- a/usr/src/boot/sys/boot/i386/libi386/comconsole.c	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/boot/sys/boot/i386/libi386/comconsole.c	Mon Dec 09 14:15:34 2019 +0000
@@ -23,6 +23,11 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * This code is shared on BIOS and UEFI systems on x86 because
+ * we can access io ports on both platforms and the UEFI Serial IO protocol
+ * is not giving us reliable port order and we see issues with input.
+ */
 #include <sys/cdefs.h>
 
 #include <stand.h>
@@ -495,7 +500,7 @@
 static uint32_t
 comc_parse_pcidev(const char *string)
 {
-#ifdef NO_PCI
+#ifdef EFI
 	(void) string;
 	return (0);
 #else
@@ -539,7 +544,7 @@
 static int
 comc_pcidev_handle(struct console *cp, uint32_t locator)
 {
-#ifdef NO_PCI
+#ifdef EFI
 	(void) cp;
 	(void) locator;
 	return (CMD_ERROR);

--- a/usr/src/cmd/format/io.c	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/cmd/format/io.c	Mon Dec 09 14:15:34 2019 +0000
@@ -49,7 +49,6 @@
 
 extern int	data_lineno;
 extern char	*space2str();
-extern long	strtol();
 
 /*
  * This variable is used to determine whether a token is present in the pipe
@@ -62,10 +61,6 @@
  */
 int	last_token_type = 0;
 
-#ifdef	__STDC__
-/*
- * Prototypes for ANSI C compilers
- */
 static int	sup_get_token(char *);
 static void	pushchar(int c);
 static int	checkeof(void);
@@ -79,33 +74,11 @@
 static void	sup_pushchar(int c);
 static int	geti64(char *str, uint64_t *iptr, uint64_t *wild);
 
-#else	/* __STDC__ */
-/*
- * Prototypes for non-ANSI C compilers
- */
-
-static int	sup_get_token();
-static void	pushchar(int c);
-static int	checkeof(void);
-static void	flushline(void);
-static int	strcnt(char *s1, char *s2);
-static int	getbn(char *str, diskaddr_t *iptr);
-static void	print_input_choices(int type, u_ioparam_t *param);
-static int	slist_widest_str(slist_t *slist);
-static void	ljust_print(char *str, int width);
-static int	sup_inputchar(void);
-static void	sup_pushchar(int c);
-static int	geti64(char *str, uint64_t *iptr, uint64_t *wild);
-
-#endif	/* __STDC__ */
-
-
 /*
  * This routine pushes the given character back onto the input stream.
  */
 static void
-pushchar(c)
-	int	c;
+pushchar(int c)
 {
 	(void) ungetc(c, stdin);
 }
@@ -114,7 +87,7 @@
  * This routine checks the input stream for an eof condition.
  */
 static int
-checkeof()
+checkeof(void)
 {
 	return (feof(stdin));
 }
@@ -124,8 +97,7 @@
  * basically any consecutive non-white characters.
  */
 char *
-gettoken(inbuf)
-	char	*inbuf;
+gettoken(char *inbuf)
 {
 	char	*ptr = inbuf;
 	int	c, quoted = 0;
@@ -196,8 +168,7 @@
  * This routine removes the leading and trailing spaces from a token.
  */
 void
-clean_token(cleantoken, token)
-	char	*cleantoken, *token;
+clean_token(char *cleantoken, char *token)
 {
 	char	*ptr;
 
@@ -214,7 +185,7 @@
 	 * Strip off trailing white-space.
 	 */
 	for (ptr = cleantoken + strlen(cleantoken) - 1;
-		isspace(*ptr) && (ptr >= cleantoken); ptr--) {
+	    isspace(*ptr) && (ptr >= cleantoken); ptr--) {
 		*ptr = '\0';
 	}
 }
@@ -254,8 +225,7 @@
  * between s1 and s2, stopping as soon as a mismatch is found.
  */
 static int
-strcnt(s1, s2)
-	char	*s1, *s2;
+strcnt(char *s1, char *s2)
 {
 	int	i = 0;
 
@@ -271,9 +241,7 @@
  * is present, the wildcard value will be returned.
  */
 int
-geti(str, iptr, wild)
-	char	*str;
-	int	*iptr, *wild;
+geti(char *str, int *iptr, int *wild)
 {
 	char	*str2;
 
@@ -306,9 +274,7 @@
  * is present, the wildcard value will be returned.
  */
 static int
-geti64(str, iptr, wild)
-	char		*str;
-	uint64_t	*iptr, *wild;
+geti64(char *str, uint64_t *iptr, uint64_t *wild)
 {
 	char	*str2;
 
@@ -345,9 +311,7 @@
  * to the highest possible legal value.
  */
 static int
-getbn(str, iptr)
-	char	*str;
-	diskaddr_t	*iptr;
+getbn(char *str, diskaddr_t *iptr)
 {
 	char	*cptr, *hptr, *sptr;
 	int	cyl, head, sect;
@@ -442,13 +406,8 @@
  * values and prompt strings.
  */
 uint64_t
-input(type, promptstr, delim, param, deflt, cmdflag)
-	int		type;
-	char		*promptstr;
-	int		delim;
-	u_ioparam_t	*param;
-	int		*deflt;
-	int		cmdflag;
+input(int type, char *promptstr, int delim, u_ioparam_t *param, int *deflt,
+    int cmdflag)
 {
 	int		interactive, help, i, length, index, tied;
 	blkaddr_t	bn;
@@ -586,7 +545,7 @@
 				cylno = bn2c(part_deflt->deflt_size) - 1;
 			} else {
 				cylno = (bn2c(part_deflt->deflt_size) +
-					    part_deflt->start_cyl) - 1;
+				    part_deflt->start_cyl) - 1;
 			}
 
 			fmt_print("[%ub, %uc, %de, %1.2fmb, %1.2fgb]",
@@ -609,11 +568,11 @@
 			    efi_deflt->end_sector,
 			    efi_deflt->start_sector + efi_deflt->end_sector - 1,
 			    (efi_deflt->end_sector * cur_blksz) /
-				(1024 * 1024),
+			    (1024 * 1024),
 			    (efi_deflt->end_sector * cur_blksz) /
-				(1024 * 1024 * 1024),
+			    (1024 * 1024 * 1024),
 			    (efi_deflt->end_sector * cur_blksz) /
-				((uint64_t)1024 * 1024 * 1024 * 1024));
+			    ((uint64_t)1024 * 1024 * 1024 * 1024));
 			break;
 		case FIO_OPINT:
 			/* no default value for optional input type */
@@ -659,9 +618,9 @@
 			 * exit gracefully.
 			 */
 			if ((strlcat(shell_argv, arg, sizeof (shell_argv)) >=
-				sizeof (shell_argv)) ||
+			    sizeof (shell_argv)) ||
 			    (strlcat(shell_argv, " ", sizeof (shell_argv)) >=
-				sizeof (shell_argv))) {
+			    sizeof (shell_argv))) {
 				err_print("Error: Command line too long.\n");
 				fullabort();
 			}
@@ -781,8 +740,8 @@
 	 * If token is a '?' or a 'h', it is a request for help.
 	 */
 	if ((strcmp(cleantoken, "?") == 0) ||
-		(strcmp(cleantoken, "h") == 0) ||
-			(strcmp(cleantoken, "help") == 0)) {
+	    (strcmp(cleantoken, "h") == 0) ||
+	    (strcmp(cleantoken, "help") == 0)) {
 		help = 1;
 	}
 	/*
@@ -813,12 +772,12 @@
 		 * Convert token to a disk block number.
 		 */
 		if (cur_label == L_TYPE_EFI) {
-		    if (geti64(cleantoken, (uint64_t *)&bn64,
-			(uint64_t *)NULL))
-			    break;
+			if (geti64(cleantoken, (uint64_t *)&bn64,
+			    (uint64_t *)NULL))
+				break;
 		} else {
-		    if (getbn(cleantoken, &bn64))
-			break;
+			if (getbn(cleantoken, &bn64))
+				break;
 		}
 		/*
 		 * Check to be sure it is within the legal bounds.
@@ -1066,8 +1025,7 @@
 	 * Return the value associated with the matched string.
 	 */
 	case FIO_SLIST:
-		i = find_value((slist_t *)param->io_slist,
-			cleantoken, &value);
+		i = find_value((slist_t *)param->io_slist, cleantoken, &value);
 		if (i == 1) {
 			return (value);
 		} else {
@@ -1520,14 +1478,14 @@
 			fmt_print("Expecting up to %llu sectors,",
 			    cur_parts->etoc->efi_last_u_lba);
 			fmt_print("or %llu megabytes,",
-			    (cur_parts->etoc->efi_last_u_lba * cur_blksz)/
-				(1024 * 1024));
+			    (cur_parts->etoc->efi_last_u_lba * cur_blksz) /
+			    (1024 * 1024));
 			fmt_print("or %llu gigabytes\n",
-			    (cur_parts->etoc->efi_last_u_lba * cur_blksz)/
-				(1024 * 1024 * 1024));
+			    (cur_parts->etoc->efi_last_u_lba * cur_blksz) /
+			    (1024 * 1024 * 1024));
 			fmt_print("or %llu terabytes\n",
-			    (cur_parts->etoc->efi_last_u_lba * cur_blksz)/
-				((uint64_t)1024 * 1024 * 1024 * 1024));
+			    (cur_parts->etoc->efi_last_u_lba * cur_blksz) /
+			    ((uint64_t)1024 * 1024 * 1024 * 1024));
 			break;
 		}
 
@@ -1591,12 +1549,12 @@
 			 * Token is number of blocks
 			 */
 			if (geti64(cleantoken, &blokno, (uint64_t *)NULL)) {
-			    break;
+				break;
 			}
 			if (blokno > bounds->upper) {
-			    err_print(
-"Number of blocks must be less that the total available blocks.\n");
-			    break;
+				err_print("Number of blocks must be less that "
+				    "the total available blocks.\n");
+				break;
 			}
 			return (blokno);
 
@@ -1614,8 +1572,8 @@
 			 * Some sanity check
 			 */
 			if (blokno < efi_deflt->start_sector) {
-				err_print(
-"End Sector must fall on or after start sector %llu\n",
+				err_print("End Sector must fall on or after "
+				    "start sector %llu\n",
 				    efi_deflt->start_sector);
 				break;
 			}
@@ -1624,8 +1582,8 @@
 			 * verify that our input is within range
 			 */
 			if (blokno > cur_parts->etoc->efi_last_u_lba) {
-				err_print(
-"End Sector %llu is beyond max Sector %llu\n",
+				err_print("End Sector %llu is beyond max "
+				    "Sector %llu\n",
 				    blokno, cur_parts->etoc->efi_last_u_lba);
 				break;
 			}
@@ -1681,11 +1639,11 @@
 				break;
 			}
 			return (uint64_t)((float)nmegs * 1024.0 *
-				1024.0 * 1024.0 * 1024.0 / cur_blksz);
+			    1024.0 * 1024.0 * 1024.0 / cur_blksz);
 
 		default:
-			err_print(
-"Please specify units in either b(number of blocks), e(end sector),\n");
+			err_print("Please specify units in either "
+			    "b(number of blocks), e(end sector),\n");
 			err_print(" g(gigabytes), m(megabytes)");
 			err_print(" or t(terabytes)\n");
 			break;
@@ -1721,9 +1679,7 @@
  * Print input choices
  */
 static void
-print_input_choices(type, param)
-	int		type;
-	u_ioparam_t	*param;
+print_input_choices(int type, u_ioparam_t *param)
 {
 	char		**sp;
 	slist_t		*lp;
@@ -1803,10 +1759,7 @@
  * associated with the matched string in match_value.
  */
 int
-find_value(slist, match_str, match_value)
-	slist_t		*slist;
-	char		*match_str;
-	int		*match_value;
+find_value(slist_t *slist, char *match_str, int *match_value)
 {
 	int		i;
 	int		nmatches;
@@ -1851,9 +1804,7 @@
  * Return the string associated with that value.
  */
 char *
-find_string(slist, match_value)
-	slist_t		*slist;
-	int		match_value;
+find_string(slist_t *slist, int match_value)
 {
 	for (; slist->str != NULL; slist++) {
 		if (slist->value == match_value) {
@@ -1861,15 +1812,14 @@
 		}
 	}
 
-	return ((char *)NULL);
+	return (NULL);
 }
 
 /*
  * Return the width of the widest string in an slist
  */
 static int
-slist_widest_str(slist)
-	slist_t	*slist;
+slist_widest_str(slist_t *slist)
 {
 	int	i;
 	int	width;
@@ -1887,9 +1837,7 @@
  * Print a string left-justified to a fixed width.
  */
 static void
-ljust_print(str, width)
-	char	*str;
-	int	width;
+ljust_print(char *str, int width)
 {
 	int	i;
 
@@ -2050,9 +1998,7 @@
  * data is not crud, so be rather defensive.
  */
 void
-print_buf(buf, nbytes)
-	char	*buf;
-	int	nbytes;
+print_buf(char *buf, int nbytes)
 {
 	int	c;
 
@@ -2072,13 +2018,12 @@
  * booting.
  */
 void
-pr_ctlrline(ctlr)
-	register struct ctlr_info *ctlr;
+pr_ctlrline(struct ctlr_info *ctlr)
 {
 
 	fmt_print("           %s%d at %s 0x%x ",
-		ctlr->ctlr_cname, ctlr->ctlr_num,
-		space2str(ctlr->ctlr_space), ctlr->ctlr_addr);
+	    ctlr->ctlr_cname, ctlr->ctlr_num,
+	    space2str(ctlr->ctlr_space), ctlr->ctlr_addr);
 	if (ctlr->ctlr_vec != 0)
 		fmt_print("vec 0x%x ", ctlr->ctlr_vec);
 	else
@@ -2093,9 +2038,7 @@
  * booting.
  */
 void
-pr_diskline(disk, num)
-	register struct disk_info *disk;
-	int	num;
+pr_diskline(struct disk_info *disk, int	num)
 {
 	struct	ctlr_info *ctlr = disk->disk_ctlr;
 	struct	disk_type *type = disk->disk_type;
@@ -2103,13 +2046,13 @@
 	fmt_print("    %4d. %s ", num, disk->disk_name);
 	if ((type != NULL) && (disk->label_type == L_TYPE_SOLARIS)) {
 		fmt_print("<%s cyl %u alt %u hd %u sec %u>",
-			type->dtype_asciilabel, type->dtype_ncyl,
-			type->dtype_acyl, type->dtype_nhead,
-			type->dtype_nsect);
+		    type->dtype_asciilabel, type->dtype_ncyl,
+		    type->dtype_acyl, type->dtype_nhead,
+		    type->dtype_nsect);
 	} else if ((type != NULL) && (disk->label_type == L_TYPE_EFI)) {
 		cur_blksz = disk->disk_lbasize;
 		print_efi_string(type->vendor, type->product,
-			type->revision, type->capacity);
+		    type->revision, type->capacity);
 	} else if (disk->disk_flags & DSK_RESERVED) {
 		fmt_print("<drive not available: reserved>");
 	} else if (disk->disk_flags & DSK_UNAVAILABLE) {
@@ -2127,9 +2070,9 @@
 		fmt_print("          %s\n", disk->devfs_name);
 	} else {
 		fmt_print("          %s%d at %s%d slave %d\n",
-			ctlr->ctlr_dname, disk->disk_dkinfo.dki_unit,
-			ctlr->ctlr_cname, ctlr->ctlr_num,
-			disk->disk_dkinfo.dki_slave);
+		    ctlr->ctlr_dname, disk->disk_dkinfo.dki_unit,
+		    ctlr->ctlr_cname, ctlr->ctlr_num,
+		    disk->disk_dkinfo.dki_slave);
 	}
 
 #ifdef	OLD
@@ -2141,8 +2084,7 @@
 	}
 	fmt_print("\n");
 	if (type != NULL) {
-		fmt_print(
-"           %s%d: <%s cyl %u alt %u hd %u sec %u>\n",
+		fmt_print("           %s%d: <%s cyl %u alt %u hd %u sec %u>\n",
 		    ctlr->ctlr_dname, disk->disk_dkinfo.dki_unit,
 		    type->dtype_asciilabel, type->dtype_ncyl,
 		    type->dtype_acyl, type->dtype_nhead,
@@ -2175,7 +2117,7 @@
  * track of the current line in the data file via a global variable.
  */
 static int
-sup_inputchar()
+sup_inputchar(void)
 {
 	int	c;
 
@@ -2210,8 +2152,7 @@
  * This routine pushes a character back onto the input pipe for the data file.
  */
 static void
-sup_pushchar(c)
-	int	c;
+sup_pushchar(int c)
 {
 	(void) ungetc(c, data_file);
 }
@@ -2230,16 +2171,14 @@
  * last token around, which is useful for error recovery.
  */
 int
-sup_gettoken(buf)
-	char	*buf;
+sup_gettoken(char *buf)
 {
 	last_token_type = sup_get_token(buf);
 	return (last_token_type);
 }
 
 static int
-sup_get_token(buf)
-	char	*buf;
+sup_get_token(char *buf)
 {
 	char	*ptr = buf;
 	int	c, quoted = 0;
@@ -2288,7 +2227,7 @@
 		 * a token.
 		 */
 		if (!quoted && (c == '=' || c == ',' || c == ':' ||
-			c == '#' || c == '|' || c == '&' || c == '~'))
+		    c == '#' || c == '|' || c == '&' || c == '~'))
 			break;
 		/*
 		 * Store the character if there's room left.
@@ -2350,9 +2289,7 @@
  * Push back a token
  */
 void
-sup_pushtoken(token_buf, token_type)
-	char	*token_buf;
-	int	token_type;
+sup_pushtoken(char *token_buf, int token_type)
 {
 	/*
 	 * We can only push one token back at a time
@@ -2369,9 +2306,7 @@
  * and EOF.
  */
 void
-get_inputline(line, nbytes)
-	char	*line;
-	int	nbytes;
+get_inputline(char *line, int nbytes)
 {
 	char	*p = line;
 	int	c;
@@ -2481,9 +2416,9 @@
 	/* reopen file descriptor if one was open before */
 	if (cur_disk != NULL) {
 		if ((cur_file = open_disk(cur_disk->disk_path,
-			O_RDWR | O_NDELAY)) < 0) {
+		    O_RDWR | O_NDELAY)) < 0) {
 			err_print("Error: can't reopen selected disk '%s'. \n",
-				cur_disk->disk_name);
+			    cur_disk->disk_name);
 			fullabort();
 		}
 	}

--- a/usr/src/cmd/format/label.c	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/cmd/format/label.c	Mon Dec 09 14:15:34 2019 +0000
@@ -282,7 +282,7 @@
 	if (cur_label == L_TYPE_EFI) {
 		enter_critical();
 		vtoc64 = cur_parts->etoc;
-		err_check(vtoc64);
+		efi_err_check(vtoc64);
 		if (efi_write(cur_file, vtoc64) != 0) {
 			err_print("Warning: error writing EFI.\n");
 			error = -1;
@@ -979,97 +979,6 @@
 	return (0);
 }
 
-/* make sure the user specified something reasonable */
-void
-err_check(struct dk_gpt *vtoc)
-{
-	int		resv_part = -1;
-	int		i, j;
-	diskaddr_t	istart, jstart, isize, jsize, endsect;
-	int		overlap = 0;
-	uint_t		reserved;
-
-	/*
-	 * make sure no partitions overlap
-	 */
-	reserved = efi_reserved_sectors(vtoc);
-	for (i = 0; i < vtoc->efi_nparts; i++) {
-		/* It can't be unassigned and have an actual size */
-		if ((vtoc->efi_parts[i].p_tag == V_UNASSIGNED) &&
-		    (vtoc->efi_parts[i].p_size != 0)) {
-			(void) fprintf(stderr,
-"partition %d is \"unassigned\" but has a size of %llu\n", i,
-			    vtoc->efi_parts[i].p_size);
-		}
-		if (vtoc->efi_parts[i].p_tag == V_UNASSIGNED) {
-			continue;
-		}
-		if (vtoc->efi_parts[i].p_tag == V_RESERVED) {
-			if (resv_part != -1) {
-				(void) fprintf(stderr,
-"found duplicate reserved partition at %d\n", i);
-			}
-			resv_part = i;
-			if (vtoc->efi_parts[i].p_size != reserved)
-				(void) fprintf(stderr,
-"Warning: reserved partition size must be %u sectors\n",
-				    reserved);
-		}
-		if ((vtoc->efi_parts[i].p_start < vtoc->efi_first_u_lba) ||
-		    (vtoc->efi_parts[i].p_start > vtoc->efi_last_u_lba)) {
-			(void) fprintf(stderr,
-			    "Partition %d starts at %llu\n",
-			    i,
-			    vtoc->efi_parts[i].p_start);
-			(void) fprintf(stderr,
-			    "It must be between %llu and %llu.\n",
-			    vtoc->efi_first_u_lba,
-			    vtoc->efi_last_u_lba);
-		}
-		if ((vtoc->efi_parts[i].p_start +
-		    vtoc->efi_parts[i].p_size <
-		    vtoc->efi_first_u_lba) ||
-		    (vtoc->efi_parts[i].p_start +
-		    vtoc->efi_parts[i].p_size >
-		    vtoc->efi_last_u_lba + 1)) {
-			(void) fprintf(stderr,
-			    "Partition %d ends at %llu\n",
-			    i,
-			    vtoc->efi_parts[i].p_start +
-			    vtoc->efi_parts[i].p_size);
-			(void) fprintf(stderr,
-			    "It must be between %llu and %llu.\n",
-			    vtoc->efi_first_u_lba,
-			    vtoc->efi_last_u_lba);
-		}
-
-		for (j = 0; j < vtoc->efi_nparts; j++) {
-			isize = vtoc->efi_parts[i].p_size;
-			jsize = vtoc->efi_parts[j].p_size;
-			istart = vtoc->efi_parts[i].p_start;
-			jstart = vtoc->efi_parts[j].p_start;
-			if ((i != j) && (isize != 0) && (jsize != 0)) {
-				endsect = jstart + jsize -1;
-				if ((jstart <= istart) &&
-				    (istart <= endsect)) {
-					if (!overlap) {
-					(void) fprintf(stderr,
-"label error: EFI Labels do not support overlapping partitions\n");
-					}
-					(void) fprintf(stderr,
-"Partition %d overlaps partition %d.\n", i, j);
-					overlap = 1;
-				}
-			}
-		}
-	}
-	/* make sure there is a reserved partition */
-	if (resv_part == -1) {
-		(void) fprintf(stderr,
-		    "no reserved partition found\n");
-	}
-}
-
 #ifdef	DEBUG
 static void
 dump_label(struct dk_label *label)

--- a/usr/src/cmd/format/label.h	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/cmd/format/label.h	Mon Dec 09 14:15:34 2019 +0000
@@ -44,7 +44,7 @@
 int	get_disk_info(int, struct efi_info *, struct disk_info *);
 int	label_to_vtoc(struct extvtoc *, struct dk_label *);
 int	SMI_vtoc_to_EFI(int, struct dk_gpt **);
-void	err_check(struct dk_gpt *);
+void	efi_err_check(struct dk_gpt *);
 extern int	is_efi_type(int);
 
 #ifdef	__cplusplus

--- a/usr/src/cmd/format/menu_command.c	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/cmd/format/menu_command.c	Mon Dec 09 14:15:34 2019 +0000
@@ -1709,7 +1709,7 @@
 			return (-1);
 		}
 		if (efi_write(cur_file, vtoc64) != 0) {
-			err_check(vtoc64);
+			efi_err_check(vtoc64);
 			err_print("Warning: error writing EFI.\n");
 			return (-1);
 		} else {

--- a/usr/src/cmd/format/menu_partition.c	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/cmd/format/menu_partition.c	Mon Dec 09 14:15:34 2019 +0000
@@ -35,25 +35,15 @@
 #include "misc.h"
 #include "param.h"
 
-#ifdef __STDC__
-
 /* Function prototypes for ANSI C Compilers */
 static void	nspaces(int);
 static int	ndigits(uint64_t);
 
-#else	/* __STDC__ */
-
-/* Function prototypes for non-ANSI C Compilers */
-static void	nspaces();
-static int	ndigits();
-
-#endif	/* __STDC__ */
-
 /*
  * This routine implements the 'a' command.  It changes the 'a' partition.
  */
 int
-p_apart()
+p_apart(void)
 {
 
 	change_partition(0);
@@ -64,7 +54,7 @@
  * This routine implements the 'b' command.  It changes the 'b' partition.
  */
 int
-p_bpart()
+p_bpart(void)
 {
 
 	change_partition(1);
@@ -75,7 +65,7 @@
  * This routine implements the 'c' command.  It changes the 'c' partition.
  */
 int
-p_cpart()
+p_cpart(void)
 {
 
 	change_partition(2);
@@ -86,7 +76,7 @@
  * This routine implements the 'd' command.  It changes the 'd' partition.
  */
 int
-p_dpart()
+p_dpart(void)
 {
 
 	change_partition(3);
@@ -97,7 +87,7 @@
  * This routine implements the 'e' command.  It changes the 'e' partition.
  */
 int
-p_epart()
+p_epart(void)
 {
 
 	change_partition(4);
@@ -108,7 +98,7 @@
  * This routine implements the 'f' command.  It changes the 'f' partition.
  */
 int
-p_fpart()
+p_fpart(void)
 {
 
 	change_partition(5);
@@ -119,7 +109,7 @@
  * This routine implements the 'g' command.  It changes the 'g' partition.
  */
 int
-p_gpart()
+p_gpart(void)
 {
 
 	change_partition(6);
@@ -130,7 +120,7 @@
  * This routine implements the 'h' command.  It changes the 'h' partition.
  */
 int
-p_hpart()
+p_hpart(void)
 {
 
 	change_partition(7);
@@ -142,7 +132,7 @@
  * labeled disks. This can be used only in expert mode.
  */
 int
-p_ipart()
+p_ipart(void)
 {
 	change_partition(8);
 	return (0);
@@ -153,7 +143,7 @@
  * This routine implements the 'j' command.  It changes the 'j' partition.
  */
 int
-p_jpart()
+p_jpart(void)
 {
 
 	change_partition(9);
@@ -162,7 +152,7 @@
 #endif	/* defined(i386) */
 
 int
-p_expand()
+p_expand(void)
 {
 	uint64_t delta;
 	uint_t nparts;
@@ -193,7 +183,7 @@
  * to make a pre-defined partition map the current map.
  */
 int
-p_select()
+p_select(void)
 {
 	struct partition_info	*pptr, *parts;
 	u_ioparam_t		ioparam;
@@ -254,8 +244,8 @@
 	cyl_offset = pptr->pinfo_map[I_PARTITION].dkl_cylno + 1;
 	if (pptr->pinfo_map[J_PARTITION].dkl_nblk != 0) {
 		cyl_offset = pptr->pinfo_map[J_PARTITION].dkl_cylno +
-			((pptr->pinfo_map[J_PARTITION].dkl_nblk +
-				(spc() - 1)) / spc());
+		    ((pptr->pinfo_map[J_PARTITION].dkl_nblk +
+		    (spc() - 1)) / spc());
 	}
 #else	/* !defined(i386) */
 
@@ -281,11 +271,10 @@
 		}
 #endif		/* defined(i386) */
 		if (pptr->pinfo_map[i].dkl_cylno < b_cylno ||
-			pptr->pinfo_map[i].dkl_cylno > (ncyl-1)) {
-			err_print(
-"partition %c: starting cylinder %d is out of range\n",
-				(PARTITION_BASE+i),
-				pptr->pinfo_map[i].dkl_cylno);
+		    pptr->pinfo_map[i].dkl_cylno > (ncyl-1)) {
+			err_print("partition %c: starting cylinder %d is out "
+			    "of range\n", (PARTITION_BASE + i),
+			    pptr->pinfo_map[i].dkl_cylno);
 			return (0);
 		}
 		if (pptr->pinfo_map[i].dkl_nblk > ((ncyl -
@@ -336,7 +325,7 @@
  * to be created.
  */
 int
-p_name()
+p_name(void)
 {
 	char	*name;
 
@@ -493,25 +482,23 @@
 
 	ncyl2_digits = ndigits(map->efi_last_u_lba);
 	if (want_header) {
-	    fmt_print("Part      ");
-	    fmt_print("Tag    Flag     ");
-	    fmt_print("First Sector");
-	    nspaces(ncyl2_digits);
-	    fmt_print("Size");
-	    nspaces(ncyl2_digits);
-	    fmt_print("Last Sector\n");
+		fmt_print("Part      ");
+		fmt_print("Tag    Flag     ");
+		fmt_print("First Sector");
+		nspaces(ncyl2_digits);
+		fmt_print("Size");
+		nspaces(ncyl2_digits);
+		fmt_print("Last Sector\n");
 	}
 
 	fmt_print("  %d ", partnum);
-	s = find_string(ptag_choices,
-		(int)map->efi_parts[partnum].p_tag);
+	s = find_string(ptag_choices, (int)map->efi_parts[partnum].p_tag);
 	if (s == (char *)NULL)
 		s = "-";
 	nspaces(10 - (int)strlen(s));
 	fmt_print("%s", s);
 
-	s = find_string(pflag_choices,
-		(int)map->efi_parts[partnum].p_flag);
+	s = find_string(pflag_choices, (int)map->efi_parts[partnum].p_flag);
 	if (s == (char *)NULL)
 		s = "-";
 	nspaces(6 - (int)strlen(s));
@@ -521,28 +508,27 @@
 
 	secsize = map->efi_parts[partnum].p_size;
 	if (secsize == 0) {
-	    fmt_print("%16llu", map->efi_parts[partnum].p_start);
-	    nspaces(ncyl2_digits);
-	    fmt_print("  0     ");
+		fmt_print("%16llu", map->efi_parts[partnum].p_start);
+		nspaces(ncyl2_digits);
+		fmt_print("  0     ");
 	} else {
-	    fmt_print("%16llu", map->efi_parts[partnum].p_start);
-	    scaled = bn2mb(secsize);
-	    nspaces(ncyl2_digits - 5);
-	    if (scaled >= (float)1024.0 * 1024) {
-		fmt_print("%8.2fTB", scaled/((float)1024.0 * 1024));
-	    } else if (scaled >= (float)1024.0) {
-		fmt_print("%8.2fGB", scaled/(float)1024.0);
-	    } else {
-		fmt_print("%8.2fMB", scaled);
-	    }
+		fmt_print("%16llu", map->efi_parts[partnum].p_start);
+		scaled = bn2mb(secsize);
+		nspaces(ncyl2_digits - 5);
+		if (scaled >= (float)1024.0 * 1024) {
+			fmt_print("%8.2fTB", scaled/((float)1024.0 * 1024));
+		} else if (scaled >= (float)1024.0) {
+			fmt_print("%8.2fGB", scaled/(float)1024.0);
+		} else {
+			fmt_print("%8.2fMB", scaled);
+		}
 	}
 	nspaces(ncyl2_digits);
-	if ((map->efi_parts[partnum].p_start+secsize - 1) ==
-		UINT_MAX64) {
-	    fmt_print(" 0    \n");
+	if ((map->efi_parts[partnum].p_start + secsize - 1) == UINT_MAX64) {
+		fmt_print(" 0    \n");
 	} else {
-	    fmt_print(" %llu    \n",
-		map->efi_parts[partnum].p_start+secsize - 1);
+		fmt_print(" %llu    \n",
+		    map->efi_parts[partnum].p_start + secsize - 1);
 	}
 }
 
@@ -607,8 +593,7 @@
 	/*
 	 * Print the partition tag.  If invalid, print -
 	 */
-	s = find_string(ptag_choices,
-		(int)pinfo->vtoc.v_part[partnum].p_tag);
+	s = find_string(ptag_choices, (int)pinfo->vtoc.v_part[partnum].p_tag);
 	if (s == (char *)NULL)
 		s = "-";
 	nspaces(10 - (int)strlen(s));
@@ -617,9 +602,8 @@
 	/*
 	 * Print the partition flag.  If invalid print -
 	 */
-	s = find_string(pflag_choices,
-		(int)pinfo->vtoc.v_part[partnum].p_flag);
-	if (s == (char *)NULL)
+	s = find_string(pflag_choices, (int)pinfo->vtoc.v_part[partnum].p_flag);
+	if (s == NULL)
 		s = "-";
 	nspaces(6 - (int)strlen(s));
 	fmt_print("%s", s);
@@ -637,7 +621,7 @@
 		scaled = bn2mb(nblks);
 		if (scaled > (float)1024.0 * 1024.0) {
 			fmt_print("%8.2fTB    ",
-				scaled/((float)1024.0 * 1024.0));
+			    scaled/((float)1024.0 * 1024.0));
 		} else if (scaled > (float)1024.0) {
 			fmt_print("%8.2fGB    ", scaled/(float)1024.0);
 		} else {
@@ -666,8 +650,7 @@
  * Return true if a disk has a volume name
  */
 int
-chk_volname(disk)
-	struct disk_info	*disk;
+chk_volname(struct disk_info *disk)
 {
 	return (disk->v_volume[0] != 0);
 }
@@ -677,8 +660,7 @@
  * Print the volume name, if it appears to be set
  */
 void
-print_volname(disk)
-	struct disk_info	*disk;
+print_volname(struct disk_info *disk)
 {
 	int	i;
 	char	*p;
@@ -696,8 +678,7 @@
  * Print a number of spaces
  */
 static void
-nspaces(n)
-	int	n;
+nspaces(int n)
 {
 	while (n-- > 0)
 		fmt_print(" ");
@@ -707,8 +688,7 @@
  * Return the number of digits required to print a number
  */
 static int
-ndigits(n)
-	uint64_t	n;
+ndigits(uint64_t n)
 {
 	int	i;
 

--- a/usr/src/cmd/format/modify_partition.c	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/cmd/format/modify_partition.c	Mon Dec 09 14:15:34 2019 +0000
@@ -38,26 +38,11 @@
 #include "label.h"
 #include "auto_sense.h"
 
-#ifdef __STDC__
-
-/* Function prototypes for ANSI C Compilers */
-
 static void	adj_cyl_offset(struct dk_map32 *map);
 static int	check_map(struct dk_map32 *map);
 static void	get_user_map(struct dk_map32 *map, int float_part);
 static void	get_user_map_efi(struct dk_gpt *map, int float_part);
 
-#else	/* __STDC__ */
-
-/* Function prototypes for non-ANSI C Compilers */
-
-static void	adj_cyl_offset();
-static int	check_map();
-static void	get_user_map();
-static void	get_user_map_efi();
-
-#endif	/* __STDC__ */
-
 static char *partn_list[] = { "0", "1", "2", "3", "4", "5", "6", "7", NULL };
 
 static char *sel_list[] = { "0", "1", "2", "3", NULL };
@@ -69,7 +54,7 @@
  * Modify/Create a predefined partition table.
  */
 int
-p_modify()
+p_modify(void)
 {
 	struct	partition_info	tmp_pinfo[1];
 	struct	dk_map32	*map = tmp_pinfo->pinfo_map;
@@ -134,89 +119,92 @@
 	 */
 	if (cur_parts->pinfo_name != NULL) {
 		(void) snprintf(tmpstr, sizeof (tmpstr),
-			"\t0. Current partition table (%s)",
-			cur_parts->pinfo_name);
+		    "\t0. Current partition table (%s)",
+		    cur_parts->pinfo_name);
 	} else {
 		(void) sprintf(tmpstr,
-			"\t0. Current partition table (unnamed)");
+		    "\t0. Current partition table (unnamed)");
 	}
 
 	(void) snprintf(tmpstr2, sizeof (tmpstr2),
-"Select partitioning base:\n%s\n"
-"\t1. All Free Hog\n"
-"Choose base (enter number) ",
-		tmpstr);
+	    "Select partitioning base:\n%s\n"
+	    "\t1. All Free Hog\n"
+	    "Choose base (enter number) ",
+	    tmpstr);
 
 	ioparam.io_charlist = sel_list;
 	sel_type = input(FIO_MSTR, tmpstr2, '?', &ioparam,
-		&sel_type, DATA_INPUT);
+	    &sel_type, DATA_INPUT);
 
 	switch (cur_label) {
 	case L_TYPE_SOLARIS:
-	    if (sel_type == 0) {
-		/*
-		 * Check for invalid parameters but do
-		 * not modify the table.
-		 */
-		if (check_map(cur_parts->pinfo_map)) {
-			err_print("\
-Warning: Fix, or select a different partition table.\n");
-			return (0);
-		}
-		/*
-		 * Create partition map from existing map
-		 */
-		tmp_pinfo->vtoc = cur_parts->vtoc;
-		for (i = 0; i < NDKMAP; i++) {
-			map[i].dkl_nblk = cur_parts->pinfo_map[i].dkl_nblk;
-			map[i].dkl_cylno = cur_parts->pinfo_map[i].dkl_cylno;
-		}
-	    } else {
-		/*
-		 * Make an empty partition map, with all the space
-		 * in the c partition.
-		 */
-		set_vtoc_defaults(tmp_pinfo);
-		for (i = 0; i < NDKMAP; i++) {
-			map[i].dkl_nblk = 0;
-			map[i].dkl_cylno = 0;
-		}
-		map[C_PARTITION].dkl_nblk = ncyl * spc();
+		if (sel_type == 0) {
+			/*
+			 * Check for invalid parameters but do
+			 * not modify the table.
+			 */
+			if (check_map(cur_parts->pinfo_map)) {
+				err_print("Warning: Fix, or select a "
+				    "different partition table.\n");
+				return (0);
+			}
+			/*
+			 * Create partition map from existing map
+			 */
+			tmp_pinfo->vtoc = cur_parts->vtoc;
+			for (i = 0; i < NDKMAP; i++) {
+				map[i].dkl_nblk =
+				    cur_parts->pinfo_map[i].dkl_nblk;
+				map[i].dkl_cylno =
+				    cur_parts->pinfo_map[i].dkl_cylno;
+			}
+		} else {
+			/*
+			 * Make an empty partition map, with all the space
+			 * in the c partition.
+			 */
+			set_vtoc_defaults(tmp_pinfo);
+			for (i = 0; i < NDKMAP; i++) {
+				map[i].dkl_nblk = 0;
+				map[i].dkl_cylno = 0;
+			}
+			map[C_PARTITION].dkl_nblk = ncyl * spc();
 
 #if defined(i386)
-		/*
-		 * Adjust for the boot and possibly alternates partitions
-		 */
-		map[I_PARTITION].dkl_nblk = spc();
-		map[I_PARTITION].dkl_cylno = 0;
-		if (cur_ctype->ctype_ctype != DKC_SCSI_CCS) {
-			map[J_PARTITION].dkl_nblk = 2 * spc();
-			map[J_PARTITION].dkl_cylno = spc() / spc();
-		}
+			/*
+			 * Adjust for the boot and possibly alternates
+			 * partitions.
+			 */
+			map[I_PARTITION].dkl_nblk = spc();
+			map[I_PARTITION].dkl_cylno = 0;
+			if (cur_ctype->ctype_ctype != DKC_SCSI_CCS) {
+				map[J_PARTITION].dkl_nblk = 2 * spc();
+				map[J_PARTITION].dkl_cylno = spc() / spc();
+			}
 #endif			/* defined(i386) */
-	    }
-	    break;
+		}
+		break;
 	case L_TYPE_EFI:
-	    if (sel_type == 1) {
-		for (i = 0; i < cur_parts->etoc->efi_nparts; i++) {
-		    cur_parts->etoc->efi_parts[i].p_start = 0;
-		    cur_parts->etoc->efi_parts[i].p_size = 0;
+		if (sel_type == 1) {
+			for (i = 0; i < cur_parts->etoc->efi_nparts; i++) {
+				cur_parts->etoc->efi_parts[i].p_start = 0;
+				cur_parts->etoc->efi_parts[i].p_size = 0;
+			}
 		}
-	    }
-	    break;
+		break;
 	}
 
 	fmt_print("\n");
 	if (cur_label == L_TYPE_SOLARIS) {
-	    print_map(tmp_pinfo);
+		print_map(tmp_pinfo);
 	} else {
-	    print_map(cur_parts);
+		print_map(cur_parts);
 	}
 
 	ioparam.io_charlist = confirm_list;
-	if (input(FIO_MSTR,
-"Do you wish to continue creating a new partition\ntable based on above table",
-			'?', &ioparam, &inpt_dflt, DATA_INPUT)) {
+	if (input(FIO_MSTR, "Do you wish to continue creating a new "
+	    "partition\ntable based on above table",
+	    '?', &ioparam, &inpt_dflt, DATA_INPUT)) {
 		return (0);
 	}
 
@@ -228,11 +216,11 @@
 		free_hog = G_PARTITION;	/* default to g partition */
 		ioparam.io_charlist = partn_list;
 		free_hog = input(FIO_MSTR, "Free Hog partition", '?',
-			&ioparam, &free_hog, DATA_INPUT);
+		    &ioparam, &free_hog, DATA_INPUT);
 		/* disallow c partition */
 		if (free_hog == C_PARTITION) {
 			fmt_print("'%c' cannot be the 'Free Hog' partition.\n",
-				C_PARTITION + PARTITION_BASE);
+			    C_PARTITION + PARTITION_BASE);
 			free_hog = -1;
 			continue;
 		}
@@ -246,7 +234,7 @@
 			map[free_hog].dkl_nblk -= map[I_PARTITION].dkl_nblk;
 			if (cur_ctype->ctype_ctype != DKC_SCSI_CCS) {
 				map[free_hog].dkl_nblk -=
-					map[J_PARTITION].dkl_nblk;
+				    map[J_PARTITION].dkl_nblk;
 			}
 #endif			/* defined(i386) */
 			break;
@@ -256,11 +244,11 @@
 		 * the float partition.
 		 */
 		if (map[free_hog].dkl_nblk == 0) {
-			err_print("\
-Warning: No space available from Free Hog partition.\n");
+			err_print("Warning: No space available from Free Hog "
+			    "partition.\n");
 			ioparam.io_charlist = confirm_list;
 			if (input(FIO_MSTR, "Continue", '?',
-				&ioparam, &inpt_dflt, DATA_INPUT)) {
+			    &ioparam, &inpt_dflt, DATA_INPUT)) {
 				free_hog = -1;
 			}
 		}
@@ -268,27 +256,27 @@
 	inpt_dflt = 0;
 
 	if (cur_label == L_TYPE_EFI) {
-	    free_hog = G_PARTITION; /* default to g partition */
-	    ioparam.io_charlist = partn_list;
-	    free_hog = input(FIO_MSTR, "Free Hog partition", '?',
-		&ioparam, &free_hog, DATA_INPUT);
-	    /* disallow c partition */
-	    if (free_hog == C_PARTITION) {
-		fmt_print("'%c' cannot be the 'Free Hog' partition.\n",
-		    C_PARTITION + PARTITION_BASE);
-		return (-1);
-	    }
-	    get_user_map_efi(cur_parts->etoc, free_hog);
-	    print_map(cur_parts);
-	    if (check("Ready to label disk, continue")) {
-		return (-1);
-	    }
-	    fmt_print("\n");
-	    if (write_label()) {
-		err_print("Writing label failed\n");
-		return (-1);
-	    }
-	    return (0);
+		free_hog = G_PARTITION; /* default to g partition */
+		ioparam.io_charlist = partn_list;
+		free_hog = input(FIO_MSTR, "Free Hog partition", '?',
+		    &ioparam, &free_hog, DATA_INPUT);
+		/* disallow c partition */
+		if (free_hog == C_PARTITION) {
+			fmt_print("'%c' cannot be the 'Free Hog' partition.\n",
+			    C_PARTITION + PARTITION_BASE);
+			return (-1);
+		}
+		get_user_map_efi(cur_parts->etoc, free_hog);
+		print_map(cur_parts);
+		if (check("Ready to label disk, continue")) {
+			return (-1);
+		}
+		fmt_print("\n");
+		if (write_label()) {
+			err_print("Writing label failed\n");
+			return (-1);
+		}
+		return (0);
 	}
 	/*
 	 * get user modified partition table
@@ -304,9 +292,8 @@
 	print_map(tmp_pinfo);
 
 	ioparam.io_charlist = confirm_list;
-	if (input(FIO_MSTR, "\
-Okay to make this the current partition table", '?',
-		&ioparam, &inpt_dflt, DATA_INPUT)) {
+	if (input(FIO_MSTR, "Okay to make this the current partition table",
+	    '?', &ioparam, &inpt_dflt, DATA_INPUT)) {
 		return (0);
 	} else {
 		make_partition();
@@ -318,9 +305,9 @@
 			cur_parts->pinfo_map[i].dkl_cylno = map[i].dkl_cylno;
 #ifdef i386
 			cur_parts->vtoc.v_part[i].p_start =
-				map[i].dkl_cylno * nhead * nsect;
+			    map[i].dkl_cylno * nhead * nsect;
 			cur_parts->vtoc.v_part[i].p_size =
-				map[i].dkl_nblk;
+			    map[i].dkl_nblk;
 #endif
 		}
 		(void) p_name();
@@ -340,14 +327,11 @@
 	}
 }
 
-
-
 /*
  * Adjust cylinder offsets
  */
 static void
-adj_cyl_offset(map)
-	struct	dk_map32 *map;
+adj_cyl_offset(struct dk_map32 *map)
 {
 	int	i;
 	int	cyloffset = 0;
@@ -390,8 +374,7 @@
  * Check partition table
  */
 static int
-check_map(map)
-	struct	dk_map32 *map;
+check_map(struct dk_map32 *map)
 {
 	int		i;
 	int		cyloffset = 0;
@@ -411,16 +394,16 @@
 	 */
 	for (i = 0; i < NDKMAP; i++) {
 		if (map[i].dkl_cylno > (blkaddr32_t)ncyl-1) {
-			err_print("\
-Warning: Partition %c starting cylinder %d is out of range.\n",
-				(PARTITION_BASE+i), map[i].dkl_cylno);
+			err_print("Warning: Partition %c starting cylinder "
+			    "%d is out of range.\n",
+			    (PARTITION_BASE+i), map[i].dkl_cylno);
 			return (-1);
 		}
 		if (map[i].dkl_nblk >
-			(blkaddr32_t)(ncyl - map[i].dkl_cylno) * spc()) {
-			err_print("\
-Warning: Partition %c, specified # of blocks, %u, is out of range.\n",
-				(PARTITION_BASE+i), map[i].dkl_nblk);
+		    (blkaddr32_t)(ncyl - map[i].dkl_cylno) * spc()) {
+			err_print("Warning: Partition %c, specified # of "
+			    "blocks, %u, is out of range.\n",
+			    (PARTITION_BASE+i), map[i].dkl_nblk);
 			return (-1);
 		}
 		if (i != C_PARTITION && map[i].dkl_nblk) {
@@ -429,21 +412,21 @@
 				continue;
 #endif
 			if (map[i].dkl_cylno < cyloffset) {
-				err_print(
-"Warning: Overlapping partition (%c) in table.\n", PARTITION_BASE+i);
+				err_print("Warning: Overlapping partition "
+				    "(%c) in table.\n", PARTITION_BASE+i);
 				return (-1);
 			} else if (map[i].dkl_cylno > cyloffset) {
-				err_print(
-"Warning: Non-contiguous partition (%c) in table.\n", PARTITION_BASE+i);
+				err_print("Warning: Non-contiguous partition "
+				    "(%c) in table.\n", PARTITION_BASE+i);
 			}
 			cyloffset += (map[i].dkl_nblk + (spc()-1))/spc();
 			tot_blks = map[i].dkl_nblk;
 		}
 	}
 	if (tot_blks > map[C_PARTITION].dkl_nblk) {
-		err_print("\
-Warning: Total blocks used is greater than number of blocks in '%c'\n\
-\tpartition.\n", C_PARTITION + PARTITION_BASE);
+		err_print("Warning: Total blocks used is greater than number "
+		    "of blocks in '%c'\n\tpartition.\n",
+		    C_PARTITION + PARTITION_BASE);
 	return (-1);
 	}
 	return (0);
@@ -455,9 +438,7 @@
  * get user defined partitions
  */
 static void
-get_user_map(map, float_part)
-	struct	dk_map32 *map;
-	int	float_part;
+get_user_map(struct dk_map32 *map, int float_part)
 {
 	int		i;
 	blkaddr32_t	newsize;
@@ -471,24 +452,24 @@
 	for (i = 0; i < NDKMAP; i++) {
 		if (partn_list[i] == NULL)
 			break;
-		if ((i == C_PARTITION) || (i == float_part))
+		if ((i == C_PARTITION) || (i == float_part)) {
 			continue;
-		else {
+		} else {
 			ioparam.io_bounds.lower = 0;
 			ioparam.io_bounds.upper = map[i].dkl_nblk +
-				map[float_part].dkl_nblk;
+			    map[float_part].dkl_nblk;
 			deflt = map[i].dkl_nblk;
 			if (ioparam.io_bounds.upper == 0) {
-				err_print("\
-Warning: no space available for '%s' from Free Hog partition\n",
-					partn_list[i]);
+				err_print("Warning: no space available for "
+				    "'%s' from Free Hog partition\n",
+				    partn_list[i]);
 				continue;
 			}
 			(void) snprintf(tmpstr, sizeof (tmpstr),
-				"Enter size of partition '%s' ",
-				partn_list[i]);
+			    "Enter size of partition '%s' ",
+			    partn_list[i]);
 			newsize = (blkaddr32_t)input(FIO_CYL, tmpstr, ':',
-				&ioparam, (int *)&deflt, DATA_INPUT);
+			    &ioparam, (int *)&deflt, DATA_INPUT);
 			map[float_part].dkl_nblk -= (newsize - map[i].dkl_nblk);
 			map[i].dkl_nblk = newsize;
 		}
@@ -496,8 +477,7 @@
 }
 
 static struct partition_info *
-build_partition(tptr)
-struct disk_type *tptr;
+build_partition(struct disk_type *tptr)
 {
 	struct partition_info	*part;
 	struct dk_label		*label;
@@ -524,21 +504,20 @@
 	if (!build_default_partition(label, cur_ctype->ctype_ctype))
 		return (NULL);
 
-	part = (struct partition_info *)
-		    zalloc(sizeof (struct partition_info));
+	part = zalloc(sizeof (struct partition_info));
 	part->pinfo_name = alloc_string(tptr->dtype_asciilabel);
 	/*
 	 * Fill in the partition info from the label
 	 */
 	for (i = 0; i < NDKMAP; i++) {
 #if defined(_SUNOS_VTOC_8)
-	    part->pinfo_map[i] = label->dkl_map[i];
+		part->pinfo_map[i] = label->dkl_map[i];
 #else
-	    part->pinfo_map[i].dkl_cylno =
-		label->dkl_vtoc.v_part[i].p_start /
-		(blkaddr32_t)(tptr->dtype_nhead * tptr->dtype_nsect - apc);
-	    part->pinfo_map[i].dkl_nblk =
-		label->dkl_vtoc.v_part[i].p_size;
+		part->pinfo_map[i].dkl_cylno =
+		    label->dkl_vtoc.v_part[i].p_start /
+		    (blkaddr32_t)(tptr->dtype_nhead * tptr->dtype_nsect - apc);
+		part->pinfo_map[i].dkl_nblk =
+		    label->dkl_vtoc.v_part[i].p_size;
 #endif /* ifdefined(_SUNOS_VTOC_8) */
 	}
 	part->vtoc = label->dkl_vtoc;
@@ -549,11 +528,8 @@
  * build new partition table for given disk type
  */
 static void
-get_user_map_efi(map, float_part)
-	struct dk_gpt *map;
-	int	float_part;
+get_user_map_efi(struct dk_gpt *map, int float_part)
 {
-
 	int		i;
 	efi_deflt_t	efi_deflt;
 	u_ioparam_t	ioparam;
@@ -591,7 +567,7 @@
 	}
 	map->efi_parts[float_part].p_start = start_lba;
 	map->efi_parts[float_part].p_size = map->efi_last_u_lba + 1 -
-		start_lba - reserved;
+	    start_lba - reserved;
 	map->efi_parts[float_part].p_tag = V_USR;
 	if (map->efi_parts[float_part].p_size == 0) {
 		map->efi_parts[float_part].p_size = 0;
@@ -612,8 +588,7 @@
 
 
 void
-new_partitiontable(tptr, oldtptr)
-struct disk_type	*tptr, *oldtptr;
+new_partitiontable(struct disk_type *tptr, struct disk_type *oldtptr)
 {
 	struct partition_info *part;
 
@@ -622,16 +597,15 @@
 	 * partition table else copy the old partition table.(best guess).
 	 */
 	if ((oldtptr != NULL) &&
-		(tptr->dtype_ncyl ==  oldtptr->dtype_ncyl) &&
-		(tptr->dtype_nhead == oldtptr->dtype_nhead) &&
-		(tptr->dtype_nsect == oldtptr->dtype_nsect)) {
-
-	    part = (struct partition_info *)
-			zalloc(sizeof (struct partition_info));
-	    bcopy((char *)cur_parts, (char *)part,
-			sizeof (struct partition_info));
-	    part->pinfo_next = tptr->dtype_plist;
-	    tptr->dtype_plist = part;
+	    (tptr->dtype_ncyl == oldtptr->dtype_ncyl) &&
+	    (tptr->dtype_nhead == oldtptr->dtype_nhead) &&
+	    (tptr->dtype_nsect == oldtptr->dtype_nsect)) {
+		part = (struct partition_info *)
+		    zalloc(sizeof (struct partition_info));
+		bcopy((char *)cur_parts, (char *)part,
+		    sizeof (struct partition_info));
+		part->pinfo_next = tptr->dtype_plist;
+		tptr->dtype_plist = part;
 	} else {
 
 #ifdef DEBUG

--- a/usr/src/cmd/format/partition.c	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/cmd/format/partition.c	Mon Dec 09 14:15:34 2019 +0000
@@ -80,31 +80,31 @@
 	int		i;
 
 	for (i = 0; i < map->efi_nparts - 1; i++) {
-	    start[0] = map->efi_parts[i].p_start;
-	    size[0] = map->efi_parts[i].p_size;
-	    sec_no[0] = start[0] + size[0];
+		start[0] = map->efi_parts[i].p_start;
+		size[0] = map->efi_parts[i].p_size;
+		sec_no[0] = start[0] + size[0];
 
-	    start[1] = map->efi_parts[i+1].p_start;
-	    size[1] = map->efi_parts[i+1].p_size;
-	    sec_no[1] = start[1] + size[1];
+		start[1] = map->efi_parts[i + 1].p_start;
+		size[1] = map->efi_parts[i + 1].p_size;
+		sec_no[1] = start[1] + size[1];
 
-	    if (map->efi_parts[i].p_tag == V_BACKUP) {
-		sec_no[0] = 0;
-	    }
-	    if (map->efi_parts[i+1].p_tag == V_BACKUP) {
-		sec_no[1] = 0;
-	    }
-	    if (i == 0) {
-		max = sec_no[1];
-	    }
-	    if (sec_no[0] > max) {
-		max = sec_no[0];
-	    } else {
-		max = max;
-	    }
+		if (map->efi_parts[i].p_tag == V_BACKUP) {
+			sec_no[0] = 0;
+		}
+		if (map->efi_parts[i+1].p_tag == V_BACKUP) {
+			sec_no[1] = 0;
+		}
+		if (i == 0) {
+			max = sec_no[1];
+		}
+		if (sec_no[0] > max) {
+			max = sec_no[0];
+		} else {
+			max = max;
+		}
 	}
 	if (max == 0)
-	    max = map->efi_first_u_lba;
+		max = map->efi_first_u_lba;
 	return (max);
 }
 
@@ -136,66 +136,66 @@
 	}
 
 	if (cur_label == L_TYPE_EFI) {
-	    if (num > cur_parts->etoc->efi_nparts - 1) {
-		err_print("Invalid partition for EFI label\n");
-		return;
-	    }
-	    print_efi_partition(cur_parts->etoc, num, 1);
-	    fmt_print("\n");
+		if (num > cur_parts->etoc->efi_nparts - 1) {
+			err_print("Invalid partition for EFI label\n");
+			return;
+		}
+		print_efi_partition(cur_parts->etoc, num, 1);
+		fmt_print("\n");
 		/*
 		 * Prompt for p_tag and p_flag values for this partition
 		 */
-	    deflt = cur_parts->etoc->efi_parts[num].p_tag;
-	    if (deflt == V_UNASSIGNED) {
-		deflt = V_USR;
-	    }
-	    (void) sprintf(msg, "Enter partition id tag");
-	    ioparam.io_slist = ptag_choices;
-	    tag = input(FIO_SLIST, msg, ':', &ioparam, &deflt, DATA_INPUT);
+		deflt = cur_parts->etoc->efi_parts[num].p_tag;
+		if (deflt == V_UNASSIGNED) {
+			deflt = V_USR;
+		}
+		(void) sprintf(msg, "Enter partition id tag");
+		ioparam.io_slist = ptag_choices;
+		tag = input(FIO_SLIST, msg, ':', &ioparam, &deflt, DATA_INPUT);
 
-	    deflt = cur_parts->etoc->efi_parts[num].p_flag;
-	    (void) sprintf(msg, "Enter partition permission flags");
-	    ioparam.io_slist = pflag_choices;
-	    flag = input(FIO_SLIST, msg, ':', &ioparam, &deflt, DATA_INPUT);
+		deflt = cur_parts->etoc->efi_parts[num].p_flag;
+		(void) sprintf(msg, "Enter partition permission flags");
+		ioparam.io_slist = pflag_choices;
+		flag = input(FIO_SLIST, msg, ':', &ioparam, &deflt, DATA_INPUT);
 
-	    ioparam.io_bounds.lower = cur_parts->etoc->efi_first_u_lba;
-	    ioparam.io_bounds.upper = cur_parts->etoc->efi_last_u_lba;
+		ioparam.io_bounds.lower = cur_parts->etoc->efi_first_u_lba;
+		ioparam.io_bounds.upper = cur_parts->etoc->efi_last_u_lba;
 
-	    efi_deflt.start_sector = maxofN(cur_parts->etoc);
-	    if ((cur_parts->etoc->efi_parts[num].p_start != 0) &&
-		(cur_parts->etoc->efi_parts[num].p_size != 0)) {
-		    efi_deflt.start_sector =
-			cur_parts->etoc->efi_parts[num].p_start;
-	    }
-	    efi_deflt.end_sector = ioparam.io_bounds.upper -
-					efi_deflt.start_sector;
-	    i64 = input(FIO_INT64, "Enter new starting Sector", ':', &ioparam,
-		(int *)&efi_deflt, DATA_INPUT);
+		efi_deflt.start_sector = maxofN(cur_parts->etoc);
+		if ((cur_parts->etoc->efi_parts[num].p_start != 0) &&
+		    (cur_parts->etoc->efi_parts[num].p_size != 0)) {
+			efi_deflt.start_sector =
+			    cur_parts->etoc->efi_parts[num].p_start;
+		}
+		efi_deflt.end_sector = ioparam.io_bounds.upper -
+		    efi_deflt.start_sector;
+		i64 = input(FIO_INT64, "Enter new starting Sector", ':',
+		    &ioparam, (int *)&efi_deflt, DATA_INPUT);
 
-	    ioparam.io_bounds.lower = 0;
-	    ioparam.io_bounds.upper = cur_parts->etoc->efi_last_u_lba;
-	    efi_deflt.end_sector = cur_parts->etoc->efi_parts[num].p_size;
-	    efi_deflt.start_sector = i64;
-	    j64 = input(FIO_EFI, "Enter partition size", ':', &ioparam,
-		(int *)&efi_deflt, DATA_INPUT);
-	    if (j64 == 0) {
-		tag = V_UNASSIGNED;
-		i64 = 0;
-	    } else if ((j64 != 0) && (tag == V_UNASSIGNED)) {
-		tag = V_USR;
-	    }
+		ioparam.io_bounds.lower = 0;
+		ioparam.io_bounds.upper = cur_parts->etoc->efi_last_u_lba;
+		efi_deflt.end_sector = cur_parts->etoc->efi_parts[num].p_size;
+		efi_deflt.start_sector = i64;
+		j64 = input(FIO_EFI, "Enter partition size", ':', &ioparam,
+		    (int *)&efi_deflt, DATA_INPUT);
+		if (j64 == 0) {
+			tag = V_UNASSIGNED;
+			i64 = 0;
+		} else if ((j64 != 0) && (tag == V_UNASSIGNED)) {
+			tag = V_USR;
+		}
 
-	    if (cur_parts->pinfo_name != NULL)
-		make_partition();
+		if (cur_parts->pinfo_name != NULL)
+			make_partition();
 
-	    cur_parts->etoc->efi_parts[num].p_tag = tag;
-	    cur_parts->etoc->efi_parts[num].p_flag = flag;
-	    cur_parts->etoc->efi_parts[num].p_start = i64;
-	    cur_parts->etoc->efi_parts[num].p_size = j64;
-	/*
-	 * We are now done with EFI part, so return now
-	 */
-	    return;
+		cur_parts->etoc->efi_parts[num].p_tag = tag;
+		cur_parts->etoc->efi_parts[num].p_flag = flag;
+		cur_parts->etoc->efi_parts[num].p_start = i64;
+		cur_parts->etoc->efi_parts[num].p_size = j64;
+		/*
+		 * We are now done with EFI part, so return now
+		 */
+		return;
 	}
 	/*
 	 * Print out the given partition so the user knows what they're
@@ -237,9 +237,11 @@
 		if (tag != V_ALTSCTR) {
 			if (cur_parts->pinfo_map[J_PARTITION].dkl_nblk != 0) {
 				cyl_offset =
-				cur_parts->pinfo_map[J_PARTITION].dkl_cylno +
-				((cur_parts->pinfo_map[J_PARTITION].dkl_nblk +
-				(spc()-1)) / spc());
+				    cur_parts->
+				    pinfo_map[J_PARTITION].dkl_cylno +
+				    ((cur_parts->
+				    pinfo_map[J_PARTITION].dkl_nblk +
+				    (spc() - 1)) / spc());
 			}
 		}
 	}
@@ -247,8 +249,7 @@
 
 	ioparam.io_bounds.lower = 0;
 	ioparam.io_bounds.upper = ncyl - 1;
-	deflt = max(cur_parts->pinfo_map[num].dkl_cylno,
-		cyl_offset);
+	deflt = max(cur_parts->pinfo_map[num].dkl_cylno, cyl_offset);
 	i = (uint_t)input(FIO_INT, "Enter new starting cyl", ':', &ioparam,
 	    &deflt, DATA_INPUT);
 
@@ -257,9 +258,8 @@
 
 	/* fill in defaults for the current partition */
 	p_deflt.start_cyl = i;
-	p_deflt.deflt_size =
-		min(cur_parts->pinfo_map[num].dkl_nblk,
-		    ioparam.io_bounds.upper);
+	p_deflt.deflt_size = min(cur_parts->pinfo_map[num].dkl_nblk,
+	    ioparam.io_bounds.upper);
 
 	/* call input, passing p_deflt's address, typecast to (int *) */
 	j = (uint_t)input(FIO_ECYL, "Enter partition size", ':', &ioparam,
@@ -378,18 +378,18 @@
 	 */
 	enter_critical();
 	for (pptr = parts; pptr != NULL; pptr = pptr->pinfo_next) {
-	    if (cur_dtype->dtype_asciilabel) {
-		if (pptr->pinfo_name != NULL && strcmp(pptr->pinfo_name,
-				cur_dtype->dtype_asciilabel) == 0) {
-			/*
-			 * Set current partition and name it.
-			 */
-			cur_disk->disk_parts = cur_parts = pptr;
-			cur_parts->pinfo_name = pptr->pinfo_name;
-			exit_critical();
-			return (0);
+		if (cur_dtype->dtype_asciilabel) {
+			if (pptr->pinfo_name != NULL && strcmp(pptr->pinfo_name,
+			    cur_dtype->dtype_asciilabel) == 0) {
+				/*
+				 * Set current partition and name it.
+				 */
+				cur_disk->disk_parts = cur_parts = pptr;
+				cur_parts->pinfo_name = pptr->pinfo_name;
+				exit_critical();
+				return (0);
+			}
 		}
-	    }
 	}
 	/*
 	 * If we couldn't find a match, take the first one.
@@ -436,18 +436,19 @@
 	 * If there was a current map, copy its values.
 	 */
 	if (cur_label == L_TYPE_EFI) {
-	    struct dk_gpt	*map;
-	    int			nparts;
-	    int			size;
+		struct dk_gpt	*map;
+		int		nparts;
+		int		size;
 
-	    nparts = cur_parts->etoc->efi_nparts;
-	    size = sizeof (struct dk_part) * nparts + sizeof (struct dk_gpt);
-	    map = zalloc(size);
-	    (void) memcpy(map, cur_parts->etoc, size);
-	    pptr->etoc = map;
-	    cur_disk->disk_parts = cur_parts = pptr;
-	    exit_critical();
-	    return;
+		nparts = cur_parts->etoc->efi_nparts;
+		size = sizeof (struct dk_part) * nparts +
+		    sizeof (struct dk_gpt);
+		map = zalloc(size);
+		(void) memcpy(map, cur_parts->etoc, size);
+		pptr->etoc = map;
+		cur_disk->disk_parts = cur_parts = pptr;
+		exit_critical();
+		return;
 	}
 	if (cur_parts != NULL) {
 		for (i = 0; i < NDKMAP; i++) {

--- a/usr/src/cmd/mdb/common/modules/zfs/zfs.c	Fri Dec 06 12:00:18 2019 -0600
+++ b/usr/src/cmd/mdb/common/modules/zfs/zfs.c	Mon Dec 09 14:15:34 2019 +0000
@@ -55,6 +55,7 @@
 #include <sys/zfs_acl.h>
 #include <sys/sa_impl.h>
 #include <sys/multilist.h>
+#include <sys/btree.h>
 
 #ifdef _KERNEL
 #define	ZFS_OBJ_NAME	"zfs"
@@ -1462,13 +1463,15 @@
 	    0, NULL));
 }
 
-
-
 typedef struct mdb_range_tree {
 	struct {
-		uint64_t avl_numnodes;
+		uint64_t bt_num_elems;
+		uint64_t bt_num_nodes;
 	} rt_root;
 	uint64_t rt_space;
+	range_seg_type_t rt_type;
+	uint8_t		rt_shift;
+	uint64_t	rt_start;
 } mdb_range_tree_t;
 
 typedef struct mdb_metaslab_group {
@@ -1566,15 +1569,13 @@
 		    ms.ms_unflushed_frees, 0) == -1)
 			return (DCMD_ERR);
 		ufrees = rt.rt_space;
-		raw_uchanges_mem = rt.rt_root.avl_numnodes *
-		    mdb_ctf_sizeof_by_name("range_seg_t");
+		raw_uchanges_mem = rt.rt_root.bt_num_nodes * BTREE_LEAF_SIZE;
 
 		if (mdb_ctf_vread(&rt, "range_tree_t", "mdb_range_tree_t",
 		    ms.ms_unflushed_allocs, 0) == -1)
 			return (DCMD_ERR);
 		uallocs = rt.rt_space;
-		raw_uchanges_mem += rt.rt_root.avl_numnodes *
-		    mdb_ctf_sizeof_by_name("range_seg_t");
+		raw_uchanges_mem += rt.rt_root.bt_num_nodes * BTREE_LEAF_SIZE;
 		mdb_nicenum(raw_uchanges_mem, uchanges_mem);
 
 		raw_free = ms.ms_size;
@@ -1644,14 +1645,12 @@
 		if (mdb_ctf_vread(&rt, "range_tree_t", "mdb_range_tree_t",
 		    ms.ms_unflushed_frees, 0) == -1)
 			return (DCMD_ERR);
-		raw_uchanges_mem +=
-		    rt.rt_root.avl_numnodes * sizeof (range_seg_t);
+		raw_uchanges_mem += rt.rt_root.bt_num_nodes * BTREE_LEAF_SIZE;
 
 		if (mdb_ctf_vread(&rt, "range_tree_t", "mdb_range_tree_t",
 		    ms.ms_unflushed_allocs, 0) == -1)
 			return (DCMD_ERR);
-		raw_uchanges_mem +=
-		    rt.rt_root.avl_numnodes * sizeof (range_seg_t);
+		raw_uchanges_mem += rt.rt_root.bt_num_nodes * BTREE_LEAF_SIZE;
 	}
 	mdb_nicenum(raw_uchanges_mem, uchanges_mem);
 	mdb_printf("%10s\n", uchanges_mem);
@@ -2669,6 +2668,202 @@
 	return (mdb_pwalk_dcmd("zio_root", "zio", argc, argv, addr));
 }
 
+
+typedef struct mdb_zfs_btree_hdr {
+	uintptr_t		bth_parent;
+	boolean_t		bth_core;
+	/*
+	 * For both leaf and core nodes, represents the number of elements in
+	 * the node. For core nodes, they will have bth_count + 1 children.
+	 */
+	uint32_t		bth_count;
+} mdb_zfs_btree_hdr_t;
+
+typedef struct mdb_zfs_btree_core {
+	mdb_zfs_btree_hdr_t	btc_hdr;
+	uintptr_t		btc_children[BTREE_CORE_ELEMS + 1];
+	uint8_t			btc_elems[];
+} mdb_zfs_btree_core_t;
+
+typedef struct mdb_zfs_btree_leaf {
+	mdb_zfs_btree_hdr_t	btl_hdr;
+	uint8_t			btl_elems[];
+} mdb_zfs_btree_leaf_t;
+
+typedef struct mdb_zfs_btree {
+	uintptr_t		bt_root;
+	size_t			bt_elem_size;
+} mdb_zfs_btree_t;
+
+typedef struct btree_walk_data {
+	mdb_zfs_btree_t		bwd_btree;
+	mdb_zfs_btree_hdr_t	*bwd_node;
+	uint64_t		bwd_offset; // In units of bt_node_size
+} btree_walk_data_t;
+
+static uintptr_t
+btree_leftmost_child(uintptr_t addr, mdb_zfs_btree_hdr_t *buf)
+{
+	size_t size = offsetof(zfs_btree_core_t, btc_children) +
+	    sizeof (uintptr_t);
+	for (;;) {
+		if (mdb_vread(buf, size, addr) == -1) {
+			mdb_warn("failed to read at %p\n", addr);
+			return ((uintptr_t)0ULL);
+		}
+		if (!buf->bth_core)
+			return (addr);
+		mdb_zfs_btree_core_t *node = (mdb_zfs_btree_core_t *)buf;
+		addr = node->btc_children[0];
+	}
+}
+
+static int
+btree_walk_step(mdb_walk_state_t *wsp)
+{
+	btree_walk_data_t *bwd = wsp->walk_data;
+	size_t elem_size = bwd->bwd_btree.bt_elem_size;
+	if (wsp->walk_addr == 0ULL)
+		return (WALK_DONE);
+
+	if (!bwd->bwd_node->bth_core) {
+		/*
+		 * For the first element in a leaf node, read in the full
+		 * leaf, since we only had part of it read in before.
+		 */
+		if (bwd->bwd_offset == 0) {
+			if (mdb_vread(bwd->bwd_node, BTREE_LEAF_SIZE,
+			    wsp->walk_addr) == -1) {
+				mdb_warn("failed to read at %p\n",
+				    wsp->walk_addr);
+				return (WALK_ERR);
+			}
+		}
+
+		int status = wsp->walk_callback((uintptr_t)(wsp->walk_addr +
+		    offsetof(mdb_zfs_btree_leaf_t, btl_elems) +
+		    bwd->bwd_offset * elem_size), bwd->bwd_node,
+		    wsp->walk_cbdata);
+		if (status != WALK_NEXT)
+			return (status);
+		bwd->bwd_offset++;
+
+		/* Find the next element, if we're at the end of the leaf. */
+		while (bwd->bwd_offset == bwd->bwd_node->bth_count) {
+			uintptr_t par = bwd->bwd_node->bth_parent;
+			uintptr_t cur = wsp->walk_addr;
+			wsp->walk_addr = par;
+			if (par == 0ULL)
+				return (WALK_NEXT);
+
+			size_t size = sizeof (zfs_btree_core_t) +
+			    BTREE_CORE_ELEMS * elem_size;
+			if (mdb_vread(bwd->bwd_node, size, wsp->walk_addr) ==
+			    -1) {
+				mdb_warn("failed to read at %p\n",
+				    wsp->walk_addr);
+				return (WALK_ERR);
+			}
+			mdb_zfs_btree_core_t *node =
+			    (mdb_zfs_btree_core_t *)bwd->bwd_node;
+			int i;
+			for (i = 0; i <= bwd->bwd_node->bth_count; i++) {
+				if (node->btc_children[i] == cur)
+					break;
+			}
+			if (i > bwd->bwd_node->bth_count) {
+				mdb_warn("btree parent/child mismatch at "
+				    "%#lx\n", cur);
+				return (WALK_ERR);
+			}
+			bwd->bwd_offset = i;
+		}
+		return (WALK_NEXT);
+	}
+
+	if (!bwd->bwd_node->bth_core) {
+		mdb_warn("Invalid btree node at %#lx\n", wsp->walk_addr);
+		return (WALK_ERR);
+	}
+	mdb_zfs_btree_core_t *node = (mdb_zfs_btree_core_t *)bwd->bwd_node;
+	int status = wsp->walk_callback((uintptr_t)(wsp->walk_addr +
+	    offsetof(mdb_zfs_btree_core_t, btc_elems) + bwd->bwd_offset *
+	    elem_size), bwd->bwd_node, wsp->walk_cbdata);
+	if (status != WALK_NEXT)
+		return (status);
+
+	uintptr_t new_child = node->btc_children[bwd->bwd_offset + 1];
+	wsp->walk_addr = btree_leftmost_child(new_child, bwd->bwd_node);
+	if (wsp->walk_addr == 0ULL)
+		return (WALK_ERR);
+
+	bwd->bwd_offset = 0;
+	return (WALK_NEXT);
+}
+
+static int
+btree_walk_init(mdb_walk_state_t *wsp)
+{
+	btree_walk_data_t *bwd;
+
+	if (wsp->walk_addr == 0ULL) {
+		mdb_warn("must supply address of zfs_btree_t\n");
+		return (WALK_ERR);
+	}
+
+	bwd = mdb_zalloc(sizeof (btree_walk_data_t), UM_SLEEP);
+	if (mdb_ctf_vread(&bwd->bwd_btree, "zfs_btree_t", "mdb_zfs_btree_t",
+	    wsp->walk_addr, 0) == -1) {
+		mdb_free(bwd, sizeof (*bwd));
+		return (WALK_ERR);
+	}
+
+	if (bwd->bwd_btree.bt_elem_size == 0) {
+		mdb_warn("invalid or uninitialized btree at %#lx\n",
+		    wsp->walk_addr);
+		mdb_free(bwd, sizeof (*bwd));
+		return (WALK_ERR);
+	}
+
+	size_t size = MAX(BTREE_LEAF_SIZE, sizeof (zfs_btree_core_t) +
+	    BTREE_CORE_ELEMS * bwd->bwd_btree.bt_elem_size);
+	bwd->bwd_node = mdb_zalloc(size, UM_SLEEP);
+
+	uintptr_t node = (uintptr_t)bwd->bwd_btree.bt_root;
+	if (node == 0ULL) {
+		wsp->walk_addr = 0ULL;
+		wsp->walk_data = bwd;
+		return (WALK_NEXT);
+	}
+	node = btree_leftmost_child(node, bwd->bwd_node);
+	if (node == 0ULL) {
+		mdb_free(bwd->bwd_node, size);
+		mdb_free(bwd, sizeof (*bwd));
+		return (WALK_ERR);
+	}
+	bwd->bwd_offset = 0;
+
+	wsp->walk_addr = node;
+	wsp->walk_data = bwd;
+	return (WALK_NEXT);
+}
+
+static void
+btree_walk_fini(mdb_walk_state_t *wsp)
+{
+	btree_walk_data_t *bwd = (btree_walk_data_t *)wsp->walk_data;
+
+	if (bwd == NULL)
+		return;
+
+	size_t size = MAX(BTREE_LEAF_SIZE, sizeof (zfs_btree_core_t) +
+	    BTREE_CORE_ELEMS * bwd->bwd_btree.bt_elem_size);
+	if (bwd->bwd_node != NULL)
+		mdb_free(bwd->bwd_node, size);
+
+	mdb_free(bwd, sizeof (*bwd));
+}
+
 typedef struct mdb_multilist {
 	uint64_t ml_num_sublists;
 	uintptr_t ml_sublists;
@@ -4170,23 +4365,43 @@
 	return (rc);
 }
 
-typedef struct mdb_range_seg {
+typedef struct mdb_range_seg64 {
 	uint64_t rs_start;
 	uint64_t rs_end;
-} mdb_range_seg_t;
+} mdb_range_seg64_t;
+
+typedef struct mdb_range_seg32 {
+	uint32_t rs_start;
+	uint32_t rs_end;
+} mdb_range_seg32_t;
 
 /* ARGSUSED */
 static int
 range_tree_cb(uintptr_t addr, const void *unknown, void *arg)
 {
-	mdb_range_seg_t rs;
-
-	if (mdb_ctf_vread(&rs, ZFS_STRUCT "range_seg", "mdb_range_seg_t",
-	    addr, 0) == -1)
-		return (DCMD_ERR);
-
-	mdb_printf("\t[%llx %llx) (length %llx)\n",
-	    rs.rs_start, rs.rs_end, rs.rs_end - rs.rs_start);
+	mdb_range_tree_t *rt = (mdb_range_tree_t *)arg;
+	uint64_t start, end;
+
+	if (rt->rt_type == RANGE_SEG64) {
+		mdb_range_seg64_t rs;
+
+		if (mdb_ctf_vread(&rs, ZFS_STRUCT "range_seg64",
+		    "mdb_range_seg64_t", addr, 0) == -1)
+			return (DCMD_ERR);
+		start = rs.rs_start;
+		end = rs.rs_end;
+	} else {
+		ASSERT3U(rt->rt_type, ==, RANGE_SEG32);
+		mdb_range_seg32_t rs;
+
+		if (mdb_ctf_vread(&rs, ZFS_STRUCT "range_seg32",
+		    "mdb_range_seg32_t", addr, 0) == -1)
+			return (DCMD_ERR);
+		start = ((uint64_t)rs.rs_start << rt->rt_shift) + rt->rt_start;
+		end = ((uint64_t)rs.rs_end << rt->rt_shift) + rt->rt_start;
+	}
+
+	mdb_printf("\t[%llx %llx) (length %llx)\n", start, end, end - start);
 
 	return (0);
 }
@@ -4197,7 +4412,7 @@
     const mdb_arg_t *argv)
 {
 	mdb_range_tree_t rt;
-	uintptr_t avl_addr;
+	uintptr_t btree_addr;
 
 	if (!(flags & DCMD_ADDRSPEC))
 		return (DCMD_USAGE);
@@ -4207,12 +4422,12 @@
 		return (DCMD_ERR);
 
 	mdb_printf("%p: range tree of %llu entries, %llu bytes\n",
-	    addr, rt.rt_root.avl_numnodes, rt.rt_space);
-
-	avl_addr = addr +
+	    addr, rt.rt_root.bt_num_elems, rt.rt_space);
+
+	btree_addr = addr +
 	    mdb_ctf_offsetof_by_name(ZFS_STRUCT "range_tree", "rt_root");
 
-	if (mdb_pwalk("avl", range_tree_cb, NULL, avl_addr) != 0) {
+	if (mdb_pwalk("zfs_btree", range_tree_cb, &rt, btree_addr) != 0) {
 		mdb_warn("can't walk range_tree segments");
 		return (DCMD_ERR);
 	}
@@ -4407,6 +4622,8 @@
 	{ "zfs_acl_node_aces0",
 	    "given a zfs_acl_node_t, walk all ACEs as ace_t",
 	    zfs_acl_node_aces0_walk_init, zfs_aces_walk_step, NULL },
+	{ "zfs_btree", "given a zfs_btree_t *, walk all entries",
+	    btree_walk_init, btree_walk_step, btree_walk_fini },
 	{ NULL }
 };