thunderbolt: Cleanup ABI entries and update wakes
Subsystems (2)
cover thunderbolt: Cleanup ABI entries and update wakes
Hi all,
The first patch just cleans up the documentation of the sysfs entrues. The following two patches add wake from DisplayPort (this is recent addition to the USB4 spec), and aligns the driver wake configuration with the USB4 Connection Manager guide (which is part of the USB4 spec package).
Mika Westerberg (3):
Documentation / thunderbolt: Clean up entries
thunderbolt: Add wake from DisplayPort
thunderbolt: Align USB4 router wakes configuration with the CM guide
.../ABI/testing/sysfs-bus-thunderbolt | 44 +++++++++---------- drivers/thunderbolt/lc.c | 6 ++- drivers/thunderbolt/switch.c | 3 +- drivers/thunderbolt/tb.h | 1 + drivers/thunderbolt/tb_regs.h | 3 ++ drivers/thunderbolt/usb4.c | 22 +++++++--- 6 files changed, 47 insertions(+), 32 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/3 Documentation / thunderbolt: Clean up entries
Align the "What" entries along with the rest and move nvm_authenticate_on_disconnect to correct place.
Signed-off-by Mika Westerberg <[email protected]>
--- .../ABI/testing/sysfs-bus-thunderbolt | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-)
Documentation/ABI/testing/sysfs-bus-thunderbolt +22 -22
@@ -1,4 +1,4 @@ -What: /sys/bus/thunderbolt/devices/.../domainX/boot_acl +What: /sys/bus/thunderbolt/devices/.../domainX/boot_acl Date: Jun 2018 KernelVersion: 4.17 Contact: [email protected]
@@ -21,7 +21,7 @@ Description: Holds a comma separated list of device unique_ids that If a device is authorized automatically during boot its boot attribute is set to 1. -What: /sys/bus/thunderbolt/devices/.../domainX/deauthorization +What: /sys/bus/thunderbolt/devices/.../domainX/deauthorization Date: May 2021 KernelVersion: 5.12 Contact: Mika Westerberg <[email protected]>
@@ -30,7 +30,7 @@ Description: This attribute tells whether the system supports de-authorize PCIe tunnel by writing 0 to authorized attribute under each device. -What: /sys/bus/thunderbolt/devices/.../domainX/iommu_dma_protection +What: /sys/bus/thunderbolt/devices/.../domainX/iommu_dma_protection Date: Mar 2019 KernelVersion: 4.21 Contact: [email protected]
@@ -39,7 +39,7 @@ Description: This attribute tells whether the system uses IOMMU it is not (DMA protection is solely based on Thunderbolt security levels). -What: /sys/bus/thunderbolt/devices/.../domainX/security +What: /sys/bus/thunderbolt/devices/.../domainX/security Date: Sep 2017 KernelVersion: 4.13 Contact: [email protected]
@@ -61,7 +61,7 @@ Description: This attribute holds current Thunderbolt security level the BIOS. ======= ================================================== -What: /sys/bus/thunderbolt/devices/.../authorized +What: /sys/bus/thunderbolt/devices/.../authorized Date: Sep 2017 KernelVersion: 4.13 Contact: [email protected]
@@ -95,14 +95,14 @@ Description: This attribute is used to authorize Thunderbolt devices EKEYREJECTED if the challenge response did not match. == ======================================================== -What: /sys/bus/thunderbolt/devices/.../boot +What: /sys/bus/thunderbolt/devices/.../boot Date: Jun 2018 KernelVersion: 4.17 Contact: [email protected] Description: This attribute contains 1 if Thunderbolt device was already authorized on boot and 0 otherwise. -What: /sys/bus/thunderbolt/devices/.../generation +What: /sys/bus/thunderbolt/devices/.../generation Date: Jan 2020 KernelVersion: 5.5 Contact: Christian Kellner <[email protected]>
@@ -110,7 +110,7 @@ Description: This attribute contains the generation of the Thunderbolt controller associated with the device. It will contain 4 for USB4. -What: /sys/bus/thunderbolt/devices/.../key +What: /sys/bus/thunderbolt/devices/.../key Date: Sep 2017 KernelVersion: 4.13 Contact: [email protected]
@@ -226,6 +226,20 @@ Description: When new NVM image is written to the non-active NVM based mailbox before the device is power cycled. Writing 0 here clears the status. +What: /sys/bus/thunderbolt/devices/.../nvm_authenticate_on_disconnect +Date: Oct 2020 +KernelVersion: v5.9 +Contact: Mario Limonciello <[email protected]> +Description: For supported devices, automatically authenticate the new Thunderbolt + image when the device is disconnected from the host system. + + This file will accept writing values "1" or "2" + + - Writing "1" will flush the image to the storage + area and prepare the device for authentication on disconnect. + - Writing "2" will run some basic validation on the image + and flush it to the storage area. + What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/key Date: Jan 2018 KernelVersion: 4.15
@@ -308,17 +322,3 @@ Date: Oct 2020 KernelVersion: v5.9 Contact: Mika Westerberg <[email protected]> Description: Retimer vendor identifier read from the hardware. - -What: /sys/bus/thunderbolt/devices/.../nvm_authenticate_on_disconnect -Date: Oct 2020 -KernelVersion: v5.9 -Contact: Mario Limonciello <[email protected]> -Description: For supported devices, automatically authenticate the new Thunderbolt - image when the device is disconnected from the host system. - - This file will accept writing values "1" or "2" - - - Writing "1" will flush the image to the storage - area and prepare the device for authentication on disconnect. - - Writing "2" will run some basic validation on the image - and flush it to the storage area.
Signature · 1 line
2.30.2
PATCH 2/3 thunderbolt: Add wake from DisplayPort
In reply to Mika WesterbergLatest USB4 spec added a new wake bit for DisplayPort so add this to the driver when runtime suspending. This way wake up the domain when a new monitor is plugged in to any of the device routers.
Also do the same for pre-USB4 devices through the link controller registers as documented in chapter 13 of the USB4 spec.
Signed-off-by Mika Westerberg <[email protected]>
--- drivers/thunderbolt/lc.c | 6 ++++-- drivers/thunderbolt/switch.c | 3 ++- drivers/thunderbolt/tb.h | 1 + drivers/thunderbolt/tb_regs.h | 3 +++ drivers/thunderbolt/usb4.c | 6 ++++-- 5 files changed, 14 insertions(+), 5 deletions(-)
drivers/thunderbolt/lc.c +4 -2
@@ -208,8 +208,8 @@ static int tb_lc_set_wake_one(struct tb_switch *sw, unsigned int offset,if (ret)return ret; - ctrl &= ~(TB_LC_SX_CTRL_WOC |TB_LC_SX_CTRL_WOD |TB_LC_SX_CTRL_WOP | -TB_LC_SX_CTRL_WOU4 ); + ctrl &= ~(TB_LC_SX_CTRL_WOC |TB_LC_SX_CTRL_WOD |TB_LC_SX_CTRL_WODPC | +TB_LC_SX_CTRL_WODPD |TB_LC_SX_CTRL_WOP |TB_LC_SX_CTRL_WOU4 );if (flags &TB_WAKE_ON_CONNECT ) ctrl |=TB_LC_SX_CTRL_WOC |TB_LC_SX_CTRL_WOD ;
@@ -217,6 +217,8 @@ static int tb_lc_set_wake_one(struct tb_switch *sw, unsigned int offset, ctrl |=TB_LC_SX_CTRL_WOU4 ;if (flags &TB_WAKE_ON_PCIE ) ctrl |=TB_LC_SX_CTRL_WOP ; +if (flags &TB_WAKE_ON_DP ) + ctrl |=TB_LC_SX_CTRL_WODPC |TB_LC_SX_CTRL_WODPD ;return tb_sw_write (sw, &ctrl,TB_CFG_SWITCH , offset +TB_LC_SX_CTRL ,1 ); }
drivers/thunderbolt/switch.c +2 -1
@@ -2844,7 +2844,8 @@ void tb_switch_suspend(struct tb_switch *sw, bool runtime)if (runtime) {/* Trigger wake when something is plugged in/out */ flags |=TB_WAKE_ON_CONNECT |TB_WAKE_ON_DISCONNECT ; - flags |=TB_WAKE_ON_USB4 |TB_WAKE_ON_USB3 |TB_WAKE_ON_PCIE ; + flags |=TB_WAKE_ON_USB4 ; + flags |=TB_WAKE_ON_USB3 |TB_WAKE_ON_PCIE |TB_WAKE_ON_DP ; }else if (device_may_wakeup (&sw->dev)) { flags |=TB_WAKE_ON_USB4 |TB_WAKE_ON_USB3 |TB_WAKE_ON_PCIE ; }
drivers/thunderbolt/tb.h +1 -0
@@ -347,6 +347,7 @@ struct tb_path {#define TB_WAKE_ON_USB4 BIT(2)#define TB_WAKE_ON_USB3 BIT(3)#define TB_WAKE_ON_PCIE BIT(4) +#define TB_WAKE_ON_DP BIT(5)/** * struct tb_cm_ops - Connection manager specific operations vector
drivers/thunderbolt/tb_regs.h +3 -0
@@ -195,6 +195,7 @@ struct tb_regs_switch_header {#define ROUTER_CS_5_SLP BIT(0)#define ROUTER_CS_5_WOP BIT(1)#define ROUTER_CS_5_WOU BIT(2) +#define ROUTER_CS_5_WOD BIT(3)#define ROUTER_CS_5_C3S BIT(23)#define ROUTER_CS_5_PTO BIT(24)#define ROUTER_CS_5_UTO BIT(25)
@@ -458,6 +459,8 @@ struct tb_regs_hop {#define TB_LC_SX_CTRL 0x96#define TB_LC_SX_CTRL_WOC BIT(1)#define TB_LC_SX_CTRL_WOD BIT(2) +#define TB_LC_SX_CTRL_WODPC BIT(3) +#define TB_LC_SX_CTRL_WODPD BIT(4)#define TB_LC_SX_CTRL_WOU4 BIT(5)#define TB_LC_SX_CTRL_WOP BIT(6)#define TB_LC_SX_CTRL_L1C BIT(16)
drivers/thunderbolt/usb4.c +4 -2
@@ -413,7 +413,7 @@ int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags) }/* -* Enable wakes from PCIe and USB 3.x on this router. Only +* Enable wakes from PCIe, USB 3.x and DP on this router. Only * needed for device routers. */ if (route) {
@@ -421,11 +421,13 @@ int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags)if (ret)return ret; - val &= ~(ROUTER_CS_5_WOP |ROUTER_CS_5_WOU ); + val &= ~(ROUTER_CS_5_WOP |ROUTER_CS_5_WOU |ROUTER_CS_5_WOD );if (flags &TB_WAKE_ON_USB3 ) val |=ROUTER_CS_5_WOU ;if (flags &TB_WAKE_ON_PCIE ) val |=ROUTER_CS_5_WOP ; +if (flags &TB_WAKE_ON_DP ) + val |=ROUTER_CS_5_WOD ; ret =tb_sw_write (sw, &val,TB_CFG_SWITCH ,ROUTER_CS_5 ,1 );if (ret)
Signature · 1 line
2.30.2
PATCH 3/3 thunderbolt: Align USB4 router wakes configuration with the CM guide
In reply to Mika WesterbergThe USB4 Configuration Manager guide suggests that the USB4 port wakes are configured in a certain way, like that when the port is configured the wake-on-connect should not be set and so forth, so align the driver with this.
Signed-off-by Mika Westerberg <[email protected]>
--- drivers/thunderbolt/usb4.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/thunderbolt/usb4.c +11 -5
@@ -399,12 +399,18 @@ int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags) val &= ~(PORT_CS_19_WOC |PORT_CS_19_WOD |PORT_CS_19_WOU4 ); -if (flags &TB_WAKE_ON_CONNECT ) - val |=PORT_CS_19_WOC ; -if (flags &TB_WAKE_ON_DISCONNECT ) - val |=PORT_CS_19_WOD ; -if (flags &TB_WAKE_ON_USB4 ) +if (tb_is_upstream_port (port)) { val |=PORT_CS_19_WOU4 ; + }else { +bool configured = val &PORT_CS_19_PC ; + +if ((flags &TB_WAKE_ON_CONNECT ) && !configured) + val |=PORT_CS_19_WOC ; +if ((flags &TB_WAKE_ON_DISCONNECT ) && configured) + val |=PORT_CS_19_WOD ; +if ((flags &TB_WAKE_ON_USB4 ) && configured) + val |=PORT_CS_19_WOU4 ; + } ret =tb_port_write (port, &val,TB_CFG_PORT , port->cap_usb4 +PORT_CS_19 ,1 );
Signature · 1 line
2.30.2
Quoted 12 lines · Mika Westerberg
Hi all,
The first patch just cleans up the documentation of the sysfs entrues. The following two patches add wake from DisplayPort (this is recent addition to the USB4 spec), and aligns the driver wake configuration with the USB4 Connection Manager guide (which is part of the USB4 spec package).
Mika Westerberg (3):
Documentation / thunderbolt: Clean up entries
thunderbolt: Add wake from DisplayPort
thunderbolt: Align USB4 router wakes configuration with the CM guide
Quoted 7 lines
.../ABI/testing/sysfs-bus-thunderbolt | 44 +++++++++---------- drivers/thunderbolt/lc.c | 6 ++- drivers/thunderbolt/switch.c | 3 +- drivers/thunderbolt/tb.h | 1 + drivers/thunderbolt/tb_regs.h | 3 ++ drivers/thunderbolt/usb4.c | 22 +++++++--- 6 files changed, 47 insertions(+), 32 deletions(-)
All applied to thunderbolt.git/next.