Revert "xhci: Loosen RPM as default policy to cover for AMD xHC 1.1"

[platform/kernel/linux-starfive.git] / drivers / usb / host / xhci-pci.c

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index b9ae5c2..d6fc08e 100644 (file)
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -693,7 +693,9 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        /* USB-2 and USB-3 roothubs initialized, allow runtime pm suspend */
        pm_runtime_put_noidle(&dev->dev);
 
-       if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
+       if (pci_choose_state(dev, PMSG_SUSPEND) == PCI_D0)
+               pm_runtime_forbid(&dev->dev);
+       else if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
                pm_runtime_allow(&dev->dev);
 
        dma_set_max_seg_size(&dev->dev, UINT_MAX);