From: Mario Limonciello <mario.limonciello@xxxxxxx>
If a dock is plugged in at the same time as autosuspend delay then this
can cause malfunctions in the USB4 stack. This happens because the
device is still in D3cold at the time that the PCI core handed
control back to the USB4 stack.
A device that has gone through a reset may return a value in PCI_COMMAND
but that doesn't mean it's finished transitioning to D0. For evices that
support power management explicitly check PCI_PM_CTRL on everything but
system resume to ensure the transition happened.
Devices that don't support power management and system resume will
continue to use PCI_COMMAND.
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
---
v4->v5:
* Fix misleading indentation
* Amend commit message
---
drivers/pci/pci.c | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1e219057a5069..f032a4aaec268 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1309,21 +1309,33 @@ static int pci_dev_wait(struct pci_dev *dev, enum pci_reset_type reset_type, int
* the read (except when CRS SV is enabled and the read was for the
* Vendor ID; in that case it synthesizes 0x0001 data).
*
- * Wait for the device to return a non-CRS completion. Read the
- * Command register instead of Vendor ID so we don't have to
- * contend with the CRS SV value.
+ * Wait for the device to return a non-CRS completion. On devices
+ * that support PM control and on waits that aren't part of system
+ * resume read the PM control register to ensure the device has
+ * transitioned to D0. On devices that don't support PM control,
+ * or during system resume read the command register to instead of
+ * Vendor ID so we don't have to contend with the CRS SV value.
*/
for (;;) {
- u32 id;
-
if (pci_dev_is_disconnected(dev)) {
pci_dbg(dev, "disconnected; not waiting\n");
return -ENOTTY;
}
- pci_read_config_dword(dev, PCI_COMMAND, &id);
- if (!PCI_POSSIBLE_ERROR(id))
- break;
+ if (dev->pm_cap && reset_type != PCI_DEV_WAIT_RESUME) {
+ u16 pmcsr;
+
+ pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
+ if (!PCI_POSSIBLE_ERROR(pmcsr) &&
+ (pmcsr & PCI_PM_CTRL_STATE_MASK) == PCI_D0)
+ break;
+ } else {
+ u32 id;
+
+ pci_read_config_dword(dev, PCI_COMMAND, &id);
+ if (!PCI_POSSIBLE_ERROR(id))
+ break;
+ }
if (delay > timeout) {
pci_warn(dev, "not ready %dms after %s; giving up\n",
--
2.43.0
