From owner-svn-src-all@FreeBSD.ORG Wed Jul 2 13:24:23 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 17828860; Wed, 2 Jul 2014 13:24:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E06E224F3; Wed, 2 Jul 2014 13:24:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62DOMIr065098; Wed, 2 Jul 2014 13:24:22 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62DOMfa065093; Wed, 2 Jul 2014 13:24:22 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201407021324.s62DOMfa065093@svn.freebsd.org> From: Ed Maste Date: Wed, 2 Jul 2014 13:24:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268158 - in head/sys: amd64/amd64 kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 13:24:23 -0000 Author: emaste Date: Wed Jul 2 13:24:21 2014 New Revision: 268158 URL: http://svnweb.freebsd.org/changeset/base/268158 Log: Prefer vt(4) for UEFI boot The UEFI framebuffer driver vt_efifb requires vt(4), so add a mechanism for the startup routine to set the preferred console. This change is ugly because console init happens very early in the boot, making a cleaner interface difficult. This change is intended only to facilitate the sc(4) / vt(4) transition, and can be reverted once vt(4) is the default. Modified: head/sys/amd64/amd64/machdep.c head/sys/kern/kern_cons.c head/sys/sys/cons.h Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Wed Jul 2 13:09:26 2014 (r268157) +++ head/sys/amd64/amd64/machdep.c Wed Jul 2 13:24:21 2014 (r268158) @@ -1955,6 +1955,14 @@ hammer_time(u_int64_t modulep, u_int64_t clock_init(); /* + * Use vt(4) by default for UEFI boot (during the sc(4)/vt(4) + * transition). + */ + if (preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP) != + NULL) + vty_set_preferred(VTY_VT); + + /* * Initialize the console before we print anything out. */ cninit(); Modified: head/sys/kern/kern_cons.c ============================================================================== --- head/sys/kern/kern_cons.c Wed Jul 2 13:09:26 2014 (r268157) +++ head/sys/kern/kern_cons.c Wed Jul 2 13:24:21 2014 (r268158) @@ -652,6 +652,7 @@ sysbeep(int pitch __unused, int period _ /* * 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"); @@ -676,6 +677,10 @@ vty_enabled(unsigned vty) break; } #endif + if (vty_prefer != 0) { + vty_selected = vty_prefer; + break; + } #if defined(DEV_SC) vty_selected = VTY_SC; #elif defined(DEV_VT) @@ -691,3 +696,16 @@ vty_enabled(unsigned vty) return ((vty_selected & vty) != 0); } +void +vty_set_preferred(unsigned vty) +{ + + vty_prefer = vty; +#if !defined(DEV_SC) + vty_prefer &= ~DEV_SC; +#endif +#if !defined(DEV_VT) + vty_prefer &= ~DEV_VT; +#endif +} + Modified: head/sys/sys/cons.h ============================================================================== --- head/sys/sys/cons.h Wed Jul 2 13:09:26 2014 (r268157) +++ head/sys/sys/cons.h Wed Jul 2 13:24:21 2014 (r268158) @@ -137,6 +137,7 @@ void constty_clear(void); #define VTY_SC 0x01 #define VTY_VT 0x02 int vty_enabled(unsigned int); +void vty_set_preferred(unsigned int); #endif /* _KERNEL */