Commit 7bffd97e authored by Mika Westerberg's avatar Mika Westerberg
Browse files

thunderbolt: Add downstream PCIe port mappings for Alpine and Titan Ridge 



In order to keep PCIe hierarchies consistent across hotplugs, add
hard-coded PCIe downstream port to Thunderbolt port for Alpine Ridge and
Titan Ridge as well.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 17a8f815

drivers/thunderbolt/tb.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -342,10 +342,13 @@ static struct tb_port *tb_find_pcie_down(struct tb_switch *sw, 
		 * Hard-coded Thunderbolt port to PCIe down port mapping

		 * Hard-coded Thunderbolt port to PCIe down port mapping

		 * per controller.

		 * per controller.

		 */

		 */

		if (tb_switch_is_cactus_ridge(sw))

		if (tb_switch_is_cactus_ridge(sw) ||

		    tb_switch_is_alpine_ridge(sw))

			index = !phy_port ? 6 : 7;

			index = !phy_port ? 6 : 7;

		else if (tb_switch_is_falcon_ridge(sw))

		else if (tb_switch_is_falcon_ridge(sw))

			index = !phy_port ? 6 : 8;

			index = !phy_port ? 6 : 8;

		else if (tb_switch_is_titan_ridge(sw))

			index = !phy_port ? 8 : 9;

		else

		else

			goto out;

			goto out;

drivers/thunderbolt/tb.h

+25 −0
Original line number Original line Diff line number Diff line
@@ -608,6 +608,31 @@ static inline bool tb_switch_is_falcon_ridge(const struct tb_switch *sw) 
	}

	}

}

}





static inline bool tb_switch_is_alpine_ridge(const struct tb_switch *sw)

{

	switch (sw->config.device_id) {

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_LP_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_BRIDGE:

		return true;

	default:

		return false;

	}

}



static inline bool tb_switch_is_titan_ridge(const struct tb_switch *sw)

{

	switch (sw->config.device_id) {

	case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_BRIDGE:

		return true;

	default:

		return false;

	}

}



/**

/**

 * tb_switch_is_icm() - Is the switch handled by ICM firmware

 * tb_switch_is_icm() - Is the switch handled by ICM firmware

 * @sw: Switch to check

 * @sw: Switch to check