From: Greg Kroah-Hartman Date: Wed, 7 Jun 2017 09:49:48 +0000 (+0200) Subject: drop pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch from... X-Git-Tag: v3.18.56~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dfcc310adb5647c6237237e4ca3db6218b2223c;p=thirdparty%2Fkernel%2Fstable-queue.git drop pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch from all queues --- diff --git a/queue-4.11/pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch b/queue-4.11/pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch deleted file mode 100644 index 9125623f66c..00000000000 --- a/queue-4.11/pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4d071c3238987325b9e50e33051a40d1cce311cc Mon Sep 17 00:00:00 2001 -From: Imre Deak -Date: Tue, 23 May 2017 14:18:17 -0500 -Subject: PCI/PM: Add needs_resume flag to avoid suspend complete optimization - -From: Imre Deak - -commit 4d071c3238987325b9e50e33051a40d1cce311cc upstream. - -Some drivers - like i915 - may not support the system suspend direct -complete optimization due to differences in their runtime and system -suspend sequence. Add a flag that when set resumes the device before -calling the driver's system suspend handlers which effectively disables -the optimization. - -Needed by a future patch fixing suspend/resume on i915. - -Suggested by Rafael. - -Signed-off-by: Imre Deak -Signed-off-by: Bjorn Helgaas -Acked-by: Rafael J. Wysocki -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/pci/pci.c | 3 ++- - include/linux/pci.h | 5 +++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - ---- a/drivers/pci/pci.c -+++ b/drivers/pci/pci.c -@@ -2142,7 +2142,8 @@ bool pci_dev_keep_suspended(struct pci_d - - if (!pm_runtime_suspended(dev) - || pci_target_state(pci_dev) != pci_dev->current_state -- || platform_pci_need_resume(pci_dev)) -+ || platform_pci_need_resume(pci_dev) -+ || (pci_dev->dev_flags & PCI_DEV_FLAGS_NEEDS_RESUME)) - return false; - - /* ---- a/include/linux/pci.h -+++ b/include/linux/pci.h -@@ -178,6 +178,11 @@ enum pci_dev_flags { - PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7), - /* Get VPD from function 0 VPD */ - PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8), -+ /* -+ * Resume before calling the driver's system suspend hooks, disabling -+ * the direct_complete optimization. -+ */ -+ PCI_DEV_FLAGS_NEEDS_RESUME = (__force pci_dev_flags_t) (1 << 11), - }; - - enum pci_irq_reroute_variant { diff --git a/queue-4.11/series b/queue-4.11/series index 7886be6169f..e0eddd39f13 100644 --- a/queue-4.11/series +++ b/queue-4.11/series @@ -85,7 +85,6 @@ mm-hugetlb-report-ehwpoison-not-efault-when-foll_hwpoison-is-specified.patch mm-consider-memblock-reservations-for-deferred-memory-initialization-sizing.patch rdma-srp-fix-null-deref-at-srp_destroy_qp.patch rdma-qib-hfi1-fix-mr-reference-count-leak-on-write-with-immediate.patch -pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch x86-boot-use-cross_compile-prefix-for-readelf.patch ksm-prevent-crash-after-write_protect_page-fails.patch slub-memcg-cure-the-brainless-abuse-of-sysfs-attributes.patch diff --git a/queue-4.4/pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch b/queue-4.4/pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch deleted file mode 100644 index 4bbb1957b6e..00000000000 --- a/queue-4.4/pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4d071c3238987325b9e50e33051a40d1cce311cc Mon Sep 17 00:00:00 2001 -From: Imre Deak -Date: Tue, 23 May 2017 14:18:17 -0500 -Subject: PCI/PM: Add needs_resume flag to avoid suspend complete optimization - -From: Imre Deak - -commit 4d071c3238987325b9e50e33051a40d1cce311cc upstream. - -Some drivers - like i915 - may not support the system suspend direct -complete optimization due to differences in their runtime and system -suspend sequence. Add a flag that when set resumes the device before -calling the driver's system suspend handlers which effectively disables -the optimization. - -Needed by a future patch fixing suspend/resume on i915. - -Suggested by Rafael. - -Signed-off-by: Imre Deak -Signed-off-by: Bjorn Helgaas -Acked-by: Rafael J. Wysocki -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/pci/pci.c | 3 ++- - include/linux/pci.h | 5 +++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - ---- a/drivers/pci/pci.c -+++ b/drivers/pci/pci.c -@@ -2079,7 +2079,8 @@ bool pci_dev_keep_suspended(struct pci_d - - if (!pm_runtime_suspended(dev) - || pci_target_state(pci_dev) != pci_dev->current_state -- || platform_pci_need_resume(pci_dev)) -+ || platform_pci_need_resume(pci_dev) -+ || (pci_dev->dev_flags & PCI_DEV_FLAGS_NEEDS_RESUME)) - return false; - - /* ---- a/include/linux/pci.h -+++ b/include/linux/pci.h -@@ -182,6 +182,11 @@ enum pci_dev_flags { - PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7), - /* Get VPD from function 0 VPD */ - PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8), -+ /* -+ * Resume before calling the driver's system suspend hooks, disabling -+ * the direct_complete optimization. -+ */ -+ PCI_DEV_FLAGS_NEEDS_RESUME = (__force pci_dev_flags_t) (1 << 11), - }; - - enum pci_irq_reroute_variant { diff --git a/queue-4.4/series b/queue-4.4/series index f1a0b4390ba..f5fd636337f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -35,7 +35,6 @@ slub-memcg-cure-the-brainless-abuse-of-sysfs-attributes.patch drm-gma500-psb-actually-use-vbt-mode-when-it-is-found.patch mm-migrate-fix-refcount-handling-when-hugepage_migration_supported.patch mlock-fix-mlock-count-can-not-decrease-in-race-condition.patch -pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch xfs-fix-missed-holes-in-seek_hole-implementation.patch xfs-fix-off-by-one-on-max-nr_pages-in-xfs_find_get_desired_pgoff.patch xfs-fix-over-copying-of-getbmap-parameters-from-userspace.patch diff --git a/queue-4.9/pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch b/queue-4.9/pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch deleted file mode 100644 index 9125623f66c..00000000000 --- a/queue-4.9/pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4d071c3238987325b9e50e33051a40d1cce311cc Mon Sep 17 00:00:00 2001 -From: Imre Deak -Date: Tue, 23 May 2017 14:18:17 -0500 -Subject: PCI/PM: Add needs_resume flag to avoid suspend complete optimization - -From: Imre Deak - -commit 4d071c3238987325b9e50e33051a40d1cce311cc upstream. - -Some drivers - like i915 - may not support the system suspend direct -complete optimization due to differences in their runtime and system -suspend sequence. Add a flag that when set resumes the device before -calling the driver's system suspend handlers which effectively disables -the optimization. - -Needed by a future patch fixing suspend/resume on i915. - -Suggested by Rafael. - -Signed-off-by: Imre Deak -Signed-off-by: Bjorn Helgaas -Acked-by: Rafael J. Wysocki -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/pci/pci.c | 3 ++- - include/linux/pci.h | 5 +++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - ---- a/drivers/pci/pci.c -+++ b/drivers/pci/pci.c -@@ -2142,7 +2142,8 @@ bool pci_dev_keep_suspended(struct pci_d - - if (!pm_runtime_suspended(dev) - || pci_target_state(pci_dev) != pci_dev->current_state -- || platform_pci_need_resume(pci_dev)) -+ || platform_pci_need_resume(pci_dev) -+ || (pci_dev->dev_flags & PCI_DEV_FLAGS_NEEDS_RESUME)) - return false; - - /* ---- a/include/linux/pci.h -+++ b/include/linux/pci.h -@@ -178,6 +178,11 @@ enum pci_dev_flags { - PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7), - /* Get VPD from function 0 VPD */ - PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8), -+ /* -+ * Resume before calling the driver's system suspend hooks, disabling -+ * the direct_complete optimization. -+ */ -+ PCI_DEV_FLAGS_NEEDS_RESUME = (__force pci_dev_flags_t) (1 << 11), - }; - - enum pci_irq_reroute_variant { diff --git a/queue-4.9/series b/queue-4.9/series index 8b897a29324..a40b08ea321 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -60,7 +60,6 @@ mm-migrate-fix-refcount-handling-when-hugepage_migration_supported.patch mlock-fix-mlock-count-can-not-decrease-in-race-condition.patch mm-consider-memblock-reservations-for-deferred-memory-initialization-sizing.patch rdma-qib-hfi1-fix-mr-reference-count-leak-on-write-with-immediate.patch -pci-pm-add-needs_resume-flag-to-avoid-suspend-complete-optimization.patch x86-boot-use-cross_compile-prefix-for-readelf.patch ksm-prevent-crash-after-write_protect_page-fails.patch slub-memcg-cure-the-brainless-abuse-of-sysfs-attributes.patch