Commit 54967f41 authored by Gil Fine's avatar Gil Fine Committed by Mika Westerberg
Browse files

thunderbolt: Make PCIe tunnel setup and teardown follow CM guide 



The USB4 Connection Manager guide suggests that the PCIe paths are
enabled from the upstream adapter to the downstream adapter and vice
versa on disable so make the driver follows this sequence.

Signed-off-by: default avatarGil Fine <gil.fine@linux.intel.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 0b663ec9

drivers/thunderbolt/tunnel.c

+10 −3
Original line number Diff line number Diff line
@@ -199,14 +199,21 @@ static int tb_pci_activate(struct tb_tunnel *tunnel, bool activate) 
			return res;

	}



	if (activate)

		res = tb_pci_port_enable(tunnel->dst_port, activate);

	else

		res = tb_pci_port_enable(tunnel->src_port, activate);

	if (res)

		return res;



	if (tb_port_is_pcie_up(tunnel->dst_port)) {

		res = tb_pci_port_enable(tunnel->dst_port, activate);



	if (activate) {

		res = tb_pci_port_enable(tunnel->src_port, activate);

		if (res)

			return res;

	} else {

		/* Downstream router could be unplugged */

		tb_pci_port_enable(tunnel->dst_port, activate);

	}



	return activate ? 0 : tb_pci_set_ext_encapsulation(tunnel, activate);