Skip to content

Commit

Permalink
thunderbolt: Do not resume routers if UID is not set
Browse files Browse the repository at this point in the history
Routers might not have a UID set if the DROM read failed during
initialization previously.

Normally upon resume the UID is re-read to confirm it's the same
device connected.
* If the DROM read failed during init but then succeeded during
  resume it could either be a new device or faulty device
* If the DROM read failed during init and also failed during resume
  it might be a different device plugged in all together.

Detect this situation and prevent re-using the same configuration in
these cirucmstances.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
  • Loading branch information
Mario Limonciello authored and Mika Westerberg committed Mar 4, 2022
1 parent e87491a commit a283de3
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/thunderbolt/switch.c
Original file line number Diff line number Diff line change
@@ -2980,6 +2980,10 @@ int tb_switch_resume(struct tb_switch *sw)
return err;
}

/* We don't have any way to confirm this was the same device */
if (!sw->uid)
return -ENODEV;

if (tb_switch_is_usb4(sw))
err = usb4_switch_read_uid(sw, &uid);
else

0 comments on commit a283de3

Please sign in to comment.