Merge tag 'thunderbolt-for-v5.9-rc4' of... (6b6c71e8) · Commits · 戴 / test

drivers/thunderbolt/switch.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -684,6 +684,7 @@ static int tb_init_port(struct tb_port *port)
		if (res == -ENODEV) {
		tb_dbg(port->sw->tb, " Port %d: not implemented\n",
		port->port);
		port->disabled = true;
		return 0;
		}
		return res;

+1 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,7 @@ struct tb_switch {
		* @cap_adap: Offset of the adapter specific capability (%0 if not present)
		* @cap_usb4: Offset to the USB4 port capability (%0 if not present)
		* @port: Port number on switch
		* @disabled: Disabled by eeprom
		* @disabled: Disabled by eeprom or enabled but not implemented
		* @bonded: true if the port is bonded (two lanes combined as one)
		* @dual_link_port: If the switch is connected using two ports, points
		* to the other port.

+10 −2

Original line number	Diff line number	Diff line
		@@ -951,10 +951,18 @@ static void tb_usb3_reclaim_available_bandwidth(struct tb_tunnel *tunnel,
		int ret, max_rate, allocate_up, allocate_down;

		ret = usb4_usb3_port_actual_link_rate(tunnel->src_port);
		if (ret <= 0) {
		tb_tunnel_warn(tunnel, "tunnel is not up\n");
		if (ret < 0) {
		tb_tunnel_warn(tunnel, "failed to read actual link rate\n");
		return;
		} else if (!ret) {
		/* Use maximum link rate if the link valid is not set */
		ret = usb4_usb3_port_max_link_rate(tunnel->src_port);
		if (ret < 0) {
		tb_tunnel_warn(tunnel, "failed to read maximum link rate\n");
		return;
		}
		}

		/*
		* 90% of the max rate can be allocated for isochronous
		* transfers.