thunderbolt: Power Management improvements
Subsystems (4)
cover thunderbolt: Power Management improvements
Hi all,
This series improves power management in the Thunderbolt driver. We already have a quite complete power management on systems where Firmware based Connection Manager is used (this is pretty much all non-Apple systems out there) so this series adds a couple of optimizations to make certain power transitions slightly faster, hopefully improving user experience.
Rest of the patches improve power management in the Software Connection manager side of the driver. USB4 spec covers power management for USB4 hosts and devices, and also TBT3 compatible devices so these patches implement that. We also switch to use device links instead of PCI quirk to make sure the Thunderbolt/USB4 host controller is resumed before tunneled PCIe and USB 3.x ports (so that it gets the chance to restore the tunnels properly before). Tiger Lake systems with Software Connection Manager enabled describe these relationships using a new ACPI _DSD property that we parse in the driver and populate device links accordingly.
Mika Westerberg (17):
thunderbolt: Software CM only should set force power in Tiger Lake
thunderbolt: Use bit 31 to check if Firmware CM is running in Tiger Lake
thunderbolt: Do not program NFC buffers for USB4 router protocol adapters
thunderbolt: No need to log an error if tb_switch_lane_bonding_enable() fails
thunderbolt: Send reset only to first generation routers
thunderbolt: Tear down DP tunnels when suspending
thunderbolt: Initialize TMU again on resume
thunderbolt: Do not change default USB4 router notification timeout
thunderbolt: Configure link after lane bonding is enabled
thunderbolt: Set port configured for both ends of the link
thunderbolt: Configure port for XDomain
thunderbolt: Disable lane 1 for XDomain connection
thunderbolt: Enable wakes from system suspend
PCI / thunderbolt: Switch to use device links instead of PCI quirk
ACPI: Export acpi_get_first_physical_node() to modules
thunderbolt: Create device links from ACPI description
thunderbolt: Add runtime PM for Software CM
Rajmohan Mani (2):
thunderbolt: Optimize Force Power logic
thunderbolt: Optimize NHI LC mailbox command processing
drivers/acpi/bus.c | 1 + drivers/pci/quirks.c | 57 -------- drivers/thunderbolt/Makefile | 2 + drivers/thunderbolt/acpi.c | 117 ++++++++++++++++ drivers/thunderbolt/domain.c | 2 + drivers/thunderbolt/icm.c | 5 +- drivers/thunderbolt/lc.c | 151 ++++++++++++++++---- drivers/thunderbolt/nhi.c | 69 ++++++++++ drivers/thunderbolt/nhi_ops.c | 31 +++-- drivers/thunderbolt/switch.c | 209 +++++++++++++++++++++++----- drivers/thunderbolt/tb.c | 189 +++++++++++++++++++++++-- drivers/thunderbolt/tb.h | 35 ++++- drivers/thunderbolt/tb_regs.h | 16 +++ drivers/thunderbolt/usb4.c | 251 ++++++++++++++++++++++++++-------- 14 files changed, 935 insertions(+), 200 deletions(-) create mode 100644 drivers/thunderbolt/acpi.c
Signature · 1 line
2.28.0
PATCH 1/19 thunderbolt: Optimize Force Power logic
From: Rajmohan Mani <[email protected]>
Currently the "Force Power" logic uses 10 retries, each with a delay of 250 ms. Thunderbolt controllers in Ice Lake and Tiger Lake platforms are found to complete this in the order of 3 ms or so. Since this delay is in resume path, surplus delay is effectively affecting runtime PM resume flows.
Decrease the granularity of the delay to 3 ms and increase the number of retries so we wait maximum of ~1 s which is the recommended timeout. This should make runtime resume a bit faster.
--- drivers/thunderbolt/nhi_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thunderbolt/nhi_ops.c +2 -2
@@ -59,7 +59,7 @@ static int icl_nhi_force_power(struct tb_nhi *nhi, bool power)pci_write_config_dword (nhi->pdev,VS_CAP_22 , vs_cap);if (power) { -unsigned int retries =10 ; +unsigned int retries =350 ;u32 val;/* Wait until the firmware tells it is up and running */
@@ -67,7 +67,7 @@ static int icl_nhi_force_power(struct tb_nhi *nhi, bool power)pci_read_config_dword (nhi->pdev,VS_CAP_9 , &val);if (val &VS_CAP_9_FW_READY )return 0 ; -msleep (250 ); +usleep_range (3000 ,3100 ); }while (--retries);return -ETIMEDOUT ;
Signature · 1 line
2.28.0
PATCH 2/19 thunderbolt: Optimize NHI LC mailbox command processing
In reply to Mika WesterbergFrom: Rajmohan Mani <[email protected]>
Currently the Ice Lake and Tiger Lake NHI (host controller) LC (link controller) mailbox command processing checks for the completion of command every 100 msecs. These controllers are found to complete this in the order of 1 ms or so. Since this delay is in suspend path, surplus delay is effectively affecting runtime PM suspend flows.
Optimize this so that we do the wait for 1 ms after reading the mailbox register. This should make Ice Lake and Tiger Lake runtime suspend take less time to complete.
--- drivers/thunderbolt/nhi_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thunderbolt/nhi_ops.c +1 -1
@@ -97,7 +97,7 @@ static int icl_nhi_lc_mailbox_cmd_complete(struct tb_nhi *nhi, int timeout)pci_read_config_dword (nhi->pdev,VS_CAP_18 , &data);if (data &VS_CAP_18_DONE ) goto clear; -msleep (100 ); +usleep_range (1000 ,1100 ); }while (time_before (jiffies, end));return -ETIMEDOUT ;
Signature · 1 line
2.28.0
PATCH 3/19 thunderbolt: Software CM only should set force power in Tiger Lake
In reply to Mika WesterbergWhen Software CM is running it should not send any NHI mailbox command during PM flows. Only force power bit needs to be set and cleared so change Tiger Lake (well and Ice Lake) nhi_ops to take this into account.
--- drivers/thunderbolt/nhi_ops.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
drivers/thunderbolt/nhi_ops.c +16 -9
@@ -121,31 +121,38 @@ static void icl_nhi_set_ltr(struct tb_nhi *nhi)static int icl_nhi_suspend (struct tb_nhi *nhi) { +struct tb *tb =pci_get_drvdata (nhi->pdev);int ret;if (icl_nhi_is_device_connected (nhi))return 0 ; -/* -* If there is no device connected we need to perform both: a -* handshake through LC mailbox and force power down before -* entering D3. -*/ -icl_nhi_lc_mailbox_cmd (nhi,ICL_LC_PREPARE_FOR_RESET ); - ret =icl_nhi_lc_mailbox_cmd_complete (nhi,ICL_LC_MAILBOX_TIMEOUT ); -if (ret) -return ret; +if (tb_switch_is_icm (tb->root_switch)) { +/* +* If there is no device connected we need to perform +* both: a handshake through LC mailbox and force power +* down before entering D3. +*/ +icl_nhi_lc_mailbox_cmd (nhi,ICL_LC_PREPARE_FOR_RESET ); + ret =icl_nhi_lc_mailbox_cmd_complete (nhi,ICL_LC_MAILBOX_TIMEOUT ); +if (ret) +return ret; + }return icl_nhi_force_power (nhi, false); }static int icl_nhi_suspend_noirq (struct tb_nhi *nhi,bool wakeup) { +struct tb *tb =pci_get_drvdata (nhi->pdev);enum icl_lc_mailbox_cmd cmd;if (!pm_suspend_via_firmware ())return icl_nhi_suspend (nhi); +if (!tb_switch_is_icm (tb->root_switch)) +return 0 ; + cmd = wakeup ?ICL_LC_GO2SX :ICL_LC_GO2SX_NO_WAKE ;icl_nhi_lc_mailbox_cmd (nhi, cmd);return icl_nhi_lc_mailbox_cmd_complete (nhi,ICL_LC_MAILBOX_TIMEOUT );
Signature · 1 line
2.28.0
PATCH 4/19 thunderbolt: Use bit 31 to check if Firmware CM is running in Tiger Lake
In reply to Mika WesterbergIn Tiger Lake the Firmware CM is always enabled (so bit 0 is always set) but it may be in "pass through" mode which means it requires Software CM instead. This can be determined by checking bit 31 instead.
--- drivers/thunderbolt/icm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/thunderbolt/icm.c +4 -1
@@ -1635,11 +1635,14 @@ static void icm_icl_rtd3_veto(struct tb *tb, const struct icm_pkg_header *hdr)static bool icm_tgl_is_supported (struct tb *tb) { +u32 val; +/* * If the firmware is not running use software CM. This platform * should fully support both. */ -return icm_firmware_running (tb->nhi); + val =ioread32 (tb->nhi->iobase +REG_FW_STS ); +return !!(val ®_FW_STS_NVM_AUTH_DONE ); }static void icm_handle_notification (struct work_struct *work)
Signature · 1 line
2.28.0
PATCH 5/19 thunderbolt: Do not program NFC buffers for USB4 router protocol adapters
In reply to Mika WesterbergUSB4 spec says that NFC buffers field is not used for protocol adapters, only for lane adapters so make tb_port_add_nfc_credits() skip non-lane adapters in order to follow the spec.
--- drivers/thunderbolt/switch.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/thunderbolt/switch.c +7 -0
@@ -601,6 +601,13 @@ int tb_port_add_nfc_credits(struct tb_port *port, int credits)if (credits ==0 || port->sw->is_unplugged)return 0 ; +/* +* USB4 restricts programming NFC buffers to lane adapters only +* so skip other ports. +*/ +if (tb_switch_is_usb4 (port->sw) && !tb_port_is_null (port)) +return 0 ; + nfc_credits = port->config.nfc_credits &ADP_CS_4_NFC_BUFFERS_MASK ; nfc_credits += credits;
Signature · 1 line
2.28.0
PATCH 6/19 thunderbolt: No need to log an error if tb_switch_lane_bonding_enable() fails
In reply to Mika WesterbergThe function already logs an error if it fails so get rid of the duplication.
--- drivers/thunderbolt/tb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/thunderbolt/tb.c +2 -4
@@ -592,8 +592,7 @@ static void tb_scan_port(struct tb_port *port) }/* Enable lane bonding if supported */ -if (tb_switch_lane_bonding_enable (sw)) -tb_sw_warn (sw,"failed to enable lane bonding\n" ); +tb_switch_lane_bonding_enable (sw);if (tb_enable_tmu (sw))tb_sw_warn (sw,"failed to enable TMU\n" );
@@ -1245,8 +1244,7 @@ static void tb_restore_children(struct tb_switch *sw)if (!tb_port_has_remote (port))continue ; -if (tb_switch_lane_bonding_enable (port->remote->sw)) -dev_warn (&sw->dev,"failed to restore lane bonding\n" ); +tb_switch_lane_bonding_enable (port->remote->sw);tb_restore_children (port->remote->sw); }
Signature · 1 line
2.28.0
PATCH 7/19 thunderbolt: Send reset only to first generation routers
In reply to Mika WesterbergFirst generation routers may need the reset command upon resume but it is not supported by newer generations.
--- drivers/thunderbolt/switch.c | 21 +++++++++++---------- drivers/thunderbolt/tb.c | 2 +- drivers/thunderbolt/tb.h | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-)
drivers/thunderbolt/switch.c +11 -10
@@ -1234,23 +1234,24 @@ static void tb_dump_switch(const struct tb *tb, const struct tb_switch *sw)/** * reset_switch() - reconfigure route, enable and send TB_CFG_PKG_RESET +* @sw: Switch to reset * * Return: Returns 0 on success or an error code on failure. */ -int tb_switch_reset (struct tb *tb,u64 route) +int tb_switch_reset (struct tb_switch *sw) {struct tb_cfg_result res; -struct tb_regs_switch_header header = { - header.route_hi = route >>32 , - header.route_lo = route, - header.enabled = true, - }; -tb_dbg (tb,"resetting switch at %llx\n" , route); - res.err =tb_cfg_write (tb->ctl, ((u32 *) &header) +2 , route, -0 ,2 ,2 ,2 ); + +if (sw->generation >1 ) +return 0 ; + +tb_sw_dbg (sw,"resetting switch\n" ); + + res.err =tb_sw_write (sw, ((u32 *) &sw->config) +2 , +TB_CFG_SWITCH ,2 ,2 );if (res.err)return res.err; - res =tb_cfg_reset (tb->ctl, route,TB_CFG_DEFAULT_TIMEOUT ); + res =tb_cfg_reset (sw->tb->ctl,tb_route (sw),TB_CFG_DEFAULT_TIMEOUT );if (res.err >0 )return -EIO ;return res.err;
drivers/thunderbolt/tb.c +1 -1
@@ -1258,7 +1258,7 @@ static int tb_resume_noirq(struct tb *tb)tb_dbg (tb,"resuming...\n" );/* remove any pci devices the firmware might have setup */ -tb_switch_reset (tb,0 ); +tb_switch_reset (tb->root_switch);tb_switch_resume (tb->root_switch);tb_free_invalid_tunnels (tb);
drivers/thunderbolt/tb.h +1 -1
@@ -634,7 +634,7 @@ int tb_switch_add(struct tb_switch *sw);void tb_switch_remove (struct tb_switch *sw);void tb_switch_suspend (struct tb_switch *sw);int tb_switch_resume (struct tb_switch *sw); -int tb_switch_reset (struct tb *tb,u64 route); +int tb_switch_reset (struct tb_switch *sw);void tb_sw_set_unplugged (struct tb_switch *sw);struct tb_port *tb_switch_find_port (struct tb_switch *sw,enum tb_port_type type);
Signature · 1 line
2.28.0
PATCH 8/19 thunderbolt: Tear down DP tunnels when suspending
In reply to Mika WesterbergDP tunnels do not need the same kind of treatment as others because they are created based on hot-plug events on DP adapter ports, and the display stack does not need the tunnels to be enabled when resuming from suspend. Also Tiger Lake Thunderbolt controller sends unplug event on D3 exit so this avoids that as well.
--- drivers/thunderbolt/tb.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/thunderbolt/tb.c +24 -0
@@ -910,6 +910,29 @@ static void tb_dp_resource_available(struct tb *tb, struct tb_port *port)tb_tunnel_dp (tb); } +static void tb_disconnect_and_release_dp (struct tb *tb) +{ +struct tb_cm *tcm =tb_priv (tb); +struct tb_tunnel *tunnel, *n; + +/* +* Tear down all DP tunnels and release their resources. They +* will be re-established after resume based on plug events. +*/ +list_for_each_entry_safe_reverse (tunnel, n, &tcm->tunnel_list, list) { +if (tb_tunnel_is_dp (tunnel)) +tb_deactivate_and_free_tunnel (tunnel); + } + +while (!list_empty (&tcm->dp_resources)) { +struct tb_port *port; + + port =list_first_entry (&tcm->dp_resources, + struct tb_port, list); +list_del_init (&port->list); + } +} +static int tb_tunnel_pci (struct tb *tb,struct tb_switch *sw) {struct tb_port *up, *down, *port;
@@ -1226,6 +1249,7 @@ static int tb_suspend_noirq(struct tb *tb)struct tb_cm *tcm =tb_priv (tb);tb_dbg (tb,"suspending...\n" ); +tb_disconnect_and_release_dp (tb);tb_switch_suspend (tb->root_switch); tcm->hotplug_active = false;/* signal tb_handle_hotplug to quit */ tb_dbg (tb,"suspend finished\n" );
Signature · 1 line
2.28.0
PATCH 9/19 thunderbolt: Initialize TMU again on resume
In reply to Mika WesterbergThe TMU will be reset after router exits sleep so in order to re-configure it upon resume make sure the structure is initialized again based on the current hardware state.
--- drivers/thunderbolt/switch.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/thunderbolt/switch.c +4 -0
@@ -2534,6 +2534,10 @@ int tb_switch_resume(struct tb_switch *sw)if (err)return err; + err =tb_switch_tmu_init (sw); +if (err) +return err; +/* check for surviving downstream switches */ tb_switch_for_each_port (sw, port) {if (!tb_port_has_remote (port) && !port->xdomain)
Signature · 1 line
2.28.0
PATCH 10/19 thunderbolt: Do not change default USB4 router notification timeout
In reply to Mika WesterbergSome early stage USB4 devices do not like that any of the enumerating router config space fields (ROUTER_CS_1 - ROUTER_CS_4) are written after the initial enumeration for example when entering sleep states. The default timeout by the USB4 spec is 10 ms which should be fine for the driver to handle.
For this reason do not change the notification timeout from the default 10 ms for USB4 routers.
--- drivers/thunderbolt/switch.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/thunderbolt/switch.c +1 -5
@@ -1269,7 +1269,7 @@ static int tb_plug_events_active(struct tb_switch *sw, bool active)u32 data;int res; -if (tb_switch_is_icm (sw)) +if (tb_switch_is_icm (sw) ||tb_switch_is_usb4 (sw))return 0 ; sw->config.plug_events_delay =0xff ;
@@ -1277,10 +1277,6 @@ static int tb_plug_events_active(struct tb_switch *sw, bool active)if (res)return res; -/* Plug events are always enabled in USB4 */ -if (tb_switch_is_usb4 (sw)) -return 0 ; - res =tb_sw_read (sw, &data,TB_CFG_SWITCH , sw->cap_plug_events +1 ,1 );if (res)return res;
Signature · 1 line
2.28.0
PATCH 11/19 thunderbolt: Configure link after lane bonding is enabled
In reply to Mika WesterbergDuring testing it was noticed that the link is not properly restored after the domain exits sleep if the link configured bits are set before lane bonding is enabled. The USB4 spec does not say in which order these need to be set but setting link configured afterwards makes the link restoration work so we do that instead.
--- drivers/thunderbolt/lc.c | 6 ---- drivers/thunderbolt/switch.c | 55 +++++++++++++++++++++++++++--------- drivers/thunderbolt/tb.c | 5 ++++ drivers/thunderbolt/tb.h | 2 ++ drivers/thunderbolt/usb4.c | 6 ---- 5 files changed, 49 insertions(+), 25 deletions(-)
drivers/thunderbolt/lc.c +0 -6
@@ -94,9 +94,6 @@ int tb_lc_configure_link(struct tb_switch *sw)struct tb_port *up, *down;int ret; -if (!tb_route (sw) ||tb_switch_is_icm (sw)) -return 0 ; - up =tb_upstream_port (sw); down =tb_port_at (tb_route (sw),tb_to_switch (sw->dev.parent));
@@ -124,9 +121,6 @@ void tb_lc_unconfigure_link(struct tb_switch *sw) {struct tb_port *up, *down; -if (sw->is_unplugged || !tb_route (sw) ||tb_switch_is_icm (sw)) -return ; - up =tb_upstream_port (sw); down =tb_port_at (tb_route (sw),tb_to_switch (sw->dev.parent));
drivers/thunderbolt/switch.c +42 -13
79 lines not on this page · raw message
drivers/thunderbolt/tb.c +5 -0
@@ -593,6 +593,8 @@ static void tb_scan_port(struct tb_port *port)/* Enable lane bonding if supported */ tb_switch_lane_bonding_enable (sw); +/* Set the link configured */ +tb_switch_configure_link (sw);if (tb_enable_tmu (sw))tb_sw_warn (sw,"failed to enable TMU\n" );
@@ -681,6 +683,7 @@ static void tb_free_unplugged_children(struct tb_switch *sw)if (port->remote->sw->is_unplugged) {tb_retimer_remove_all (port);tb_remove_dp_resources (port->remote->sw); +tb_switch_unconfigure_link (port->remote->sw);tb_switch_lane_bonding_disable (port->remote->sw);tb_switch_remove (port->remote->sw); port->remote =NULL ;
@@ -1076,6 +1079,7 @@ static void tb_handle_hotplug(struct work_struct *work)tb_free_invalid_tunnels (tb);tb_remove_dp_resources (port->remote->sw);tb_switch_tmu_disable (port->remote->sw); +tb_switch_unconfigure_link (port->remote->sw);tb_switch_lane_bonding_disable (port->remote->sw);tb_switch_remove (port->remote->sw); port->remote =NULL ;
@@ -1269,6 +1273,7 @@ static void tb_restore_children(struct tb_switch *sw)continue ;tb_switch_lane_bonding_enable (port->remote->sw); +tb_switch_configure_link (port->remote->sw);tb_restore_children (port->remote->sw); }
drivers/thunderbolt/tb.h +2 -0
@@ -767,6 +767,8 @@ static inline bool tb_switch_is_icm(const struct tb_switch *sw)int tb_switch_lane_bonding_enable (struct tb_switch *sw);void tb_switch_lane_bonding_disable (struct tb_switch *sw); +int tb_switch_configure_link (struct tb_switch *sw); +void tb_switch_unconfigure_link (struct tb_switch *sw);bool tb_switch_query_dp_resource (struct tb_switch *sw,struct tb_port *in);int tb_switch_alloc_dp_resource (struct tb_switch *sw,struct tb_port *in);
drivers/thunderbolt/usb4.c +0 -6
@@ -368,9 +368,6 @@ int usb4_switch_configure_link(struct tb_switch *sw) {struct tb_port *up; -if (!tb_route (sw)) -return 0 ; - up =tb_upstream_port (sw);return usb4_set_port_configured (up, true); }
@@ -385,9 +382,6 @@ void usb4_switch_unconfigure_link(struct tb_switch *sw) {struct tb_port *up; -if (sw->is_unplugged || !tb_route (sw)) -return ; - up =tb_upstream_port (sw);usb4_set_port_configured (up, false); }
Signature · 1 line
2.28.0
PATCH 12/19 thunderbolt: Set port configured for both ends of the link
In reply to Mika WesterbergBoth ends of the link needs to have this set. Otherwise the link is not re-established properly after sleep. Now since it is possible to have mixed USB4 and Thunderbolt 1, 2 and 3 devices we need to split the link configuration functionality to happen per port so we can pick the correct implementation.
--- drivers/thunderbolt/lc.c | 48 +++++-------------- drivers/thunderbolt/switch.c | 33 ++++++++++--- drivers/thunderbolt/tb.h | 8 ++-- drivers/thunderbolt/usb4.c | 92 +++++++++++++++++------------------- 4 files changed, 87 insertions(+), 94 deletions(-)
drivers/thunderbolt/lc.c +12 -36
@@ -45,7 +45,7 @@ static int find_port_lc_cap(struct tb_port *port)return sw->cap_lc + start + phys * size; } -static int tb_lc_configure_lane (struct tb_port *port,bool configure) +static int tb_lc_set_port_configured (struct tb_port *port,bool configured) {bool upstream =tb_is_upstream_port (port);struct tb_switch *sw = port->sw;
@@ -69,7 +69,7 @@ static int tb_lc_configure_lane(struct tb_port *port, bool configure)else lane =TB_LC_SX_CTRL_L2C ; -if (configure) { +if (configured) { ctrl |= lane;if (upstream) ctrl |=TB_LC_SX_CTRL_UPSTREAM ;
@@ -83,49 +83,25 @@ static int tb_lc_configure_lane(struct tb_port *port, bool configure) }/** -* tb_lc_configure_link() - Let LC know about configured link -* @sw: Switch that is being added +* tb_lc_configure_port() - Let LC know about configured port +* @port: Port that is set as configured * -* Informs LC of both parent switch and @sw that there is established -* link between the two. +* Sets the port configured for power management purposes. */ -int tb_lc_configure_link (struct tb_switch *sw) +int tb_lc_configure_port (struct tb_port *port) { -struct tb_port *up, *down; -int ret; - - up =tb_upstream_port (sw); - down =tb_port_at (tb_route (sw),tb_to_switch (sw->dev.parent)); - -/* Configure parent link toward this switch */ - ret =tb_lc_configure_lane (down, true); -if (ret) -return ret; - -/* Configure upstream link from this switch to the parent */ - ret =tb_lc_configure_lane (up, true); -if (ret) -tb_lc_configure_lane (down, false); - -return ret; +return tb_lc_set_port_configured (port, true); }/** -* tb_lc_unconfigure_link() - Let LC know about unconfigured link -* @sw: Switch to unconfigure +* tb_lc_unconfigure_port() - Let LC know about unconfigured port +* @port: Port that is set as configured * -* Informs LC of both parent switch and @sw that the link between the -* two does not exist anymore. +* Sets the port unconfigured for power management purposes. */ -void tb_lc_unconfigure_link (struct tb_switch *sw) +void tb_lc_unconfigure_port (struct tb_port *port) { -struct tb_port *up, *down; - - up =tb_upstream_port (sw); - down =tb_port_at (tb_route (sw),tb_to_switch (sw->dev.parent)); - -tb_lc_configure_lane (up, false); -tb_lc_configure_lane (down, false); +tb_lc_set_port_configured (port, false); }/**
drivers/thunderbolt/switch.c +27 -6
@@ -2321,12 +2321,24 @@ void tb_switch_lane_bonding_disable(struct tb_switch *sw)*/ int tb_switch_configure_link (struct tb_switch *sw) { +struct tb_port *up, *down; +int ret; +if (!tb_route (sw) ||tb_switch_is_icm (sw))return 0 ; -if (tb_switch_is_usb4 (sw)) -return usb4_switch_configure_link (sw); -return tb_lc_configure_link (sw); + up =tb_upstream_port (sw); +if (tb_switch_is_usb4 (up->sw)) + ret =usb4_port_configure (up); +else + ret =tb_lc_configure_port (up); +if (ret) +return ret; + + down = up->remote; +if (tb_switch_is_usb4 (down->sw)) +return usb4_port_configure (down); +return tb_lc_configure_port (down); }/**
@@ -2338,15 +2350,24 @@ int tb_switch_configure_link(struct tb_switch *sw)*/ void tb_switch_unconfigure_link (struct tb_switch *sw) { +struct tb_port *up, *down; +if (sw->is_unplugged)return ;if (!tb_route (sw) ||tb_switch_is_icm (sw))return ; -if (tb_switch_is_usb4 (sw)) -usb4_switch_unconfigure_link (sw); + up =tb_upstream_port (sw); +if (tb_switch_is_usb4 (up->sw)) +usb4_port_unconfigure (up); +else +tb_lc_unconfigure_port (up); + + down = up->remote; +if (tb_switch_is_usb4 (down->sw)) +usb4_port_unconfigure (down);else -tb_lc_unconfigure_link (sw); +tb_lc_unconfigure_port (down); }/**
drivers/thunderbolt/tb.h +4 -4
@@ -846,8 +846,8 @@ int tb_drom_read(struct tb_switch *sw);int tb_drom_read_uid_only (struct tb_switch *sw,u64 *uid);int tb_lc_read_uuid (struct tb_switch *sw,u32 *uuid); -int tb_lc_configure_link (struct tb_switch *sw); -void tb_lc_unconfigure_link (struct tb_switch *sw); +int tb_lc_configure_port (struct tb_port *port); +void tb_lc_unconfigure_port (struct tb_port *port);int tb_lc_set_sleep (struct tb_switch *sw);bool tb_lc_lane_bonding_possible (struct tb_switch *sw);bool tb_lc_dp_sink_query (struct tb_switch *sw,struct tb_port *in);
@@ -902,8 +902,6 @@ int usb4_switch_setup(struct tb_switch *sw);int usb4_switch_read_uid (struct tb_switch *sw,u64 *uid);int usb4_switch_drom_read (struct tb_switch *sw,unsigned int address,void *buf,size_t size); -int usb4_switch_configure_link (struct tb_switch *sw); -void usb4_switch_unconfigure_link (struct tb_switch *sw);bool usb4_switch_lane_bonding_possible (struct tb_switch *sw);int usb4_switch_set_sleep (struct tb_switch *sw);int usb4_switch_nvm_sector_size (struct tb_switch *sw);
@@ -921,6 +919,8 @@ struct tb_port *usb4_switch_map_usb3_down(struct tb_switch *sw, const struct tb_port *port);int usb4_port_unlock (struct tb_port *port); +int usb4_port_configure (struct tb_port *port); +void usb4_port_unconfigure (struct tb_port *port);int usb4_port_enumerate_retimers (struct tb_port *port); int usb4_port_retimer_read(struct tb_port *port, u8 index, u8 reg, void *buf,
drivers/thunderbolt/usb4.c +44 -48
104 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 13/19 thunderbolt: Configure port for XDomain
In reply to Mika WesterbergWhen the port is connected to another host it should be marked as such in the USB4 port capability. This information is used by the router during sleep and wakeup.
Also do the same for legacy switches via link controller vendor specific registers.
--- drivers/thunderbolt/lc.c | 54 +++++++++++++++++++++++++++++++++++ drivers/thunderbolt/tb.c | 32 ++++++++++++++++++--- drivers/thunderbolt/tb.h | 4 +++ drivers/thunderbolt/tb_regs.h | 3 ++ drivers/thunderbolt/usb4.c | 45 +++++++++++++++++++++++++++++ 5 files changed, 134 insertions(+), 4 deletions(-)
drivers/thunderbolt/lc.c +54 -0
@@ -104,6 +104,60 @@ void tb_lc_unconfigure_port(struct tb_port *port)tb_lc_set_port_configured (port, false); } +static int tb_lc_set_xdomain_configured (struct tb_port *port,bool configure) +{ +struct tb_switch *sw = port->sw; +u32 ctrl, lane; +int cap, ret; + +if (sw->generation <2 ) +return 0 ; + + cap =find_port_lc_cap (port); +if (cap <0 ) +return cap; + + ret =tb_sw_read (sw, &ctrl,TB_CFG_SWITCH , cap +TB_LC_SX_CTRL ,1 ); +if (ret) +return ret; + +/* Resolve correct lane */ +if (port->port %2 ) + lane =TB_LC_SX_CTRL_L1D ; +else + lane =TB_LC_SX_CTRL_L2D ; + +if (configure) + ctrl |= lane; +else + ctrl &= ~lane; + +return tb_sw_write (sw, &ctrl,TB_CFG_SWITCH , cap +TB_LC_SX_CTRL ,1 ); +} + +/** +* tb_lc_configure_xdomain() - Inform LC that the link is XDomain +* @port: Switch downstream port connected to another host +* +* Sets the lane configured for XDomain accordingly so that the LC knows +* about this. Returns %0 in success and negative errno in failure. +*/ +int tb_lc_configure_xdomain (struct tb_port *port) +{ +return tb_lc_set_xdomain_configured (port, true); +} + +/** +* tb_lc_unconfigure_xdomain() - Unconfigure XDomain from port +* @port: Switch downstream port that was connected to another host +* +* Unsets the lane XDomain configuration. +*/ +void tb_lc_unconfigure_xdomain (struct tb_port *port) +{ +tb_lc_set_xdomain_configured (port, false); +} +/** * tb_lc_set_sleep() - Inform LC that the switch is going to sleep * @sw: Switch to set sleep
drivers/thunderbolt/tb.c +28 -4
@@ -140,6 +140,21 @@ static void tb_discover_tunnels(struct tb_switch *sw) } } +static int tb_port_configure_xdomain (struct tb_port *port) +{ +if (tb_switch_is_usb4 (port->sw)) +return usb4_port_configure_xdomain (port); +return tb_lc_configure_xdomain (port); +} + +static void tb_port_unconfigure_xdomain (struct tb_port *port) +{ +if (tb_switch_is_usb4 (port->sw)) +usb4_port_unconfigure_xdomain (port); +else +tb_lc_unconfigure_xdomain (port); +} +static void tb_scan_xdomain (struct tb_port *port) {struct tb_switch *sw = port->sw;
@@ -158,6 +173,7 @@ static void tb_scan_xdomain(struct tb_port *port) NULL);if (xd) {tb_port_at (route, sw)->xdomain = xd; +tb_port_configure_xdomain (port);tb_xdomain_add (xd); } }
@@ -566,6 +582,7 @@ static void tb_scan_port(struct tb_port *port)*/ if (port->xdomain) {tb_xdomain_remove (port->xdomain); +tb_port_unconfigure_xdomain (port); port->xdomain =NULL ; }
@@ -1047,6 +1064,7 @@ static void tb_handle_hotplug(struct work_struct *work)struct tb_cm *tcm =tb_priv (tb);struct tb_switch *sw;struct tb_port *port; +mutex_lock (&tb->lock);if (!tcm->hotplug_active) goto out;/* during init, suspend or shutdown */
@@ -1103,6 +1121,7 @@ static void tb_handle_hotplug(struct work_struct *work) port->xdomain =NULL ;__tb_disconnect_xdomain_paths (tb, xd);tb_xdomain_put (xd); +tb_port_unconfigure_xdomain (port); }else if (tb_port_is_dpout (port) ||tb_port_is_dpin (port)) {tb_dp_resource_unavailable (tb, port); }else {
@@ -1269,13 +1288,17 @@ static void tb_restore_children(struct tb_switch *sw)tb_sw_warn (sw,"failed to restore TMU configuration\n" );tb_switch_for_each_port (sw, port) { -if (!tb_port_has_remote (port)) +if (!tb_port_has_remote (port) && !port->xdomain)continue ; -tb_switch_lane_bonding_enable (port->remote->sw); -tb_switch_configure_link (port->remote->sw); +if (port->remote) { +tb_switch_lane_bonding_enable (port->remote->sw); +tb_switch_configure_link (port->remote->sw); -tb_restore_children (port->remote->sw); +tb_restore_children (port->remote->sw); + }else if (port->xdomain) { +tb_port_configure_xdomain (port); + } } }
@@ -1321,6 +1344,7 @@ static int tb_free_unplugged_xdomains(struct tb_switch *sw)if (port->xdomain && port->xdomain->is_unplugged) {tb_retimer_remove_all (port);tb_xdomain_remove (port->xdomain); +tb_port_unconfigure_xdomain (port); port->xdomain =NULL ; ret++; }else if (port->remote) {
drivers/thunderbolt/tb.h +4 -0
@@ -848,6 +848,8 @@ int tb_drom_read_uid_only(struct tb_switch *sw, u64 *uid);int tb_lc_read_uuid (struct tb_switch *sw,u32 *uuid);int tb_lc_configure_port (struct tb_port *port);void tb_lc_unconfigure_port (struct tb_port *port); +int tb_lc_configure_xdomain (struct tb_port *port); +void tb_lc_unconfigure_xdomain (struct tb_port *port);int tb_lc_set_sleep (struct tb_switch *sw);bool tb_lc_lane_bonding_possible (struct tb_switch *sw);bool tb_lc_dp_sink_query (struct tb_switch *sw,struct tb_port *in);
@@ -921,6 +923,8 @@ struct tb_port *usb4_switch_map_usb3_down(struct tb_switch *sw,int usb4_port_unlock (struct tb_port *port);int usb4_port_configure (struct tb_port *port);void usb4_port_unconfigure (struct tb_port *port); +int usb4_port_configure_xdomain (struct tb_port *port); +void usb4_port_unconfigure_xdomain (struct tb_port *port);int usb4_port_enumerate_retimers (struct tb_port *port); int usb4_port_retimer_read(struct tb_port *port, u8 index, u8 reg, void *buf,
drivers/thunderbolt/tb_regs.h +3 -0
@@ -303,6 +303,7 @@ struct tb_regs_port_header {#define PORT_CS_18_TCM BIT(9)#define PORT_CS_19 0x13#define PORT_CS_19_PC BIT(3) +#define PORT_CS_19_PID BIT(4)/* Display Port adapter registers */ #define ADP_DP_CS_0 0x00
@@ -417,7 +418,9 @@ struct tb_regs_hop {#define TB_LC_SX_CTRL 0x96#define TB_LC_SX_CTRL_L1C BIT(16) +#define TB_LC_SX_CTRL_L1D BIT(17)#define TB_LC_SX_CTRL_L2C BIT(20) +#define TB_LC_SX_CTRL_L2D BIT(21)#define TB_LC_SX_CTRL_UPSTREAM BIT(30)#define TB_LC_SX_CTRL_SLP BIT(31)
drivers/thunderbolt/usb4.c +45 -0
51 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 14/19 thunderbolt: Disable lane 1 for XDomain connection
In reply to Mika WesterbergUSB4 spec mandates that the lane 1 should be disabled if lanes are not bonded. For host-to-host connections (XDomain) we don't support lane bonding so in order to be compatible with the spec, disable lane 1 when another host is connected.
--- drivers/thunderbolt/switch.c | 44 +++++++++++++++++++++++++++++++++++ drivers/thunderbolt/tb.c | 8 +++++++ drivers/thunderbolt/tb.h | 2 ++ drivers/thunderbolt/tb_regs.h | 1 + 4 files changed, 55 insertions(+)
drivers/thunderbolt/switch.c +44 -0
@@ -673,6 +673,50 @@ int tb_port_unlock(struct tb_port *port)return 0 ; } +static int __tb_port_enable (struct tb_port *port,bool enable) +{ +int ret; +u32 phy; + +if (!tb_port_is_null (port)) +return -EINVAL ; + + ret =tb_port_read (port, &phy,TB_CFG_PORT , + port->cap_phy +LANE_ADP_CS_1 ,1 ); +if (ret) +return ret; + +if (enable) + phy &= ~LANE_ADP_CS_1_LD ; +else + phy |=LANE_ADP_CS_1_LD ; + +return tb_port_write (port, &phy,TB_CFG_PORT , + port->cap_phy +LANE_ADP_CS_1 ,1 ); +} + +/** +* tb_port_enable() - Enable lane adapter +* @port: Port to enable (can be %NULL) +* +* This is used for lane 0 and 1 adapters to enable it. +*/ +int tb_port_enable (struct tb_port *port) +{ +return __tb_port_enable (port, true); +} + +/** +* tb_port_disable() - Disable lane adapter +* @port: Port to disable (can be %NULL) +* +* This is used for lane 0 and 1 adapters to disable it. +*/ +int tb_port_disable (struct tb_port *port) +{ +return __tb_port_enable (port, false); +} +/** * tb_init_port() - initialize a port *
drivers/thunderbolt/tb.c +8 -0
@@ -142,6 +142,12 @@ static void tb_discover_tunnels(struct tb_switch *sw)static int tb_port_configure_xdomain (struct tb_port *port) { +/* +* XDomain paths currently only support single lane so we must +* disable the other lane according to USB4 spec. +*/ +tb_port_disable (port->dual_link_port); +if (tb_switch_is_usb4 (port->sw))return usb4_port_configure_xdomain (port);return tb_lc_configure_xdomain (port);
@@ -153,6 +159,8 @@ static void tb_port_unconfigure_xdomain(struct tb_port *port)usb4_port_unconfigure_xdomain (port); elsetb_lc_unconfigure_xdomain (port ); + +tb_port_enable (port->dual_link_port); }static void tb_scan_xdomain (struct tb_port *port)
drivers/thunderbolt/tb.h +2 -0
@@ -790,6 +790,8 @@ int tb_port_add_nfc_credits(struct tb_port *port, int credits);int tb_port_set_initial_credits (struct tb_port *port,u32 credits);int tb_port_clear_counter (struct tb_port *port,int counter);int tb_port_unlock (struct tb_port *port); +int tb_port_enable (struct tb_port *port); +int tb_port_disable (struct tb_port *port);int tb_port_alloc_in_hopid (struct tb_port *port,int hopid,int max_hopid);void tb_port_release_in_hopid (struct tb_port *port,int hopid);int tb_port_alloc_out_hopid (struct tb_port *port,int hopid,int max_hopid);
drivers/thunderbolt/tb_regs.h +1 -0
@@ -279,6 +279,7 @@ struct tb_regs_port_header {#define LANE_ADP_CS_1_TARGET_WIDTH_SHIFT 4#define LANE_ADP_CS_1_TARGET_WIDTH_SINGLE 0x1#define LANE_ADP_CS_1_TARGET_WIDTH_DUAL 0x3 +#define LANE_ADP_CS_1_LD BIT(14)#define LANE_ADP_CS_1_LB BIT(15)#define LANE_ADP_CS_1_CURRENT_SPEED_MASK GENMASK(19, 16)#define LANE_ADP_CS_1_CURRENT_SPEED_SHIFT 16
Signature · 1 line
2.28.0
PATCH 15/19 thunderbolt: Enable wakes from system suspend
In reply to Mika WesterbergIn order for the router and the whole domain to wake up from system suspend states we need to enable wakes for the connected routers. For device routers we enable wakes from PCIe and USB 3.x. This allows devices such as keyboards connected to USB 3.x hub that is tunneled to wake the system up as expected. For all routers we enabled wake on USB4 for each connected ports. This is used to propagate the wake from router to another.
Do the same for legacy routers through link controller vendor specific registers as documented in USB4 spec chapter 13.
While there correct kernel-doc of usb4_switch_set_sleep() -- it does not enable wakes instead there is a separate function (usb4_switch_set_wake()) that does.
--- drivers/thunderbolt/domain.c | 2 + drivers/thunderbolt/lc.c | 67 ++++++++++++++++++++ drivers/thunderbolt/nhi.c | 2 + drivers/thunderbolt/switch.c | 30 ++++++++- drivers/thunderbolt/tb.h | 9 +++ drivers/thunderbolt/tb_regs.h | 12 ++++ drivers/thunderbolt/usb4.c | 112 +++++++++++++++++++++++++++++++++- 7 files changed, 231 insertions(+), 3 deletions(-)
drivers/thunderbolt/domain.c +2 -0
@@ -455,6 +455,8 @@ int tb_domain_add(struct tb *tb)/* This starts event processing */ mutex_unlock (&tb->lock); +device_init_wakeup (&tb->dev, true); +pm_runtime_no_callbacks (&tb->dev);pm_runtime_set_active (&tb->dev);pm_runtime_enable (&tb->dev);
drivers/thunderbolt/lc.c +67 -0
73 lines not on this page · raw message
drivers/thunderbolt/nhi.c +2 -0
@@ -1157,6 +1157,8 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id) }pci_set_drvdata (pdev, tb); +device_wakeup_enable (&pdev->dev); +pm_runtime_allow (&pdev->dev);pm_runtime_set_autosuspend_delay (&pdev->dev,TB_AUTOSUSPEND_DELAY );pm_runtime_use_autosuspend (&pdev->dev);
drivers/thunderbolt/switch.c +29 -1
@@ -2036,7 +2036,7 @@ int tb_switch_configure(struct tb_switch *sw) route =tb_route (sw);tb_dbg (tb,"%s Switch at %#llx (depth: %d, up port: %d)\n" , - sw->config.enabled ?"restoring " :"initializing" , route, + sw->config.enabled ?"restoring" :"initializing" , route,tb_route_length (route), sw->config.upstream_port_number); sw->config.enabled =1 ;
@@ -2502,6 +2502,13 @@ int tb_switch_add(struct tb_switch *sw)return ret; } +/* +* Thunderbolt routers do not generate wakeups themselves but +* they forward wakeups from tunneled protocols, so enable it +* here. +*/ +device_init_wakeup (&sw->dev, true); +pm_runtime_set_active (&sw->dev);if (sw->rpm) {pm_runtime_set_autosuspend_delay (&sw->dev,TB_AUTOSUSPEND_DELAY );
@@ -2579,6 +2586,18 @@ void tb_sw_set_unplugged(struct tb_switch *sw) } } +static int tb_switch_set_wake (struct tb_switch *sw,unsigned int flags) +{ +if (flags) +tb_sw_dbg (sw,"enabling wakeup: %#x\n" , flags); +else +tb_sw_dbg (sw,"disabling wakeup\n" ); + +if (tb_switch_is_usb4 (sw)) +return usb4_switch_set_wake (sw, flags); +return tb_lc_set_wake (sw, flags); +} +int tb_switch_resume (struct tb_switch *sw) {struct tb_port *port;
@@ -2624,6 +2643,9 @@ int tb_switch_resume(struct tb_switch *sw)if (err)return err; +/* Disable wakes */ +tb_switch_set_wake (sw,0 ); + err =tb_switch_tmu_init (sw);if (err)return err;
@@ -2659,6 +2681,7 @@ int tb_switch_resume(struct tb_switch *sw)void tb_switch_suspend (struct tb_switch *sw) { +unsigned int flags =0 ;struct tb_port *port;int err;
@@ -2671,6 +2694,11 @@ void tb_switch_suspend(struct tb_switch *sw)tb_switch_suspend (port->remote->sw); } +if (device_may_wakeup (&sw->dev)) + flags =TB_WAKE_ON_USB4 |TB_WAKE_ON_USB3 |TB_WAKE_ON_PCIE ; + +tb_switch_set_wake (sw, flags); +if (tb_switch_is_usb4 (sw))usb4_switch_set_sleep (sw);else
drivers/thunderbolt/tb.h +9 -0
@@ -333,6 +333,13 @@ struct tb_path {*/ #define TB_PATH_MAX_HOPS (7 * 2) +/* Possible wake types */ +#define TB_WAKE_ON_CONNECT BIT(0) +#define TB_WAKE_ON_DISCONNECT BIT(1) +#define TB_WAKE_ON_USB4 BIT(2) +#define TB_WAKE_ON_USB3 BIT(3) +#define TB_WAKE_ON_PCIE BIT(4) +/** * struct tb_cm_ops - Connection manager specific operations vector * @driver_ready: Called right after control channel is started. Used by
@@ -852,6 +859,7 @@ int tb_lc_configure_port(struct tb_port *port);void tb_lc_unconfigure_port (struct tb_port *port);int tb_lc_configure_xdomain (struct tb_port *port);void tb_lc_unconfigure_xdomain (struct tb_port *port); +int tb_lc_set_wake (struct tb_switch *sw,unsigned int flags);int tb_lc_set_sleep (struct tb_switch *sw);bool tb_lc_lane_bonding_possible (struct tb_switch *sw);bool tb_lc_dp_sink_query (struct tb_switch *sw,struct tb_port *in);
@@ -907,6 +915,7 @@ int usb4_switch_read_uid(struct tb_switch *sw, u64 *uid);int usb4_switch_drom_read (struct tb_switch *sw,unsigned int address,void *buf,size_t size);bool usb4_switch_lane_bonding_possible (struct tb_switch *sw); +int usb4_switch_set_wake (struct tb_switch *sw,unsigned int flags);int usb4_switch_set_sleep (struct tb_switch *sw);int usb4_switch_nvm_sector_size (struct tb_switch *sw); int usb4_switch_nvm_read(struct tb_switch *sw, unsigned int address, void *buf,
drivers/thunderbolt/tb_regs.h +12 -0
@@ -178,6 +178,8 @@ struct tb_regs_switch_header {#define ROUTER_CS_4 0x04#define ROUTER_CS_5 0x05#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_C3S BIT(23)#define ROUTER_CS_5_PTO BIT(24)#define ROUTER_CS_5_UTO BIT(25)
@@ -186,6 +188,8 @@ struct tb_regs_switch_header {#define ROUTER_CS_6 0x06#define ROUTER_CS_6_SLPR BIT(0)#define ROUTER_CS_6_TNS BIT(1) +#define ROUTER_CS_6_WOPS BIT(2) +#define ROUTER_CS_6_WOUS BIT(3)#define ROUTER_CS_6_HCI BIT(18)#define ROUTER_CS_6_CR BIT(25)#define ROUTER_CS_7 0x07
@@ -302,9 +306,13 @@ struct tb_regs_port_header {#define PORT_CS_18 0x12#define PORT_CS_18_BE BIT(8)#define PORT_CS_18_TCM BIT(9) +#define PORT_CS_18_WOU4S BIT(18)#define PORT_CS_19 0x13#define PORT_CS_19_PC BIT(3)#define PORT_CS_19_PID BIT(4) +#define PORT_CS_19_WOC BIT(16) +#define PORT_CS_19_WOD BIT(17) +#define PORT_CS_19_WOU4 BIT(18)/* Display Port adapter registers */ #define ADP_DP_CS_0 0x00
@@ -418,6 +426,10 @@ struct tb_regs_hop {#define TB_LC_PORT_ATTR_BE BIT(12)#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_WOU4 BIT(5) +#define TB_LC_SX_CTRL_WOP BIT(6)#define TB_LC_SX_CTRL_L1C BIT(16)#define TB_LC_SX_CTRL_L1D BIT(17)#define TB_LC_SX_CTRL_L2C BIT(20)
drivers/thunderbolt/usb4.c +110 -2
134 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 16/19 PCI / thunderbolt: Switch to use device links instead of PCI quirk
In reply to Mika WesterbergOn older Apple systems there is currently a PCI quirk in place to block resume of tunneled PCIe ports until NHI (Thunderbolt controller) is resumed. This makes sure the PCIe tunnels are re-established before PCI core notices it.
With device links the same thing can be done without quirks. The driver core will make sure the supplier (NHI) is resumed before consumers (PCIe downstream ports).
For this reason switch the Thunderbolt driver to use device links and remove the PCI quirk.
--- drivers/pci/quirks.c | 57 --------------------------------- drivers/thunderbolt/nhi.c | 66 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 57 deletions(-)
drivers/pci/quirks.c +0 -57
@@ -3673,63 +3673,6 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev)DECLARE_PCI_FIXUP_SUSPEND_LATE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C , quirk_apple_poweroff_thunderbolt); - -/* -* Apple: Wait for the Thunderbolt controller to reestablish PCI tunnels -* -* During suspend the Thunderbolt controller is reset and all PCI -* tunnels are lost. The NHI driver will try to reestablish all tunnels -* during resume. We have to manually wait for the NHI since there is -* no parent child relationship between the NHI and the tunneled -* bridges. -*/ -static void quirk_apple_wait_for_thunderbolt (struct pci_dev *dev) -{ -struct pci_dev *sibling =NULL ; -struct pci_dev *nhi =NULL ; - -if (!x86_apple_machine) -return ; -if (pci_pcie_type (dev) !=PCI_EXP_TYPE_DOWNSTREAM ) -return ; - -/* -* Find the NHI and confirm that we are a bridge on the Thunderbolt -* host controller and not on a Thunderbolt endpoint. -*/ - sibling =pci_get_slot (dev->bus,0x0 ); -if (sibling == dev) - goto out;/* we are the downstream bridge to the NHI */ -if (!sibling || !sibling->subordinate) - goto out; - nhi =pci_get_slot (sibling->subordinate,0x0 ); -if (!nhi) - goto out; -if (nhi->vendor !=PCI_VENDOR_ID_INTEL - || (nhi->device !=PCI_DEVICE_ID_INTEL_LIGHT_RIDGE && - nhi->device !=PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C && - nhi->device !=PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI && - nhi->device !=PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI ) - || nhi->class !=PCI_CLASS_SYSTEM_OTHER <<8 ) - goto out; -pci_info (dev,"quirk: waiting for Thunderbolt to reestablish PCI tunnels...\n" ); -device_pm_wait_for_dev (&dev->dev, &nhi->dev); -out: -pci_dev_put (nhi); -pci_dev_put (sibling); -} -DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_LIGHT_RIDGE , - quirk_apple_wait_for_thunderbolt); -DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C , - quirk_apple_wait_for_thunderbolt); -DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE , - quirk_apple_wait_for_thunderbolt); -DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_BRIDGE , - quirk_apple_wait_for_thunderbolt);#endif /*
drivers/thunderbolt/nhi.c +66 -0
84 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH 16/19] PCI / thunderbolt: Switch to use device links instead of PCI quirk
Quoted 9 lines · Mika Westerberg
On older Apple systems there is currently a PCI quirk in place to block resume of tunneled PCIe ports until NHI (Thunderbolt controller) is resumed. This makes sure the PCIe tunnels are re-established before PCI core notices it.
With device links the same thing can be done without quirks. The driver core will make sure the supplier (NHI) is resumed before consumers (PCIe downstream ports).
Quoted 5 lines
For this reason switch the Thunderbolt driver to use device links and remove the PCI quirk.
Cc Bjorn Helgaas <[email protected]>Signed-off-by Mika Westerberg <[email protected]>
Quoted 167 lines
--- drivers/pci/quirks.c | 57 --------------------------------- drivers/thunderbolt/nhi.c | 66 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 57 deletions(-)drivers/pci/quirks.c +0
-57@@ -3673,63 +3673,6 @@ static void quirk_apple_poweroff_thunderbolt(struct pci_dev *dev)DECLARE_PCI_FIXUP_SUSPEND_LATE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C , quirk_apple_poweroff_thunderbolt); - -/* -* Apple: Wait for the Thunderbolt controller to reestablish PCI tunnels -* -* During suspend the Thunderbolt controller is reset and all PCI -* tunnels are lost. The NHI driver will try to reestablish all tunnels -* during resume. We have to manually wait for the NHI since there is -* no parent child relationship between the NHI and the tunneled -* bridges. -*/ -static void quirk_apple_wait_for_thunderbolt (struct pci_dev *dev) -{ -struct pci_dev *sibling =NULL ; -struct pci_dev *nhi =NULL ; - -if (!x86_apple_machine) -return ; -if (pci_pcie_type (dev) !=PCI_EXP_TYPE_DOWNSTREAM ) -return ; - -/* -* Find the NHI and confirm that we are a bridge on the Thunderbolt -* host controller and not on a Thunderbolt endpoint. -*/ - sibling =pci_get_slot (dev->bus,0x0 ); -if (sibling == dev) - goto out;/* we are the downstream bridge to the NHI */ -if (!sibling || !sibling->subordinate) - goto out; - nhi =pci_get_slot (sibling->subordinate,0x0 ); -if (!nhi) - goto out; -if (nhi->vendor !=PCI_VENDOR_ID_INTEL - || (nhi->device !=PCI_DEVICE_ID_INTEL_LIGHT_RIDGE && - nhi->device !=PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C && - nhi->device !=PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI && - nhi->device !=PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI ) - || nhi->class !=PCI_CLASS_SYSTEM_OTHER <<8 ) - goto out; -pci_info (dev,"quirk: waiting for Thunderbolt to reestablish PCI tunnels...\n" ); -device_pm_wait_for_dev (&dev->dev, &nhi->dev); -out: -pci_dev_put (nhi); -pci_dev_put (sibling); -} -DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_LIGHT_RIDGE , - quirk_apple_wait_for_thunderbolt); -DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C , - quirk_apple_wait_for_thunderbolt); -DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE , - quirk_apple_wait_for_thunderbolt); -DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_BRIDGE , - quirk_apple_wait_for_thunderbolt);#endif /* drivers/thunderbolt/nhi.c +66
-0@@ -17,6 +17,7 @@#include <linux/module.h> #include <linux/delay.h> #include <linux/property.h> +#include <linux/platform_data/x86/apple.h> #include "nhi.h" #include "nhi_regs.h" @@ -1069,6 +1070,69 @@ static bool nhi_imr_valid(struct pci_dev *pdev)return true; } +/* +* During suspend the Thunderbolt controller is reset and all PCIe +* tunnels are lost. The NHI driver will try to reestablish all tunnels +* during resume. This adds device links between the tunneled PCIe +* downstream ports and the NHI so that the device core will make sure +* NHI is resumed first before the rest. +*/ +static void tb_apple_add_links (struct tb_nhi *nhi) +{ +struct pci_dev *upstream, *pdev; + +if (!x86_apple_machine) +return ; + +switch (nhi->pdev->device) { +case PCI_DEVICE_ID_INTEL_LIGHT_RIDGE : +case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C : +case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI : +case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI : +break ; +default : +return ; + } + + upstream =pci_upstream_bridge (nhi->pdev); +while (upstream) { +if (!pci_is_pcie (upstream)) +return ; +if (pci_pcie_type (upstream) ==PCI_EXP_TYPE_UPSTREAM ) +break ; + upstream =pci_upstream_bridge (upstream); + } + +if (!upstream) +return ; + +/* +* For each hotplug downstream port, create add device link +* back to NHI so that PCIe tunnels can be re-established after +* sleep. +*/ +for_each_pci_bridge (pdev, upstream->subordinate) { +const struct device_link *link; + +if (!pci_is_pcie (pdev)) +continue ; +if (pci_pcie_type (pdev) !=PCI_EXP_TYPE_DOWNSTREAM || + !pdev->is_hotplug_bridge) +continue ; + + link =device_link_add (&pdev->dev, &nhi->pdev->dev, +DL_FLAG_AUTOREMOVE_SUPPLIER | +DL_FLAG_PM_RUNTIME ); +if (link) { +dev_dbg (&nhi->pdev->dev,"created link from %s\n" , +dev_name (&pdev->dev)); + }else { +dev_warn (&nhi->pdev->dev,"device link creation from %s failed\n" , +dev_name (&pdev->dev)); + } + } +} +static int nhi_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct tb_nhi *nhi;@@ -1134,6 +1198,8 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id)return res; } +tb_apple_add_links (nhi); + tb =icm_probe (nhi);if (!tb) tb =tb_probe (nhi);Signature · 1 line
2.28.0
PATCH 17/19 ACPI: Export acpi_get_first_physical_node() to modules
In reply to Mika WesterbergThis function will be needed by the Thunderbolt driver when it parses ACPI description for linking tunneled ports to the Thunderbolt controller device.
--- drivers/acpi/bus.c | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/bus.c +1 -0
@@ -551,6 +551,7 @@ struct device *acpi_get_first_physical_node(struct acpi_device *adev)mutex_unlock (physical_node_lock);return phys_dev; } +EXPORT_SYMBOL_GPL (acpi_get_first_physical_node);static struct acpi_device *acpi_primary_dev_companion (struct acpi_device *adev,const struct device *dev)
Signature · 1 line
2.28.0
PATCH 18/19 thunderbolt: Create device links from ACPI description
In reply to Mika WesterbergThe new way to describe relationship between tunneled ports and USB4 NHI (Native Host Interface) is with ACPI _DSD looking like below for a PCIe downstream port:
Scope (\_SB.PCI0)
{
Device (NHI0) { } // Thunderbolt NHI
Device (DSB0) // Hotplug downstream port
{
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package () {"usb4-host-interface", \_SB.PCI0.NHI0},
...
}
})
}
}This is "documented" in these [1] USB-IF slides and being used on systems that ship with Windows.
The _DSD can be added to tunneled USB3 and PCIe ports, and is needed to make sure the USB4 NHI is resumed before any of the tunneled ports so the protocol tunnels get established properly before the actual port itself is resumed. Othwerwise the USB/PCI core find the link may not be established and starts tearing down the device stack.
This parses the ACPI description each time NHI is probed and tries to find devices that has the property and it references the NHI in question. For each matching device a device link from that device to the NHI is created.
Since USB3 ports themselves do not get runtime suspended with the parent device (hub) we do not add the link from the USB3 port to USB4 NHI but instead we add the link from the xHCI device. This makes the device link usable for runtime PM as well.
[1] https://www.usb.org/sites/default/files/D1T2-2%20-%20USB4%20on%20Windows.pdf
--- drivers/thunderbolt/Makefile | 2 + drivers/thunderbolt/acpi.c | 117 +++++++++++++++++++++++++++++++++++ drivers/thunderbolt/nhi.c | 1 + drivers/thunderbolt/tb.h | 6 ++ 4 files changed, 126 insertions(+) create mode 100644 drivers/thunderbolt/acpi.c
drivers/thunderbolt/Makefile +2 -0
@@ -4,4 +4,6 @@ thunderbolt-objs := nhi.o nhi_ops.o ctl.o tb.o switch.o cap.o path.o tunnel.o ee thunderbolt-objs += domain.o dma_port.o icm.o property.o xdomain.o lc.o tmu.o usb4.o thunderbolt-objs += nvm.o retimer.o quirks.o +thunderbolt-${CONFIG_ACPI} += acpi.o + obj-${CONFIG_USB4_KUNIT_TEST} += test.o
drivers/thunderbolt/acpi.c new file +117 -0
117 lines not on this page · raw message
drivers/thunderbolt/nhi.c +1 -0
@@ -1199,6 +1199,7 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id) }tb_apple_add_links (nhi); +tb_acpi_add_links (nhi); tb =icm_probe (nhi);if (!tb)
drivers/thunderbolt/tb.h +6 -0
@@ -967,4 +967,10 @@ int usb4_usb3_port_release_bandwidth(struct tb_port *port, int *upstream_bw,void tb_check_quirks (struct tb_switch *sw); +#ifdef CONFIG_ACPI +void tb_acpi_add_links (struct tb_nhi *nhi); +#else +static inline void tb_acpi_add_links (struct tb_nhi *nhi) { } +#endif +#endif
Signature · 1 line
2.28.0
PATCH 19/19 thunderbolt: Add runtime PM for Software CM
In reply to Mika WesterbergThis adds runtime PM support for the Software Connection Manager parts of the driver. This allows to save power when either there is no device attached at all or there is a device attached and all following conditions are true:
- Tunneled PCIe root/downstream ports are runtime suspended
- Tunneled USB3 ports are runtime suspended
- No active DisplayPort stream
- No active XDomain connection
For the first two we take advantage of device links that were added in previous patch. Difference for the system sleep case is that we also enable wakes when something is geting plugged in/out of the Thunderbolt ports.
--- drivers/thunderbolt/switch.c | 25 ++++++-- drivers/thunderbolt/tb.c | 116 ++++++++++++++++++++++++++++++++++- drivers/thunderbolt/tb.h | 2 +- 3 files changed, 136 insertions(+), 7 deletions(-)
drivers/thunderbolt/switch.c +21 -4
@@ -2679,23 +2679,40 @@ int tb_switch_resume(struct tb_switch *sw)return 0 ; } -void tb_switch_suspend (struct tb_switch *sw) +/** +* tb_switch_suspend() - Put a switch to sleep +* @sw: Switch to suspend +* @runtime: Is this runtime suspend or system sleep +* +* Suspends router and all its children. Enables wakes according to +* value of @runtime and then sets sleep bit for the router. If @sw is +* host router the domain is ready to go to sleep once this function +* returns. +*/ +void tb_switch_suspend (struct tb_switch *sw,bool runtime) {unsigned int flags =0 ;struct tb_port *port;int err; +tb_sw_dbg (sw,"suspending switch\n" ); + err =tb_plug_events_active (sw, false);if (err)return ;tb_switch_for_each_port (sw, port) {if (tb_port_has_remote (port)) -tb_switch_suspend (port->remote->sw); +tb_switch_suspend (port->remote->sw, runtime); } -if (device_may_wakeup (&sw->dev)) - flags =TB_WAKE_ON_USB4 |TB_WAKE_ON_USB3 |TB_WAKE_ON_PCIE ; +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 ; + }else if (device_may_wakeup (&sw->dev)) { + flags |=TB_WAKE_ON_USB4 |TB_WAKE_ON_USB3 |TB_WAKE_ON_PCIE ; + }tb_switch_set_wake (sw, flags);
drivers/thunderbolt/tb.c +114 -2
233 lines not on this page · raw message
drivers/thunderbolt/tb.h +1 -1
@@ -639,7 +639,7 @@ struct tb_switch *tb_switch_alloc_safe_mode(struct tb *tb,int tb_switch_configure (struct tb_switch *sw);int tb_switch_add (struct tb_switch *sw);void tb_switch_remove (struct tb_switch *sw); -void tb_switch_suspend (struct tb_switch *sw); +void tb_switch_suspend (struct tb_switch *sw,bool runtime);int tb_switch_resume (struct tb_switch *sw);int tb_switch_reset (struct tb_switch *sw);void tb_sw_set_unplugged (struct tb_switch *sw);
Signature · 1 line
2.28.0
Quoted 37 lines · Mika Westerberg
Hi all,
This series improves power management in the Thunderbolt driver. We already have a quite complete power management on systems where Firmware based Connection Manager is used (this is pretty much all non-Apple systems out there) so this series adds a couple of optimizations to make certain power transitions slightly faster, hopefully improving user experience.
Rest of the patches improve power management in the Software Connection manager side of the driver. USB4 spec covers power management for USB4 hosts and devices, and also TBT3 compatible devices so these patches implement that. We also switch to use device links instead of PCI quirk to make sure the Thunderbolt/USB4 host controller is resumed before tunneled PCIe and USB 3.x ports (so that it gets the chance to restore the tunnels properly before). Tiger Lake systems with Software Connection Manager enabled describe these relationships using a new ACPI
_DSDproperty that we parse in the driver and populate device links accordingly.Mika Westerberg (17):
thunderbolt: Software CM only should set force power in Tiger Lake
thunderbolt: Use bit 31 to check if Firmware CM is running in Tiger Lake
thunderbolt: Do not program NFC buffers for USB4 router protocol adapters
thunderbolt: No need to log an error iftb_switch_lane_bonding_enable()fails
thunderbolt: Send reset only to first generation routers
thunderbolt: Tear down DP tunnels when suspending
thunderbolt: Initialize TMU again on resume
thunderbolt: Do not change default USB4 router notification timeout
thunderbolt: Configure link after lane bonding is enabled
thunderbolt: Set port configured for both ends of the link
thunderbolt: Configure port for XDomain
thunderbolt: Disable lane 1 for XDomain connection
thunderbolt: Enable wakes from system suspend
PCI / thunderbolt: Switch to use device links instead of PCI quirk
ACPI: Exportacpi_get_first_physical_node()to modules
thunderbolt: Create device links from ACPI description
thunderbolt: Add runtime PM for Software CM
Quoted 3 lines
Rajmohan Mani (2):
thunderbolt: Optimize Force Power logic
thunderbolt: Optimize NHI LC mailbox command processing
All applied to thunderbolt.git/next.
@Rafael, I added your Acked-by to patches 17 and 18 as we discussed offline.