PCI: check saved state before restore (c82f63e4) · Commits · 戴 / test

Without the check, the config space may be filled with zeros. Though the driver should try to avoid call restoring before saving, but the pci layer also should check this. Also removes the existing check in pci_restore_standard_config, since it's superfluous with the new check in restore_state. Acked-by:

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

Alek Du <alek.du@intel.com> Signed-off-by:

Jesse Barnes <jbarnes@virtuousgeek.org>

drivers/pci/pci-driver.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev)
		return error;
		}

		return pci_dev->state_saved ? pci_restore_state(pci_dev) : 0;
		return pci_restore_state(pci_dev);
		}

		static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev)

drivers/pci/pci.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -846,6 +846,8 @@ pci_restore_state(struct pci_dev *dev)
		int i;
		u32 val;

		if (!dev->state_saved)
		return 0;
		/* PCI Express register must be restored first */
		pci_restore_pcie_state(dev);

Admin message