PCI PM: Fix saving of device state in pci_legacy_suspend (99dadce8) · Commits · 戴 / test

Make pci_legacy_suspend() save the state of the device if it is in PCI_UNKNOWN after its suspend callback has run and warn only if the power state of the device has been changed by its suspend callback. Also, use WARN_ONCE(), which is more useful, in pci_legacy_suspend(), so that the name of the offending function is printed. Additionally, remove the unnecessary line of code setting pci_dev->state_saved. Signed-off-by:

Rafael J. Wysocki <rjw@sisk.pl> Reported-by:

Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:

Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by:

Jesse Barnes <jbarnes@virtuousgeek.org>

drivers/pci/pci-driver.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -355,6 +355,8 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
		int i = 0;

		if (drv && drv->suspend) {
		pci_power_t prev = pci_dev->current_state;

		pci_dev->state_saved = false;

		i = drv->suspend(pci_dev, state);
		@@ -365,12 +367,16 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
		if (pci_dev->state_saved)
		goto Fixup;

		if (WARN_ON_ONCE(pci_dev->current_state != PCI_D0))
		if (pci_dev->current_state != PCI_D0
		&& pci_dev->current_state != PCI_UNKNOWN) {
		WARN_ONCE(pci_dev->current_state != prev,
		"PCI PM: Device state not saved by %pF\n",
		drv->suspend);
		goto Fixup;
		}
		}

		pci_save_state(pci_dev);
		pci_dev->state_saved = true;
		/*
		* This is for compatibility with existing code with legacy PM support.
		*/

Admin message