Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de7d5f72 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Bjorn Helgaas
Browse files

PCI/PM: Disable runtime PM of PCIe ports 

The runtime PM of PCIe ports turns out to be quite fragile, as in
some cases things work while in some other cases they don't and we
don't seem to have a good way to determine whether or not they are
going to work in advance.

For this reason, avoid enabling runtime PM for PCIe ports by
keeping their runtime PM reference counters always above 0 for the
time being.

When a PCIe port is suspended, it can no longer report events like
hotplug, so hotplug below the port may not work, as in the bug
report below.

[bhelgaas: changelog, stable]
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=53811


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org	# v3.6+
parent 24ad0ef9

drivers/pci/pcie/portdrv_pci.c

+0 −13
Original line number Diff line number Diff line
@@ -184,14 +184,6 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops = { 
#define PCIE_PORTDRV_PM_OPS	NULL

#endif /* !PM */



/*

 * PCIe port runtime suspend is broken for some chipsets, so use a

 * black list to disable runtime PM for these chipsets.

 */

static const struct pci_device_id port_runtime_pm_black_list[] = {

	{ /* end: all zeroes */ }

};



/*

 * pcie_portdrv_probe - Probe PCI-Express port devices

 * @dev: PCI-Express port device being probed
@@ -225,16 +217,11 @@ static int pcie_portdrv_probe(struct pci_dev *dev, 
	 * it by default.

	 */

	dev->d3cold_allowed = false;

	if (!pci_match_id(port_runtime_pm_black_list, dev))

		pm_runtime_put_noidle(&dev->dev);



	return 0;

}



static void pcie_portdrv_remove(struct pci_dev *dev)

{

	if (!pci_match_id(port_runtime_pm_black_list, dev))

		pm_runtime_get_noresume(&dev->dev);

	pcie_port_device_remove(dev);

	pci_disable_device(dev);

}