From: Greg Kroah-Hartman Date: Sun, 4 Oct 2020 11:59:41 +0000 (+0200) Subject: drop i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch from... X-Git-Tag: v4.19.150~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=398bfac9dba85406c267a4b8c5e7287ee27a2a6a;p=thirdparty%2Fkernel%2Fstable-queue.git drop i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch from 5.4 and 4.19 --- diff --git a/queue-4.19/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch b/queue-4.19/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch deleted file mode 100644 index bc004ca6f37..00000000000 --- a/queue-4.19/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 845b89127bc5458d0152a4d63f165c62a22fcb70 Mon Sep 17 00:00:00 2001 -From: Jean Delvare -Date: Thu, 10 Sep 2020 11:57:08 +0200 -Subject: i2c: i801: Exclude device from suspend direct complete optimization -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Jean Delvare - -commit 845b89127bc5458d0152a4d63f165c62a22fcb70 upstream. - -By default, PCI drivers with runtime PM enabled will skip the calls -to suspend and resume on system PM. For this driver, we don't want -that, as we need to perform additional steps for system PM to work -properly on all systems. So instruct the PM core to not skip these -calls. - -Fixes: a9c8088c7988 ("i2c: i801: Don't restore config registers on runtime PM") -Reported-by: Volker Rümelin -Signed-off-by: Jean Delvare -Cc: stable@vger.kernel.org -Signed-off-by: Wolfram Sang -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/i2c/busses/i2c-i801.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/i2c/busses/i2c-i801.c -+++ b/drivers/i2c/busses/i2c-i801.c -@@ -1698,6 +1698,7 @@ static int i801_probe(struct pci_dev *de - - pci_set_drvdata(dev, priv); - -+ dev_pm_set_driver_flags(&dev->dev, DPM_FLAG_NO_DIRECT_COMPLETE); - pm_runtime_set_autosuspend_delay(&dev->dev, 1000); - pm_runtime_use_autosuspend(&dev->dev); - pm_runtime_put_autosuspend(&dev->dev); diff --git a/queue-4.19/series b/queue-4.19/series index 61f894d3c84..b15ff0ddffc 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -7,7 +7,6 @@ vsock-virtio-use-rcu-to-avoid-use-after-free-on-the_.patch vsock-virtio-stop-workers-during-the-.remove.patch vsock-virtio-add-transport-parameter-to-the-virtio_t.patch net-virtio_vsock-enhance-connection-semantics.patch -i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch input-i8042-add-nopnp-quirk-for-acer-aspire-5-a515.patch ftrace-move-rcu-is-watching-check-after-recursion-check.patch drm-amdgpu-restore-proper-ref-count-in-amdgpu_display_crtc_set_config.patch diff --git a/queue-5.4/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch b/queue-5.4/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch deleted file mode 100644 index e7906903e8e..00000000000 --- a/queue-5.4/i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 845b89127bc5458d0152a4d63f165c62a22fcb70 Mon Sep 17 00:00:00 2001 -From: Jean Delvare -Date: Thu, 10 Sep 2020 11:57:08 +0200 -Subject: i2c: i801: Exclude device from suspend direct complete optimization -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Jean Delvare - -commit 845b89127bc5458d0152a4d63f165c62a22fcb70 upstream. - -By default, PCI drivers with runtime PM enabled will skip the calls -to suspend and resume on system PM. For this driver, we don't want -that, as we need to perform additional steps for system PM to work -properly on all systems. So instruct the PM core to not skip these -calls. - -Fixes: a9c8088c7988 ("i2c: i801: Don't restore config registers on runtime PM") -Reported-by: Volker Rümelin -Signed-off-by: Jean Delvare -Cc: stable@vger.kernel.org -Signed-off-by: Wolfram Sang -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/i2c/busses/i2c-i801.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/i2c/busses/i2c-i801.c -+++ b/drivers/i2c/busses/i2c-i801.c -@@ -1891,6 +1891,7 @@ static int i801_probe(struct pci_dev *de - - pci_set_drvdata(dev, priv); - -+ dev_pm_set_driver_flags(&dev->dev, DPM_FLAG_NO_DIRECT_COMPLETE); - pm_runtime_set_autosuspend_delay(&dev->dev, 1000); - pm_runtime_use_autosuspend(&dev->dev); - pm_runtime_put_autosuspend(&dev->dev); diff --git a/queue-5.4/series b/queue-5.4/series index 420e5497cb5..0f78bded6b9 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -8,7 +8,6 @@ clk-socfpga-stratix10-fix-the-divider-for-the-emac_ptp_free_clk.patch vsock-virtio-add-transport-parameter-to-the-virtio_t.patch net-virtio_vsock-enhance-connection-semantics.patch xfs-trim-io-to-found-cow-extent-limit.patch -i2c-i801-exclude-device-from-suspend-direct-complete-optimization.patch input-i8042-add-nopnp-quirk-for-acer-aspire-5-a515.patch iio-adc-qcom-spmi-adc5-fix-driver-name.patch ftrace-move-rcu-is-watching-check-after-recursion-check.patch