thunderbolt: Reset only non-USB4 host routers in resume

There is no need to reset the USB4 host routers on resume because they
are reset already and this may cause problems if the link does not come
up soon enough. For this reason limit this to happen in non-USB4 host
routers only (that's Apple systems with Intel Thunderbolt controllers).

Fixes: 59a54c5f3dbd ("thunderbolt: Reset topology created by the boot firmware")
Cc: Sanath S <Sanath.S@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index 9a261560d0f4c23087d96fae51b15b6902c7655d..f127088b6ebd1c139cf655c51a6ec71cd7455140 100644 (file)
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -2710,8 +2710,12 @@ 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->root_switch);
+       /*
+        * For non-USB4 hosts (Apple systems) remove any PCIe devices
+        * the firmware might have setup.
+        */
+       if (!tb_switch_is_usb4(tb->root_switch))
+               tb_switch_reset(tb->root_switch);
 
        tb_switch_resume(tb->root_switch);
        tb_free_invalid_tunnels(tb);