Commit e69b71f8 authored by Mika Westerberg's avatar Mika Westerberg Committed by David S. Miller
Browse files

thunderbolt: Move tb_switch_phy_port_from_link() to thunderbolt.h 



A Thunderbolt service might need to find the physical port from a link
the cable is connected to. For instance networking driver uses this
information to generate MAC address according the Apple ThunderboltIP
protocol.

Move this function to thunderbolt.h and rename it to
tb_phy_port_from_link() to reflect the fact that it does not take switch
as parameter.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarMichael Jamet <michael.jamet@intel.com>
Reviewed-by: default avatarYehezkel Bernat <yehezkel.bernat@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e99b9f4

drivers/thunderbolt/icm.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static inline struct tb *icm_to_tb(struct icm *icm) 


static inline u8 phy_port_from_route(u64 route, u8 depth)

{

	return tb_switch_phy_port_from_link(route >> ((depth - 1) * 8));

	return tb_phy_port_from_link(route >> ((depth - 1) * 8));

}



static inline u8 dual_link_from_link(u8 link)

drivers/thunderbolt/tb.h

+0 −7
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ struct tb_switch_nvm { 
};



#define TB_SWITCH_KEY_SIZE		32

/* Each physical port contains 2 links on modern controllers */

#define TB_SWITCH_LINKS_PER_PHY_PORT	2



/**

 * struct tb_switch - a thunderbolt switch
@@ -367,11 +365,6 @@ struct tb_switch *tb_switch_find_by_link_depth(struct tb *tb, u8 link, 
					       u8 depth);

struct tb_switch *tb_switch_find_by_uuid(struct tb *tb, const uuid_t *uuid);



static inline unsigned int tb_switch_phy_port_from_link(unsigned int link)

{

	return (link - 1) / TB_SWITCH_LINKS_PER_PHY_PORT;

}



static inline void tb_switch_put(struct tb_switch *sw)

{

	put_device(&sw->dev);

include/linux/thunderbolt.h

+7 −0
Original line number Diff line number Diff line
@@ -78,6 +78,13 @@ struct tb { 


extern struct bus_type tb_bus_type;



#define TB_LINKS_PER_PHY_PORT	2



static inline unsigned int tb_phy_port_from_link(unsigned int link)

{

	return (link - 1) / TB_LINKS_PER_PHY_PORT;

}



/**

 * struct tb_property_dir - XDomain property directory

 * @uuid: Directory UUID or %NULL if root directory

CRA Git | Maintained and supported by SUSTech CRA and CCSE