Commit 2c3c4197 authored by Mika Westerberg's avatar Mika Westerberg Committed by Greg Kroah-Hartman
Browse files

thunderbolt: Store Thunderbolt generation in the switch structure 



In some cases it is useful to know what is the Thunderbolt generation
the switch supports. This introduces a new field to struct switch that
stores the generation of the switch based on the device ID. Unknown
switches (there should be none) are assumed to be first generation to be
on the safe side.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarYehezkel Bernat <yehezkel.bernat@intel.com>
Reviewed-by: default avatarMichael Jamet <michael.jamet@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarAndreas Noever <andreas.noever@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd446ee2

drivers/thunderbolt/switch.c

+38 −17
Original line number Diff line number Diff line
@@ -390,6 +390,42 @@ struct device_type tb_switch_type = { 
	.release = tb_switch_release,

};



static int tb_switch_get_generation(struct tb_switch *sw)

{

	switch (sw->config.device_id) {

	case PCI_DEVICE_ID_INTEL_LIGHT_RIDGE:

	case PCI_DEVICE_ID_INTEL_EAGLE_RIDGE:

	case PCI_DEVICE_ID_INTEL_LIGHT_PEAK:

	case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_2C:

	case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C:

	case PCI_DEVICE_ID_INTEL_PORT_RIDGE:

	case PCI_DEVICE_ID_INTEL_REDWOOD_RIDGE_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_REDWOOD_RIDGE_4C_BRIDGE:

		return 1;



	case PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_BRIDGE:

		return 2;



	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_LP_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_BRIDGE:

		return 3;



	default:

		/*

		 * For unknown switches assume generation to be 1 to be

		 * on the safe side.

		 */

		tb_sw_warn(sw, "unsupported switch device id %#x\n",

			   sw->config.device_id);

		return 1;

	}

}



/**

 * tb_switch_alloc() - allocate a switch

 * @tb: Pointer to the owning domain
@@ -443,6 +479,8 @@ struct tb_switch *tb_switch_alloc(struct tb *tb, struct device *parent, 
		sw->ports[i].port = i;

	}



	sw->generation = tb_switch_get_generation(sw);



	cap = tb_switch_find_vse_cap(sw, TB_VSE_CAP_PLUG_EVENTS);

	if (cap < 0) {

		tb_sw_warn(sw, "cannot find TB_VSE_CAP_PLUG_EVENTS aborting\n");
@@ -491,23 +529,6 @@ int tb_switch_configure(struct tb_switch *sw) 
		tb_sw_warn(sw, "unknown switch vendor id %#x\n",

			   sw->config.vendor_id);



	switch (sw->config.device_id) {

	case PCI_DEVICE_ID_INTEL_LIGHT_RIDGE:

	case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C:

	case PCI_DEVICE_ID_INTEL_PORT_RIDGE:

	case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_BRIDGE:

	case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_BRIDGE:

		break;



	default:

		tb_sw_warn(sw, "unsupported switch device id %#x\n",

			   sw->config.device_id);

	}



	sw->config.enabled = 1;



	/* upload configuration */

drivers/thunderbolt/tb.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
 * @device: Device ID of the switch

 * @vendor_name: Name of the vendor (or %NULL if not known)

 * @device_name: Name of the device (or %NULL if not known)

 * @generation: Switch Thunderbolt generation

 * @cap_plug_events: Offset to the plug events capability (%0 if not found)

 * @is_unplugged: The switch is going away

 * @drom: DROM of the switch (%NULL if not found)
@@ -40,6 +41,7 @@ struct tb_switch { 
	u16 device;

	const char *vendor_name;

	const char *device_name;

	unsigned int generation;

	int cap_plug_events;

	bool is_unplugged;

	u8 *drom;

CRA Git | Maintained and supported by SUSTech CRA and CCSE