From: Rafael J. Wysocki <[email protected]> Hi Rafael, Bjorn or Greg,
This patch has been backport to 3.8 and 3.6 stable tree. This looks applicable to stable-3.4. It prevents from using the stale pci config state during the ->slot_reset(). I try to git am it to 3.4 stable kernel, but failed, so I apply this patch manually, and format this fresh patch for 3.4. =========== From: Rafael J. Wysocki <[email protected]> commit 82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765 upstream 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. [wangyj: adjust context] Signed-off-by: Konstantin Khlebnikov <[email protected]> # add comment Signed-off-by: Bjorn Helgaas <[email protected]> Signed-off-by: Yijing Wang <[email protected]> --- drivers/pci/pci-driver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 3389387..920d701 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -686,6 +686,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; @@ -832,6 +833,7 @@ static int pci_pm_freeze(struct device *dev) return 0; } + pci_dev->state_saved = false; if (pm->freeze) { int error; @@ -920,6 +922,7 @@ static int pci_pm_poweroff(struct device *dev) goto Fixup; } + pci_dev->state_saved = false; if (pm->poweroff) { int error; @@ -1038,6 +1041,7 @@ static int pci_pm_runtime_suspend(struct device *dev) if (!pm || !pm->runtime_suspend) return -ENOSYS; + pci_dev->state_saved = false; error = pm->runtime_suspend(dev); suspend_report_result(pm->runtime_suspend, error); if (error) -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
