From nobody Sat May 25 15:00:50 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 4VmlTb3Gjgz5LjPK; Sat, 25 May 2024 15:00:51 +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 4VmlTZ6y4Rz4GWd; Sat, 25 May 2024 15:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716649251; 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=XUkSZQna7xGTrN/eV3jcDatKOw4UPJLJOP4FPB8NLIM=; b=G+K4xN2nqAIaKDCtnGTpIj0WSBUCgFJ8Xl0UUQmSR3NrBtHN8o3szerSFjZZqglVr0hR+b TM1evuK0uNLqTu1lb4hYCUcwGwpxgFsLcPKjoM2WLc/HcllpfKzG5bVXuCCAysxUn39XEg 1NV4Df9X7ytFjMRQbCJitJuY3EqacqZQ+g6Nlgz73lxAPsKpDTIsz1nmP62yMlOiVFCSiE sctdzP0XEvYegYPLnHAxAj4ur9Mbh/3HkdaMZqn8VogKtekWsLTm+Qn8ZXeReaVPTjBvR1 xEPKeskjPP6FjvN9EfdOAutjYW2SJvy4douQznpre5nGfcyHz03D0PBdzaOj/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716649251; a=rsa-sha256; cv=none; b=nUSP+z5lw9NErmXkkRi6dA9GBfcNg+OIBPrlJ2R3rFjHv+IprJjSlGpxNSaxPYEjE6Zh+u 5g6N31+BmeLUKgM5ZVDvS6KMOsX1uGXaxZfyFD27qval9hIZO5U7ATXfIzqpUmUjZ3iz4s StOw2ipqJ08WthcN22Js+jEZIhOOIrn5QNxoNl3e/fPGhg86v+RtUTE2KDki1kHWXxcq/K MJgzZv70/sSx89jogGrhWuBfTeYR65SppjodHUEfRD+G+KGzfwV2WgatEFyQmOjCIeT1X2 M7or8O2yzmSTQ4P+oDvIOy/IA6QTpoOxHX8otOh/y89kQyqCXKIYgxlVd+Uy/w== 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=1716649251; 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=XUkSZQna7xGTrN/eV3jcDatKOw4UPJLJOP4FPB8NLIM=; b=xCrfHGWdM1NrzvJdUo9wvjC/Z42Pi/QMMOInENJsWg50q3+iPG6oY9a4CpSkszf0He3fJ5 tnx4h3oT6P0rb3eqkNj14Hbu9M8x+Qd23HZiBqLdDte80d/SAp90BrJrDDSFX4AIcdJOe2 Mk1K7h2PznoUorKsW48dini7XWoU2Nf8XZsIOqDwjuuh1C2x/+oFIgOSCzs+u2lkIO01g2 yDZ4zVyM7s1G/WBMYgod2d4wMy5O4OTlM/0P+t4fH7YMQVjCJ5DVFEcqPxryKDbeB5dfsS 4BSvl/UH29RJfi+XBPGN7rXX6s7/VY0leZBv4HvL9haoBVVCf92aOJTCXLWvig== 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 4VmlTZ6HL3zLrM; Sat, 25 May 2024 15:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44PF0oss084076; Sat, 25 May 2024 15:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44PF0odb084073; Sat, 25 May 2024 15:00:50 GMT (envelope-from git) Date: Sat, 25 May 2024 15:00:50 GMT Message-Id: <202405251500.44PF0odb084073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9b1de7e4844d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9b1de7e4844d951a7d7335cbde75a86a2380e220 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9b1de7e4844d951a7d7335cbde75a86a2380e220 commit 9b1de7e4844d951a7d7335cbde75a86a2380e220 Author: Ed Maste AuthorDate: 2024-05-24 21:36:09 +0000 Commit: Ed Maste CommitDate: 2024-05-25 15:00:35 +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 --- 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 c8539b7b189d..c509dcc2f7dd 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1464,15 +1464,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 040aa3932a1a..2ab86d5905a9 100644 --- a/sys/kern/kern_cons.c +++ b/sys/kern/kern_cons.c @@ -737,7 +737,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"); @@ -762,10 +761,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) @@ -780,16 +775,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 78df26858376..c7110a7c8c17 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 */