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

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

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

Mika writes:

thunderbolt: Changes for v6.10 merge window

This includes following USB4/Thunderbolt changes for the v6.10 merge
window:

  - Enable NVM firmare upgrade on Intel Maple Ridge Thunderbolt 4
    controller
  - Improve USB3 tunnel bandwidth calculation
  - Improve sideband access
  - Minor cleanups and fixes.

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

* tag 'thunderbolt-for-v6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Correct trace output of firmware connection manager packets
  thunderbolt: Fix kernel-doc for tb_tunnel_alloc_dp()
  thunderbolt: Fix uninitialized variable in tb_tunnel_alloc_usb3()
  thunderbolt: There are only 5 basic router registers in pre-USB4 routers
  thunderbolt: No need to loop over all retimers if access fails
  thunderbolt: Increase sideband access polling delay
  thunderbolt: Get rid of TB_CFG_PKG_PREPARE_TO_SLEEP
  thunderbolt: Use correct error code with ERROR_NOT_SUPPORTED
  thunderbolt: Allow USB3 bandwidth to be lower than maximum supported
  thunderbolt: Fix calculation of consumed USB3 bandwidth on a path
  thunderbolt: Enable NVM upgrade support on Intel Maple Ridge
parents adeab5bf a3dc6d82

drivers/thunderbolt/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ static int switch_basic_regs_show(struct tb_switch *sw, struct seq_file *s) 
	if (tb_switch_is_usb4(sw))

		dwords = ARRAY_SIZE(data);

	else

		dwords = 7;

		dwords = 5;



	ret = tb_sw_read(sw, data, TB_CFG_SWITCH, 0, dwords);

	if (ret)

drivers/thunderbolt/icm.c

+1 −0
Original line number Diff line number Diff line
@@ -2532,6 +2532,7 @@ struct tb *icm_probe(struct tb_nhi *nhi) 


	case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI:

	case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI:

		icm->can_upgrade_nvm = true;

		icm->is_supported = icm_tgl_is_supported;

		icm->get_mode = icm_ar_get_mode;

		icm->driver_ready = icm_tr_driver_ready;

drivers/thunderbolt/retimer.c

+8 −4
Original line number Diff line number Diff line
@@ -199,8 +199,10 @@ static void tb_retimer_nvm_authenticate_status(struct tb_port *port, u32 *status 
	 * If the retimer has it set, store it for the new retimer

	 * device instance.

	 */

	for (i = 1; i <= TB_MAX_RETIMER_INDEX; i++)

		usb4_port_retimer_nvm_authenticate_status(port, i, &status[i]);

	for (i = 1; i <= TB_MAX_RETIMER_INDEX; i++) {

		if (usb4_port_retimer_nvm_authenticate_status(port, i, &status[i]))

			break;

	}

}



static void tb_retimer_set_inbound_sbtx(struct tb_port *port)
@@ -234,8 +236,10 @@ static void tb_retimer_unset_inbound_sbtx(struct tb_port *port) 


	tb_port_dbg(port, "disabling sideband transactions\n");



	for (i = TB_MAX_RETIMER_INDEX; i >= 1; i--)

		usb4_port_retimer_unset_inbound_sbtx(port, i);

	for (i = TB_MAX_RETIMER_INDEX; i >= 1; i--) {

		if (usb4_port_retimer_unset_inbound_sbtx(port, i))

			break;

	}

}



static ssize_t nvm_authenticate_store(struct device *dev,

drivers/thunderbolt/tb.c

+5 −4
Original line number Diff line number Diff line
@@ -498,8 +498,9 @@ static struct tb_tunnel *tb_find_first_usb3_tunnel(struct tb *tb, 
 * @consumed_down: Consumed downstream bandwidth (Mb/s)

 *

 * Calculates consumed USB3 and PCIe bandwidth at @port between path

 * from @src_port to @dst_port. Does not take tunnel starting from

 * @src_port and ending from @src_port into account.

 * from @src_port to @dst_port. Does not take USB3 tunnel starting from

 * @src_port and ending on @src_port into account because that bandwidth is

 * already included in as part of the "first hop" USB3 tunnel.

 */

static int tb_consumed_usb3_pcie_bandwidth(struct tb *tb,

					   struct tb_port *src_port,
@@ -514,8 +515,8 @@ static int tb_consumed_usb3_pcie_bandwidth(struct tb *tb, 
	*consumed_up = *consumed_down = 0;



	tunnel = tb_find_first_usb3_tunnel(tb, src_port, dst_port);

	if (tunnel && tunnel->src_port != src_port &&

	    tunnel->dst_port != dst_port) {

	if (tunnel && !tb_port_is_usb3_down(src_port) &&

	    !tb_port_is_usb3_up(dst_port)) {

		int ret;



		ret = tb_tunnel_consumed_bandwidth(tunnel, consumed_up,

drivers/thunderbolt/tb_msgs.h

+0 −6
Original line number Diff line number Diff line
@@ -98,12 +98,6 @@ struct cfg_reset_pkg { 
	struct tb_cfg_header header;

} __packed;



/* TB_CFG_PKG_PREPARE_TO_SLEEP */

struct cfg_pts_pkg {

	struct tb_cfg_header header;

	u32 data;

} __packed;



/* ICM messages */



enum icm_pkg_code {