hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Michael Jamet <michael.jamet@intel.com>
Reviewed-by: Yehezkel Bernat <yehezkel.bernat@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mika Westerberg 2017-10-02 13:38:33 +03:00 committed by David S. Miller
parent 9e99b9f4d5
commit e69b71f845
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/thunderbolt/icm.c
View File

@ -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) 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) static inline u8 dual_link_from_link(u8 link)

7
drivers/thunderbolt/tb.h
View File

@ -40,8 +40,6 @@ struct tb_switch_nvm {
}; };
#define TB_SWITCH_KEY_SIZE 32 #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 * 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); u8 depth);
struct tb_switch *tb_switch_find_by_uuid(struct tb *tb, const uuid_t *uuid); 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) static inline void tb_switch_put(struct tb_switch *sw)
{ {
put_device(&sw->dev); put_device(&sw->dev);

7
include/linux/thunderbolt.h
View File

@ -78,6 +78,13 @@ struct tb {
extern struct bus_type tb_bus_type; 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 * struct tb_property_dir - XDomain property directory
* @uuid: Directory UUID or %NULL if root directory * @uuid: Directory UUID or %NULL if root directory