Date: Thu, 30 Mar 2023 17:40:05 -0600 From: Warner Losh <imp@bsdimp.com> To: Gleb Smirnoff <glebius@freebsd.org> Cc: Wei Hu <whu@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, imp@freebsd.org, gallatin@freebsd.org, kevans@freebsd.org Subject: Re: git: 927358dd98cb - main - amd64 loader: Use efiserialio for Hyper-V booted systems Message-ID: <CANCZdfpbWSbhJUDU_VUXzkqWE9Xc=MrE%2BgmEOqg%2ByOhG%2BTS6xw@mail.gmail.com> In-Reply-To: <ZCYb4V4Mg8y%2BU7tu@FreeBSD.org> References: <202303180720.32I7KXOc030612@gitrepo.freebsd.org> <ZCYb4V4Mg8y%2BU7tu@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000064441305f8269db7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Let's back it out. I didn't get a chance to review it and the duplicated name strikes me as massively unwise. Of course, the efi serial driver never should have had the name comconsole in the first place, imho. It was OK on arm where we couldn't conflict. So let's back it out and talk about how we should do this, including the need to possibly just rename the efi version of the console driver to something else. IMHO, it never should have been comconsole in the first place because it's configured differently than comconsole.... Warner On Thu, Mar 30, 2023 at 5:31=E2=80=AFPM Gleb Smirnoff <glebius@freebsd.org>= wrote: > Wei, Kyle, > > this commit hangs loader on real hardware, at least on some > of it. The loader prints list of consoles and hangs hard: > > [Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M > ^M/^Hconsole vidconsole is invalid!^M > ^MAvailable consoles:^M > ^M efi^M > ^M comconsole^M > ^M comconsole^M > ^M nullconsole^M > ^M spinconsole^M > > Machine is unrecoverable unless you got alternate boot media > and access to BMC console. > > First, please DO NOT MFC this as scheduled. Second, let's try > to fix it or back it out if we hear from any other CURRENT > user. > > Our configuration isn't special. This is what we got in > loader.conf, related to consoles: > > console=3D"comconsole vidconsole efi" > comconsole_speed=3D115200 > comconsole_port=3D0x3e8 > console=3D"efi" > hw.uart.console=3D"io:1016,br:115200" > > On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote: > W> The branch main has been updated by whu: > W> > W> URL: > https://cgit.FreeBSD.org/src/commit/?id=3D927358dd98cb902160093e0dc0bac00= 2d6b43858 > W> > W> commit 927358dd98cb902160093e0dc0bac002d6b43858 > W> Author: Wei Hu <whu@FreeBSD.org> > W> AuthorDate: 2023-03-14 15:13:46 +0000 > W> Commit: Wei Hu <whu@FreeBSD.org> > W> CommitDate: 2023-03-18 07:07:35 +0000 > W> > W> amd64 loader: Use efiserialio for Hyper-V booted systems > W> > W> UEFI provides ConIn/ConOut handles for consoles that it supports, > W> which include the text-video and serial ports. When the serial por= t > W> is available, use the UEFI driver instead of direct io-port access= es > W> to avoid conflicts between the firmware and direct hardware access= , > as > W> happens on Hyper-V (Azure) setups. > W> > W> This change enables efiserialio to be built for efi-amd64 and has > W> higher order priority vs comconsole, and only uses efiserialio > W> if the hypervisor is Hyper-V. When efiserialio successfully > W> probes, it will set efi_comconsole_avail=3Dtrue which will prevent > W> comconsole from probing in this setup. > W> > W> Tested on Hyper-V, ESXi and Azure VMs. > W> > W> PR: 264267 > W> Reviewed by: kevans, whu > W> Tested by: whu > W> Obtained from: Rubicon Communications, LLC (Netgate) > W> MFC after: 2 weeks > W> Sponsored by: Rubicon Communications, LLC (Netgate) > W> --- > W> stand/efi/loader/arch/amd64/Makefile.inc | 1 + > W> stand/efi/loader/bootinfo.c | 11 ++++++-- > W> stand/efi/loader/conf.c | 6 +++++ > W> stand/efi/loader/efiserialio.c | 43 > ++++++++++++++++++++++++++++---- > W> stand/i386/libi386/comconsole.c | 14 +++++++++++ > W> 5 files changed, 68 insertions(+), 7 deletions(-) > W> > W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc > b/stand/efi/loader/arch/amd64/Makefile.inc > W> index 0d9e2648cb59..bd89044bd6c7 100644 > W> --- a/stand/efi/loader/arch/amd64/Makefile.inc > W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc > W> @@ -5,6 +5,7 @@ SRCS+=3D amd64_tramp.S \ > W> elf64_freebsd.c \ > W> trap.c \ > W> multiboot2.c \ > W> + efiserialio.c \ > W> exc.S > W> > W> .PATH: ${BOOTSRC}/i386/libi386 > W> diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c > W> index 939f2cf4c3fe..d79f59343af1 100644 > W> --- a/stand/efi/loader/bootinfo.c > W> +++ b/stand/efi/loader/bootinfo.c > W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs) > W> if (tmp !=3D NULL) > W> speed =3D strtol(tmp, NULL, 0); > W> tmp =3D getenv("efi_com_port"); > W> - if (tmp =3D=3D NULL) > W> - tmp =3D getenv("comconsole_port"); > W> if (tmp !=3D NULL) > W> port =3D strtol(tmp, NULL, 0); > W> + if (port <=3D 0) { > W> + tmp =3D getenv("comconsole_port"); > W> + if (tmp !=3D NULL) > W> + port =3D strtol(tmp, NULL, 0); > W> + else { > W> + if (port =3D=3D 0) > W> + port =3D 0x3f8; > W> + } > W> + } > W> if (speed !=3D -1 && port !=3D -1) { > W> snprintf(buf, sizeof(buf), "io:%d,br:%d", > port, > W> speed); > W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c > W> index 863c9188c72c..051e1a3381d1 100644 > W> --- a/stand/efi/loader/conf.c > W> +++ b/stand/efi/loader/conf.c > W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] =3D { > W> > W> extern struct console efi_console; > W> extern struct console comconsole; > W> +#if defined(__amd64__) > W> +extern struct console eficomconsole; > W> +#endif > W> #if defined(__amd64__) || defined(__i386__) > W> extern struct console nullconsole; > W> extern struct console spinconsole; > W> @@ -88,6 +91,9 @@ extern struct console spinconsole; > W> > W> struct console *consoles[] =3D { > W> &efi_console, > W> +#if defined(__amd64__) > W> + &eficomconsole, > W> +#endif > W> &comconsole, > W> #if defined(__amd64__) || defined(__i386__) > W> &nullconsole, > W> diff --git a/stand/efi/loader/efiserialio.c > b/stand/efi/loader/efiserialio.c > W> index 375e679d2590..5fbc700f6ac2 100644 > W> --- a/stand/efi/loader/efiserialio.c > W> +++ b/stand/efi/loader/efiserialio.c > W> @@ -69,6 +69,11 @@ static int comc_speed_set(struct env_var *, > int, const void *); > W> > W> static struct serial *comc_port; > W> extern struct console efi_console; > W> +bool efi_comconsole_avail =3D false; > W> + > W> +#if defined(__amd64__) > W> +#define comconsole eficomconsole > W> +#endif > W> > W> struct console comconsole =3D { > W> .c_name =3D "comconsole", > W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc) > W> char *env, *buf, *ep; > W> size_t sz; > W> > W> +#if defined(__amd64__) > W> + /* > W> + * For x86-64, don't use this driver if not running in Hyper-V. > W> + */ > W> + env =3D getenv("smbios.bios.version"); > W> + if (env =3D=3D NULL || strncmp(env, "Hyper-V", 7) !=3D 0) { > W> + return; > W> + } > W> +#endif > W> + > W> if (comc_port =3D=3D NULL) { > W> comc_port =3D calloc(1, sizeof (struct serial)); > W> if (comc_port =3D=3D NULL) > W> return; > W> } > W> + > W> /* Use defaults from firmware */ > W> comc_port->databits =3D 8; > W> comc_port->parity =3D DefaultParity; > W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc) > W> comc_port_set, env_nounset); > W> > W> env =3D getenv("efi_com_speed"); > W> + if (env =3D=3D NULL) > W> + /* fallback to comconsole setting */ > W> + env =3D getenv("comconsole_speed"); > W> + > W> if (comc_parse_intval(env, &val) =3D=3D CMD_OK) > W> comc_port->baudrate =3D val; > W> > W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc) > W> comc_speed_set, env_nounset); > W> > W> comconsole.c_flags =3D 0; > W> - if (comc_setup()) > W> + if (comc_setup()) { > W> sc->c_flags =3D C_PRESENTIN | C_PRESENTOUT; > W> + efi_comconsole_avail =3D true; > W> + } else { > W> + /* disable being seen as "comconsole" */ > W> + comconsole.c_name =3D "efiserialio"; > W> + } > W> } > W> > W> static int > W> @@ -489,6 +514,7 @@ comc_setup(void) > W> { > W> EFI_STATUS status; > W> UINT32 control; > W> + char *ev; > W> > W> /* port is not usable */ > W> if (comc_port->sio =3D=3D NULL) > W> @@ -498,10 +524,17 @@ comc_setup(void) > W> if (EFI_ERROR(status)) > W> return (false); > W> > W> - status =3D comc_port->sio->SetAttributes(comc_port->sio, > W> - comc_port->baudrate, comc_port->receivefifodepth, > W> - comc_port->timeout, comc_port->parity, > W> - comc_port->databits, comc_port->stopbits); > W> + ev =3D getenv("smbios.bios.version"); > W> + if (ev !=3D NULL && strncmp(ev, "Hyper-V", 7) =3D=3D 0) { > W> + status =3D comc_port->sio->SetAttributes(comc_port->sio, > W> + 0, 0, 0, DefaultParity, 0, DefaultStopBits); > W> + } else { > W> + status =3D comc_port->sio->SetAttributes(comc_port->sio, > W> + comc_port->baudrate, comc_port->receivefifodepth, > W> + comc_port->timeout, comc_port->parity, > W> + comc_port->databits, comc_port->stopbits); > W> + } > W> + > W> if (EFI_ERROR(status)) > W> return (false); > W> > W> diff --git a/stand/i386/libi386/comconsole.c > b/stand/i386/libi386/comconsole.c > W> index ed1f1aa08ed7..3fbb6a292c19 100644 > W> --- a/stand/i386/libi386/comconsole.c > W> +++ b/stand/i386/libi386/comconsole.c > W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp) > W> int speed, port; > W> uint32_t locator; > W> > W> +#if defined(__amd64__) > W> + extern bool efi_comconsole_avail; > W> + > W> + if (efi_comconsole_avail) { > W> + /* > W> + * If EFI provides serial I/O, then don't use this legacy > W> + * com driver to avoid conflicts with the firmware's > driver. > W> + * Change c_name so that it cannot be found in the lookup= . > W> + */ > W> + comconsole.c_name =3D "xcomconsole"; > W> + return; > W> + } > W> +#endif > W> + > W> if (comc_curspeed =3D=3D 0) { > W> comc_curspeed =3D COMSPEED; > W> /* > > -- > Gleb Smirnoff > --00000000000064441305f8269db7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">Let's back it out. I didn't get a chance to review= it and the duplicated name strikes me as massively unwise.<div>Of course, = the efi serial driver never should have had the name comconsole in the firs= t place, imho. It was OK</div><div>on arm where we couldn't conflict.</= div><div><br></div><div>So let's back it out and talk about how we shou= ld do this, including the need to possibly just rename the efi</div><div>ve= rsion of the console driver to something else. IMHO, it never should have b= een comconsole in the first</div><div>place because it's configured dif= ferently than comconsole....</div><div><div><br></div><div>Warner</div></di= v></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr= ">On Thu, Mar 30, 2023 at 5:31=E2=80=AFPM Gleb Smirnoff <<a href=3D"mail= to:glebius@freebsd.org">glebius@freebsd.org</a>> wrote:<br></div><blockq= uote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1p= x solid rgb(204,204,204);padding-left:1ex">=C2=A0 Wei, Kyle,<br> <br> this commit hangs loader on real hardware, at least on some<br> of it.=C2=A0 The loader prints list of consoles and hangs hard:<br> <br> [Thu Mar 30 20:46:12 2023]^M|^HLoading /boot/loader.conf^M<br> ^M/^Hconsole vidconsole is invalid!^M<br> ^MAvailable consoles:^M<br> ^M=C2=A0 =C2=A0 efi^M<br> ^M=C2=A0 =C2=A0 comconsole^M<br> ^M=C2=A0 =C2=A0 comconsole^M<br> ^M=C2=A0 =C2=A0 nullconsole^M<br> ^M=C2=A0 =C2=A0 spinconsole^M<br> <br> Machine is unrecoverable unless you got alternate boot media<br> and access to BMC console.<br> <br> First, please DO NOT MFC this as scheduled. Second, let's try<br> to fix it or back it out if we hear from any other CURRENT<br> user.<br> <br> Our configuration isn't special. This is what we got in<br> loader.conf, related to consoles:<br> <br> console=3D"comconsole vidconsole efi"<br> comconsole_speed=3D115200<br> comconsole_port=3D0x3e8<br> console=3D"efi"<br> hw.uart.console=3D"io:1016,br:115200"<br> <br> On Sat, Mar 18, 2023 at 07:20:33AM +0000, Wei Hu wrote:<br> W> The branch main has been updated by whu:<br> W> <br> W> URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D927358dd98c= b902160093e0dc0bac002d6b43858" rel=3D"noreferrer" target=3D"_blank">https:/= /cgit.FreeBSD.org/src/commit/?id=3D927358dd98cb902160093e0dc0bac002d6b43858= </a><br> W> <br> W> commit 927358dd98cb902160093e0dc0bac002d6b43858<br> W> Author:=C2=A0 =C2=A0 =C2=A0Wei Hu <whu@FreeBSD.org><br> W> AuthorDate: 2023-03-14 15:13:46 +0000<br> W> Commit:=C2=A0 =C2=A0 =C2=A0Wei Hu <whu@FreeBSD.org><br> W> CommitDate: 2023-03-18 07:07:35 +0000<br> W> <br> W>=C2=A0 =C2=A0 =C2=A0amd64 loader: Use efiserialio for Hyper-V booted s= ystems<br> W>=C2=A0 =C2=A0 =C2=A0<br> W>=C2=A0 =C2=A0 =C2=A0UEFI provides ConIn/ConOut handles for consoles th= at it supports,<br> W>=C2=A0 =C2=A0 =C2=A0which include the text-video and serial ports. Whe= n the serial port<br> W>=C2=A0 =C2=A0 =C2=A0is available, use the UEFI driver instead of direc= t io-port accesses<br> W>=C2=A0 =C2=A0 =C2=A0to avoid conflicts between the firmware and direct= hardware access, as<br> W>=C2=A0 =C2=A0 =C2=A0happens on Hyper-V (Azure) setups.<br> W>=C2=A0 =C2=A0 =C2=A0<br> W>=C2=A0 =C2=A0 =C2=A0This change enables efiserialio to be built for ef= i-amd64 and has<br> W>=C2=A0 =C2=A0 =C2=A0higher order priority vs comconsole, and only uses= efiserialio<br> W>=C2=A0 =C2=A0 =C2=A0if the hypervisor is Hyper-V. When efiserialio suc= cessfully<br> W>=C2=A0 =C2=A0 =C2=A0probes, it will set efi_comconsole_avail=3Dtrue wh= ich will prevent<br> W>=C2=A0 =C2=A0 =C2=A0comconsole from probing in this setup.<br> W>=C2=A0 =C2=A0 =C2=A0<br> W>=C2=A0 =C2=A0 =C2=A0Tested on Hyper-V, ESXi and Azure VMs.<br> W>=C2=A0 =C2=A0 =C2=A0<br> W>=C2=A0 =C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0264267<br> W>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 kevans, whu<br> W>=C2=A0 =C2=A0 =C2=A0Tested by:=C2=A0 =C2=A0 =C2=A0 whu<br> W>=C2=A0 =C2=A0 =C2=A0Obtained from:=C2=A0 Rubicon Communications, LLC (= Netgate)<br> W>=C2=A0 =C2=A0 =C2=A0MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks<br> W>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0Rubicon Communications, = LLC (Netgate)<br> W> ---<br> W>=C2=A0 stand/efi/loader/arch/amd64/Makefile.inc |=C2=A0 1 +<br> W>=C2=A0 stand/efi/loader/bootinfo.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 11 ++++++--<br> W>=C2=A0 stand/efi/loader/conf.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 6 +++++<br> W>=C2=A0 stand/efi/loader/efiserialio.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0| 43 ++++++++++++++++++++++++++++----<br> W>=C2=A0 stand/i386/libi386/comconsole.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 | 14 +++++++++++<br> W>=C2=A0 5 files changed, 68 insertions(+), 7 deletions(-)<br> W> <br> W> diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loa= der/arch/amd64/Makefile.inc<br> W> index 0d9e2648cb59..bd89044bd6c7 100644<br> W> --- a/stand/efi/loader/arch/amd64/Makefile.inc<br> W> +++ b/stand/efi/loader/arch/amd64/Makefile.inc<br> W> @@ -5,6 +5,7 @@ SRCS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0amd64_tramp.S \<br= > W>=C2=A0 =C2=A0 =C2=A0 elf64_freebsd.c \<br> W>=C2=A0 =C2=A0 =C2=A0 trap.c \<br> W>=C2=A0 =C2=A0 =C2=A0 multiboot2.c \<br> W> +=C2=A0 =C2=A0 efiserialio.c \<br> W>=C2=A0 =C2=A0 =C2=A0 exc.S<br> W>=C2=A0 <br> W>=C2=A0 .PATH:=C2=A0 =C2=A0 =C2=A0 ${BOOTSRC}/i386/libi386<br> W> diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.= c<br> W> index 939f2cf4c3fe..d79f59343af1 100644<br> W> --- a/stand/efi/loader/bootinfo.c<br> W> +++ b/stand/efi/loader/bootinfo.c<br> W> @@ -119,10 +119,17 @@ bi_getboothowto(char *kargs)<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 if (tmp !=3D NULL)<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 speed =3D strtol(tmp, NULL, 0);<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 tmp =3D getenv("efi_com_port");<br> W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 if (tmp =3D=3D NULL)<br> W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tmp =3D getenv("comconsole_port")= ;<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 if (tmp !=3D NULL)<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 port =3D strtol(tmp, NULL, 0);<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 if (port <=3D 0) {<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tmp =3D getenv("comconsole_port")= ;<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (tmp !=3D NULL)<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 port =3D strtol= (tmp, NULL, 0);<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 else {<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (port =3D=3D= 0)<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 port =3D 0x3f8;<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 }<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 if (speed !=3D -1 && port !=3D -1) {<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 snprintf(buf, sizeof(buf), "io:%d,b= r:%d", port,<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 speed);<br> W> diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c<br> W> index 863c9188c72c..051e1a3381d1 100644<br> W> --- a/stand/efi/loader/conf.c<br> W> +++ b/stand/efi/loader/conf.c<br> W> @@ -81,6 +81,9 @@ struct netif_driver *netif_drivers[] =3D {<br> W>=C2=A0 <br> W>=C2=A0 extern struct console efi_console;<br> W>=C2=A0 extern struct console comconsole;<br> W> +#if defined(__amd64__)<br> W> +extern struct console eficomconsole;<br> W> +#endif<br> W>=C2=A0 #if defined(__amd64__) || defined(__i386__)<br> W>=C2=A0 extern struct console nullconsole;<br> W>=C2=A0 extern struct console spinconsole;<br> W> @@ -88,6 +91,9 @@ extern struct console spinconsole;<br> W>=C2=A0 <br> W>=C2=A0 struct console *consoles[] =3D {<br> W>=C2=A0 =C2=A0 =C2=A0 &efi_console,<br> W> +#if defined(__amd64__)<br> W> +=C2=A0 =C2=A0 &eficomconsole,<br> W> +#endif<br> W>=C2=A0 =C2=A0 =C2=A0 &comconsole,<br> W>=C2=A0 #if defined(__amd64__) || defined(__i386__)<br> W>=C2=A0 =C2=A0 =C2=A0 &nullconsole,<br> W> diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiser= ialio.c<br> W> index 375e679d2590..5fbc700f6ac2 100644<br> W> --- a/stand/efi/loader/efiserialio.c<br> W> +++ b/stand/efi/loader/efiserialio.c<br> W> @@ -69,6 +69,11 @@ static int=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_speed_s= et(struct env_var *, int, const void *);<br> W>=C2=A0 <br> W>=C2=A0 static struct serial=C2=A0 =C2=A0 =C2=A0 =C2=A0 *comc_port;<br> W>=C2=A0 extern struct console efi_console;<br> W> +bool efi_comconsole_avail =3D false;<br> W> +<br> W> +#if defined(__amd64__)<br> W> +#define comconsole eficomconsole<br> W> +#endif<br> W>=C2=A0 <br> W>=C2=A0 struct console comconsole =3D {<br> W>=C2=A0 =C2=A0 =C2=A0 .c_name =3D "comconsole",<br> W> @@ -254,11 +259,22 @@ comc_probe(struct console *sc)<br> W>=C2=A0 =C2=A0 =C2=A0 char *env, *buf, *ep;<br> W>=C2=A0 =C2=A0 =C2=A0 size_t sz;<br> W>=C2=A0 <br> W> +#if defined(__amd64__)<br> W> +=C2=A0 =C2=A0 /*<br> W> +=C2=A0 =C2=A0 =C2=A0* For x86-64, don't use this driver if not r= unning in Hyper-V.<br> W> +=C2=A0 =C2=A0 =C2=A0*/<br> W> +=C2=A0 =C2=A0 env =3D getenv("smbios.bios.version");<br> W> +=C2=A0 =C2=A0 if (env =3D=3D NULL || strncmp(env, "Hyper-V"= ;, 7) !=3D 0) {<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return;<br> W> +=C2=A0 =C2=A0 }<br> W> +#endif<br> W> +<br> W>=C2=A0 =C2=A0 =C2=A0 if (comc_port =3D=3D NULL) {<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port =3D calloc(= 1, sizeof (struct serial));<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (comc_port =3D=3D = NULL)<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 return;<br> W>=C2=A0 =C2=A0 =C2=A0 }<br> W> +<br> W>=C2=A0 =C2=A0 =C2=A0 /* Use defaults from firmware */<br> W>=C2=A0 =C2=A0 =C2=A0 comc_port->databits =3D 8;<br> W>=C2=A0 =C2=A0 =C2=A0 comc_port->parity =3D DefaultParity;<br> W> @@ -308,6 +324,10 @@ comc_probe(struct console *sc)<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port_set, env_nounset);<br> W>=C2=A0 <br> W>=C2=A0 =C2=A0 =C2=A0 env =3D getenv("efi_com_speed");<br> W> +=C2=A0 =C2=A0 if (env =3D=3D NULL)<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* fallback to comconsole = setting */<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 env =3D getenv("comco= nsole_speed");<br> W> +<br> W>=C2=A0 =C2=A0 =C2=A0 if (comc_parse_intval(env, &val) =3D=3D CMD_O= K)<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->baudrat= e =3D val;<br> W>=C2=A0 <br> W> @@ -318,8 +338,13 @@ comc_probe(struct console *sc)<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_speed_set, env_nounset);<br> W>=C2=A0 <br> W>=C2=A0 =C2=A0 =C2=A0 comconsole.c_flags =3D 0;<br> W> -=C2=A0 =C2=A0 if (comc_setup())<br> W> +=C2=A0 =C2=A0 if (comc_setup()) {<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sc->c_flags =3D C_= PRESENTIN | C_PRESENTOUT;<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 efi_comconsole_avail =3D t= rue;<br> W> +=C2=A0 =C2=A0 } else {<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* disable being seen as &= quot;comconsole" */<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comconsole.c_name =3D &quo= t;efiserialio";<br> W> +=C2=A0 =C2=A0 }<br> W>=C2=A0 }<br> W>=C2=A0 <br> W>=C2=A0 static int<br> W> @@ -489,6 +514,7 @@ comc_setup(void)<br> W>=C2=A0 {<br> W>=C2=A0 =C2=A0 =C2=A0 EFI_STATUS status;<br> W>=C2=A0 =C2=A0 =C2=A0 UINT32 control;<br> W> +=C2=A0 =C2=A0 char *ev;<br> W>=C2=A0 <br> W>=C2=A0 =C2=A0 =C2=A0 /* port is not usable */<br> W>=C2=A0 =C2=A0 =C2=A0 if (comc_port->sio =3D=3D NULL)<br> W> @@ -498,10 +524,17 @@ comc_setup(void)<br> W>=C2=A0 =C2=A0 =C2=A0 if (EFI_ERROR(status))<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (false);<br> W>=C2=A0 <br> W> -=C2=A0 =C2=A0 status =3D comc_port->sio->SetAttributes(comc_po= rt->sio,<br> W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->baudrate, comc_port->re= ceivefifodepth,<br> W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->timeout, comc_port->par= ity,<br> W> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port->databits, comc_port->st= opbits);<br> W> +=C2=A0 =C2=A0 ev =3D getenv("smbios.bios.version");<br> W> +=C2=A0 =C2=A0 if (ev !=3D NULL && strncmp(ev, "Hyper-V&= quot;, 7) =3D=3D 0) {<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 status =3D comc_port->s= io->SetAttributes(comc_port->sio,<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 0, 0, 0, Def= aultParity, 0, DefaultStopBits);<br> W> +=C2=A0 =C2=A0 } else {<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 status =3D comc_port->s= io->SetAttributes(comc_port->sio,<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port-&g= t;baudrate, comc_port->receivefifodepth,<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port-&g= t;timeout, comc_port->parity,<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_port-&g= t;databits, comc_port->stopbits);<br> W> +=C2=A0 =C2=A0 }<br> W> +<br> W>=C2=A0 =C2=A0 =C2=A0 if (EFI_ERROR(status))<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (false);<br> W>=C2=A0 <br> W> diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/com= console.c<br> W> index ed1f1aa08ed7..3fbb6a292c19 100644<br> W> --- a/stand/i386/libi386/comconsole.c<br> W> +++ b/stand/i386/libi386/comconsole.c<br> W> @@ -85,6 +85,20 @@ comc_probe(struct console *cp)<br> W>=C2=A0 =C2=A0 =C2=A0 int speed, port;<br> W>=C2=A0 =C2=A0 =C2=A0 uint32_t locator;<br> W>=C2=A0 <br> W> +#if defined(__amd64__)<br> W> +=C2=A0 =C2=A0 extern bool efi_comconsole_avail;<br> W> +<br> W> +=C2=A0 =C2=A0 if (efi_comconsole_avail) {<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /*<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* If EFI provides se= rial I/O, then don't use this legacy<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* com driver to avoi= d conflicts with the firmware's driver.<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* Change c_name so t= hat it cannot be found in the lookup.<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comconsole.c_name =3D &quo= t;xcomconsole";<br> W> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return;<br> W> +=C2=A0 =C2=A0 }<br> W> +#endif<br> W> +<br> W>=C2=A0 =C2=A0 =C2=A0 if (comc_curspeed =3D=3D 0) {<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 comc_curspeed =3D COM= SPEED;<br> W>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /*<br> <br> -- <br> Gleb Smirnoff<br> </blockquote></div> --00000000000064441305f8269db7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpbWSbhJUDU_VUXzkqWE9Xc=MrE%2BgmEOqg%2ByOhG%2BTS6xw>