From nobody Thu Aug 01 16:11:23 2024 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 4WZYqc45sXz5T0jk; Thu, 01 Aug 2024 16:11:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZYqc0Zb3z4fKm; Thu, 1 Aug 2024 16:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722528684; 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=Uuh2tGpCPyIrQ1ABhHpoQ4oo+CfzeISmaDeN1XOgOvM=; b=G9dKkUMnI4yWp89pmrVlyM7WONtdE8YXMNSE4/Uwmm5jr3L+pIEk1xvybQu5I3ruGsroLs ZxweN1XCnpz+h/ZKG2hUpT/ZuKqG2LzCb3Lk8MgrPmxAPWa6oesksaImjc95nJ+FlyVKnH w9ALyFviiMfrbaqkHFMHuidpPdC68uqEdTy6ID1gkMkvxWx9igSGL5lzv+odx3eAksMcGV nRbH1ZxylDmi5dQ7SSkjpPGgCHGa43EyK5XT9rBtUKfqOW+SsQdJ9SCFJg4R3n4ddkoxhF Jao3ox91Nn7nE9vl0v2zJ7eMW2OBJZD64X9nLpWO3OyKbzYdImneXU7stQQZBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722528684; a=rsa-sha256; cv=none; b=vZa+1rqmJdD9GTxRb0mktNHp9i9MZPZXkUO0qE4xC38v3z5EtotGYvzAassVx6QN25JFRS azr8BSXEhfYlneqnaxM+gXJvm4DIwUp97h5v5Cx2yp+zDb52kKl8Gd9DJaDeb1kM4u0X/g iw8w3Ihg+27Xa3mJTEYbiN/3Fw11xGxWDb01pRzehPHpGMyk6jzWSrSPoyCDjVi4Ujt/2e natnP3dllVLyi7/VpyRgPfKmv+Tois8IbBiz38dSEiTceVNMLbczO1vfBFXUSBrcxnhiuT cRf7v/Qfsst0p+qj+WoMYFNmvvoohXXh0YNTUCzuYEaYzn8VDWGMc/JQ/B4XGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722528684; 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=Uuh2tGpCPyIrQ1ABhHpoQ4oo+CfzeISmaDeN1XOgOvM=; b=xX7P/O5zUtgMETdzVytsF0cLbfO7wwudRkVz/q/IkT6nOIJa+1+G1u+/eXHKdmH6C/cArp l8Wb7isxkGTGAXxqZEBYA0FLq1YiF/oUh0QAH4piZiembk+a6XmBhhM+DtRnr431b/YtA0 lI/GywaOj5s/inS8WqnVWzaNorD56PpGO5a2HeJ7NxOKVwF09ArTRY3KbOIsVJ7OLrLrng yGpcnqeqcI2N0roVRJuHUsJr4XxgdSL0QR7uY+JnWuLrEt3FRG+JCEuJzrCEazJk9Hp8nx XOwAkw1lNezfUC/WL+yw48D8wYy4rP38VmSWSQF4RMFx+gmjW9JLG7MCdN7s/w== 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 4WZYqb6MDqzr9L; Thu, 1 Aug 2024 16:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471GBNQ6092886; Thu, 1 Aug 2024 16:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471GBNEl092883; Thu, 1 Aug 2024 16:11:23 GMT (envelope-from git) Date: Thu, 1 Aug 2024 16:11:23 GMT Message-Id: <202408011611.471GBNEl092883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 34f7ebd56319 - stable/14 - vt/sc: retire logic to select vt(4) by default for UEFI boot 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34f7ebd56319c909f6b05ce0273b688074345c66 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=34f7ebd56319c909f6b05ce0273b688074345c66 commit 34f7ebd56319c909f6b05ce0273b688074345c66 Author: Ed Maste AuthorDate: 2024-05-24 21:36:09 +0000 Commit: Ed Maste CommitDate: 2024-08-01 16:10:26 +0000 vt/sc: retire logic to select vt(4) by default for UEFI boot We previously defaulted to using sc(4) with a special case to prefer vt(4) when booted via UEFI. As vt(4) is now always the default we can simplify this. Reviewed by: imp, kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45356 (cherry picked from commit 9b1de7e4844d951a7d7335cbde75a86a2380e220) --- sys/amd64/amd64/machdep.c | 9 --------- sys/kern/kern_cons.c | 18 ------------------ sys/sys/cons.h | 1 - 3 files changed, 28 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index ea440f46a12f..f5c49c6ca243 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1465,15 +1465,6 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) r_idt.rd_base = (long) idt; lidt(&r_idt); - /* - * Use vt(4) by default for UEFI boot (during the sc(4)/vt(4) - * transition). - * Once bootblocks have updated, we can test directly for - * efi_systbl != NULL here... - */ - if (efi_boot) - vty_set_preferred(VTY_VT); - TUNABLE_INT_FETCH("hw.ibrs_disable", &hw_ibrs_disable); TUNABLE_INT_FETCH("machdep.mitigations.ibrs.disable", &hw_ibrs_disable); diff --git a/sys/kern/kern_cons.c b/sys/kern/kern_cons.c index 24952561449b..2b28c51984e1 100644 --- a/sys/kern/kern_cons.c +++ b/sys/kern/kern_cons.c @@ -715,7 +715,6 @@ sysbeep(int pitch __unused, sbintime_t duration __unused) /* * Temporary support for sc(4) to vt(4) transition. */ -static unsigned vty_prefer; static char vty_name[16]; SYSCTL_STRING(_kern, OID_AUTO, vty, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, vty_name, 0, "Console vty driver"); @@ -740,10 +739,6 @@ vty_enabled(unsigned vty) break; } #endif - if (vty_prefer != 0) { - vty_selected = vty_prefer; - break; - } #if defined(DEV_VT) vty_selected = VTY_VT; #elif defined(DEV_SC) @@ -758,16 +753,3 @@ vty_enabled(unsigned vty) } return ((vty_selected & vty) != 0); } - -void -vty_set_preferred(unsigned vty) -{ - - vty_prefer = vty; -#if !defined(DEV_SC) - vty_prefer &= ~VTY_SC; -#endif -#if !defined(DEV_VT) - vty_prefer &= ~VTY_VT; -#endif -} diff --git a/sys/sys/cons.h b/sys/sys/cons.h index 5ad85a516dc5..75dc66aa252f 100644 --- a/sys/sys/cons.h +++ b/sys/sys/cons.h @@ -145,7 +145,6 @@ int constty_clear(struct tty *tp); #define VTY_SC 0x01 #define VTY_VT 0x02 int vty_enabled(unsigned int); -void vty_set_preferred(unsigned int); #endif /* _KERNEL */