From nobody Wed Jun 21 05:41:46 2023 X-Original-To: dev-commits-src-branches@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 4QmC6y5Wnmz4g27r; Wed, 21 Jun 2023 05:41:46 +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 4QmC6y56Csz3j87; Wed, 21 Jun 2023 05:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326106; 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=i89FtpqLgP7myt5JZMJH/TaDwzbXr32B8651ZahS7FQ=; b=VMQOQIqpJkA7yPlyYFys3NccfggqLy16XGkqZ+6GI0y3Vpl/EWHJbx68uN0uHsh1qpmuyO w7ZtFx3uZS9A1EXEbDzLjjF3f/Pb5nPMrmHAQk6S4E+n6yje3XrNKt5Ul6aVEKdg7+Mg8C YmXCk/cNtHyDpx1QI+UvetwP9LkY1/eyIy+qEtqa8swIBoHs/SMJ7E9QkFxfjiUGGu5xAz FECrWJpxDqgfnEIL/fEWHtAy+UG9HkUAFvMoTkGlLjM7/uNyQ1kWlUnRd/GwWmRivNHaiS 0ln8DxUiaZc7fpXgOjJFNGoXany27byRvz7sa4+swlcixP5ChJ6GdEL5rcyhiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326106; 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=i89FtpqLgP7myt5JZMJH/TaDwzbXr32B8651ZahS7FQ=; b=x8sxzxZztS/yZ5zLmgz0c8YwPRBsuPhDHnKyS7y7gn1N1gXqIHtR4/Oi5f6zjsjqyMkZd+ Ex+t81FesQr0pGHK/jlxDPSkbQFPPgMj3cQxIY0aacbZhnnpa2Kv9ketg8bm2+BLrDRtNI HcGn6oCn1kCb+K1ixunnZRpbcDHTeu/m/cXm05co7KA8nF3aEnx9SxomnvZy7EMmfZyslU s5MdPRQu0LFdo0AP6CAxV5BLbRlGpDEDYNyjlJi9vWCCMc8HuJxiGB7ZteQ4Jh86Fu/SUa uEeZfMp2U7d8gbOIitQp54RgKgxFWdRiMyAwMHN1uR60qpGj7ldkIl1HAJ/f8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687326106; a=rsa-sha256; cv=none; b=R+R8fkumS2N23wJsxyMqKc9LCTWL/Jv7i+bmg6Cyl09aBclqb9nb+oC08NYjPNX6aXIH8+ eL8NaNWlJ9NFY49gHcTQCT7/vmGBJ9dv6grPh95bIWyYdV7EzMK688nJvcQhQ2ePTWVC4j 9XSuI+IHAvugiKiIencdQ/VAE2hq1bEjpKqPNg84DnSQ4ffvgRt7PCw4uTJII/nX9fI/k9 ZkuzQiF6h1Vb1eUBsJAscSmv2VaPsNRlif2H+aE5WKiNDFjy97Sd30xZ09gzOvaQW1qhRe jnnm6KXp8deNoRKuSGRCPT84P7+DQW2RKKq8Hl4i1JvSjU/qHwiyz44bRstfbQ== 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 4QmC6y49t1zV5W; Wed, 21 Jun 2023 05:41:46 +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 35L5fkNE062685; Wed, 21 Jun 2023 05:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5fkTK062684; Wed, 21 Jun 2023 05:41:46 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:41:46 GMT Message-Id: <202306210541.35L5fkTK062684@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: 525ac1948af8 - releng/13.2 - loader: comconsole: don't unconditionally wipe out hw.uart.console List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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.2 X-Git-Reftype: branch X-Git-Commit: 525ac1948af8fb7253f15e3645f4041cb0e2b107 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=525ac1948af8fb7253f15e3645f4041cb0e2b107 commit 525ac1948af8fb7253f15e3645f4041cb0e2b107 Author: Kyle Evans AuthorDate: 2023-04-14 04:41:22 +0000 Commit: Gordon Tetlow CommitDate: 2023-06-21 05:05:15 +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.