git: 886164895f3f - main - amd64: complete thunderbolt KERNCONF integration

The branch main has been updated by ngie:

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

commit 886164895f3f4805dc11171ac7980acaccf6ec77
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-06-03 06:02:01 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-06-03 06:02:01 +0000

    amd64: complete thunderbolt KERNCONF integration
    
    This completes the work so the driver can be integrated into KERNCONFs
    properly on amd64.
    
    MFC after: 1 month
    
    Differential Revision:  https://reviews.freebsd.org/D55573
---
 sys/amd64/conf/GENERIC |  1 +
 sys/amd64/conf/NOTES   |  4 ++++
 sys/conf/files.amd64   | 10 ++++++++++
 sys/conf/options.amd64 |  3 +++
 4 files changed, 18 insertions(+)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 9d76736cc46b..1376011de4ee 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -343,6 +343,7 @@ device		uhci			# UHCI PCI->USB interface
 device		ohci			# OHCI PCI->USB interface
 device		ehci			# EHCI PCI->USB interface (USB 2.0)
 device		xhci			# XHCI PCI->USB interface (USB 3.0)
+device		thunderbolt		# Thunderbolt PCI->USB interface (USB 4.0)
 device		usb			# USB Bus (required)
 device		usbhid			# USB HID Transport
 device		hkbd			# HID Keyboard
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index fac8d9314cad..21d9c8e745a2 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -61,6 +61,10 @@ device		tdfx			# Enable 3Dfx Voodoo support
 #XXX this stores pointers in a 32bit field that is defined by the hardware
 #device	pst
 
+# Thunderbolt (USB 4.0) support
+device		thunderbolt
+options		THUNDERBOLT_DEBUG
+
 #
 # Microsemi smartpqi controllers.
 # These controllers have a SCSI-like interface, and require the
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 718fc4097002..f12547727a97 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -381,6 +381,16 @@ dev/smartpqi/smartpqi_sis.c     optional 	smartpqi
 dev/smartpqi/smartpqi_tag.c     optional 	smartpqi
 dev/sume/if_sume.c		optional	sume
 dev/syscons/apm/apm_saver.c	optional	apm_saver apm
+dev/thunderbolt/hcm.c		optional	thunderbolt
+dev/thunderbolt/nhi.c		optional	thunderbolt
+dev/thunderbolt/nhi_pci.c	optional	thunderbolt
+dev/thunderbolt/nhi_wmi.c	optional	acpi acpi_wmi thunderbolt
+dev/thunderbolt/router.c	optional	thunderbolt
+dev/thunderbolt/tb_acpi_pcib.c	optional	acpi thunderbolt
+dev/thunderbolt/tb_debug.c	optional	thunderbolt
+dev/thunderbolt/tb_dev.c	optional	thunderbolt
+dev/thunderbolt/tb_if.m		optional	thunderbolt
+dev/thunderbolt/tb_pcib.c	optional	acpi thunderbolt
 dev/tpm/tpm_crb.c		optional	tpm acpi
 dev/p2sb/p2sb.c			optional	p2sb pci
 dev/p2sb/lewisburg_gpiocm.c	optional	lbggpiocm p2sb
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index a3a735731438..5c157371118a 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -71,3 +71,6 @@ UART_NS8250_EARLY_PORT	opt_uart.h
 
 # Enable asmc(4)-specific debug logic.
 ASMC_DEBUG		opt_asmc.h
+
+# Enable thunderbolt(4)-specific debug logic.
+THUNDERBOLT_DEBUG	opt_thunderbolt.h