From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Yehezkel Bernat <YehezkelShB@gmail.com>,
Lukas Wunner <lukas@wunner.de>,
Andreas Noever <andreas.noever@gmail.com>,
linux-usb@vger.kernel.org,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [GIT PULL] USB4/Thunderbolt changes for v7.2 merge window
Date: Thu, 11 Jun 2026 10:48:45 +0200 [thread overview]
Message-ID: <20260611084845.GX2990@black.igk.intel.com> (raw)
Hi Greg,
The following changes since commit 254f49634ee16a731174d2ae34bc50bd5f45e731:
Linux 7.1-rc1 (2026-04-26 14:19:00 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git tags/thunderbolt-for-v7.2-rc1
for you to fetch changes up to c1bef05763c94ae284ee2881c03bf0753f8d213a:
thunderbolt: debugfs: Fix sideband write size check (2026-06-08 12:47:28 +0200)
----------------------------------------------------------------
thunderbolt: Changes for v7.2 merge window
This includes following USB4/Thunderbolt changes for the v7.2 merge
window:
- Make the driver more compliant with the connection manager guide.
- Improvements over Thunderbolt XDomain service handling.
- USB4STREAM driver.
- Split out PCIe bits into pci.c to allow the driver to work on
non-PCIe hosts as well.
- Various fixes and improvements.
All these have been in linux-next with no reported issues.
----------------------------------------------------------------
There is one trivial merge conflict due to changes in
drivers/thunderbolt/property.c done in the current -rc. Here's how I would
resolve it:
diff --cc drivers/thunderbolt/property.c
index 59beab43f90a,6b9666b61181..df18a6d69d8b
--- a/drivers/thunderbolt/property.c
+++ b/drivers/thunderbolt/property.c
@@@ -39,7 -37,8 +39,8 @@@ struct tb_property_dir_entry
static struct tb_property_dir *__tb_property_parse_dir(const u32 *block,
size_t block_len, unsigned int dir_offset, size_t dir_len,
- bool is_root);
+ bool is_root, unsigned int depth);
+ static struct tb_property *tb_property_copy(const struct tb_property *property);
static inline void parse_dwdata(void *dst, const void *src, size_t dwords)
{
Thanks!
----------------------------------------------------------------
Alan Borzeszkowski (2):
thunderbolt: Don't create multiple DMA tunnels on firmware connection manager
thunderbolt: Improve multi-display DisplayPort tunnel allocation
Gil Fine (7):
thunderbolt: Avoid reserved fields in path config space for USB4 routers
thunderbolt: Fix lane bonding log when bonding not possible
thunderbolt: Activate path hops from source to destination
thunderbolt: Verify PCIe adapter in detect state before tunnel setup
thunderbolt: Verify Router Ready bit is set after router enumeration
thunderbolt: Increase timeout for Configuration Ready bit
thunderbolt: Increase Notification Timeout to 255 ms for USB4 routers
Konrad Dybcio (5):
thunderbolt: debugfs: Don't stop reading SB registers if just one fails
thunderbolt: Move pci_device out of tb_nhi
thunderbolt: Separate out common NHI bits
thunderbolt: Require nhi->ops be valid
thunderbolt: Add some more descriptive probe error messages
Michael Bommarito (3):
thunderbolt: test: add KUnit regression tests for XDomain property parser
thunderbolt: test: Add KUnit tests for property parser bounds checks
thunderbolt: Prevent XDomain delayed work use-after-free on disconnect
Mika Westerberg (20):
thunderbolt: Don't disable lane adapter if XDomain lane bonding isn't possible
thunderbolt: Make XDomain lane bonding comply with the USB4 v2 spec
thunderbolt: Keep the domain reference while processing hotplug
thunderbolt: Release request if tb_cfg_request() fails in __tb_xdomain_response()
thunderbolt: Set tb->root_switch to NULL when domain is stopped
thunderbolt: Wait for tb_domain_release() to complete when driver is removed
thunderbolt: Keep XDomain reference during the lifetime of a service
thunderbolt: dma_test: No need to store debugfs directory pointer
thunderbolt: Remove service debugfs entries during unregister
thunderbolt: Remove XDomain from the bus without holding tb->lock
thunderbolt: Add tb_property_merge_dir()
thunderbolt: Add KUnit test for tb_property_merge_dir()
thunderbolt: Allow service drivers to specify their own properties
thunderbolt / net: Move ring_frame_size() to thunderbolt.h
thunderbolt / net: Let the service drivers configure interrupt throttling
thunderbolt: Add helper to figure size of the ring
thunderbolt: Add tb_ring_flush()
thunderbolt: Add support for ConfigFS
thunderbolt: Add support for USB4STREAM
docs: admin-guide: thunderbolt: Add instructions how to use USB4STREAM
Pooja Katiyar (1):
thunderbolt: Don't access path config space on Lane 1 adapters in tb_switch_reset_host()
Xu Rao (3):
thunderbolt: test: Release third DP tunnel
thunderbolt: debugfs: Fix margining error counter buffer leak
thunderbolt: debugfs: Fix sideband write size check
.../ABI/testing/configfs-thunderbolt_stream | 83 +
Documentation/admin-guide/thunderbolt.rst | 61 +
drivers/net/thunderbolt/main.c | 20 +-
drivers/thunderbolt/Kconfig | 15 +
drivers/thunderbolt/Makefile | 6 +-
drivers/thunderbolt/acpi.c | 14 +-
drivers/thunderbolt/configfs.c | 61 +
drivers/thunderbolt/ctl.c | 16 +-
drivers/thunderbolt/debugfs.c | 18 +-
drivers/thunderbolt/dma_test.c | 25 +-
drivers/thunderbolt/domain.c | 37 +-
drivers/thunderbolt/eeprom.c | 2 +-
drivers/thunderbolt/icm.c | 39 +-
drivers/thunderbolt/nhi.c | 606 ++-----
drivers/thunderbolt/nhi.h | 33 +-
drivers/thunderbolt/nhi_ops.c | 185 ---
drivers/thunderbolt/nhi_regs.h | 3 +-
drivers/thunderbolt/path.c | 37 +-
drivers/thunderbolt/pci.c | 622 +++++++
drivers/thunderbolt/property.c | 154 +-
drivers/thunderbolt/stream.c | 1698 ++++++++++++++++++++
drivers/thunderbolt/switch.c | 77 +-
drivers/thunderbolt/tb.c | 86 +-
drivers/thunderbolt/tb.h | 21 +-
drivers/thunderbolt/tb_regs.h | 19 +-
drivers/thunderbolt/test.c | 249 +++
drivers/thunderbolt/tunnel.c | 35 +
drivers/thunderbolt/usb4.c | 35 +-
drivers/thunderbolt/usb4_port.c | 2 +-
drivers/thunderbolt/xdomain.c | 311 +++-
include/linux/thunderbolt.h | 59 +-
31 files changed, 3710 insertions(+), 919 deletions(-)
create mode 100644 Documentation/ABI/testing/configfs-thunderbolt_stream
create mode 100644 drivers/thunderbolt/configfs.c
delete mode 100644 drivers/thunderbolt/nhi_ops.c
create mode 100644 drivers/thunderbolt/pci.c
create mode 100644 drivers/thunderbolt/stream.c
reply other threads:[~2026-06-11 8:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260611084845.GX2990@black.igk.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=lukas@wunner.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox