From owner-svn-src-all@freebsd.org Thu Mar 15 19:41:27 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A018F4CD01; Thu, 15 Mar 2018 19:41:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E0B5F74236; Thu, 15 Mar 2018 19:41:26 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB3791A4F6; Thu, 15 Mar 2018 19:41:26 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FJfQ2Q072994; Thu, 15 Mar 2018 19:41:26 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FJfQJd072993; Thu, 15 Mar 2018 19:41:26 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803151941.w2FJfQJd072993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 19:41:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r331021 - stable/11/sys/dev/efidev X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/dev/efidev X-SVN-Commit-Revision: 331021 X-SVN-Commit-Repository: base 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.25 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: Thu, 15 Mar 2018 19:41:27 -0000 Author: kevans Date: Thu Mar 15 19:41:26 2018 New Revision: 331021 URL: https://svnweb.freebsd.org/changeset/base/331021 Log: r322279: Don't create /dev/efi without EFI runtime Turns out to be even simpler to just not create /dev/efi if we don't have a efi runtime. Modified: stable/11/sys/dev/efidev/efidev.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/efidev/efidev.c ============================================================================== --- stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:32:33 2018 (r331020) +++ stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:41:26 2018 (r331021) @@ -39,28 +39,15 @@ __FBSDID("$FreeBSD$"); #include #include -static d_open_t efidev_open; static d_ioctl_t efidev_ioctl; static struct cdevsw efi_cdevsw = { .d_name = "efi", .d_version = D_VERSION, - .d_open = efidev_open, .d_ioctl = efidev_ioctl, }; static int -efidev_open(struct cdev *dev __unused, int oflags __unused, - int devtype __unused, struct thread *td __unused) -{ - /* - * Only return success when we have an actual runtime to call. - */ - - return efi_rt_ok(); -} - -static int efidev_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t addr, int flags __unused, struct thread *td __unused) { @@ -195,6 +182,11 @@ efidev_modevents(module_t m, int event, void *arg __un switch (event) { case MOD_LOAD: + /* + * If we have no efi environment, then don't create the device. + */ + if (efi_rt_ok() != 0) + return (0); make_dev_args_init(&mda); mda.mda_flags = MAKEDEV_WAITOK | MAKEDEV_CHECKNAME; mda.mda_devsw = &efi_cdevsw;