git: b2c50bb934fb - main - xen/efi: make Xen PV EFI clock optional

The branch main has been updated by royger:

URL: https://cgit.FreeBSD.org/src/commit/?id=b2c50bb934fb1dab793c74b5d1f1eb9a5c41221e

commit b2c50bb934fb1dab793c74b5d1f1eb9a5c41221e
Author:     Elliott Mitchell <ehem+freebsd@m5p.com>
AuthorDate: 2021-02-19 04:19:20 +0000
Commit:     Roger Pau Monné <royger@FreeBSD.org>
CommitDate: 2023-04-14 13:58:47 +0000

    xen/efi: make Xen PV EFI clock optional
    
    The present implementation is only for x86.  Other architectures need
    adjustments for querying presence of EFI.
    
    Xen's EFI support is also quite troublesome on non-x86.  This is being
    slowly remedied, but until in better shape the EFI clock functionality
    should be disabled.
    
    Reviewed by: royger
    Differential Revision: https://reviews.freebsd.org/D31065
---
 sys/amd64/conf/GENERIC | 1 +
 sys/amd64/conf/MINIMAL | 1 +
 sys/amd64/conf/NOTES   | 1 +
 sys/conf/files         | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 6073f9716d3e..7133c128de50 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -383,6 +383,7 @@ device		hyperv			# HyperV drivers
 # NOTE: XENHVM depends on xenpci and xentimer.
 # They must be added or removed together.
 options 	XENHVM			# Xen HVM kernel infrastructure
+device		xenefi			# Xen EFI timer device
 device		xenpci			# Xen HVM Hypervisor services driver
 device		xentimer		# Xen x86 PV timer device
 
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index fdafeed46eef..e4d2d0febe94 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -147,6 +147,7 @@ device		kvm_clock		# KVM paravirtual clock driver
 # NOTE: XENHVM depends on xenpci and xentimer.
 # They must be added or removed together.
 options 	XENHVM			# Xen HVM kernel infrastructure
+device		xenefi			# Xen EFI timer device
 device		xenpci			# Xen HVM Hypervisor services driver
 device		xentimer		# Xen x86 PV timer device
 
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index e568842f2830..ef0f7076633f 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -505,6 +505,7 @@ device		hvhid		# HyperV HID device
 
 # Xen HVM Guest Optimizations
 options 	XENHVM		# Xen HVM kernel infrastructure
+device		xenefi		# Xen EFI timer device
 device 		xenpci		# Xen HVM Hypervisor services driver
 device		xentimer	# Xen x86 PV timer device
 
diff --git a/sys/conf/files b/sys/conf/files
index ff840dce1355..9800c016532c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3486,7 +3486,7 @@ dev/xen/bus/xenpv.c		optional xenhvm
 dev/xen/console/xen_console.c	optional xenhvm
 dev/xen/control/control.c	optional xenhvm
 dev/xen/cpu/xen_acpi_cpu.c	optional xenhvm
-dev/xen/efi/pvefi.c		optional xenhvm efirt
+dev/xen/efi/pvefi.c		optional xenhvm xenefi efirt
 dev/xen/grant_table/grant_table.c	optional xenhvm
 dev/xen/netback/netback.c	optional xenhvm
 dev/xen/netfront/netfront.c	optional xenhvm