diff options
| author | Andreas Noever <andreas.noever@gmail.com> | 2014-06-12 23:11:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-19 23:14:35 +0200 |
| commit | 343fcb8c70d76967ba64493ca984e40baad9d0f6 (patch) | |
| tree | 8e8b8731fe2094124f459ba33b66b703dcab2178 /drivers/thunderbolt/tb.c | |
| parent | thunderbolt: Read port configuration from eeprom. (diff) | |
| download | linux-343fcb8c70d76967ba64493ca984e40baad9d0f6.tar.xz linux-343fcb8c70d76967ba64493ca984e40baad9d0f6.zip | |
thunderbolt: Fix nontrivial endpoint devices.
Fix issues observed with the Startech docking station:
Fix the type of the route parameter in tb_ctl_rx. It should be u64 and not
u8 (which only worked for short routes).
A thunderbolt cable contains two lanes. If both endpoints support it a
connection will be established on both lanes. Previously we tried to
scan below both "dual link ports". Use the information extracted from
the drom to only scan behind ports with lane_nr == 0.
Endpoints with more complex thunderbolt controllers have some of their
ports disabled (for example the NHI port or one of the HDMI/DP ports).
Accessing them results in an error so we now ignore ports which are
marked as disabled in the drom.
Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/thunderbolt/tb.c')
| -rw-r--r-- | drivers/thunderbolt/tb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c index 1aa6dd7dc68b..d2c3fe346e91 100644 --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c @@ -38,6 +38,11 @@ static void tb_scan_port(struct tb_port *port) return; if (port->config.type != TB_TYPE_PORT) return; + if (port->dual_link_port && port->link_nr) + return; /* + * Downstream switch is reachable through two ports. + * Only scan on the primary port (link_nr == 0). + */ if (tb_wait_for_port(port, false) <= 0) return; if (port->remote) { |