From nobody Wed Apr 26 17:32:10 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 4Q65XW1Ptrz473Lb; Wed, 26 Apr 2023 17:32:11 +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 4Q65XW0tgPz3pKy; Wed, 26 Apr 2023 17:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682530331; 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=zDwS8iQaX7Ym3fMmlRwmTalPQWJrQJIxec0Y3/IkG50=; b=L8dTzWBTMvxadtjOZwcbKHvQ2COw3/YXbyAlec01nq8Q3CCyOAX8O37Z9Lfgg60Ya+ovfK us2PEY5v+zC73Oaawqz1FG/vmGDwSJVRYRuIr1djs1bbkGT1kW4p2I2iUR6oEqpnfGkPnk tgiiFU5Kf2feWIDg6aQOHjihLvTV2l/b8zGnJoXuumjXazMYkdv+zfsbPtq77sGe9Ag1wc oXcd47SZTq2WG8kDJxRv1ywo3TIINiczOTjPny0pNLTMjcmCyx9Zq0JD/SEksA4U4SGehW 19BggFQbr5AOoTX/uqrvK04X793gI9SJM/XXeCQNrsiKVrjCfD7/0V3wDLfqzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682530331; 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=zDwS8iQaX7Ym3fMmlRwmTalPQWJrQJIxec0Y3/IkG50=; b=VF+hsoV9KgIXzM2+VhNj+YhzNV8uKNB0eV2W6PjGkZ/hj26jUpTuD2Qu9KvOAH+Om/cSfe 1pqPQ1r4kVVDAoeRupF4KU87y0ULBZA0omyAJaMeqoGslQaPYioBkp1r5/JUecNn8meoQA ZtUt5x/K9Lua7+SHnGxgdboG60NBrsVu0Nu6CZ0Zh3kx2A9v9NEYeKUo4p0Ps1K6YgmKwv 8p68YTKsbXjtJKaiUvtglicmCrjOF9tfjHHgm5Oax7fQ50PNi6qx7jZNR5bRLPSyVCSnKy /wMtOcwQ9bvo18lhLiwfWYu6MWjlJZfSkWij/oC4kh6G6Os+que09vMFJGjQKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682530331; a=rsa-sha256; cv=none; b=HxQnnjFjnrd6RSRRjUpmJuA/xylMrdE8J3zCq32Zv8R0Q/YKFuVTQVtsnGXFu7trvDXpM4 blZQYlvD8F4nbJ7s6tPLljpp6nDisWNecy0gSDCo1sN90A96pcY644zcflZO3/5V4/oXVJ +M6Kawg19S7zCJaVRr/eamakxNrUqGC90WUSs89RK9kbc/vDnuxdB1jWtAkdhz4vsksAAO yg8JsQKVOaZ0FhntFX0tOV4L32KF0yFXeZoGIrIc4v44S15HFp2+5Wa0CJfPkc3IPG/HIm TWH79f/oJBani8ew4TcLKcmG9t+e1P3O5+q25NX0QLMmdn4rtmnT+Q3eLnebiA== 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 4Q65XV73Nhzk1c; Wed, 26 Apr 2023 17:32:10 +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 33QHWAHd015982; Wed, 26 Apr 2023 17:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33QHWAvd015981; Wed, 26 Apr 2023 17:32:10 GMT (envelope-from git) Date: Wed, 26 Apr 2023 17:32:10 GMT Message-Id: <202304261732.33QHWAvd015981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 362677cae8e9 - stable/13 - 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 362677cae8e9ac4c6f7ff4d74a4378ea11d47797 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=362677cae8e9ac4c6f7ff4d74a4378ea11d47797 commit 362677cae8e9ac4c6f7ff4d74a4378ea11d47797 Author: Kyle Evans AuthorDate: 2023-04-14 04:41:22 +0000 Commit: Kyle Evans CommitDate: 2023-04-26 17:30:19 +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) --- 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.