Commit 5cc0df9c authored by Isaac Hazan's avatar Isaac Hazan Committed by Mika Westerberg
Browse files

thunderbolt: Add functions for enabling and disabling lane bonding on XDomain 



These can be used by service drivers to enable and disable lane bonding
as needed.

Signed-off-by: default avatarIsaac Hazan <isaac.hazan@intel.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarYehezkel Bernat <YehezkelShB@gmail.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4210d50f

drivers/thunderbolt/switch.c

+21 −3
Original line number Diff line number Diff line
@@ -503,12 +503,13 @@ static void tb_dump_port(struct tb *tb, struct tb_regs_port_header *port) 


/**

 * tb_port_state() - get connectedness state of a port

 * @port: the port to check

 *

 * The port must have a TB_CAP_PHY (i.e. it should be a real port).

 *

 * Return: Returns an enum tb_port_state on success or an error code on failure.

 */

static int tb_port_state(struct tb_port *port)

int tb_port_state(struct tb_port *port)

{

	struct tb_cap_phy phy;

	int res;
@@ -1008,7 +1009,16 @@ static int tb_port_set_link_width(struct tb_port *port, unsigned int width) 
			     port->cap_phy + LANE_ADP_CS_1, 1);

}



static int tb_port_lane_bonding_enable(struct tb_port *port)

/**

 * tb_port_lane_bonding_enable() - Enable bonding on port

 * @port: port to enable

 *

 * Enable bonding by setting the link width of the port and the

 * other port in case of dual link port.

 *

 * Return: %0 in case of success and negative errno in case of error

 */

int tb_port_lane_bonding_enable(struct tb_port *port)

{

	int ret;
@@ -1038,7 +1048,15 @@ static int tb_port_lane_bonding_enable(struct tb_port *port) 
	return 0;

}



static void tb_port_lane_bonding_disable(struct tb_port *port)

/**

 * tb_port_lane_bonding_disable() - Disable bonding on port

 * @port: port to disable

 *

 * Disable bonding by setting the link width of the port and the

 * other port in case of dual link port.

 *

 */

void tb_port_lane_bonding_disable(struct tb_port *port)

{

	port->dual_link_port->bonded = false;

	port->bonded = false;

drivers/thunderbolt/tb.h

+3 −0
Original line number Diff line number Diff line
@@ -863,6 +863,9 @@ struct tb_port *tb_next_port_on_path(struct tb_port *start, struct tb_port *end, 


int tb_port_get_link_speed(struct tb_port *port);

int tb_port_get_link_width(struct tb_port *port);

int tb_port_state(struct tb_port *port);

int tb_port_lane_bonding_enable(struct tb_port *port);

void tb_port_lane_bonding_disable(struct tb_port *port);



int tb_switch_find_vse_cap(struct tb_switch *sw, enum tb_switch_vse_cap vsec);

int tb_switch_find_cap(struct tb_switch *sw, enum tb_switch_cap cap);

drivers/thunderbolt/xdomain.c

+66 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/device.h>

#include <linux/delay.h>

#include <linux/kmod.h>

#include <linux/module.h>

#include <linux/pm_runtime.h>
@@ -21,6 +22,7 @@ 
#define XDOMAIN_UUID_RETRIES			10

#define XDOMAIN_PROPERTIES_RETRIES		60

#define XDOMAIN_PROPERTIES_CHANGED_RETRIES	10

#define XDOMAIN_BONDING_WAIT			100  /* ms */



struct xdomain_request_work {

	struct work_struct work;
@@ -1443,6 +1445,70 @@ void tb_xdomain_remove(struct tb_xdomain *xd) 
		device_unregister(&xd->dev);

}



/**

 * tb_xdomain_lane_bonding_enable() - Enable lane bonding on XDomain

 * @xd: XDomain connection

 *

 * Lane bonding is disabled by default for XDomains. This function tries

 * to enable bonding by first enabling the port and waiting for the CL0

 * state.

 *

 * Return: %0 in case of success and negative errno in case of error.

 */

int tb_xdomain_lane_bonding_enable(struct tb_xdomain *xd)

{

	struct tb_port *port;

	int ret;



	port = tb_port_at(xd->route, tb_xdomain_parent(xd));

	if (!port->dual_link_port)

		return -ENODEV;



	ret = tb_port_enable(port->dual_link_port);

	if (ret)

		return ret;



	ret = tb_wait_for_port(port->dual_link_port, true);

	if (ret < 0)

		return ret;

	if (!ret)

		return -ENOTCONN;



	ret = tb_port_lane_bonding_enable(port);

	if (ret) {

		tb_port_warn(port, "failed to enable lane bonding\n");

		return ret;

	}



	tb_xdomain_update_link_attributes(xd);



	dev_dbg(&xd->dev, "lane bonding enabled\n");

	return 0;

}

EXPORT_SYMBOL_GPL(tb_xdomain_lane_bonding_enable);



/**

 * tb_xdomain_lane_bonding_disable() - Disable lane bonding

 * @xd: XDomain connection

 *

 * Lane bonding is disabled by default for XDomains. If bonding has been

 * enabled, this function can be used to disable it.

 */

void tb_xdomain_lane_bonding_disable(struct tb_xdomain *xd)

{

	struct tb_port *port;



	port = tb_port_at(xd->route, tb_xdomain_parent(xd));

	if (port->dual_link_port) {

		tb_port_lane_bonding_disable(port);

		tb_port_disable(port->dual_link_port);

		tb_xdomain_update_link_attributes(xd);



		dev_dbg(&xd->dev, "lane bonding disabled\n");

	}

}

EXPORT_SYMBOL_GPL(tb_xdomain_lane_bonding_disable);



/**

 * tb_xdomain_enable_paths() - Enable DMA paths for XDomain connection

 * @xd: XDomain connection

include/linux/thunderbolt.h

+2 −0
Original line number Diff line number Diff line
@@ -247,6 +247,8 @@ struct tb_xdomain { 
	u8 depth;

};



int tb_xdomain_lane_bonding_enable(struct tb_xdomain *xd);

void tb_xdomain_lane_bonding_disable(struct tb_xdomain *xd);

int tb_xdomain_enable_paths(struct tb_xdomain *xd, u16 transmit_path,

			    u16 transmit_ring, u16 receive_path,

			    u16 receive_ring);