From owner-dev-commits-src-branches@freebsd.org Fri Feb 5 16:44:56 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 873AA54C393 for ; Fri, 5 Feb 2021 16:44:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DXLqq5ZtRz3knR for ; Fri, 5 Feb 2021 16:44:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf33.google.com with SMTP id a1so3707187qvd.13 for ; Fri, 05 Feb 2021 08:44:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=fMmUFIIiiUyxZLeFcAIKiNQmlWZuvXNzqd7lqK7ZSn0=; b=of1s0PTuBf3VrEHi0hdc94GjXYQ17xyOAoTt/z3wFX889QegY1K17OC9G0FiDaR0cO 92LqO+v5VBEX5cig9hFeLVGaT3ia4v1FMVIGNdGw0fTe5kvRr/307hep7cNb9uGRvJC5 YJDA3Q8fT7FnC+Cu5lithUDoVUT7Ckv0LD0f+gT8J2FPeADbodnjFv1rXSHRpvYrE/kd sjy0BWTrk/W3M3KHrURbYHDtOgtrrs6gK4ml4eTx9P3tWVBhXmrtlbAPS+ity8OGXec9 jbFfB0RJef0ois+zySqjUyqHKlM3Pv0nQY8WGMM+CjFZcGJ+Eoy328L9VKhghErEm2AQ Nk9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fMmUFIIiiUyxZLeFcAIKiNQmlWZuvXNzqd7lqK7ZSn0=; b=eEgddXmOhfr4cKa+Y55HFJyBNKsMdZ/J8fnmotSq+GFmMgrv/Dgb5ozj3JRSbdZY9T Hdhf771L/NCJICT5aCCXxpAbz+X+xngCUU9qFyBwYJFRhbOd2PzDqKSIC/Hw/yRhfeUJ iIC1OjYXYQtfUIWB6EXFaSNmPUfvIE/iWwilZn0yNN2oE2CR6J3GBGBadsqaFYVqJ06U rcvCjmjDBLxRWkMHA2wFENCvuqYNSFCOYVCJ9C0AhF380MYSaz1Oh4TfvQhnkuDqj73T jBQqXFPjG2ERaybLQt6bU4Z66ggFARifoKMyHOlEyPXCUigPx8MBX6rPbpSuwGrgsuMo pADg== X-Gm-Message-State: AOAM532EGNoz0VqvQIyaiJMRWrlPm+OhNGDYxek6MPWM115/8kMiKoD+ /t0czDZgxltQe+/haLJiwZQaKIkynMTksdyyuiYm3A== X-Google-Smtp-Source: ABdhPJw2kUseLNjyPrJTBvdBz8h4bQ5UDgeFYY6bX0JImwWyiOG0YBAEcbKnyqRoXDz6vKMauxvpVJveAFCHNfdn6vU= X-Received: by 2002:ad4:576a:: with SMTP id r10mr5029232qvx.29.1612543493274; Fri, 05 Feb 2021 08:44:53 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Fri, 5 Feb 2021 09:44:42 -0700 Message-ID: Subject: Re: git: 0c839497c174 - stable/13 - loader.efi: There are systems without ConOut, also use ConOutDev To: Toomas Soome Cc: Toomas Soome , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org X-Rspamd-Queue-Id: 4DXLqq5ZtRz3knR X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=of1s0PTu; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f33) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-branches@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f33:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f33:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[me.com]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f33:from]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[dev-commits-src-branches] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Feb 2021 16:44:56 -0000 On Thu, Feb 4, 2021 at 11:38 PM Toomas Soome wrote: > > > On 5. Feb 2021, at 01:56, Warner Losh 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 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 >> AuthorDate: 2021-02-04 20:49:02 +0000 >> Commit: Toomas Soome >> 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; >> >