From 164138e7d87334ef45b20e260f06669f566faa3c Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Mon, 30 Jul 2018 17:54:18 +0000 Subject: [PATCH] amd64/GENERIC: Enable EFIRT by default As noted in UDPATING, the new loader tunable efi.rt_disabled may be used to disable EFIRT at runtime. It should have no effect if you are not booted via UEFI boot. MFC after: 6 weeks --- UPDATING | 7 +++++++ sys/amd64/conf/GENERIC | 1 + sys/amd64/conf/NOTES | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index fad06a0090d1..f06468f61537 100644 --- a/UPDATING +++ b/UPDATING @@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20180730: + amd64/GENERIC now has EFI runtime services, EFIRT, enabled by default. + This should have no effect if the kernel is booted via UEFI/legacy boot. + EFIRT may be disabled via a loader tunable, efi.rt_disabled, if a system + has a buggy firmware that prevents a successful boot due to use of + runtime services. + 20180727: Atmel AT91RM9200 and AT91SAM9, Cavium CNS 11xx and XScale support has been removed from the tree. These ports were diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index fa90aff14bc5..ab3404d30cf3 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -54,6 +54,7 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization +options EFIRT # EFI Runtime Services support options COMPAT_FREEBSD32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 4355a2292785..185af92ff3da 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -613,7 +613,7 @@ device amdsmn # options NKPT=31 -# EFI Runtime Services support (not functional yet). +# EFI Runtime Services support options EFIRT