Skip to content

Commit aed1a2a

Browse files
committed
Merge tag 'thunderbolt-for-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next
Mika writes: thunderbolt: Changes for v6.5 merge window This includes following Thunderbolt/USB4 changes for the v6.5 merge window: - Improve debug logging - Rework for TMU and CL states handling - Retimer access improvements - Initial support for USB4 v2 features: * 80G symmetric link support * New notifications * PCIe extended encapsulation * enhanced uni-directional TMU mode * CL2 link low power state * DisplayPort 2.x tunneling - Support for Intel Barlow Ridge Thunderbolt/USB4 controller - Minor fixes and improvements. All these have been in linux-next with no reported issues. * tag 'thunderbolt-for-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: (55 commits) thunderbolt: Add test case for 3 DisplayPort tunnels thunderbolt: Add DisplayPort 2.x tunneling support thunderbolt: Make bandwidth allocation mode function names consistent thunderbolt: Enable CL2 low power state thunderbolt: Add support for enhanced uni-directional TMU mode thunderbolt: Increase NVM_MAX_SIZE to support Intel Barlow Ridge controller thunderbolt: Move constants related to NVM into nvm.c thunderbolt: Limit Intel Barlow Ridge USB3 bandwidth thunderbolt: Add Intel Barlow Ridge PCI ID thunderbolt: Fix PCIe adapter capability length for USB4 v2 routers thunderbolt: Fix DisplayPort IN adapter capability length for USB4 v2 routers thunderbolt: Add two additional double words for adapters TMU for USB4 v2 routers thunderbolt: Enable USB4 v2 PCIe TLP/DLLP extended encapsulation thunderbolt: Announce USB4 v2 connection manager support thunderbolt: Reset USB4 v2 host router thunderbolt: Add the new USB4 v2 notification types thunderbolt: Add support for USB4 v2 80 Gb/s link thunderbolt: Identify USB4 v2 routers thunderbolt: Do not touch lane 1 adapter path config space thunderbolt: Ignore data CRC mismatch for USB4 routers ...
2 parents 99f2d95 + 481012b commit aed1a2a

25 files changed

Lines changed: 2181 additions & 1016 deletions

drivers/thunderbolt/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
obj-${CONFIG_USB4} := thunderbolt.o
33
thunderbolt-objs := nhi.o nhi_ops.o ctl.o tb.o switch.o cap.o path.o tunnel.o eeprom.o
44
thunderbolt-objs += domain.o dma_port.o icm.o property.o xdomain.o lc.o tmu.o usb4.o
5-
thunderbolt-objs += usb4_port.o nvm.o retimer.o quirks.o
5+
thunderbolt-objs += usb4_port.o nvm.o retimer.o quirks.o clx.o
66

77
thunderbolt-${CONFIG_ACPI} += acpi.o
88
thunderbolt-$(CONFIG_DEBUG_FS) += debugfs.o

drivers/thunderbolt/acpi.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,16 +296,15 @@ static bool tb_acpi_bus_match(struct device *dev)
296296

297297
static struct acpi_device *tb_acpi_switch_find_companion(struct tb_switch *sw)
298298
{
299+
struct tb_switch *parent_sw = tb_switch_parent(sw);
299300
struct acpi_device *adev = NULL;
300-
struct tb_switch *parent_sw;
301301

302302
/*
303303
* Device routers exists under the downstream facing USB4 port
304304
* of the parent router. Their _ADR is always 0.
305305
*/
306-
parent_sw = tb_switch_parent(sw);
307306
if (parent_sw) {
308-
struct tb_port *port = tb_port_at(tb_route(sw), parent_sw);
307+
struct tb_port *port = tb_switch_downstream_port(sw);
309308
struct acpi_device *port_adev;
310309

311310
port_adev = acpi_find_child_by_adr(ACPI_COMPANION(&parent_sw->dev),

0 commit comments

Comments
 (0)