Author: imp
Date: Sat Dec 19 19:01:43 2015
New Revision: 292472
URL: https://svnweb.freebsd.org/changeset/base/292472
Log:
Save the physical address passed into the kernel of the UEFI system
table.
Modified:
head/sys/amd64/amd64/machdep.c
head/sys/sys/efi.h
Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c Sat Dec 19 19:01:42 2015
(r292471)
+++ head/sys/amd64/amd64/machdep.c Sat Dec 19 19:01:43 2015
(r292472)
@@ -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
@@ -1495,6 +1501,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);
}
@@ -1615,6 +1622,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 (preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP)
!= NULL)
Modified: head/sys/sys/efi.h
==============================================================================
--- head/sys/sys/efi.h Sat Dec 19 19:01:42 2015 (r292471)
+++ head/sys/sys/efi.h Sat Dec 19 19:01:43 2015 (r292472)
@@ -151,4 +151,5 @@ struct efi_systbl {
uint64_t st_cfgtbl;
};
+extern vm_paddr_t efi_systbl;
#endif /* _SYS_EFI_H_ */
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
