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

PCI/PM: Replace pci_set_power_state() in pci_pm_thaw_noirq() 

Calling pci_set_power_state() to put the given device into D0 in
pci_pm_thaw_noirq() may cause it to restore the device's BARs, which is
redundant before calling pci_restore_state(), so replace it with a direct
pci_power_up() call followed by pci_update_current_state() if it returns a
nonzero value, in analogy with pci_pm_default_resume_early().

Avoid code duplication by introducing a wrapper function to contain the
repeating pattern and calling it in both places.

Link: https://lore.kernel.org/r/3639079.MHq7AAxBmi@kreacher


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 3cc2a2b2

drivers/pci/pci-driver.c

+7 −2
Original line number Diff line number Diff line
@@ -556,10 +556,15 @@ static void pci_pm_default_resume(struct pci_dev *pci_dev) 
	pci_enable_wake(pci_dev, PCI_D0, false);

}



static void pci_pm_default_resume_early(struct pci_dev *pci_dev)

static void pci_pm_power_up_and_verify_state(struct pci_dev *pci_dev)

{

	pci_power_up(pci_dev);

	pci_update_current_state(pci_dev, PCI_D0);

}



static void pci_pm_default_resume_early(struct pci_dev *pci_dev)

{

	pci_pm_power_up_and_verify_state(pci_dev);

	pci_restore_state(pci_dev);

	pci_pme_restore(pci_dev);

}
@@ -1084,7 +1089,7 @@ static int pci_pm_thaw_noirq(struct device *dev) 
	 * in case the driver's "freeze" callbacks put it into a low-power

	 * state.

	 */

	pci_set_power_state(pci_dev, PCI_D0);

	pci_pm_power_up_and_verify_state(pci_dev);

	pci_restore_state(pci_dev);



	if (pci_has_legacy_pm_support(pci_dev))