Skip to content

thunderbolt: Software connection manager improvements

Mika Westerberg lkml netdev 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest35 of 36 patches 1 replyIn review
  2. v336 patches 15 repliesSuperseded
  3. v228 patches 28 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v128 patches7 repliesSuperseded

Changes in v4 from the cover letter

* Added tags from Lukas.

* Fixed typo get_switch_by_route() -> get_switch_at_route().

* In patch 12 drop check for port->sw->is_unplugged (done already in patch 4) and add check for -ENODEV instead.

* Fixed tb_path_alloc() to make sure in_hopid matches the previous out_hopid in patch 19. Also updated kernel-docs accordingly.

* Added missing \n termination in patch 34.

35 of 36 patches are in this archive. The cover letter announces 36.

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/36net: thunderbolt: Unregister ThunderboltIP protocol handler when suspendingdrivers/net/thunderbolt.c+3 -00 replies
2/36thunderbolt: Remove unused work field in struct tb_switchdrivers/thunderbolt/tb.h+0 -20 replies
3/36thunderbolt: Drop duplicated get_switch_at_route()drivers/thunderbolt/icm.c drivers/thunderbolt/switch.c drivers/thunderbolt/tb.c +1 more+14 -260 replies
4/36thunderbolt: Block reads and writes if switch is unpluggeddrivers/thunderbolt/tb.h+8 -00 replies
6/36thunderbolt: Do not allocate switch if depth is greater than 6drivers/thunderbolt/icm.c drivers/thunderbolt/switch.c drivers/thunderbolt/tb.h+15 -90 replies
7/36thunderbolt: Enable TMU access when accessing port space on legacy devicesdrivers/thunderbolt/cap.c drivers/thunderbolt/tb.h+62 -170 replies
8/36thunderbolt: Add dummy read after port capability list walk on Light Ridgedrivers/thunderbolt/cap.c+16 -00 replies
9/36thunderbolt: Move LC specific functionality into a separate filedrivers/thunderbolt/Makefile drivers/thunderbolt/lc.c drivers/thunderbolt/switch.c +2 more+37 -120 replies
10/36thunderbolt: Configure lanes when switch is initializeddrivers/thunderbolt/lc.c drivers/thunderbolt/switch.c drivers/thunderbolt/tb.h +1 more+136 -00 replies
11/36thunderbolt: Set sleep bit when suspending switchdrivers/thunderbolt/lc.c drivers/thunderbolt/switch.c drivers/thunderbolt/tb.h +1 more+49 -40 replies
12/36thunderbolt: Properly disable pathdrivers/thunderbolt/path.c drivers/thunderbolt/tb_regs.h+45 -50 replies
13/36thunderbolt: Cache adapter specific capability offset into struct portdrivers/thunderbolt/switch.c drivers/thunderbolt/tb.c drivers/thunderbolt/tb.h +1 more+13 -100 replies
14/36thunderbolt: Rename tunnel_pci to tunneldrivers/thunderbolt/Makefile drivers/thunderbolt/tb.c drivers/thunderbolt/tunnel.c +1 more+7 -70 replies
15/36thunderbolt: Generalize tunnel creation functionalitydrivers/thunderbolt/switch.c drivers/thunderbolt/tb.c drivers/thunderbolt/tb.h +3 more+235 -1500 replies
16/36thunderbolt: Add functions for allocating and releasing HopIDsdrivers/thunderbolt/nhi.c drivers/thunderbolt/switch.c drivers/thunderbolt/tb.h+98 -30 replies
17/36thunderbolt: Assign remote for both ports in case of dual linkdrivers/thunderbolt/icm.c drivers/thunderbolt/switch.c drivers/thunderbolt/tb.c +2 more+73 -520 replies
18/36thunderbolt: Add helper function to iterate from one port to anotherdrivers/thunderbolt/switch.c drivers/thunderbolt/tb.h+56 -00 replies
19/36thunderbolt: Extend tunnel creation to more than 2 adjacent switchesdrivers/thunderbolt/path.c drivers/thunderbolt/tb.h drivers/thunderbolt/tunnel.c+163 -680 replies
20/36thunderbolt: Deactivate all paths before restarting themdrivers/thunderbolt/tunnel.c+11 -10 replies
21/36thunderbolt: Discover preboot PCIe paths the boot firmware establisheddrivers/thunderbolt/path.c drivers/thunderbolt/switch.c drivers/thunderbolt/tb.c +3 more+340 -250 replies
22/36thunderbolt: Add support for full PCIe daisy chainsdrivers/thunderbolt/tb.c drivers/thunderbolt/tb.h+129 -720 replies
23/36thunderbolt: Scan only valid NULL adapter ports in hotplugdrivers/thunderbolt/tb.c drivers/thunderbolt/tb.h+11 -40 replies
24/36thunderbolt: Generalize port finding routines to support all port typesdrivers/thunderbolt/switch.c drivers/thunderbolt/tb.c drivers/thunderbolt/tb.h+34 -180 replies
25/36thunderbolt: Rework NFC credits handlingdrivers/thunderbolt/switch.c drivers/thunderbolt/tb_regs.h+16 -70 replies
26/36thunderbolt: Add support for Display Port tunnelsdrivers/thunderbolt/switch.c drivers/thunderbolt/tb.c drivers/thunderbolt/tb.h +3 more+554 -250 replies
27/36thunderbolt: Do not tear down tunnels when driver is unloadeddrivers/thunderbolt/path.c drivers/thunderbolt/tb.c drivers/thunderbolt/tunnel.c+6 -180 replies
28/36thunderbolt: Run tb_xdp_handle_request() in system workqueuedrivers/thunderbolt/tb.h drivers/thunderbolt/xdomain.c+11 -20 replies
29/36thunderbolt: Add XDomain UUID exchange supportdrivers/thunderbolt/tb_msgs.h drivers/thunderbolt/xdomain.c include/linux/thunderbolt.h+145 -100 replies
30/36thunderbolt: Add support for DMA tunnelsdrivers/thunderbolt/path.c drivers/thunderbolt/switch.c drivers/thunderbolt/tb.h +3 more+149 -50 replies
31/36thunderbolt: Make tb_switch_alloc() return ERR_PTR()drivers/thunderbolt/icm.c drivers/thunderbolt/switch.c drivers/thunderbolt/tb.c+26 -220 replies
32/36thunderbolt: Add support for XDomain connectionsdrivers/thunderbolt/switch.c drivers/thunderbolt/tb.c+188 -80 replies
33/36thunderbolt: Make __TB_[SW|PORT]_PRINT take const parametersdrivers/thunderbolt/tb.h+3 -30 replies
34/36thunderbolt: Make rest of the logging to happen at debug leveldrivers/thunderbolt/ctl.c drivers/thunderbolt/icm.c drivers/thunderbolt/path.c +3 more+21 -250 replies
35/36thunderbolt: Reword output of tb_dump_hop()drivers/thunderbolt/path.c+13 -130 replies
36/36thunderbolt: Start firmware on Titan Ridge Apple systemsdrivers/thunderbolt/icm.c+2 -00 replies

Reviews trailers per patch

3 of 35 patches have a Reviewed-by or Acked-by.

PatchDavid S. MillerLukas Wunner
1/36A-b
2/36
3/36R-b
4/36
6/36
7/36
8/36
9/36
10/36
11/36
12/36
13/36
14/36
15/36
16/36
17/36
18/36R-b
19/36
20/36
21/36
22/36
23/36
24/36
25/36
26/36
27/36
28/36
29/36
30/36
31/36
32/36
33/36
34/36
35/36
36/36

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/36] thunderbolt: Software connection manager improvements

Hi,

This is fourth iteration of the patch series improving software connection manager capabilities to support:

- PCIe tunnels for full daisy chain up to 6 devices
- Display port tunneling
- P2P networking

The series applies on top of thunderbolt.git/next.

Previous version of the patch series can be viewed here:

v3: https://lkml.org/lkml/2019/3/28/310
v2: https://lkml.org/lkml/2019/2/6/347
v1: https://lkml.org/lkml/2019/1/29/924

Changes from v3:

* Added tags from Lukas.

* Fixed typo get_switch_by_route() -> get_switch_at_route().

* In patch 12 drop check for port->sw->is_unplugged (done already in patch 4) and add check for -ENODEV instead.

* Fixed tb_path_alloc() to make sure in_hopid matches the previous out_hopid in patch 19. Also updated kernel-docs accordingly.

* Added missing \n termination in patch 34.

Changes from v2 (major):

* Always set port->remote even in case of dual link connection.

* Leave (DP, PCIe) tunnels up when the driver is unloaded. When loaded back, it discovers the existing tunnels and updated data structures accordingly. I noticed that the code in v2 did not support cases properly when you unplug something before the driver gets loaded back. This version tears down partial paths during discovery.

* Do not automatically create PCIe tunnels. Instead we implement "user" security level in the software connection manager as well taking advantage of the existing sysfs interfaces. This allows user to disable PCIe tunneling completely or implement different white listing policies. Major distros include bolt system daemon that takes care of this.

* When testing on two-port Falcon Ridge based system I realized that we always just pick the first available PCIe downstream adapter regardless of which Thunderbolt port you plug the device which is not consistent. To solve this we add mapping between host PCIe downstream adapter and the Thunderbolt port for Cactus Ridge and Falcon Ridge based systems.

* Take domain lock in switch sysfs callbacks. This is needed because the software connection manager needs to walk over the topology during tunnel creation so switch_lock is not enough anymore.

Changes from v1:

* Added ACK from David

* Add constant (TMU_ACCESS_EN) for BIT(20) when TMU access is enabled. We keep it in cap.c close to the LR/ER workaround. Also we enable/disable only during capability walk. If it turns we need to have it enabled elsewhere we can move it to switch.c and enable just once during switch enumeration.

* Use 0 to mean no cap_adap instead of negative value. This follows cap_phy.

* Use correct PCI IDs (_BRIDGE) in the last patch where we start firmware on Titan Ridge. It wrongly used NHI PCI IDs in v1.

Mika Westerberg (36):
net: thunderbolt: Unregister ThunderboltIP protocol handler when suspending
thunderbolt: Remove unused work field in struct tb_switch
thunderbolt: Drop duplicated get_switch_at_route()
thunderbolt: Block reads and writes if switch is unplugged
thunderbolt: Take domain lock in switch sysfs attribute callbacks
thunderbolt: Do not allocate switch if depth is greater than 6
thunderbolt: Enable TMU access when accessing port space on legacy devices
thunderbolt: Add dummy read after port capability list walk on Light Ridge
thunderbolt: Move LC specific functionality into a separate file
thunderbolt: Configure lanes when switch is initialized
thunderbolt: Set sleep bit when suspending switch
thunderbolt: Properly disable path
thunderbolt: Cache adapter specific capability offset into struct port
thunderbolt: Rename tunnel_pci to tunnel
thunderbolt: Generalize tunnel creation functionality
thunderbolt: Add functions for allocating and releasing HopIDs
thunderbolt: Assign remote for both ports in case of dual link
thunderbolt: Add helper function to iterate from one port to another
thunderbolt: Extend tunnel creation to more than 2 adjacent switches
thunderbolt: Deactivate all paths before restarting them
thunderbolt: Discover preboot PCIe paths the boot firmware established
thunderbolt: Add support for full PCIe daisy chains
thunderbolt: Scan only valid NULL adapter ports in hotplug
thunderbolt: Generalize port finding routines to support all port types
thunderbolt: Rework NFC credits handling
thunderbolt: Add support for Display Port tunnels
thunderbolt: Do not tear down tunnels when driver is unloaded
thunderbolt: Run tb_xdp_handle_request() in system workqueue
thunderbolt: Add XDomain UUID exchange support
thunderbolt: Add support for DMA tunnels
thunderbolt: Make tb_switch_alloc() return ERR_PTR()
thunderbolt: Add support for XDomain connections
thunderbolt: Make __TB_[SW|PORT]_PRINT take const parameters
thunderbolt: Make rest of the logging to happen at debug level
thunderbolt: Reword output of tb_dump_hop()
thunderbolt: Start firmware on Titan Ridge Apple systems

 drivers/net/thunderbolt.c        |   3 +
 drivers/thunderbolt/Makefile     |   4 +-
 drivers/thunderbolt/cap.c        |  85 +++-
 drivers/thunderbolt/ctl.c        |   2 +-
 drivers/thunderbolt/icm.c        |  60 ++-
 drivers/thunderbolt/lc.c         | 179 ++++++++
 drivers/thunderbolt/nhi.c        |   3 +-
 drivers/thunderbolt/path.c       | 420 ++++++++++++++++---
 drivers/thunderbolt/switch.c     | 551 +++++++++++++++++++-----
 drivers/thunderbolt/tb.c         | 608 ++++++++++++++++++++-------
 drivers/thunderbolt/tb.h         | 225 ++++++++--
 drivers/thunderbolt/tb_msgs.h    |  11 +
 drivers/thunderbolt/tb_regs.h    |  50 ++-
 drivers/thunderbolt/tunnel.c     | 691 +++++++++++++++++++++++++++++++
 drivers/thunderbolt/tunnel.h     |  78 ++++
 drivers/thunderbolt/tunnel_pci.c | 226 ----------
 drivers/thunderbolt/tunnel_pci.h |  31 --
 drivers/thunderbolt/xdomain.c    | 147 ++++++-
 include/linux/thunderbolt.h      |   8 +
 19 files changed, 2720 insertions(+), 662 deletions(-)
 create mode 100644 drivers/thunderbolt/lc.c
 create mode 100644 drivers/thunderbolt/tunnel.c
 create mode 100644 drivers/thunderbolt/tunnel.h
 delete mode 100644 drivers/thunderbolt/tunnel_pci.c
 delete mode 100644 drivers/thunderbolt/tunnel_pci.h
Signature · 1 line
2.20.1