]> git.hungrycats.org Git - linux/commitdiff
xhci: Enable RPM on controllers that support low-power states
authorBasavaraj Natikar <Basavaraj.Natikar@amd.com>
Thu, 19 Oct 2023 10:29:20 +0000 (13:29 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Nov 2023 17:15:10 +0000 (17:15 +0000)
commit a5d6264b638efeca35eff72177fd28d149e0764b upstream.

Use the low-power states of the underlying platform to enable runtime PM.
If the platform doesn't support runtime D3, then enabling default RPM will
result in the controller malfunctioning, as in the case of hotplug devices
not being detected because of a failed interrupt generation.

Cc: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20231019102924.2797346-16-mathias.nyman@linux.intel.com
Cc: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci-pci.c

index bde43cef8846cd2070878cd92d2b12a2390fafbd..95ed9404f6f8520678ccf3a220a8dad8fff82d98 100644 (file)
@@ -695,7 +695,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);