PCI/PM: Make pci_pme_active() ignore devices without PME support (ffaddbe8) · Commits · 戴 / test

Make pci_pme_active() ignore devices without PME support, so that it doesn't print the "PME enabled" or "PME disabled" debug messages for devices that don't support PME. So that pci_pme_active() doesn't have to check pm_cap in addition to pme_support, make pci_pm_init() clear pme_support upfront to make sure that it will be 0 for pm_cap equal to 0. Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com>

drivers/pci/pci.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1571,7 +1571,7 @@ void pci_pme_active(struct pci_dev *dev, bool enable)
		{
		u16 pmcsr;

		if (!dev->pm_cap)
		if (!dev->pme_support)
		return;

		pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
		@@ -1920,6 +1920,7 @@ void pci_pm_init(struct pci_dev *dev)
		dev->wakeup_prepared = false;

		dev->pm_cap = 0;
		dev->pme_support = 0;

		/* find PCI PM capability in list */
		pm = pci_find_capability(dev, PCI_CAP_ID_PM);
		@@ -1971,8 +1972,6 @@ void pci_pm_init(struct pci_dev *dev)
		device_set_wakeup_capable(&dev->dev, true);
		/* Disable the PME# generation functionality */
		pci_pme_active(dev, false);
		} else {
		dev->pme_support = 0;
		}
		}

Admin message