Commit 3d411378 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v5.11-rc1' of... 

Merge tag 'thunderbolt-for-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next

Mika writes:

thunderbolt: Changes for v5.11 merge window

This includes following Thunderbolt/USB4 changes for v5.11 merge window:

  * DMA traffic test driver

  * USB4 router NVM upgrade improvements

  * USB4 router operations proxy implementation available in the recent
    Intel Connection Manager firmwares

  * Support for Intel Maple Ridge discrete Thunderbolt 4 controller

  * A couple of cleanups and minor improvements.

* tag 'thunderbolt-for-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: (22 commits)
  thunderbolt: Add support for Intel Maple Ridge
  thunderbolt: Add USB4 router operation proxy for firmware connection manager
  thunderbolt: Move constants for USB4 router operations to tb_regs.h
  thunderbolt: Add connection manager specific hooks for USB4 router operations
  thunderbolt: Pass TX and RX data directly to usb4_switch_op()
  thunderbolt: Pass metadata directly to usb4_switch_op()
  thunderbolt: Perform USB4 router NVM upgrade in two phases
  thunderbolt: Return -ENOTCONN when ERR_CONN is received
  thunderbolt: Keep the parent runtime resumed for a while on device disconnect
  thunderbolt: Log adapter numbers in decimal in path activation/deactivation
  thunderbolt: Log which connection manager implementation is used
  thunderbolt: Move max_boot_acl field to correct place in struct icm
  MAINTAINERS: Add Isaac as maintainer of Thunderbolt DMA traffic test driver
  thunderbolt: Add DMA traffic test driver
  thunderbolt: Add support for end-to-end flow control
  thunderbolt: Make it possible to allocate one directional DMA tunnel
  thunderbolt: Create debugfs directory automatically for services
  thunderbolt: Add functions for enabling and disabling lane bonding on XDomain
  thunderbolt: Add link_speed and link_width to XDomain
  thunderbolt: Create XDomain devices for loops back to the host
  ...
parents 08a02f95 db0746e3

Documentation/ABI/testing/sysfs-bus-thunderbolt

+28 −0
Original line number Diff line number Diff line 
What:		/sys/bus/thunderbolt/devices/<xdomain>/rx_speed

Date:		Feb 2021

KernelVersion:	5.11

Contact:	Isaac Hazan <isaac.hazan@intel.com>

Description:	This attribute reports the XDomain RX speed per lane.

		All RX lanes run at the same speed.



What:		/sys/bus/thunderbolt/devices/<xdomain>/rx_lanes

Date:		Feb 2021

KernelVersion:	5.11

Contact:	Isaac Hazan <isaac.hazan@intel.com>

Description:	This attribute reports the number of RX lanes the XDomain

		is using simultaneously through its upstream port.



What:		/sys/bus/thunderbolt/devices/<xdomain>/tx_speed

Date:		Feb 2021

KernelVersion:	5.11

Contact:	Isaac Hazan <isaac.hazan@intel.com>

Description:	This attribute reports the XDomain TX speed per lane.

		All TX lanes run at the same speed.



What:		/sys/bus/thunderbolt/devices/<xdomain>/tx_lanes

Date:		Feb 2021

KernelVersion:	5.11

Contact:	Isaac Hazan <isaac.hazan@intel.com>

Description:	This attribute reports number of TX lanes the XDomain

		is using simultaneously through its upstream port.



What: /sys/bus/thunderbolt/devices/.../domainX/boot_acl

Date:		Jun 2018

KernelVersion:	4.17

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -17372,6 +17372,12 @@ W: http://thinkwiki.org/wiki/Ibm-acpi 
T:	git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git

F:	drivers/platform/x86/thinkpad_acpi.c









THUNDERBOLT DMA TRAFFIC TEST DRIVER









M:	Isaac Hazan <isaac.hazan@intel.com>









L:	linux-usb@vger.kernel.org









S:	Maintained









F:	drivers/thunderbolt/dma_test.c

















THUNDERBOLT DRIVER









M:	Andreas Noever <andreas.noever@gmail.com>









M:	Michael Jamet <michael.jamet@intel.com>
































drivers/net/thunderbolt.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -866,7 +866,7 @@ static int tbnet_open(struct net_device *dev)







	eof_mask = BIT(TBIP_PDF_FRAME_END);



















	ring = tb_ring_alloc_rx(xd->tb->nhi, -1, TBNET_RING_SIZE,









				RING_FLAG_FRAME, sof_mask, eof_mask,









				RING_FLAG_FRAME, 0, sof_mask, eof_mask,









				tbnet_start_poll, net);









	if (!ring) {









		netdev_err(dev, "failed to allocate Rx ring\n");
































drivers/thunderbolt/Kconfig



+13
−0






























Original line number
Diff line number
Diff line







@@ -31,4 +31,17 @@ config USB4_KUNIT_TEST







	bool "KUnit tests"









	depends on KUNIT=y



















config USB4_DMA_TEST









	tristate "DMA traffic test driver"









	depends on DEBUG_FS









	help









	  This allows sending and receiving DMA traffic through loopback









	  connection. Loopback connection can be done by either special









	  dongle that has TX/RX lines crossed, or by simply connecting a









	  cable back to the host. Only enable this if you know what you









	  are doing. Normal users and distro kernels should say N here.



















	  To compile this driver a module, choose M here. The module will be









	  called thunderbolt_dma_test.



















endif # USB4
























drivers/thunderbolt/Makefile



+3
−0






























Original line number
Diff line number
Diff line







@@ -7,3 +7,6 @@ thunderbolt-objs += nvm.o retimer.o quirks.o







thunderbolt-${CONFIG_ACPI} += acpi.o









thunderbolt-$(CONFIG_DEBUG_FS) += debugfs.o









thunderbolt-${CONFIG_USB4_KUNIT_TEST} += test.o



















thunderbolt_dma_test-${CONFIG_USB4_DMA_TEST} += dma_test.o









obj-$(CONFIG_USB4_DMA_TEST) += thunderbolt_dma_test.o