 @@ -1,14 +1,14 @@
-/*	$NetBSD: eficons.c,v 1.4.2.6 2020/03/09 09:48:00 martin Exp $	*/
+/*	$NetBSD: eficons.c,v 1.4.2.7 2023/09/15 15:44:20 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,29 +16,32 @@
  * 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.
  */
 #include <sys/param.h>
 #include <sys/bitops.h>
 #include <sys/stdint.h>
 #include <comio_direct.h>
 #include "efiboot.h"
 #include "bootinfo.h"
 #include "vbe.h"
 #ifndef DEFAULT_GOP_MODE
 #define DEFAULT_GOP_MODE	"1024x768"
 #endif
 #define FALLBACK_GOP_MODE	0
 extern struct x86_boot_params boot_params;
 struct btinfo_console btinfo_console;
 @@ -50,42 +53,50 @@ static int keybuf_read = 0;
 static int keybuf_write = 0;
 static SERIAL_IO_INTERFACE *serios[4];
 static int default_comspeed =
 #if defined(CONSPEED)
     CONSPEED;
 #else
 ;
 #endif
 static u_char serbuf[16];
 static int serbuf_read = 0;
 static int serbuf_write = 0;
 static int raw_com_addr = 0;
 static void eficons_init_video(void);
 static void efi_switch_video_to_text_mode(void);
 static int efi_cons_getc(void);
 static int efi_cons_putc(int);
 static int efi_cons_iskey(int);
 static int efi_cons_waitforinputevent(uint64_t);
 static void efi_com_probe(void);
 static bool efi_valid_com(int);
 static int efi_com_init(int, int);
 static int efi_com_getc(void);
 static int efi_com_putc(int);
 static int efi_com_status(int);
 static int efi_com_waitforinputevent(uint64_t);
 static int raw_com_init(int, int);
 static int raw_com_getc(void);
 static int raw_com_putc(int);
 static int raw_com_status(int);
 static int raw_com_waitforinputevent(uint64_t);
 static int efi_find_gop_mode(char *);
 static int iodev;
 static int (*internal_getchar)(void) = efi_cons_getc;
 static int (*internal_putchar)(int) = efi_cons_putc;
 static int (*internal_iskey)(int) = efi_cons_iskey;
 static int (*internal_waitforinputevent)(uint64_t) = efi_cons_waitforinputevent;
 static int
 getcomaddr(int idx)
+{
 	static const short comioport[4] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
 @@ -124,43 +135,38 @@ efi_consinit(int dev, int ioport, int sp
 			    awaitkey(7, 0))
 				goto ok;
+		}
 		goto nocom;
 ok:
 		break;
 	case CONSDEV_COM0:
 	case CONSDEV_COM1:
 	case CONSDEV_COM2:
 	case CONSDEV_COM3:
 		iodev = dev;
 		btinfo_console.addr = ioport;
-		if (btinfo_console.addr == 0) {
+		if (btinfo_console.addr == 0)
 			if (!efi_valid_com(iodev))
 				goto nocom;
 			btinfo_console.addr = getcomaddr(iodev - CONSDEV_COM0);
 		if (speed != 0)
 			btinfo_console.speed = speed;
 		efi_com_init(btinfo_console.addr, btinfo_console.speed);
 		break;
 	case CONSDEV_COM0KBD:
 	case CONSDEV_COM1KBD:
 	case CONSDEV_COM2KBD:
 	case CONSDEV_COM3KBD:
 		iodev = dev - CONSDEV_COM0KBD + CONSDEV_COM0;
 		if (!efi_valid_com(iodev))
 			goto nocom;
 		btinfo_console.addr = getcomaddr(iodev - CONSDEV_COM0);
 		efi_cons_putc('0' + iodev - CONSDEV_COM0);
 		efi_com_init(btinfo_console.addr, btinfo_console.speed);
 		/* check for:
 		 *  1. successful output
 		 *  2. optionally, keypress within 7s
 		 */
 		if (efi_com_putc(':') &&
 		    efi_com_putc('-') &&
 		    efi_com_putc('(') &&
 		    awaitkey(7, 0))
 			goto kbd;
 @@ -858,42 +864,43 @@ efi_valid_com(int dev)
 	    getcomaddr(idx) != 0;
+}
 static int
 efi_com_init(int addr, int speed)
+{
 	EFI_STATUS status;
 	SERIAL_IO_INTERFACE *serio;
 	if (speed <= 0)
 		return 0;
 	if (!efi_valid_com(iodev))
-		return 0;
+		return raw_com_init(addr, speed);
 	serio = serios[iodev - CONSDEV_COM0];
 	if (serio->Mode->BaudRate != btinfo_console.speed) {
 		status = uefi_call_wrapper(serio->SetAttributes, 7, serio,
 		    speed, serio->Mode->ReceiveFifoDepth,
 		    serio->Mode->Timeout, serio->Mode->Parity,
 		    serio->Mode->DataBits, serio->Mode->StopBits);
 		if (EFI_ERROR(status)) {
 			printf("com%d: SetAttribute() failed with status=%" PRIxMAX
 			    "\n", iodev - CONSDEV_COM0, (uintmax_t)status);
 			return 0;
+		}
+	}
 	raw_com_addr = 0;
 	default_comspeed = speed;
 	internal_getchar = efi_com_getc;
 	internal_putchar = efi_com_putc;
 	internal_iskey = efi_com_status;
 	internal_waitforinputevent = efi_com_waitforinputevent;
 	memset(serbuf, 0, sizeof(serbuf));
 	serbuf_read = serbuf_write = 0;
 	return speed;
+}
 static int
 efi_com_getc(void)
 @@ -1008,13 +1015,75 @@ efi_com_waitforinputevent(uint64_t timeo
 		uefi_call_wrapper(BS->CloseEvent, 1, timer);
 		return EINVAL;
+	}
 	status = WaitForSingleEvent(&timer, timeout);
 	uefi_call_wrapper(BS->SetTimer, 3, periodic, TimerCancel, 0);
 	uefi_call_wrapper(BS->CloseEvent, 1, periodic);
 	uefi_call_wrapper(BS->CloseEvent, 1, timer);
 	if (!EFI_ERROR(status))
 		return 0;
 	if (status == EFI_TIMEOUT)
 		return ETIMEDOUT;
 	return EINVAL;
+}
 static int
 raw_com_init(int addr, int speed)
+{
 	if (addr == 0 || speed <= 0)
 		return 0;
 	speed = cominit_d(addr, speed);
 	raw_com_addr = addr;
 	default_comspeed = speed;
 	internal_getchar = raw_com_getc;
 	internal_putchar = raw_com_putc;
 	internal_iskey = raw_com_status;
 	internal_waitforinputevent = raw_com_waitforinputevent;
 	return speed;
+}
 static int
 raw_com_getc(void)
+{
 	if (raw_com_addr == 0)
 		panic("%s: Invalid serial port", __func__);
 	return comgetc_d(raw_com_addr);
+}
 static int
 raw_com_putc(int c)
+{
 	if (raw_com_addr == 0)
 		panic("%s: Invalid serial port", __func__);
 	return computc_d(c, raw_com_addr);
+}
 static int
 raw_com_status(int intr)
+{
 	if (raw_com_addr == 0)
 		panic("%s: Invalid serial port", __func__);
 	return comstatus_d(raw_com_addr);
+}
 static int
 raw_com_waitforinputevent(uint64_t timeout /* in 0.1 usec */)
+{
 	uint64_t ms;
 	if (raw_com_addr == 0)
 		panic("%s: Invalid serial port", __func__);
 	for (ms = howmany(timeout, 10 * 1000); ms != 0; ms--) {
 		if (raw_com_status(0))
 			return 0;
 		uefi_call_wrapper(BS->Stall, 1, 1000);
+	}
 	return ETIMEDOUT;
+}

 @@ -1,28 +1,30 @@
-# $NetBSD: Makefile.efiboot,v 1.9.2.5 2019/09/18 17:30:05 martin Exp $
+# $NetBSD: Makefile.efiboot,v 1.9.2.6 2023/09/15 15:44:20 martin Exp $
 S=		${.CURDIR}/../../../../..
 NOMAN=		# defined
 PROG?=		boot.efi
 NEWVERSWHAT?=	"EFI Boot"
 AFLAGS.start.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 SOURCES= start.S boot.c conf.c devopen.c dev_net.c self_reloc.c panic.c
 SOURCES+= efiboot.c efichar.c eficons.c efidelay.c efidev.c
 SOURCES+= eficpufunc.c
 SOURCES+= efidisk.c efidisk_ll.c efigetsecs.c efimemory.c
 SOURCES+= efinet.c efipxe.c
 LIBI386SRCS= biosdisk.c bootinfo.c bootinfo_biosgeom.c bootmenu.c
 LIBI386SRCS+= comio_direct.c
 LIBI386SRCS+= diskbuf.c exec.c menuutils.c parseutils.c pread.c
 LIBI386SRCS+= exec_multiboot1.c exec_multiboot2.c
 # use our own nfs implementation
 LIBSASRCS+= nfs.c
 SRCS= ${SOURCES} ${EXTRA_SOURCES} ${LIBI386SRCS} ${LIBSASRCS}
 PIE_CFLAGS=
 PIE_LDFLAGS=
 PIE_AFLAGS=
 .include <bsd.own.mk>
 STRIPFLAG=	# nothing