From nobody Wed Jun 21 05:42:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmC7P3TZLz4g1pk; Wed, 21 Jun 2023 05:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmC7P29phz3k3q; Wed, 21 Jun 2023 05:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Clj+xIVDIrjA4Xv0CaEFmf9aiTXs26a3vQ//h2Tx3k=; b=mcQm3f5cRT0kLIfdYM/FnNUu2VSyfjeS+VIAm0ViWiJye1CGKhRoV0135VrHUhSLPp3Qq6 LQF1MFfKRkcr/8AmdsMfZyC/kgXjIN3G6U3O/N4jJqdueTTKSUYWM8IwyZwlBJY+8kvXJT TmJeBZhK8YDHdfms+SOL2lCh+RuKEpktKkpx94VwK6tDNMBXkLfQy0d2Sho35xUMb3eP4t 0EbcFAjcBFnoXc00Zfm+7GUMppV1tRdiQN2AkdZTd+I6EOoHYB2P7a6PvZoqnGsAJ+DwKq FzO+OP+4aOj6nxAdGI8zFF+Mc8IMUW/JhHsR/KI61WlUMW08lWaPBJ+OvfiyUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Clj+xIVDIrjA4Xv0CaEFmf9aiTXs26a3vQ//h2Tx3k=; b=EjRyhdGqBnEqQoQUxyJ1Z5ijvN7VJ1KV6uYkjDr5T68nZHkBFzbkh+WB2IzwSVvVTUbOAs wtdlXSV4NJJ4WK5NigTpxo6UpJ4WKXnjaMEntNgZsnLWaXdvWOtIbwsDx0CoDP7hVpoQU6 4VDU/8uhOS8v+Dmck1gm6fNlwnT/d0G5ui5SPqg9+Y7m6roE6FpJPvLexww6qQMwi2aucs w2Dq5pPnEjHjUxe2ow3TkgGAHMp7HED/sRhnec8Oyj5KxOA2ujN4ms+a77a3y7NU0APLum 7VDkrjnVCbA4xaK8Jzkd57V0O+Xinn2b2WNPx6oVObwIFRR3nd2knhYijukEnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687326129; a=rsa-sha256; cv=none; b=tpnSSTguEfyzIbKPM+ZYqXw69xO0C0jiRFwwBTRCQS4y3XKAdSBzdZ0dCafIwsfNBFNzy/ gHINccnOBQI9P8+xwX9IhP3L+uyXbQKPchAXRjDfMytttSlL6KqKJFjTfwOfiPIDx6NVaj WniipTMl/ixHqhudUcJnkWzWQIdaB4fvDB3LwiPBpS+JnzyXUywziGReLD58kiHFwxm/Gd DDy5i2pjrRzQSAy34J8pNYQMWtCL9gTaflw7FXSawqNirSZSM35w7H8ypOw/20hR+OTos3 QjRrPVHjXiCTAzBZFp0Ghyh6L5dIQqNyL+M+FiZQ/f4zKysblbkaeMBApD3Ypw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QmC7P09dPzVHF; Wed, 21 Jun 2023 05:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L5g8HH062955; Wed, 21 Jun 2023 05:42:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5g8dR062954; Wed, 21 Jun 2023 05:42:08 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:42:08 GMT Message-Id: <202306210542.35L5g8dR062954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 5d2bbb9db2d2 - releng/13.1 - loader: comconsole: don't unconditionally wipe out hw.uart.console List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 5d2bbb9db2d2c61629dcaee17cb269593e75d267 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=5d2bbb9db2d2c61629dcaee17cb269593e75d267 commit 5d2bbb9db2d2c61629dcaee17cb269593e75d267 Author: Kyle Evans AuthorDate: 2023-04-14 04:41:22 +0000 Commit: Gordon Tetlow CommitDate: 2023-06-21 05:05:51 +0000 loader: comconsole: don't unconditionally wipe out hw.uart.console It may be the case that we need to set hw.uart.console manually in some scenarios that comconsole can't necessarily support. Avoid clobbering hw.uart.console unless we've actually selected comconsole so that one could at least get kernel console output.. Discussed with: imp Sponsored by: Zenith Electronics LLC Sponsored by: Klara, Inc. (cherry picked from commit ec671f4980437008b0119c6367816083e15fa503) (cherry picked from commit 362677cae8e9ac4c6f7ff4d74a4378ea11d47797) Approved by: so Security: FreeBSD-EN-23:06.loader --- stand/i386/libi386/comconsole.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c index ed1f1aa08ed7..6d48e876fa37 100644 --- a/stand/i386/libi386/comconsole.c +++ b/stand/i386/libi386/comconsole.c @@ -324,12 +324,13 @@ comc_setup(int speed, int port) char intbuf[64]; int tries; - unsetenv("hw.uart.console"); comc_curspeed = speed; comc_port = port; if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) == 0) return; + unsetenv("hw.uart.console"); + #define COMC_TEST 0xbb /* * Write byte to scratch register and read it out.