This reverts commit a5d6264b638efeca35eff72177fd28d149e0764b.
This patch was an attempt to solve issues seen when enabling runtime PM as default for all AMD 1.1 xHC hosts. see commit 4baf12181509 ("xhci: Loosen RPM as default policy to cover for AMD xHC 1.1")
This was not enough, regressions are still seen, so start from a clean slate and revert both of them.
This patch went to stable and should be reverted from there as well
Fixes: a5d6264b638e ("xhci: Enable RPM on controllers that support low-power states") Cc: stable@vger.kernel.org Cc: Mario Limonciello mario.limonciello@amd.com Cc: Basavaraj Natikar Basavaraj.Natikar@amd.com Signed-off-by: Mathias Nyman mathias.nyman@linux.intel.com --- drivers/usb/host/xhci-pci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 95ed9404f6f8..bde43cef8846 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -695,9 +695,7 @@ 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 (pci_choose_state(dev, PMSG_SUSPEND) == PCI_D0) - pm_runtime_forbid(&dev->dev); - else if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW) + if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW) pm_runtime_allow(&dev->dev);
dma_set_max_seg_size(&dev->dev, UINT_MAX);