From nobody Wed Jun 3 06:02:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gVcY916fTz6g4Ls for ; Wed, 03 Jun 2026 06:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gVcY86s91z3P7y for ; Wed, 03 Jun 2026 06:02:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780466541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vdd5v4OWbb8quV7AL+wMn1tamAw5okDk1hiTvLprC2g=; b=VVbJ0JN0i/eCAhF6/oy3VjJnPGBpywBvangdlZLkOeQGcp3UEVYRq3XKd7UIDQaFpK6jPn zKrqEqaXuK1tURvYRsJp4e9umyc3oFvReaXbL5aYVj7hg7hytplEOfB+9Rv42DosUl22sn cnkgTkSNPv1Ti5nq1yYykIqYc9nUcupwU9uHtKiqPoMS3O6pSuJZifd5gAW+O5+zFPlzav y7FvHkVV7ikWDzYnEX8A5z/V6rM9q5gpiFV5L7+DUPlzKGKswWDl/7otFik2/NhIiTHRSX bXg3viSYoq6cWCZUgqjge8PPsBcmWzUNh39S2RAAmZDtU17yO3T23df/6vpAzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780466541; a=rsa-sha256; cv=none; b=lmZvWmG2yWs3A9q47ekgYL5+1iDFY8jcrxN9dJ0ziLLojO8p1vbvfd6YAWBvKnLgf26dBc xG4sUyHsIo7absvpdZPbs0973HOhTzsFspODaB8pGSpYQ0i5GUqIAqo0pjP2BczbrnyShA MBicVSVT8d2AnJ/UYRhlJt/bQ56xUVOj2d4f9ECAKg3O/YU/VB/fE6Vruda47IqqfpDCez VCFrB+7RwMq/W6poHYhpfOfOBzyoMuxHjlBXF2wtUvx6gpWiA8zKNz3dGqmU37X+ucL9kk JCo4n+bT/kYasxrMBZAkLOU9Nr0ktAjhCdJaD000/NuhMS01UQ19uue0qHgBcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780466541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vdd5v4OWbb8quV7AL+wMn1tamAw5okDk1hiTvLprC2g=; b=jMqSlneM4KC0dUgHH1vJ1JTcdEU7jkDrNRX7Y4QAJvvOrvIyIik9iBkIOXzY1MxN8lt8TY ra1jEpLcNCogN8plcg3ojYNvigIBsu0mQ33xEhfW+8MNJ0R0/plwZ08Los6dVfmBVwF2OI fIA/mT2olU8wcK6ZKw+qvvkeacrR5BiNuLNbkleLrF+iYuldvLilsnoRs+0fSgzq+dsHZc ifN+S6wJRwIeT/Zn7BhVRZaaCBjzdtXQs3wdnYMXhRDNM+0s/XpBRTEec5r2YOmNTFB8ly IRIDXGmWC5zL+fLtWssiOEJ3QsCB9ue+UvAg8NnC8n3FkEBrwLaKuKE91nYwLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVcY86MxMzxwM for ; Wed, 03 Jun 2026 06:02:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20f4d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 06:02:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 886164895f3f - main - amd64: complete thunderbolt KERNCONF integration List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 886164895f3f4805dc11171ac7980acaccf6ec77 Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 06:02:20 +0000 Message-Id: <6a1fc36c.20f4d.2792bff2@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=886164895f3f4805dc11171ac7980acaccf6ec77 commit 886164895f3f4805dc11171ac7980acaccf6ec77 Author: Enji Cooper AuthorDate: 2026-06-03 06:02:01 +0000 Commit: Enji Cooper 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