 @@ -1,29 +1,29 @@
-# $NetBSD: Makefile.efiboot,v 1.9 2017/04/29 00:05:35 nonaka Exp $
+# $NetBSD: Makefile.efiboot,v 1.9.2.1 2018/03/13 14:54:52 martin Exp $
 S=		${.CURDIR}/../../../../..
 NOMAN=		# defined
 PROG?=		boot.efi
 NEWVERSWHAT?=	"EFI Boot"
 AFLAGS.start.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 SOURCES?= start.S conf.c devopen.c efiboot.c self_reloc.c
 LIBI386SRCS= boot.c biosdisk.c bootinfo.c bootinfo_biosgeom.c
 LIBI386SRCS+= bootmenu.c diskbuf.c exec.c menuutils.c
 LIBI386SRCS+= panic.c parseutils.c pread.c
-LIBI386SRCS+= eficons.c efidelay.c efidisk.c efidisk_ll.c efigetsecs.c
+LIBI386SRCS+= eficons.c efidelay.c efidev.c efidisk.c efidisk_ll.c
-LIBI386SRCS+= efimemory.c
+LIBI386SRCS+= efigetsecs.c efimemory.c
 SRCS= ${SOURCES} ${EXTRA_SOURCES} ${LIBI386SRCS}
 PIE_CFLAGS=
 PIE_LDFLAGS=
 PIE_AFLAGS=
 .include <bsd.own.mk>
 STRIPFLAG=	# nothing
 LIBCRT0=	# nothing
 LIBCRTI=	# nothing
 LIBCRTBEGIN=	# nothing
 @@ -44,38 +44,41 @@ CPPFLAGS+= -I${.CURDIR}/../../lib
 COPTS+= -ffreestanding -fPIC -fshort-wchar -fno-strict-aliasing -fno-builtin
 COPTS+= -fno-stack-protector
 COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=unused-but-set-variable :}
 CPPFLAGS+= -nostdinc -D_STANDALONE
 CPPFLAGS+= -DEFIBOOT
 CPPFLAGS+= -Wall -Wmissing-prototypes
 CPPFLAGS+= -Wno-pointer-sign
 CPPFLAGS+= -DEFI_ALLOCATE_MAX_ADDRESS=0x100000000ULL
 CPPFLAGS+= -DHEAP_VARIABLE
 CPPFLAGS+= -DSUPPORT_CD9660
 CPPFLAGS+= -D"devb2cdb(bno)=(bno)"
 CPPFLAGS+= -DSUPPORT_DOSFS
 CPPFLAGS+= -DSUPPORT_EXT2FS
 CPPFLAGS+= -DPASS_BIOSGEOM
 CPPFLAGS+= -DBIOSDISK_DEFAULT_SECSIZE=2048	# for bootinfo_biosgeom.c
 CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
 EFIDIR= ${S}/external/bsd/gnu-efi/dist
 GNUEFIARCH?= ${MACHINE_CPU}
 CPPFLAGS+= -I${EFIDIR}/inc -I${EFIDIR}/inc/${GNUEFIARCH}
 CPPFLAGS+= -I${EFIDIR}/inc/protocol
 SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG_SUPPORT
 SAMISCCPPFLAGS+= -DLIBSA_PRINTF_WIDTH_SUPPORT
 SAMISCCPPFLAGS+= -D"cdb2devb(bno)=(bno)"
 SAMISCMAKEFLAGS+= SA_USE_CREAD=yes      # Read compressed kernels
 SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no     # Netboot via TFTP, NFS
 ### find out what to use for libsa
 SA_AS= library
 SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
 SAMISCMAKEFLAGS+="SA_ENABLE_LS_OP=yes"
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA= ${SALIB}
 ### find out what to use for libkern
 KERN_AS= library
 LIBKERN_ARCH?= ${MACHINE_ARCH}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot.c,v 1.5 2017/05/01 13:03:01 nonaka Exp $	*/
+/*	$NetBSD: boot.c,v 1.5.2.1 2018/03/13 14:54:52 martin Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -409,27 +409,27 @@ command_boot(char *arg)
 			bootit(names[i][1], howto);
+		}
+	}
+}
 void
 command_dev(char *arg)
+{
 	static char savedevname[MAXDEVNAME + 1];
 	char *fsname, *devname;
 	const char *file; /* dummy */
 	if (*arg == '\0') {
-		biosdisk_probe();
+		efi_disk_show();
 		printf("default %s%d%c\n", default_devname, default_unit,
 		       'a' + default_partition);
 		return;
+	}
 	if (strchr(arg, ':') == NULL ||
 	    parsebootfile(arg, &fsname, &devname, &default_unit,
 	      &default_partition, &file)) {
 		command_help(NULL);
 		return;
+	}
 	/* put to own static storage */
 @@ -544,35 +544,40 @@ command_multiboot(char *arg)
 	char *filename;
 	filename = arg;
 	if (exec_multiboot(filename, gettrailer(arg)) < 0)
 		printf("multiboot: %s: %s\n", sprint_bootsel(filename),
 		       strerror(errno));
 	else
 		printf("boot returned\n");
+}
 void
 command_version(char *arg)
+{
 	CHAR16 *path;
 	if (strcmp(arg, "full") == 0) {
 		printf("ImageBase: 0x%" PRIxPTR "\n",
 		    (uintptr_t)efi_li->ImageBase);
 		printf("Stack: 0x%" PRIxPTR "\n", efi_main_sp);
 		printf("EFI version: %d.%02d\n",
 		    ST->Hdr.Revision >> 16, ST->Hdr.Revision & 0xffff);
 		Print(L"EFI Firmware: %s (rev %d.%02d)\n", ST->FirmwareVendor,
 		    ST->FirmwareRevision >> 16, ST->FirmwareRevision & 0xffff);
 		path = DevicePathToStr(efi_bootdp);
 		Print(L"Boot DevicePath: %d:%d:%s\n", DevicePathType(efi_bootdp),
 		    DevicePathSubType(efi_bootdp), path);
 		FreePool(path);
+	}
 	printf("\n"
 	    ">> %s, Revision %s (from NetBSD %s)\n"
 	    ">> Memory: %d/%d k\n",
 	    bootprog_name, bootprog_rev, bootprog_kernrev,
 	    getbasemem(), getextmem());
+}
 void
 command_memmap(char *arg)
+{
 	bool sorted = true;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efiboot.h,v 1.5 2017/05/01 13:03:01 nonaka Exp $	*/
+/*	$NetBSD: efiboot.h,v 1.5.2.1 2018/03/13 14:54:52 martin Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -36,37 +36,43 @@
 #include "efiboot_machdep.h"
 extern EFI_GUID GraphicsOutputProtocol;
 /* boot.c */
 void boot(void);
 void clearit(void);
 void print_banner(void);
 /* efiboot.c */
 extern EFI_HANDLE IH;
 extern EFI_DEVICE_PATH *efi_bootdp;
 extern int efi_bootdp_type;
 extern EFI_LOADED_IMAGE *efi_li;
 extern uintptr_t efi_main_sp;
 extern physaddr_t efi_loadaddr, efi_kernel_start;
 extern u_long efi_kernel_size;
 extern bool efi_cleanuped;
 void efi_cleanup(void);
 /* eficons.c */
 int cninit(void);
 void consinit(int, int, int);
 void command_text(char *);
 void command_gop(char *);
 /* efidev.c */
 int efi_device_path_depth(EFI_DEVICE_PATH *dp, int);
 int efi_device_path_ncmp(EFI_DEVICE_PATH *, EFI_DEVICE_PATH *, int);
 /* efidisk.c */
 void efi_disk_probe(void);
 void efi_disk_show(void);
 /* efimemory.c */
 void efi_memory_probe(void);
 void efi_memory_show_map(bool);
 EFI_MEMORY_DESCRIPTOR *efi_memory_get_map(UINTN *, UINTN *, UINTN *, UINT32 *,
     bool);
 /* panic.c */
 __dead VOID Panic(IN CHAR16 *, ...);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: devopen.c,v 1.1 2017/01/24 11:09:14 nonaka Exp $	 */
+/*	$NetBSD: devopen.c,v 1.1.12.1 2018/03/13 14:54:52 martin Exp $	 */
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bang Jun-Young.
+ *
  * 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.
 @@ -56,37 +56,46 @@
 #include "efiboot.h"
 #include <biosdisk.h>
 #include "devopen.h"
 #include <bootinfo.h>
 static int
 dev2bios(char *devname, int unit, int *biosdev)
+{
 	if (strcmp(devname, "hd") == 0)
 		*biosdev = 0x80 + unit;
 	if (strcmp(devname, "cd") == 0)
 		*biosdev = 0x80 + get_harddrives() + unit;
 	else
 		return ENXIO;
 	return 0;
+}
 void
 bios2dev(int biosdev, daddr_t sector, char **devname, int *unit, int *partition)
+{
 	*unit = biosdev & 0x7f;
 	*devname = "hd";
 	if (biosdev >= 0x80 + get_harddrives()) {
 		*devname = "cd";
 		*unit -= get_harddrives();
 	} else
 		*devname = "hd";
 	*partition = biosdisk_findpartition(biosdev, sector);
+}
 struct btinfo_bootpath bibp;
 extern bool kernel_loaded;
 /*
  * Open the EFI disk device
  */
 int
 devopen(struct open_file *f, const char *fname, char **file)
+{
 	char *fsname, *devname;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efidisk.c,v 1.1 2017/01/24 11:09:14 nonaka Exp $	*/
+/*	$NetBSD: efidisk.c,v 1.1.12.1 2018/03/13 14:54:52 martin Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,102 +16,191 @@
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #define FSTYPENAMES	/* for sys/disklabel.h */
 #include "efiboot.h"
 #include <sys/disklabel.h>
 #include "biosdisk.h"
 #include "biosdisk_ll.h"
 #include "devopen.h"
 #include "efidisk.h"
 static struct efidiskinfo_lh efi_disklist;
 static int nefidisks;
 void
 efi_disk_probe(void)
+{
 	EFI_STATUS status;
 	UINTN i, nhandles;
 	EFI_HANDLE *handles;
 	EFI_BLOCK_IO *bio;
 	EFI_BLOCK_IO_MEDIA *media;
 	EFI_DEVICE_PATH *dp;
 	struct efidiskinfo *edi;
-	EFI_DEVICE_PATH *dp, *bdp;
+	int dev, depth = -1;
 	bool bootdev;
 	int dev;
 	TAILQ_INIT(&efi_disklist);
 	status = LibLocateHandle(ByProtocol, &BlockIoProtocol, NULL,
 	    &nhandles, &handles);
 	if (EFI_ERROR(status))
 		Panic(L"LocateHandle(BlockIoProtocol): %r", status);
 	if (efi_bootdp != NULL)
 		depth = efi_device_path_depth(efi_bootdp, MEDIA_DEVICE_PATH);
 	/*
 	 * U-Boot incorrectly represents devices with a single
 	 * MEDIA_DEVICE_PATH component.  In that case include that
 	 * component into the matching, otherwise we'll blindly select
 	 * the first device.
 	 */
 	if (depth == 0)
 		depth = 1;
 	for (i = 0; i < nhandles; i++) {
 		status = uefi_call_wrapper(BS->HandleProtocol, 3, handles[i],
 		    &BlockIoProtocol, (void **)&bio);
 		if (EFI_ERROR(status))
 			Panic(L"HandleProtocol(BlockIoProtocol): %r", status);
 		media = bio->Media;
 		if (media->LogicalPartition || !media->MediaPresent)
 			continue;
 		edi = alloc(sizeof(struct efidiskinfo));
 		memset(edi, 0, sizeof(*edi));
 		edi->type = BIOSDISK_TYPE_HD;
 		edi->bio = bio;
 		edi->media_id = media->MediaId;
-		bootdev = false;
+		if (efi_bootdp != NULL && depth > 0) {
-		if (efi_bootdp == NULL)
+			status = uefi_call_wrapper(BS->HandleProtocol, 3,
-			goto next;
+			    handles[i], &DevicePathProtocol, (void **)&dp);
 			if (EFI_ERROR(status))
-		status = uefi_call_wrapper(BS->HandleProtocol, 3, handles[i],
+				goto next;
-		    &DevicePathProtocol, (void **)&dp);
+			if (efi_device_path_ncmp(efi_bootdp, dp, depth) == 0) {
-		if (EFI_ERROR(status))
+				edi->bootdev = true;
-			goto next;
+				TAILQ_INSERT_HEAD(&efi_disklist, edi,
 				    list);
-		bdp = efi_bootdp;
+				continue;
 		for (;;) {
 			if (IsDevicePathEnd(dp)) {
 				bootdev = true;
 				break;
+			}
 			if (memcmp(dp, bdp, sizeof(EFI_DEVICE_PATH)) != 0 ||
 			    memcmp(dp, bdp, DevicePathNodeLength(dp)) != 0)
 				break;
 			dp = NextDevicePathNode(dp);
 			bdp = NextDevicePathNode(bdp);
+		}
 next:
-		if (bootdev)
+		TAILQ_INSERT_TAIL(&efi_disklist, edi, list);
 			TAILQ_INSERT_HEAD(&efi_disklist, edi, list);
 		else
 			TAILQ_INSERT_TAIL(&efi_disklist, edi, list);
+	}
 	FreePool(handles);
 	if (efi_bootdp_type == BIOSDISK_TYPE_CD) {
 		TAILQ_FOREACH(edi, &efi_disklist, list) {
 			if (edi->bootdev) {
 				edi = TAILQ_FIRST(&efi_disklist);
 				edi->type = BIOSDISK_TYPE_CD;
 				TAILQ_REMOVE(&efi_disklist, edi, list);
 				TAILQ_INSERT_TAIL(&efi_disklist, edi, list);
 				break;
+			}
+		}
+	}
 	dev = 0x80;
 	TAILQ_FOREACH(edi, &efi_disklist, list) {
 		edi->dev = dev++;
-		nefidisks++;
+		if (edi->type == BIOSDISK_TYPE_HD)
 			nefidisks++;
 		if (edi->bootdev)
 			boot_biosdev = edi->dev;
+	}
+}
 void
 efi_disk_show(void)
+{
 	const struct efidiskinfo *edi;
 	EFI_BLOCK_IO_MEDIA *media;
 	struct biosdisk_partition *part;
 	uint64_t size;
 	int i, nparts;
 	bool first;
 	TAILQ_FOREACH(edi, &efi_disklist, list) {
 		media = edi->bio->Media;
 		first = true;
 		printf("disk ");
 		switch (edi->type) {
 		case BIOSDISK_TYPE_CD:
 			printf("cd0");
 			printf(" mediaId %u", media->MediaId);
 			if (edi->media_id != media->MediaId)
 				printf("(%u)", edi->media_id);
 			printf("\n");
 			printf("  cd0a\n");
 			break;
 		case BIOSDISK_TYPE_HD:
 			printf("hd%d", edi->dev & 0x7f);
 			printf(" mediaId %u", media->MediaId);
 			if (edi->media_id != media->MediaId)
 				printf("(%u)", edi->media_id);
 			printf(" size ");
 			size = (media->LastBlock + 1) * media->BlockSize;
 			if (size >= (10ULL * 1024 * 1024 * 1024))
 				printf("%"PRIu64" GB", size / (1024 * 1024 * 1024));
 			else
 				printf("%"PRIu64" MB", size / (1024 * 1024));
 			printf("\n");
 			break;
+		}
 		if (edi->type != BIOSDISK_TYPE_HD)
 			continue;
 		if (biosdisk_readpartition(edi->dev, &part, &nparts))
 			continue;
 		for (i = 0; i < nparts; i++) {
 			if (part[i].size == 0)
 				continue;
 			if (part[i].fstype == FS_UNUSED)
 				continue;
 			if (first) {
 				printf(" ");
 				first = false;
+			}
 			printf(" hd%d%c(", edi->dev & 0x7f, i + 'a');
 			if (part[i].guid != NULL)
 				printf("%s", part[i].guid->name);
 			else if (part[i].fstype < FSMAXTYPES)
 				printf("%s", fstypenames[part[i].fstype]);
 			else
 				printf("%d", part[i].fstype);
 			printf(")");
+		}
 		if (!first)
 			printf("\n");
 		dealloc(part, sizeof(*part) * nparts);
+	}
+}
 const struct efidiskinfo *
 efidisk_getinfo(int dev)
+{
 	const struct efidiskinfo *edi;
 	TAILQ_FOREACH(edi, &efi_disklist, list) {
 		if (dev == edi->dev)
 			return edi;
+	}
 	return NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efidisk.h,v 1.1 2017/01/24 11:09:14 nonaka Exp $	*/
+/*	$NetBSD: efidisk.h,v 1.1.12.1 2018/03/13 14:54:52 martin Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,19 +22,21 @@
  * 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/queue.h>
 struct efidiskinfo {
 	TAILQ_ENTRY(efidiskinfo) list;
 	int		dev;
 	int		type;
 	EFI_BLOCK_IO	*bio;
 	UINT32		media_id;
 	bool		bootdev;
 };
 TAILQ_HEAD(efidiskinfo_lh, efidiskinfo);
 const struct efidiskinfo *efidisk_getinfo(int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efidisk_ll.c,v 1.1 2017/01/24 11:09:14 nonaka Exp $	 */
+/*	$NetBSD: efidisk_ll.c,v 1.1.12.1 2018/03/13 14:54:52 martin Exp $	 */
 /*	NetBSD: biosdisk_ll.c,v 1.31 2011/02/21 02:58:02 jakllsch Exp	 */
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bang Jun-Young.
+ *
  * 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
 @@ -85,34 +85,36 @@ static int do_read(struct biosdisk_ll *,
 int
 set_geometry(struct biosdisk_ll *d, struct biosdisk_extinfo *ed)
+{
 	const struct efidiskinfo *edi;
 	EFI_BLOCK_IO_MEDIA *media;
 	edi = efidisk_getinfo(d->dev);
 	if (edi == NULL)
 		return 1;
 	media = edi->bio->Media;
 	d->secsize = media->BlockSize;
-	d->type = BIOSDISK_TYPE_HD;
+	d->type = edi->type;
 	d->flags = BIOSDISK_INT13EXT;
-	ed->totsec = media->LastBlock + 1;
+	if (ed != NULL) {
-	ed->sbytes = media->BlockSize;
+		ed->totsec = media->LastBlock + 1;
-	ed->flags = 0;
+		ed->sbytes = media->BlockSize;
-	if (media->RemovableMedia)
+		ed->flags = 0;
-		ed->flags |= EXTINFO_REMOVABLE;
+		if (media->RemovableMedia)
 			ed->flags |= EXTINFO_REMOVABLE;
+	}
 	return 0;
+}
 /*
  * Global shared "diskbuf" is used as read ahead buffer.  For reading from
  * floppies, the bootstrap has to be loaded on a 64K boundary to ensure that
  * this buffer doesn't cross a 64K DMA boundary.
  */
 static int      ra_dev;
 static daddr_t  ra_end;
 static daddr_t  ra_first;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efiboot.c,v 1.4 2017/02/11 10:23:39 nonaka Exp $	*/
+/*	$NetBSD: efiboot.c,v 1.4.10.1 2018/03/13 14:54:52 martin Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,31 +18,33 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "efiboot.h"
 #include "biosdisk_ll.h"
 #include "bootinfo.h"
 #include "devopen.h"
 EFI_HANDLE IH;
 EFI_DEVICE_PATH *efi_bootdp;
 int efi_bootdp_type = BIOSDISK_TYPE_HD;
 EFI_LOADED_IMAGE *efi_li;
 uintptr_t efi_main_sp;
 physaddr_t efi_loadaddr, efi_kernel_start;
 u_long efi_kernel_size;
 bool efi_cleanuped;
 static EFI_PHYSICAL_ADDRESS heap_start = EFI_ALLOCATE_MAX_ADDRESS;
 static UINTN heap_size = 1 * 1024 * 1024;			/* 1MB */
 static struct btinfo_efi btinfo_efi;
 static void efi_heap_init(void);
 EFI_STATUS EFIAPI efi_main(EFI_HANDLE, EFI_SYSTEM_TABLE *);
 @@ -61,35 +63,33 @@ efi_main(EFI_HANDLE imageHandle, EFI_SYS
 	cninit();
 	efi_heap_init();
 	efi_md_init();
 	status = uefi_call_wrapper(BS->HandleProtocol, 3, IH,
 	    &LoadedImageProtocol, (void **)&efi_li);
 	if (EFI_ERROR(status))
 		Panic(L"HandleProtocol(LoadedImageProtocol): %r", status);
 	status = uefi_call_wrapper(BS->HandleProtocol, 3, efi_li->DeviceHandle,
 	    &DevicePathProtocol, (void **)&dp0);
 	if (EFI_ERROR(status))
 		Panic(L"HandleProtocol(DevicePathProtocol): %r", status);
 	efi_bootdp = dp0;
 	for (dp = dp0; !IsDevicePathEnd(dp); dp = NextDevicePathNode(dp)) {
-		if (DevicePathType(dp) == MEDIA_DEVICE_PATH)
+		if (DevicePathType(dp) == MEDIA_DEVICE_PATH &&
-			continue;
+		    DevicePathSubType(dp) == MEDIA_CDROM_DP) {
-		if (DevicePathSubType(dp) == MEDIA_HARDDRIVE_DP) {
+			efi_bootdp_type = BIOSDISK_TYPE_CD;
 			boot_biosdev = 0x80;
 			efi_bootdp = dp;
 			break;
+		}
 		break;
+	}
 	efi_disk_probe();
 	status = uefi_call_wrapper(BS->SetWatchdogTimer, 4, 0, 0, 0, NULL);
 	if (EFI_ERROR(status))
 		Panic(L"SetWatchdogTimer: %r", status);
 	boot();
 	return EFI_SUCCESS;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: biosdisk.c,v 1.46 2017/01/24 11:09:14 nonaka Exp $	*/
+/*	$NetBSD: biosdisk.c,v 1.46.6.1 2018/03/13 14:54:52 martin Exp $	*/
 /*
  * Copyright (c) 1996, 1998
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -79,47 +79,38 @@
 #include <fs/cd9660/iso.h>
 #include <lib/libsa/saerrno.h>
 #include <machine/cpu.h>
 #include "libi386.h"
 #include "biosdisk_ll.h"
 #include "biosdisk.h"
 #ifdef _STANDALONE
 #include "bootinfo.h"
 #endif
-#define BUFSIZE	2048	/* must be large enough for a CD sector */
+#ifndef BIOSDISK_BUFSIZE
 #define BIOSDISK_BUFSIZE	2048	/* must be large enough for a CD sector */
 #endif
 #define BIOSDISKNPART 26
 struct biosdisk {
 	struct biosdisk_ll ll;
 	daddr_t         boff;
-	char            buf[BUFSIZE];
+	char            buf[BIOSDISK_BUFSIZE];
 #if !defined(NO_DISKLABEL) || !defined(NO_GPT)
-	struct {
+	struct biosdisk_partition part[BIOSDISKNPART];
 		daddr_t offset;
 		daddr_t size;
 		int     fstype;
 #ifdef EFIBOOT
 		const struct gpt_part {
 			const struct uuid *guid;
 			const char *name;
 		} *guid;
 		uint64_t attr;
 #endif
 	} part[BIOSDISKNPART];
 #endif
 };
 #ifndef NO_GPT
 const struct uuid GET_nbsd_raid = GPT_ENT_TYPE_NETBSD_RAIDFRAME;
 const struct uuid GET_nbsd_ffs = GPT_ENT_TYPE_NETBSD_FFS;
 const struct uuid GET_nbsd_lfs = GPT_ENT_TYPE_NETBSD_LFS;
 const struct uuid GET_nbsd_swap = GPT_ENT_TYPE_NETBSD_SWAP;
 const struct uuid GET_nbsd_ccd = GPT_ENT_TYPE_NETBSD_CCD;
 const struct uuid GET_nbsd_cgd = GPT_ENT_TYPE_NETBSD_CGD;
 #ifdef EFIBOOT
 const struct uuid GET_efi = GPT_ENT_TYPE_EFI;
 const struct uuid GET_mbr = GPT_ENT_TYPE_MBR;
 @@ -168,40 +159,44 @@ const struct gpt_part gpt_parts[] = {
 };
 #endif
 #endif /* NO_GPT */
 #ifdef _STANDALONE
 static struct btinfo_bootdisk bi_disk;
 static struct btinfo_bootwedge bi_wedge;
 #endif
 #define MBR_PARTS(buf) ((char *)(buf) + offsetof(struct mbr_sector, mbr_parts))
 #define	RF_PROTECTED_SECTORS	64	/* XXX refer to <.../rf_optnames.h> */
 #ifndef	devb2cdb
 #define	devb2cdb(bno)	(((bno) * DEV_BSIZE) / ISO_DEFAULT_BLOCK_SIZE)
 #endif
 int
 biosdisk_strategy(void *devdata, int flag, daddr_t dblk, size_t size,
 		  void *buf, size_t *rsize)
+{
 	struct biosdisk *d;
 	int blks, frag;
 	if (flag != F_READ)
 		return EROFS;
 	d = (struct biosdisk *) devdata;
 	if (d->ll.type == BIOSDISK_TYPE_CD)
-		dblk = dblk * DEV_BSIZE / ISO_DEFAULT_BLOCK_SIZE;
+		dblk = devb2cdb(dblk);
 	dblk += d->boff;
 	blks = size / d->ll.secsize;
 	if (blks && readsects(&d->ll, dblk, blks, buf, 0)) {
 		if (rsize)
 			*rsize = 0;
 		return EIO;
+	}
 	/* needed for CD */
 	frag = size % d->ll.secsize;
 	if (frag) {
 @@ -507,26 +502,59 @@ read_minix_subp(struct biosdisk *d, stru
 		if (typ == 0)
 			continue;
 		sector = this_ext + mbr[i].mbrp_start;
 		if (dflt_lbl->d_npartitions >= MAXPARTITIONS)
 			continue;
 		p = &dflt_lbl->d_partitions[dflt_lbl->d_npartitions++];
 		p->p_offset = sector;
 		p->p_size = mbr[i].mbrp_size;
 		p->p_fstype = xlat_mbr_fstype(typ);
+	}
 	return 0;
+}
 #if defined(EFIBOOT) && defined(SUPPORT_CD9660)
 static int
 check_cd9660(struct biosdisk *d)
+{
 	struct biosdisk_extinfo ed;
 	struct iso_primary_descriptor *vd;
 	daddr_t bno;
 	for (bno = 16;; bno++) {
 		if (readsects(&d->ll, bno, 1, d->buf, 0))
 			return -1;
 		vd = (struct iso_primary_descriptor *)d->buf;
 		if (memcmp(vd->id, ISO_STANDARD_ID, sizeof vd->id) != 0)
 			return -1;
 		if (isonum_711(vd->type) == ISO_VD_END)
 			return -1;
 		if (isonum_711(vd->type) == ISO_VD_PRIMARY)
 			break;
+	}
 	if (isonum_723(vd->logical_block_size) != ISO_DEFAULT_BLOCK_SIZE)
 		return -1;
 	if (set_geometry(&d->ll, &ed))
 		return -1;
 	memset(d->part, 0, sizeof(d->part));
 	d->part[0].fstype = FS_ISO9660;
 	d->part[0].offset = 0;
 	d->part[0].size = ed.totsec;
 	return 0;
+}
 #endif
 static int
 read_label(struct biosdisk *d)
+{
 	struct disklabel dflt_lbl;
 	struct mbr_partition mbr[MBR_PART_COUNT];
 	struct partition *p;
 	uint32_t sector;
 	int i;
 	int error;
 	int typ;
 	uint32_t ext_base, this_ext, next_ext;
 #ifdef COMPAT_386BSD_MBRPART
 	int sector_386bsd = -1;
 @@ -614,26 +642,33 @@ read_label(struct biosdisk *d)
 	/*
 	 * One of two things:
 	 * 	1. no MBR
 	 *	2. no NetBSD partition in MBR
+	 *
 	 * We simply default to "start of disk" in this case and
 	 * press on.
 	 */
 	error = check_label(d, sector);
 	if (error >= 0)
 		return error;
 #if defined(EFIBOOT) && defined(SUPPORT_CD9660)
 	/* Check CD/DVD */
 	error = check_cd9660(d);
 	if (error >= 0)
 		return error;
 #endif
 	/*
 	 * Nothing at start of disk, return info from mbr partitions.
 	 */
 	/* XXX fill it to make checksum match kernel one */
 	dflt_lbl.d_checksum = dkcksum(&dflt_lbl);
 	ingest_label(d, &dflt_lbl);
 	return 0;
+}
 #endif /* NO_DISKLABEL */
 #if !defined(NO_DISKLABEL) || !defined(NO_GPT)
 static int
 read_partitions(struct biosdisk *d)
 @@ -764,50 +799,88 @@ biosdisk_findpartition(int biosdev, dadd
 	if (read_partitions(d) == 0) {
 		for (partition = (BIOSDISKNPART-1); --partition;) {
 			if (d->part[partition].fstype == FS_UNUSED)
 				continue;
 #ifdef EFIBOOT
 			if (d->part[partition].attr & GPT_ENT_ATTR_BOOTME) {
 				switch (d->part[partition].fstype) {
 				case FS_BSDFFS:
 				case FS_BSDLFS:
 				case FS_RAID:
 				case FS_CCD:
 				case FS_CGD:
 				case FS_ISO9660:
 					break;
 				default:
 					candidate = partition;
 					continue;
+				}
 				break;
+			}
 #else
 			if (d->part[partition].offset == sector)
 				break;
 #endif
+		}
 #ifdef EFIBOOT
 		if (partition == 0 && candidate != 0)
 			partition = candidate;
 #endif
+	}
 	dealloc(d, sizeof(*d));
 	return partition;
 #endif /* NO_DISKLABEL && NO_GPT */
+}
 int
 biosdisk_readpartition(int biosdev, struct biosdisk_partition **partpp,
     int *rnum)
+{
 #if defined(NO_DISKLABEL) && defined(NO_GPT)
 	return ENOTSUP;
 #else
 	struct biosdisk *d;
 	struct biosdisk_partition *part;
 	int rv;
 	/* Look for netbsd partition that is the dos boot one */
 	d = alloc_biosdisk(biosdev);
 	if (d == NULL)
 		return ENOMEM;
 	if (read_partitions(d)) {
 		rv = EINVAL;
 		goto out;
+	}
 	part = alloc(sizeof(d->part));
 	if (part == NULL) {
 		rv = ENOMEM;
 		goto out;
+	}
 	memcpy(part, d->part, sizeof(d->part));
 	*partpp = part;
 	*rnum = (int)__arraycount(d->part);
 	rv = 0;
 out:
 	dealloc(d, sizeof(*d));
 	return rv;
 #endif /* NO_DISKLABEL && NO_GPT */
+}
 #ifdef _STANDALONE
 static void
 add_biosdisk_bootinfo(void)
+{
 	if (bootinfo == NULL) {
 		return;
+	}
 	BI_ADD(&bi_disk, BTINFO_BOOTDISK, sizeof(bi_disk));
 	BI_ADD(&bi_wedge, BTINFO_BOOTWEDGE, sizeof(bi_wedge));
 	return;
+}
 #endif

 @@ -1,32 +1,46 @@
-/*	$NetBSD: biosdisk.h,v 1.8 2010/12/24 20:36:51 jakllsch Exp $	*/
+/*	$NetBSD: biosdisk.h,v 1.8.52.1 2018/03/13 14:54:52 martin Exp $	*/
 /*
  * Copyright (c) 1996
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 struct biosdisk_partition {
 	daddr_t offset;
 	daddr_t size;
 	int     fstype;
 #ifdef EFIBOOT
 	const struct gpt_part {
 		const struct uuid *guid;
 		const char *name;
 	} *guid;
 	uint64_t attr;
 #endif
 };
 int biosdisk_strategy(void *, int, daddr_t, size_t, void *, size_t *);
 int biosdisk_open(struct open_file *, ...);
 int biosdisk_close(struct open_file *);
 int biosdisk_ioctl(struct open_file *, u_long, void *);
 int biosdisk_findpartition(int, daddr_t);
 int biosdisk_readpartition(int, struct biosdisk_partition **, int *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: biosdisk_ll.h,v 1.15 2007/12/25 18:33:34 perry Exp $	 */
+/*	$NetBSD: biosdisk_ll.h,v 1.15.90.1 2018/03/13 14:54:52 martin Exp $	 */
 /*
  * Copyright (c) 1996
  * 	Matthias Drochner.  All rights reserved.
  * Copyright (c) 1996
  * 	Perry E. Metzger.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -110,17 +110,19 @@ struct biosdisk_extinfo {
 	uint8_t		checksum;	/* byte sum from dev_path_sig is 0 */
 #endif /* BIOSDISK_EXTINFO_V3 */
 #endif /* BIOSDISK_EXTINFO_V2 */
 } __packed;
 #define EXTINFO_DMA_TRANS	0x0001	/* transparent DMA boundary errors */
 #define EXTINFO_GEOM_VALID	0x0002	/* geometry in c/h/s in struct valid */
 #define EXTINFO_REMOVABLE	0x0004	/* removable device */
 #define EXTINFO_WRITEVERF	0x0008	/* supports write with verify */
 #define EXTINFO_CHANGELINE	0x0010	/* changeline support */
 #define EXTINFO_LOCKABLE	0x0020	/* device is lockable */
 #define EXTINFO_MAXGEOM		0x0040	/* geometry set to max; no media */
 #ifndef BIOSDISK_DEFAULT_SECSIZE
 #define BIOSDISK_DEFAULT_SECSIZE	512
 #endif
 int set_geometry(struct biosdisk_ll *, struct biosdisk_extinfo *);
 int readsects(struct biosdisk_ll *, daddr_t, int, char *, int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660.c,v 1.30 2014/03/20 03:13:18 christos Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.30.22.1 2018/03/13 14:54:52 martin Exp $	*/
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
  * Copyright (C) 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -61,27 +61,29 @@ struct file {
 	off_t size;			/* Size of file */
 };
 struct ptable_ent {
 	char namlen	[ISODCL( 1, 1)];	/* 711 */
 	char extlen	[ISODCL( 2, 2)];	/* 711 */
 	char block	[ISODCL( 3, 6)];	/* 732 */
 	char parent	[ISODCL( 7, 8)];	/* 722 */
 	char name	[1];
 };
 #define	PTFIXSZ		8
 #define	PTSIZE(pp)	roundup(PTFIXSZ + isonum_711((pp)->namlen), 2)
 #ifndef	cdb2devb
 #define	cdb2devb(bno)	((bno) * ISO_DEFAULT_BLOCK_SIZE / DEV_BSIZE)
 #endif
 static int	pnmatch(const char *, struct ptable_ent *);
 static int	dirmatch(const char *, struct iso_directory_record *);
 static int
 pnmatch(const char *path, struct ptable_ent *pp)
+{
 	char *cp;
 	int i;
 	cp = pp->name;
 	for (i = isonum_711(pp->namlen); --i >= 0; path++, cp++) {
 		if (toupper(*path) == *cp)

 @@ -1,16 +1,15 @@
 - efiboot
  * handle UEFI variables
  * boot from CD/DVD (bootable from CD/DVD, but root fs not found.)
  * load boot.cfg from EFI system partition (FAT32)
 - kernel
  * handle UEFI variables (/dev/efivar)
  * accelerated console
 - userland
  * efibootmgr like utility
  * merge distrib/amd64/uefi-installimage to distrib/amd64/install-image
  * merge distrib/amd64/uefi-installimage/Makefile.* to distrib/common/Makefile.*
 - installer
  * sysinst(8): handle dk(4) for install disk