[GIT PULL] USB4/Thunderbolt changes for v7.3 merge window
Mika Westerberg <[email protected]>
| Newsgroups | org.kernel.vger.linux-usb |
|---|---|
| Message-ID | <[email protected]> |
Hi Greg,
The following changes since commit dc59e4fea9d83f03bad6bddf3fa2e52491777482:
Linux 7.2-rc1 (2026-06-28 12:01:31 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git tags/thunderbolt-for-v7.3-rc1
for you to fetch changes up to 86feaba911f2f1a540a7695c8f4a98fd0fd60ac4:
thunderbolt: Clamp DMA tunnel credits to what a hop register can hold (2026-08-11 05:57:59 +0200)
----------------------------------------------------------------
thunderbolt: Changes for v7.3 merge window
This includes following USB4/Thunderbolt changes for the v7.3 merge
window:
- Assert Downstream Port Reset for Thunderbolt 3 devices during
shutdown to avoid unnecessary delays over warm reset.
- Tidy up Thunderbolt service ->probe callbacks.
- USB4STREAM improvements.
- AMD host interface quirk to fix Tx ring hang on teardown of a DMA tunnel.
- Minor fixes and cleanups.
All these have been in linux-next with no reported issues.
----------------------------------------------------------------
There is one merge conflict due to a changes to drivers/thunderbolt/nhi.c
done in the current release cycle. This is how I solved it:
diff --cc drivers/thunderbolt/nhi.c
index 35e3c119d5ee,914d4f8700b5..5809809f64d4
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@@ -1235,6 -1274,10 +1276,8 @@@ int nhi_probe(struct tb_nhi *nhi
dev_dbg(dev, "NHI initialized, starting thunderbolt\n");
- init_completion(&nhi->domain_released);
-
+ nhi->host_reset = host_reset;
+
res = tb_domain_add(tb, host_reset);
if (res) {
/*
Thanks!
----------------------------------------------------------------
Basavaraj Natikar (2):
thunderbolt: Assert downstream port reset on shutdown
thunderbolt: Add quirk to reset host interface on DMA path teardown for AMD USB4 routers
Fan Ye (2):
thunderbolt: Use min() for the DMA path credit cap
thunderbolt: Clamp DMA tunnel credits to what a hop register can hold
Mahad Ibrahim (1):
thunderbolt: debugfs: Replace get_zeroed_page() with kzalloc()
Manuel Ebner (1):
docs: admin-guide: thunderbolt: Fix sentence structure
Mika Westerberg (5):
thunderbolt: stream: Restore consumer if copying from iter fails
thunderbolt: stream: Fix possible short reads/writes
thunderbolt: stream: Support IOCB_NOWAIT in non-blocking I/O as well
thunderbolt: Make interrupt optional for rings
thunderbolt: stream: Add support for busy polling
Milo Chen (1):
thunderbolt: xdomain: Notify peers after enumeration
Pan Chuang (1):
thunderbolt: Remove redundant dev_err_probe()
Uwe Kleine-König (The Capable Hub) (3):
thunderbolt: Stop passing matched device ID to .probe()
thunderbolt: Assert that a service driver has a probe callback
thunderbolt: Drop comma after device id array terminator
.../ABI/testing/configfs-thunderbolt_stream | 15 ++
Documentation/admin-guide/thunderbolt.rst | 4 +-
drivers/net/thunderbolt/main.c | 4 +-
drivers/thunderbolt/debugfs.c | 28 +--
drivers/thunderbolt/dma_test.c | 4 +-
drivers/thunderbolt/domain.c | 30 ++-
drivers/thunderbolt/nhi.c | 55 ++++-
drivers/thunderbolt/nhi.h | 21 +-
drivers/thunderbolt/nhi_regs.h | 4 +
drivers/thunderbolt/pci.c | 54 ++++-
drivers/thunderbolt/stream.c | 260 ++++++++++++++++-----
drivers/thunderbolt/switch.c | 11 +-
drivers/thunderbolt/tb.c | 21 ++
drivers/thunderbolt/tb.h | 1 +
drivers/thunderbolt/tunnel.c | 13 +-
drivers/thunderbolt/xdomain.c | 4 +
include/linux/thunderbolt.h | 10 +-
17 files changed, 442 insertions(+), 97 deletions(-)