# HG changeset patch
# Parent 7bb369d20b804a452803ae42f6980b1d69ece26a
# Parent  ea57ec61329b7b680274e3abb4cd1139a0e78c29

diff -r ea57ec61329b sys/amd64/amd64/machdep.c
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -188,6 +188,12 @@ extern char kernphys[];
 
 struct msgbuf *msgbufp;
 
+/*
+ * Physical address of the EFI System Table. Stashed from the metadata hints
+ * passed into the kernel and used by the EFI code to call runtime services.
+ */
+vm_paddr_t efi_systbl;
+
 /* Intel ICH registers */
 #define ICH_PMBASE	0x400
 #define ICH_SMI_EN	ICH_PMBASE + 0x30
@@ -1866,6 +1872,7 @@ native_parse_preload_data(u_int64_t modu
 	ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t);
 	db_fetch_ksymtab(ksym_start, ksym_end);
 #endif
+	efi_systbl = MD_FETCH(kmdp, MODINFOMD_FW_HANDLE, vm_paddr_t);
 
 	return (kmdp);
 }
@@ -1986,6 +1993,8 @@ hammer_time(u_int64_t modulep, u_int64_t
 	/*
 	 * 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 (kmdp != NULL && preload_search_info(kmdp,
 	    MODINFO_METADATA | MODINFOMD_EFI_MAP) != NULL)
diff -r ea57ec61329b sys/sys/efi.h
--- a/sys/sys/efi.h
+++ b/sys/sys/efi.h
@@ -151,4 +151,5 @@ struct efi_systbl {
 	uint64_t	st_cfgtbl;
 };
 
+extern vm_paddr_t efi_systbl;
 #endif /* _SYS_EFI_H_ */