Author: kevans
Date: Thu Mar 15 19:31:39 2018
New Revision: 331019
URL: https://svnweb.freebsd.org/changeset/base/331019
Log:
MFC r322278,324177: EFIRT Improvements
r322278 (imp): Fail to open efirt device when no EFI on system.
libefivar expects opening /dev/efi to indicate if the we can make efi
runtime calls. With a null routine, it was always succeeding leading
efi_variables_supported() to return the wrong value. Only succeed if
we have an efi_runtime table. Also, while I'm hear, out of an
abundance of caution, add a likely redundant check to make sure
efi_systbl is not NULL before dereferencing it. I know it can't be
NULL if efi_cfgtbl is non-NULL, but the compiler doesn't.
r324177 (andrew):
To prepare for adding EFI runtime services support on arm64 move the
machine independent parts of the existing code to a new file that can be
shared between amd64 and arm64.
Care has been taken to ensure that the MFC of r324177 did not clobber
cherry-picked MFC's.
Added:
stable/11/sys/amd64/amd64/efirt_machdep.c (contents, props changed)
- copied, changed from r324177, head/sys/amd64/amd64/efirt_machdep.c
- copied unchanged from r324177, head/sys/dev/efidev/efirt.c
Directory Properties:
stable/11/sys/dev/efidev/efirt.c (props changed)
Deleted:
stable/11/sys/amd64/amd64/efirt.c
Modified:
stable/11/sys/amd64/include/efi.h
stable/11/sys/conf/files
stable/11/sys/conf/files.amd64
stable/11/sys/dev/efidev/efidev.c
stable/11/sys/modules/efirt/Makefile
stable/11/sys/sys/efi.h
Directory Properties:
stable/11/ (props changed)
Copied and modified: stable/11/sys/amd64/amd64/efirt_machdep.c (from r324177,
head/sys/amd64/amd64/efirt_machdep.c)
==============================================================================
--- head/sys/amd64/amd64/efirt_machdep.c Sun Oct 1 19:52:47 2017
(r324177, copy source)
+++ stable/11/sys/amd64/amd64/efirt_machdep.c Thu Mar 15 19:31:39 2018
(r331019)
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
static pml4_entry_t *efi_pml4;
static vm_object_t obj_1t1_pt;
static vm_page_t efi_pml4_page;
+static vm_pindex_t efi_1t1_idx;
void
efi_destroy_1t1_map(void)
@@ -85,10 +86,10 @@ efi_destroy_1t1_map(void)
}
static vm_page_t
-efi_1t1_page(vm_pindex_t idx)
+efi_1t1_page(void)
{
- return (vm_page_grab(obj_1t1_pt, idx, VM_ALLOC_NOBUSY |
+ return (vm_page_grab(obj_1t1_pt, efi_1t1_idx++, VM_ALLOC_NOBUSY |
VM_ALLOC_WIRED | VM_ALLOC_ZERO));
}
@@ -106,7 +107,7 @@ efi_1t1_pte(vm_offset_t va)
pml4_idx = pmap_pml4e_index(va);
pml4e = &efi_pml4[pml4_idx];
if (*pml4e == 0) {
- m = efi_1t1_page(1 + pml4_idx);
+ m = efi_1t1_page();
mphys = VM_PAGE_TO_PHYS(m);
*pml4e = mphys | X86_PG_RW | X86_PG_V;
} else {
@@ -117,7 +118,7 @@ efi_1t1_pte(vm_offset_t va)
pdp_idx = pmap_pdpe_index(va);
pdpe += pdp_idx;
if (*pdpe == 0) {
- m = efi_1t1_page(1 + NPML4EPG + (pml4_idx + 1) * (pdp_idx + 1));
+ m = efi_1t1_page();
mphys = VM_PAGE_TO_PHYS(m);
*pdpe = mphys | X86_PG_RW | X86_PG_V;
} else {
@@ -128,8 +129,7 @@ efi_1t1_pte(vm_offset_t va)
pd_idx = pmap_pde_index(va);
pde += pd_idx;
if (*pde == 0) {
- m = efi_1t1_page(1 + NPML4EPG + NPML4EPG * NPDPEPG +
- (pml4_idx + 1) * (pdp_idx + 1) * (pd_idx + 1));
+ m = efi_1t1_page();
mphys = VM_PAGE_TO_PHYS(m);
*pde = mphys | X86_PG_RW | X86_PG_V;
} else {
@@ -155,8 +155,9 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int
obj_1t1_pt = vm_pager_allocate(OBJT_PHYS, NULL, ptoa(1 +
NPML4EPG + NPML4EPG * NPDPEPG + NPML4EPG * NPDPEPG * NPDEPG),
VM_PROT_ALL, 0, NULL);
+ efi_1t1_idx = 0;
VM_OBJECT_WLOCK(obj_1t1_pt);
- efi_pml4_page = efi_1t1_page(0);
+ efi_pml4_page = efi_1t1_page();
VM_OBJECT_WUNLOCK(obj_1t1_pt);
efi_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(efi_pml4_page));
pmap_pinit_pml4(efi_pml4_page);
Modified: stable/11/sys/amd64/include/efi.h
==============================================================================
--- stable/11/sys/amd64/include/efi.h Thu Mar 15 19:23:07 2018
(r331018)
+++ stable/11/sys/amd64/include/efi.h Thu Mar 15 19:31:39 2018
(r331019)
@@ -32,6 +32,8 @@
#ifndef __AMD64_INCLUDE_EFI_H_
#define __AMD64_INCLUDE_EFI_H_
+#include <isa/rtc.h>
+
/*
* XXX: from gcc 6.2 manual:
* Note, the ms_abi attribute for Microsoft Windows 64-bit targets
@@ -45,21 +47,8 @@
#define EFIABI_ATTR __attribute__((ms_abi))
#endif
-#ifdef _KERNEL
-struct uuid;
-struct efi_tm;
-
-int efi_get_table(struct uuid *uuid, void **ptr);
-int efi_get_time(struct efi_tm *tm);
-int efi_get_time_locked(struct efi_tm *tm);
-int efi_reset_system(void);
-int efi_set_time(struct efi_tm *tm);
-int efi_set_time_locked(struct efi_tm *tm);
-int efi_var_get(uint16_t *name, struct uuid *vendor, uint32_t *attrib,
- size_t *datasize, void *data);
-int efi_var_nextname(size_t *namesize, uint16_t *name, struct uuid *vendor);
-int efi_var_set(uint16_t *name, struct uuid *vendor, uint32_t attrib,
- size_t datasize, void *data);
-#endif
+#define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock);
+#define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock);
+#define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED);
#endif /* __AMD64_INCLUDE_EFI_H_ */
Modified: stable/11/sys/conf/files
==============================================================================
--- stable/11/sys/conf/files Thu Mar 15 19:23:07 2018 (r331018)
+++ stable/11/sys/conf/files Thu Mar 15 19:31:39 2018 (r331019)
@@ -1584,6 +1584,7 @@ dev/ed/if_ed_rtl80x9.c optional ed
dev/ed/if_ed_pccard.c optional ed pccard
dev/ed/if_ed_pci.c optional ed pci
dev/efidev/efidev.c optional efirt
+dev/efidev/efirt.c optional efirt
dev/eisa/eisa_if.m standard
dev/eisa/eisaconf.c optional eisa
dev/e1000/if_em.c optional em \
Modified: stable/11/sys/conf/files.amd64
==============================================================================
--- stable/11/sys/conf/files.amd64 Thu Mar 15 19:23:07 2018
(r331018)
+++ stable/11/sys/conf/files.amd64 Thu Mar 15 19:31:39 2018
(r331019)
@@ -133,7 +133,7 @@ amd64/amd64/cpu_switch.S standard
amd64/amd64/db_disasm.c optional ddb
amd64/amd64/db_interface.c optional ddb
amd64/amd64/db_trace.c optional ddb
-amd64/amd64/efirt.c optional efirt
+amd64/amd64/efirt_machdep.c optional efirt
amd64/amd64/elf_machdep.c standard
amd64/amd64/exception.S standard
amd64/amd64/fpu.c standard
Modified: stable/11/sys/dev/efidev/efidev.c
==============================================================================
--- stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:23:07 2018
(r331018)
+++ stable/11/sys/dev/efidev/efidev.c Thu Mar 15 19:31:39 2018
(r331019)
@@ -39,14 +39,27 @@ __FBSDID("$FreeBSD$");
#include <machine/efi.h>
#include <sys/efiio.h>
+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)
Copied: stable/11/sys/dev/efidev/efirt.c (from r324177,
head/sys/dev/efidev/efirt.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/11/sys/dev/efidev/efirt.c Thu Mar 15 19:31:39 2018
(r331019, copy of r324177, head/sys/dev/efidev/efirt.c)
@@ -0,0 +1,388 @@
+/*-
+ * Copyright (c) 2004 Marcel Moolenaar
+ * Copyright (c) 2001 Doug Rabson
+ * Copyright (c) 2016 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * Portions of this software were developed by Konstantin Belousov
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/efi.h>
+#include <sys/kernel.h>
+#include <sys/linker.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/clock.h>
+#include <sys/proc.h>
+#include <sys/rwlock.h>
+#include <sys/sched.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
+#include <sys/vmmeter.h>
+
+#include <machine/fpu.h>
+#include <machine/efi.h>
+#include <machine/metadata.h>
+#include <machine/vmparam.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
+
+static struct efi_systbl *efi_systbl;
+static struct efi_cfgtbl *efi_cfgtbl;
+static struct efi_rt *efi_runtime;
+
+static int efi_status2err[25] = {
+ 0, /* EFI_SUCCESS */
+ ENOEXEC, /* EFI_LOAD_ERROR */
+ EINVAL, /* EFI_INVALID_PARAMETER */
+ ENOSYS, /* EFI_UNSUPPORTED */
+ EMSGSIZE, /* EFI_BAD_BUFFER_SIZE */
+ EOVERFLOW, /* EFI_BUFFER_TOO_SMALL */
+ EBUSY, /* EFI_NOT_READY */
+ EIO, /* EFI_DEVICE_ERROR */
+ EROFS, /* EFI_WRITE_PROTECTED */
+ EAGAIN, /* EFI_OUT_OF_RESOURCES */
+ EIO, /* EFI_VOLUME_CORRUPTED */
+ ENOSPC, /* EFI_VOLUME_FULL */
+ ENXIO, /* EFI_NO_MEDIA */
+ ESTALE, /* EFI_MEDIA_CHANGED */
+ ENOENT, /* EFI_NOT_FOUND */
+ EACCES, /* EFI_ACCESS_DENIED */
+ ETIMEDOUT, /* EFI_NO_RESPONSE */
+ EADDRNOTAVAIL, /* EFI_NO_MAPPING */
+ ETIMEDOUT, /* EFI_TIMEOUT */
+ EDOOFUS, /* EFI_NOT_STARTED */
+ EALREADY, /* EFI_ALREADY_STARTED */
+ ECANCELED, /* EFI_ABORTED */
+ EPROTO, /* EFI_ICMP_ERROR */
+ EPROTO, /* EFI_TFTP_ERROR */
+ EPROTO /* EFI_PROTOCOL_ERROR */
+};
+
+static int
+efi_status_to_errno(efi_status status)
+{
+ u_long code;
+
+ code = status & 0x3ffffffffffffffful;
+ return (code < nitems(efi_status2err) ? efi_status2err[code] : EDOOFUS);
+}
+
+static struct mtx efi_lock;
+
+static int
+efi_init(void)
+{
+ struct efi_map_header *efihdr;
+ struct efi_md *map;
+ caddr_t kmdp;
+ size_t efisz;
+
+ mtx_init(&efi_lock, "efi", NULL, MTX_DEF);
+
+ if (efi_systbl_phys == 0) {
+ if (bootverbose)
+ printf("EFI systbl not available\n");
+ return (0);
+ }
+ efi_systbl = (struct efi_systbl *)PHYS_TO_DMAP(efi_systbl_phys);
+ if (efi_systbl->st_hdr.th_sig != EFI_SYSTBL_SIG) {
+ efi_systbl = NULL;
+ if (bootverbose)
+ printf("EFI systbl signature invalid\n");
+ return (0);
+ }
+ efi_cfgtbl = (efi_systbl->st_cfgtbl == 0) ? NULL :
+ (struct efi_cfgtbl *)efi_systbl->st_cfgtbl;
+ if (efi_cfgtbl == NULL) {
+ if (bootverbose)
+ printf("EFI config table is not present\n");
+ }
+
+ kmdp = preload_search_by_type("elf kernel");
+ if (kmdp == NULL)
+ kmdp = preload_search_by_type("elf64 kernel");
+ efihdr = (struct efi_map_header *)preload_search_info(kmdp,
+ MODINFO_METADATA | MODINFOMD_EFI_MAP);
+ if (efihdr == NULL) {
+ if (bootverbose)
+ printf("EFI map is not present\n");
+ return (0);
+ }
+ efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf;
+ map = (struct efi_md *)((uint8_t *)efihdr + efisz);
+ if (efihdr->descriptor_size == 0)
+ return (ENOMEM);
+
+ if (!efi_create_1t1_map(map, efihdr->memory_size /
+ efihdr->descriptor_size, efihdr->descriptor_size)) {
+ if (bootverbose)
+ printf("EFI cannot create runtime map\n");
+ return (ENOMEM);
+ }
+
+ efi_runtime = (efi_systbl->st_rt == 0) ? NULL :
+ (struct efi_rt *)efi_systbl->st_rt;
+ if (efi_runtime == NULL) {
+ if (bootverbose)
+ printf("EFI runtime services table is not present\n");
+ efi_destroy_1t1_map();
+ return (ENXIO);
+ }
+
+ return (0);
+}
+
+static void
+efi_uninit(void)
+{
+
+ efi_destroy_1t1_map();
+
+ efi_systbl = NULL;
+ efi_cfgtbl = NULL;
+ efi_runtime = NULL;
+
+ mtx_destroy(&efi_lock);
+}
+
+int
+efi_rt_ok(void)
+{
+
+ if (efi_runtime == NULL)
+ return (ENXIO);
+ return (0);
+}
+
+static int
+efi_enter(void)
+{
+ struct thread *td;
+ pmap_t curpmap;
+ int error;
+
+ if (efi_runtime == NULL)
+ return (ENXIO);
+ td = curthread;
+ curpmap = &td->td_proc->p_vmspace->vm_pmap;
+ PMAP_LOCK(curpmap);
+ mtx_lock(&efi_lock);
+ error = fpu_kern_enter(td, NULL, FPU_KERN_NOCTX);
+ if (error != 0) {
+ PMAP_UNLOCK(curpmap);
+ return (error);
+ }
+
+ return (efi_arch_enter());
+}
+
+static void
+efi_leave(void)
+{
+ struct thread *td;
+ pmap_t curpmap;
+
+ efi_arch_leave();
+
+ curpmap = &curproc->p_vmspace->vm_pmap;
+ td = curthread;
+ fpu_kern_leave(td, NULL);
+ mtx_unlock(&efi_lock);
+ PMAP_UNLOCK(curpmap);
+}
+
+int
+efi_get_table(struct uuid *uuid, void **ptr)
+{
+ struct efi_cfgtbl *ct;
+ u_long count;
+
+ if (efi_cfgtbl == NULL || efi_systbl == NULL)
+ return (ENXIO);
+ count = efi_systbl->st_entries;
+ ct = efi_cfgtbl;
+ while (count--) {
+ if (!bcmp(&ct->ct_uuid, uuid, sizeof(*uuid))) {
+ *ptr = (void *)PHYS_TO_DMAP(ct->ct_data);
+ return (0);
+ }
+ ct++;
+ }
+ return (ENOENT);
+}
+
+static int
+efi_get_time_locked(struct efi_tm *tm)
+{
+ efi_status status;
+ int error;
+
+ EFI_TIME_OWNED()
+ error = efi_enter();
+ if (error != 0)
+ return (error);
+ status = efi_runtime->rt_gettime(tm, NULL);
+ efi_leave();
+ error = efi_status_to_errno(status);
+ return (error);
+}
+
+int
+efi_get_time(struct efi_tm *tm)
+{
+ int error;
+
+ if (efi_runtime == NULL)
+ return (ENXIO);
+ EFI_TIME_LOCK()
+ error = efi_get_time_locked(tm);
+ EFI_TIME_UNLOCK()
+ return (error);
+}
+
+int
+efi_reset_system(void)
+{
+ int error;
+
+ error = efi_enter();
+ if (error != 0)
+ return (error);
+ efi_runtime->rt_reset(EFI_RESET_WARM, 0, 0, NULL);
+ efi_leave();
+ return (EIO);
+}
+
+static int
+efi_set_time_locked(struct efi_tm *tm)
+{
+ efi_status status;
+ int error;
+
+ EFI_TIME_OWNED();
+ error = efi_enter();
+ if (error != 0)
+ return (error);
+ status = efi_runtime->rt_settime(tm);
+ efi_leave();
+ error = efi_status_to_errno(status);
+ return (error);
+}
+
+int
+efi_set_time(struct efi_tm *tm)
+{
+ int error;
+
+ if (efi_runtime == NULL)
+ return (ENXIO);
+ EFI_TIME_LOCK()
+ error = efi_set_time_locked(tm);
+ EFI_TIME_UNLOCK()
+ return (error);
+}
+
+int
+efi_var_get(efi_char *name, struct uuid *vendor, uint32_t *attrib,
+ size_t *datasize, void *data)
+{
+ efi_status status;
+ int error;
+
+ error = efi_enter();
+ if (error != 0)
+ return (error);
+ status = efi_runtime->rt_getvar(name, vendor, attrib, datasize, data);
+ efi_leave();
+ error = efi_status_to_errno(status);
+ return (error);
+}
+
+int
+efi_var_nextname(size_t *namesize, efi_char *name, struct uuid *vendor)
+{
+ efi_status status;
+ int error;
+
+ error = efi_enter();
+ if (error != 0)
+ return (error);
+ status = efi_runtime->rt_scanvar(namesize, name, vendor);
+ efi_leave();
+ error = efi_status_to_errno(status);
+ return (error);
+}
+
+int
+efi_var_set(efi_char *name, struct uuid *vendor, uint32_t attrib,
+ size_t datasize, void *data)
+{
+ efi_status status;
+ int error;
+
+ error = efi_enter();
+ if (error != 0)
+ return (error);
+ status = efi_runtime->rt_setvar(name, vendor, attrib, datasize, data);
+ efi_leave();
+ error = efi_status_to_errno(status);
+ return (error);
+}
+
+static int
+efirt_modevents(module_t m, int event, void *arg __unused)
+{
+
+ switch (event) {
+ case MOD_LOAD:
+ return (efi_init());
+
+ case MOD_UNLOAD:
+ efi_uninit();
+ return (0);
+
+ case MOD_SHUTDOWN:
+ return (0);
+
+ default:
+ return (EOPNOTSUPP);
+ }
+}
+
+static moduledata_t efirt_moddata = {
+ .name = "efirt",
+ .evhand = efirt_modevents,
+ .priv = NULL,
+};
+DECLARE_MODULE(efirt, efirt_moddata, SI_SUB_VM_CONF, SI_ORDER_ANY);
+MODULE_VERSION(efirt, 1);
Modified: stable/11/sys/modules/efirt/Makefile
==============================================================================
--- stable/11/sys/modules/efirt/Makefile Thu Mar 15 19:23:07 2018
(r331018)
+++ stable/11/sys/modules/efirt/Makefile Thu Mar 15 19:31:39 2018
(r331019)
@@ -4,7 +4,7 @@
.PATH: ${SRCTOP}/sys/dev/efidev
KMOD= efirt
-SRCS= efirt.c efidev.c
+SRCS= efirt.c efirt_machdep.c efidev.c
SRCS+= device_if.h bus_if.h
.include <bsd.kmod.mk>
Modified: stable/11/sys/sys/efi.h
==============================================================================
--- stable/11/sys/sys/efi.h Thu Mar 15 19:23:07 2018 (r331018)
+++ stable/11/sys/sys/efi.h Thu Mar 15 19:31:39 2018 (r331019)
@@ -168,6 +168,25 @@ struct efi_systbl {
};
extern vm_paddr_t efi_systbl_phys;
+
+/* Internal MD EFI functions */
+int efi_arch_enter(void);
+void efi_arch_leave(void);
+bool efi_create_1t1_map(struct efi_md *, int, int);
+void efi_destroy_1t1_map(void);
+
+/* Public MI EFI functions */
+int efi_rt_ok(void);
+int efi_get_table(struct uuid *uuid, void **ptr);
+int efi_get_time(struct efi_tm *tm);
+int efi_reset_system(void);
+int efi_set_time(struct efi_tm *tm);
+int efi_var_get(uint16_t *name, struct uuid *vendor, uint32_t *attrib,
+ size_t *datasize, void *data);
+int efi_var_nextname(size_t *namesize, uint16_t *name, struct uuid *vendor);
+int efi_var_set(uint16_t *name, struct uuid *vendor, uint32_t attrib,
+ size_t datasize, void *data);
+
#endif /* _KERNEL */
#endif /* _SYS_EFI_H_ */
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
