Commit 8b94a4b9 authored by Mika Westerberg's avatar Mika Westerberg
Browse files

thunderbolt: Fix path indices used in USB3 tunnel discovery 



The USB3 discovery used wrong indices when tunnel is discovered. It
should use TB_USB3_PATH_DOWN for path that flows downstream and
TB_USB3_PATH_UP when it flows upstream. This should not affect the
functionality but better to fix it.

Fixes: e6f81858 ("thunderbolt: Add support for USB 3.x tunnels")
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Cc: stable@vger.kernel.org # v5.6+
parent 48778464

drivers/thunderbolt/tunnel.c

+6 −6
Original line number Diff line number Diff line
@@ -913,21 +913,21 @@ struct tb_tunnel *tb_tunnel_discover_usb3(struct tb *tb, struct tb_port *down) 
	 * case.

	 */

	path = tb_path_discover(down, TB_USB3_HOPID, NULL, -1,

				&tunnel->dst_port, "USB3 Up");

				&tunnel->dst_port, "USB3 Down");

	if (!path) {

		/* Just disable the downstream port */

		tb_usb3_port_enable(down, false);

		goto err_free;

	}

	tunnel->paths[TB_USB3_PATH_UP] = path;

	tb_usb3_init_path(tunnel->paths[TB_USB3_PATH_UP]);

	tunnel->paths[TB_USB3_PATH_DOWN] = path;

	tb_usb3_init_path(tunnel->paths[TB_USB3_PATH_DOWN]);



	path = tb_path_discover(tunnel->dst_port, -1, down, TB_USB3_HOPID, NULL,

				"USB3 Down");

				"USB3 Up");

	if (!path)

		goto err_deactivate;

	tunnel->paths[TB_USB3_PATH_DOWN] = path;

	tb_usb3_init_path(tunnel->paths[TB_USB3_PATH_DOWN]);

	tunnel->paths[TB_USB3_PATH_UP] = path;

	tb_usb3_init_path(tunnel->paths[TB_USB3_PATH_UP]);



	/* Validate that the tunnel is complete */

	if (!tb_port_is_usb3_up(tunnel->dst_port)) {