From owner-dev-commits-src-all@freebsd.org Fri Feb 5 06:38:44 2021 Return-Path: Delivered-To: dev-commits-src-all@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 3934053E46F for ; Fri, 5 Feb 2021 06:38:44 +0000 (UTC) (envelope-from tsoome@me.com) Received: from pv50p00im-zteg10011501.me.com (pv50p00im-zteg10011501.me.com [17.58.6.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DX5NN0H5fz4ZBV for ; Fri, 5 Feb 2021 06:38:43 +0000 (UTC) (envelope-from tsoome@me.com) Received: from [192.168.150.141] (148-52-235-80.sta.estpak.ee [80.235.52.148]) by pv50p00im-zteg10011501.me.com (Postfix) with ESMTPSA id EA24AB00459; Fri, 5 Feb 2021 06:38:41 +0000 (UTC) From: Toomas Soome Mime-Version: 1.0 (1.0) Subject: Re: git: 0c839497c174 - stable/13 - loader.efi: There are systems without ConOut, also use ConOutDev Date: Fri, 5 Feb 2021 08:38:39 +0200 Message-Id: References: Cc: Toomas Soome , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org In-Reply-To: To: Warner Losh X-Mailer: iPhone Mail (18D52) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.737 definitions=2021-02-05_04:2021-02-05, 2021-02-05 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-2006250000 definitions=main-2102050043 X-Rspamd-Queue-Id: 4DX5NN0H5fz4ZBV X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Feb 2021 06:38:44 -0000 > On 5. Feb 2021, at 01:56, Warner Losh wrote: >=20 > =EF=BB=BF > And why the instaMFC? Changes are supposed to cook force days before mergi= ng... I have questions about the wisdom of this change... >=20 > Warner=20 >=20 Reason is in PR. There is someone with the system without ConOut but ConOutD= ev is set. Instead of falling back to arbitrary device (which in this case w= as totally wrong choice), we can try the possible devices list. We do not ch= ange the ConOut parsing. If it would appear, there are systems with unusable devices listed in ConOut= Dev, then we need to think how to handle such case. Thanks, Toomas >> On Thu, Feb 4, 2021, 2:34 PM Toomas Soome wrote: >> The branch stable/13 has been updated by tsoome: >>=20 >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D0c839497c174e961fc71f7d332= 9d05b10ec5525b >>=20 >> commit 0c839497c174e961fc71f7d3329d05b10ec5525b >> Author: Toomas Soome >> AuthorDate: 2021-02-04 20:49:02 +0000 >> Commit: Toomas Soome >> CommitDate: 2021-02-04 21:33:15 +0000 >>=20 >> loader.efi: There are systems without ConOut, also use ConOutDev >>=20 >> 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. >>=20 >> PR: 253253 >>=20 >> (cherry picked from commit 2bd4ff2d8911009283e4e615ca4aad35a845f48b) >> --- >> stand/efi/loader/main.c | 2 ++ >> 1 file changed, 2 insertions(+) >>=20 >> 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;