Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-14 20:34:00 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-14 20:34:04 +0200
commit759d72fb45ac2fd9700a10cf6b6bd99eaad83632 (patch)
tree425949d68c86aa7c5a502572181e699fa60a651f
parent4f42d54abba7928720f2feb7f6ebb3ecbf76da12 (diff)
PCI: PM: Avoid possible suspend-to-idle issue (bsc#1051510).
-rw-r--r--patches.fixes/PCI-PM-Avoid-possible-suspend-to-idle-issue.patch89
-rw-r--r--series.conf1
2 files changed, 90 insertions, 0 deletions
diff --git a/patches.fixes/PCI-PM-Avoid-possible-suspend-to-idle-issue.patch b/patches.fixes/PCI-PM-Avoid-possible-suspend-to-idle-issue.patch
new file mode 100644
index 0000000000..1acf3c9c29
--- /dev/null
+++ b/patches.fixes/PCI-PM-Avoid-possible-suspend-to-idle-issue.patch
@@ -0,0 +1,89 @@
+From d491f2b75237ef37d8867830ab7fad8d9659e853 Mon Sep 17 00:00:00 2001
+From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+Date: Fri, 17 May 2019 11:08:50 +0200
+Subject: [PATCH] PCI: PM: Avoid possible suspend-to-idle issue
+Git-commit: d491f2b75237ef37d8867830ab7fad8d9659e853
+Patch-mainline: v5.2-rc3
+References: bsc#1051510
+
+If a PCI driver leaves the device handled by it in D0 and calls
+pci_save_state() on the device in its ->suspend() or ->suspend_late()
+callback, it can expect the device to stay in D0 over the whole
+s2idle cycle. However, that may not be the case if there is a
+spurious wakeup while the system is suspended, because in that case
+pci_pm_suspend_noirq() will run again after pci_pm_resume_noirq()
+which calls pci_restore_state(), via pci_pm_default_resume_early(),
+so state_saved is cleared and the second iteration of
+pci_pm_suspend_noirq() will invoke pci_prepare_to_sleep() which
+may change the power state of the device.
+
+To avoid that, add a new internal flag, skip_bus_pm, that will be set
+by pci_pm_suspend_noirq() when it runs for the first time during the
+given system suspend-resume cycle if the state of the device has
+been saved already and the device is still in D0. Setting that flag
+will cause the next iterations of pci_pm_suspend_noirq() to set
+state_saved for pci_pm_resume_noirq(), so that it always restores the
+device state from the originally saved data, and avoid calling
+pci_prepare_to_sleep() for the device.
+
+Fixes: 33e4f80ee69b ("ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle")
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Reviewed-by: Keith Busch <keith.busch@intel.com>
+Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/pci/pci-driver.c | 17 ++++++++++++++++-
+ include/linux/pci.h | 1 +
+ 2 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
+index cae630fe6387..5eadbc3d0969 100644
+--- a/drivers/pci/pci-driver.c
++++ b/drivers/pci/pci-driver.c
+@@ -734,6 +734,8 @@ static int pci_pm_suspend(struct device *dev)
+ struct pci_dev *pci_dev = to_pci_dev(dev);
+ const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+
++ pci_dev->skip_bus_pm = false;
++
+ if (pci_has_legacy_pm_support(pci_dev))
+ return pci_legacy_suspend(dev, PMSG_SUSPEND);
+
+@@ -827,7 +829,20 @@ static int pci_pm_suspend_noirq(struct device *dev)
+ }
+ }
+
+- if (!pci_dev->state_saved) {
++ if (pci_dev->skip_bus_pm) {
++ /*
++ * The function is running for the second time in a row without
++ * going through full resume, which is possible only during
++ * suspend-to-idle in a spurious wakeup case. Moreover, the
++ * device was originally left in D0, so its power state should
++ * not be changed here and the device register values saved
++ * originally should be restored on resume again.
++ */
++ pci_dev->state_saved = true;
++ } else if (pci_dev->state_saved) {
++ if (pci_dev->current_state == PCI_D0)
++ pci_dev->skip_bus_pm = true;
++ } else {
+ pci_save_state(pci_dev);
+ if (pci_power_manageable(pci_dev))
+ pci_prepare_to_sleep(pci_dev);
+diff --git a/include/linux/pci.h b/include/linux/pci.h
+index 4a5a84d7bdd4..dd436da7eccc 100644
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -344,6 +344,7 @@ struct pci_dev {
+ D3cold, not set for devices
+ powered on/off by the
+ corresponding bridge */
++ unsigned int skip_bus_pm:1; /* Internal: Skip bus-level PM */
+ unsigned int ignore_hotplug:1; /* Ignore hotplug events */
+ unsigned int hotplug_user_indicators:1; /* SlotCtl indicators
+ controlled exclusively by
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index b60275e5f8..5fcfd6d5b5 100644
--- a/series.conf
+++ b/series.conf
@@ -22414,6 +22414,7 @@
patches.drivers/staging-wlan-ng-fix-adapter-initialization-failure.patch
patches.drivers/Staging-vc04_services-Fix-a-couple-error-codes.patch
patches.drivers/staging-vc04_services-prevent-integer-overflow-in-cr.patch
+ patches.fixes/PCI-PM-Avoid-possible-suspend-to-idle-issue.patch
patches.suse/memcg-make-it-work-on-sparse-non-0-node-systems.patch
patches.suse/kernel-signal.c-trace_signal_deliver-when-signal_gro.patch
patches.drivers/leds-avoid-flush_work-in-atomic-context.patch