From patchwork Tue Jan 29 04:34:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/4] PCI/PM: Set pci_dev->set_d3cold in pci_set_power_state Date: Mon, 28 Jan 2013 18:34:17 -0000 From: Huang Ying X-Patchwork-Id: 216424 Message-Id: <1359434058-15918-4-git-send-email-ying.huang@intel.com> To: Bjorn Helgaas Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, "Rafael J. Wysocki" , Huang Ying Because now pci_dev->set_d3cold is only used after pci_set_power_state(, PCI_D3cold) and before pci_set_power_state(, PCI_D0). And we will use pci_dev->set_d3cold for D3cold support during system suspend too, but now pci_dev->set_d3cold is set only in runtime power management code path now. Signed-off-by: Huang Ying --- drivers/pci/pci-driver.c | 2 -- drivers/pci/pci.c | 12 +++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1036,8 +1036,6 @@ static int pci_pm_runtime_resume(struct rc = pm->runtime_resume(dev); - pci_dev->set_d3cold = false; - return rc; } --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -775,6 +775,9 @@ int pci_set_power_state(struct pci_dev * if (dev->current_state == state) return 0; + if (state == PCI_D3cold) + dev->set_d3cold = true; + __pci_start_power_transition(dev, state); /* This device is quirked not to be put into D3, so @@ -798,6 +801,9 @@ int pci_set_power_state(struct pci_dev * if (!error && dev->bus->self) pcie_aspm_powersave_config_link(dev->bus->self); + if (error || state != PCI_D3cold) + dev->set_d3cold = false; + return error; } @@ -1833,16 +1839,12 @@ int pci_finish_runtime_suspend(struct pc if (target_state == PCI_POWER_ERROR) return -EIO; - dev->set_d3cold = target_state == PCI_D3cold; - __pci_enable_wake(dev, target_state, true, pci_dev_run_wake(dev)); error = pci_set_power_state(dev, target_state); - if (error) { + if (error) __pci_enable_wake(dev, target_state, true, false); - dev->set_d3cold = false; - } return error; }