Date: Fri, 5 Feb 2021 09:44:42 -0700 From: Warner Losh <imp@bsdimp.com> To: Toomas Soome <tsoome@me.com> Cc: Toomas Soome <tsoome@freebsd.org>, src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 0c839497c174 - stable/13 - loader.efi: There are systems without ConOut, also use ConOutDev Message-ID: <CANCZdfrdpMXTxJbzY6w2NE_DtwZ1eBuMm%2B1rr6d0a22R2QKaCQ@mail.gmail.com> In-Reply-To: <CF59D855-228A-4BC1-AC4B-0C54417EF3BF@me.com> References: <CANCZdfqXU7Syo4wvxJ17Gt%2B0E2Kw8yOU_nrTNA%2Beu=z-ZwTKow@mail.gmail.com> <CF59D855-228A-4BC1-AC4B-0C54417EF3BF@me.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Feb 4, 2021 at 11:38 PM Toomas Soome <tsoome@me.com> wrote: > > > On 5. Feb 2021, at 01:56, Warner Losh <imp@bsdimp.com> wrote: > > =EF=BB=BF > And why the instaMFC? Changes are supposed to cook force days before > merging... I have questions about the wisdom of this change... > > Warner > > > Reason is in PR. There is someone with the system without ConOut but > ConOutDev is set. Instead of falling back to arbitrary device (which in > this case was totally wrong choice), we can try the possible devices list= . > We do not change the ConOut parsing. > We could have the same effect defaulting to Video. This bug should have been discussed / reviewed before it was committed. If it would appear, there are systems with unusable devices listed in > ConOutDev, then we need to think how to handle such case. > Yes. We fall back to the arbitrary device... It's just a flag that can be overridden. We can easily fall back to video too. Please seek more review is the point I'd hoped to make in the private email. This could easily have been reviewed. There was no urgent rush that required it to go in w/o review or even discussion. However, you didn't answer my question: Why the instant MFC? There's a 3 day minimum for changes in head... And there's nothing so urgent that requires a short-circuit. Warner > Thanks, > Toomas > > On Thu, Feb 4, 2021, 2:34 PM Toomas Soome <tsoome@freebsd.org> wrote: > >> The branch stable/13 has been updated by tsoome: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D0c839497c174e961fc71f7d3329d05= b10ec5525b >> >> commit 0c839497c174e961fc71f7d3329d05b10ec5525b >> Author: Toomas Soome <tsoome@FreeBSD.org> >> AuthorDate: 2021-02-04 20:49:02 +0000 >> Commit: Toomas Soome <tsoome@FreeBSD.org> >> CommitDate: 2021-02-04 21:33:15 +0000 >> >> loader.efi: There are systems without ConOut, also use ConOutDev >> >> Conout does contian the default output device name. >> ConOutDev does contain all possible output device names, so we can >> use it as fallback, when there is no ConOut. >> >> PR: 253253 >> >> (cherry picked from commit 2bd4ff2d8911009283e4e615ca4aad35a845f48b) >> --- >> stand/efi/loader/main.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c >> index ca41cd4a2610..32b278950745 100644 >> --- a/stand/efi/loader/main.c >> +++ b/stand/efi/loader/main.c >> @@ -735,6 +735,8 @@ parse_uefi_con_out(void) >> how =3D 0; >> sz =3D sizeof(buf); >> rv =3D efi_global_getenv("ConOut", buf, &sz); >> + if (rv !=3D EFI_SUCCESS) >> + rv =3D efi_global_getenv("ConOutDev", buf, &sz); >> if (rv !=3D EFI_SUCCESS) { >> /* If we don't have any ConOut default to serial */ >> how =3D RB_SERIAL; >> >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrdpMXTxJbzY6w2NE_DtwZ1eBuMm%2B1rr6d0a22R2QKaCQ>