[ 093/136 ] PCI/PM: Clear state_saved during suspend

Steven Rostedt
2013-05-18T03:09:42Z

[-- Attachment #1: 0093-PCI-PM-Clear-state_saved-during-suspend.patch --]
[-- Type: text/plain, Size: 1706 bytes --]

3.6.11.4 stable review patch.
If anyone has any objections, please let me know.

------------------

From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>

[ Upstream commit 82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765 ]

This patch clears pci_dev->state_saved at the beginning of suspending.
PCI config state may be saved long before that. Some drivers call
pci_save_state() from the ->probe() callback to get snapshot of sane
configuration space to use in the ->slot_reset() callback.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> # add comment
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
drivers/pci/pci-driver.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 729e038..97d0f03d 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -685,6 +685,7 @@ static int pci_pm_suspend(struct device *dev)
goto Fixup;
}

+ pci_dev->state_saved = false;
if (pm->suspend) {
pci_power_t prev = pci_dev->current_state;
int error;
@@ -831,6 +832,7 @@ static int pci_pm_freeze(struct device *dev)
return 0;
}

+ pci_dev->state_saved = false;
if (pm->freeze) {
int error;

@@ -919,6 +921,7 @@ static int pci_pm_poweroff(struct device *dev)
goto Fixup;
}

+ pci_dev->state_saved = false;
if (pm->poweroff) {
int error;

@@ -1037,6 +1040,7 @@ static int pci_pm_runtime_suspend(struct device *dev)
if (!pm || !pm->runtime_suspend)
return -ENOSYS;

+ pci_dev->state_saved = false;
pci_dev->no_d3cold = false;
error = pm->runtime_suspend(dev);
suspend_report_result(pm->runtime_suspend, error);
--
1.7.10.4