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

Merge tag 'thunderbolt-for-v6.1-rc1' of... 

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

Mika writes:
  "thunderbolt: Changes for v6.1 merge window

   This includes following Thunderbolt/USB4 changes for the v6.1 merge
   window:
     - Support for Intel Meteor Lake integrated Thunderbolt/USB4 controller
     - Support for ASMedia USB4 controller NVM firmware upgrade
     - Receiver lane margining support
     - Few fixes and cleanups.

   All these have been in linux-next with no reported issues."

* tag 'thunderbolt-for-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Explicitly enable lane adapter hotplug events at startup
  thunderbolt: Use dev_err_probe()
  thunderbolt: Convert to use sysfs_emit()/sysfs_emit_at() APIs
  thunderbolt: Fix spelling mistake "simultaneusly" -> "simultaneously"
  thunderbolt: debugfs: Fix spelling mistakes in seq_puts text
  thunderbolt: Add support for ASMedia NVM image format
  thunderbolt: Move vendor specific NVM handling into nvm.c
  thunderbolt: Provide tb_retimer_nvm_read() analogous to tb_switch_nvm_read()
  thunderbolt: Rename and make nvm_read() available for other files
  thunderbolt: Extend NVM version fields to 32-bits
  thunderbolt: Allow NVM upgrade of USB4 host routers
  thunderbolt: Add support for receiver lane margining
  thunderbolt: Add helper to check if CL states are enabled on port
  thunderbolt: Pass CL state bitmask to tb_port_clx_supported()
  thunderbolt: Move port CL state functions into correct place in switch.c
  thunderbolt: Move tb_xdomain_parent() to tb.h
  thunderbolt: Add support for Intel Meteor Lake
  thunderbolt: Add comment where Thunderbolt 4 PCI IDs start
  thunderbolt: Add DP OUT resource when DP tunnel is discovered
parents a62e6791 5d2569cb

Documentation/ABI/testing/sysfs-bus-thunderbolt

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ Date: Jan 2020 
KernelVersion:	5.5

Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>

Description:	This attribute reports number of RX lanes the device is

		using simultaneusly through its upstream port.

		using simultaneously through its upstream port.



What:		/sys/bus/thunderbolt/devices/.../tx_speed

Date:		Jan 2020
@@ -167,7 +167,7 @@ Date: Jan 2020 
KernelVersion:	5.5

Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>

Description:	This attribute reports number of TX lanes the device is

		using simultaneusly through its upstream port.

		using simultaneously through its upstream port.



What:		/sys/bus/thunderbolt/devices/.../vendor

Date:		Sep 2017

drivers/thunderbolt/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,16 @@ config USB4_DEBUGFS_WRITE 
	  Only enable this if you know what you are doing! Never enable

	  this for production systems or distro kernels.



config USB4_DEBUGFS_MARGINING

	bool "Expose receiver lane margining operations under USB4 ports (DANGEROUS)"

	depends on DEBUG_FS

	depends on USB4_DEBUGFS_WRITE

	help

	  Enables hardware and software based receiver lane margining support

	  under each USB4 port. Used for electrical quality and robustness

	  validation during manufacturing. Should not be enabled by distro

	  kernels.



config USB4_KUNIT_TEST

	bool "KUnit tests" if !KUNIT_ALL_TESTS

	depends on USB4 && KUNIT=y

drivers/thunderbolt/debugfs.c

+836 −0

File changed.

Preview size limit exceeded, changes collapsed.

drivers/thunderbolt/domain.c

+4 −6
Original line number Diff line number Diff line
@@ -144,11 +144,9 @@ static ssize_t boot_acl_show(struct device *dev, struct device_attribute *attr, 


	for (ret = 0, i = 0; i < tb->nboot_acl; i++) {

		if (!uuid_is_null(&uuids[i]))

			ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%pUb",

					&uuids[i]);

			ret += sysfs_emit_at(buf, ret, "%pUb", &uuids[i]);



		ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s",

			       i < tb->nboot_acl - 1 ? "," : "\n");

		ret += sysfs_emit_at(buf, ret, "%s", i < tb->nboot_acl - 1 ? "," : "\n");

	}



out:
@@ -247,7 +245,7 @@ static ssize_t deauthorization_show(struct device *dev, 
	    tb->security_level == TB_SECURITY_SECURE)

		deauthorization = !!tb->cm_ops->disapprove_switch;



	return sprintf(buf, "%d\n", deauthorization);

	return sysfs_emit(buf, "%d\n", deauthorization);

}

static DEVICE_ATTR_RO(deauthorization);
@@ -270,7 +268,7 @@ static ssize_t security_show(struct device *dev, struct device_attribute *attr, 
	if (tb->security_level < ARRAY_SIZE(tb_security_names))

		name = tb_security_names[tb->security_level];



	return sprintf(buf, "%s\n", name);

	return sysfs_emit(buf, "%s\n", name);

}

static DEVICE_ATTR_RO(security);

drivers/thunderbolt/icm.c

+3 −0

File changed.

Preview size limit exceeded, changes collapsed.