Skip to content

Commit 299fad4

Browse files
superm1bjorn-helgaas
authored andcommitted
PCI/PM: Skip resuming to D0 if device is disconnected
When a device is surprise-removed (e.g., due to a dock unplug), the PCI core unconfigures all downstream devices and sets their error state to pci_channel_io_perm_failure. This marks them as disconnected via pci_dev_is_disconnected(). During device removal, the runtime PM framework may attempt to resume the device to D0 via pm_runtime_get_sync(), which calls into pci_power_up(). Since the device is already disconnected, this resume attempt is unnecessary and results in a predictable errors like this, typically when undocking from a TBT3 or USB4 dock with PCIe tunneling: pci 0000:01:00.0: Unable to change power state from D3cold to D0, device inaccessible Avoid powering up disconnected devices by checking their status early in pci_power_up() and returning -EIO. Suggested-by: Lukas Wunner <[email protected]> Signed-off-by: Mario Limonciello <[email protected]> [bhelgaas: add typical message] Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Lukas Wunner <[email protected]> Reviewed-by: Ilpo Järvinen <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 8f5ae30 commit 299fad4

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/pci/pci.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,6 +1374,11 @@ int pci_power_up(struct pci_dev *dev)
13741374
return -EIO;
13751375
}
13761376

1377+
if (pci_dev_is_disconnected(dev)) {
1378+
dev->current_state = PCI_D3cold;
1379+
return -EIO;
1380+
}
1381+
13771382
pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
13781383
if (PCI_POSSIBLE_ERROR(pmcsr)) {
13791384
pci_err(dev, "Unable to change power state from %s to D0, device inaccessible\n",

0 commit comments

Comments
 (0)