xhci: Use pm_runtime_get to prevent RPM on unsupported systems

Use pm_runtime_put in the remove function and pm_runtime_get to disable
RPM on platforms that don't support runtime D3, as re-enabling it through
sysfs auto power control may cause the controller to malfunction. This
can lead to issues such as hotplug devices not being detected due to
failed interrupt generation.

Fixes: a5d6264b638e ("xhci: Enable RPM on controllers that support low-power states")
Cc: stable <stable@kernel.org>
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20241024133718.723846-1-Basavaraj.Natikar@amd.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 7e53819..cb07cee 100644 (file)
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -640,7 +640,7 @@ int xhci_pci_common_probe(struct pci_dev *dev, const struct pci_device_id *id)
        pm_runtime_put_noidle(&dev->dev);
 
        if (pci_choose_state(dev, PMSG_SUSPEND) == PCI_D0)
-               pm_runtime_forbid(&dev->dev);
+               pm_runtime_get(&dev->dev);
        else if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
                pm_runtime_allow(&dev->dev);
 
@@ -683,7 +683,9 @@ void xhci_pci_remove(struct pci_dev *dev)
 
        xhci->xhc_state |= XHCI_STATE_REMOVING;
 
-       if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
+       if (pci_choose_state(dev, PMSG_SUSPEND) == PCI_D0)
+               pm_runtime_put(&dev->dev);
+       else if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
                pm_runtime_forbid(&dev->dev);
 
        if (xhci->shared_hcd) {