| Message ID | 20240802070543.1338656-1-mika.westerberg@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e2006140ad2e01a02ed0aff49cc2ae3ceeb11f8d |
| Headers | show |
| Series | thunderbolt: Mark XDomain as unplugged when router is removed | expand |
On Fri, Aug 02, 2024 at 10:05:43AM +0300, Mika Westerberg wrote: > I noticed that when we do discrete host router NVM upgrade and it gets > hot-removed from the PCIe side as a result of NVM firmware authentication, > if there is another host connected with enabled paths we hang in tearing > them down. This is due to fact that the Thunderbolt networking driver > also tries to cleanup the paths and ends up blocking in > tb_disconnect_xdomain_paths() waiting for the domain lock. > > However, at this point we already cleaned the paths in tb_stop() so > there is really no need for tb_disconnect_xdomain_paths() to do that > anymore. Furthermore it already checks if the XDomain is unplugged and > bails out early so take advantage of that and mark the XDomain as > unplugged when we remove the parent router. > > Cc: stable@vger.kernel.org > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Applied to thunderbolt.git/fixes.
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 326433df5880..6a2116cbb06f 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -3392,6 +3392,7 @@ void tb_switch_remove(struct tb_switch *sw) tb_switch_remove(port->remote->sw); port->remote = NULL; } else if (port->xdomain) { + port->xdomain->is_unplugged = true; tb_xdomain_remove(port->xdomain); port->xdomain = NULL; }
I noticed that when we do discrete host router NVM upgrade and it gets hot-removed from the PCIe side as a result of NVM firmware authentication, if there is another host connected with enabled paths we hang in tearing them down. This is due to fact that the Thunderbolt networking driver also tries to cleanup the paths and ends up blocking in tb_disconnect_xdomain_paths() waiting for the domain lock. However, at this point we already cleaned the paths in tb_stop() so there is really no need for tb_disconnect_xdomain_paths() to do that anymore. Furthermore it already checks if the XDomain is unplugged and bails out early so take advantage of that and mark the XDomain as unplugged when we remove the parent router. Cc: stable@vger.kernel.org Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> --- drivers/thunderbolt/switch.c | 1 + 1 file changed, 1 insertion(+)