From: Sasha Levin Date: Fri, 17 Jul 2020 17:15:28 +0000 (-0400) Subject: Fixes for 4.4 X-Git-Tag: v4.4.231~59 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40225608f0d3bfcf11b5758cffe8d8b6033a6b6f;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/revert-usb-ehci-platform-set-pm-runtime-as-active-on.patch b/queue-4.4/revert-usb-ehci-platform-set-pm-runtime-as-active-on.patch new file mode 100644 index 00000000000..adba0a380a2 --- /dev/null +++ b/queue-4.4/revert-usb-ehci-platform-set-pm-runtime-as-active-on.patch @@ -0,0 +1,56 @@ +From 3a50ee49c2e7095d65807f585d54fbf07dd3b573 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 12:36:52 -0400 +Subject: Revert "usb/ehci-platform: Set PM runtime as active on resume" + +This reverts commit 13af14dfadcb95030dc8e2e0cacbffc1990a9772. + +Eugeniu Rosca writes: + +On Thu, Jul 09, 2020 at 09:00:23AM +0200, Eugeniu Rosca wrote: +>After integrating v4.14.186 commit 5410d158ca2a50 ("usb/ehci-platform: +>Set PM runtime as active on resume") into downstream v4.14.x, we started +>to consistently experience below panic [1] on every second s2ram of +>R-Car H3 Salvator-X Renesas reference board. +> +>After some investigations, we concluded the following: +> - the issue does not exist in vanilla v5.8-rc4+ +> - [bisecting shows that] the panic on v4.14.186 is caused by the lack +> of v5.6-rc1 commit 987351e1ea7772 ("phy: core: Add consumer device +> link support"). Getting evidence for that is easy. Reverting +> 987351e1ea7772 in vanilla leads to a similar backtrace [2]. +> +>Questions: +> - Backporting 987351e1ea7772 ("phy: core: Add consumer device +> link support") to v4.14.187 looks challenging enough, so probably not +> worth it. Anybody to contradict this? +> - Assuming no plans to backport the missing mainline commit to v4.14.x, +> should the following three v4.14.186 commits be reverted on v4.14.x? +> * baef809ea497a4 ("usb/ohci-platform: Fix a warning when hibernating") +> * 9f33eff4958885 ("usb/xhci-plat: Set PM runtime as active on resume") +> * 5410d158ca2a50 ("usb/ehci-platform: Set PM runtime as active on resume") + +Signed-off-by: Sasha Levin +--- + drivers/usb/host/ehci-platform.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c +index 56200650b46b4..bd7082f297bbe 100644 +--- a/drivers/usb/host/ehci-platform.c ++++ b/drivers/usb/host/ehci-platform.c +@@ -375,11 +375,6 @@ static int ehci_platform_resume(struct device *dev) + } + + ehci_resume(hcd, priv->reset_on_resume); +- +- pm_runtime_disable(dev); +- pm_runtime_set_active(dev); +- pm_runtime_enable(dev); +- + return 0; + } + #endif /* CONFIG_PM_SLEEP */ +-- +2.25.1 + diff --git a/queue-4.4/revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch b/queue-4.4/revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch new file mode 100644 index 00000000000..d320db284b2 --- /dev/null +++ b/queue-4.4/revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch @@ -0,0 +1,56 @@ +From 9d3d34c11f28273581e75623cbd8f807dbafe86e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 12:39:13 -0400 +Subject: Revert "usb/ohci-platform: Fix a warning when hibernating" + +This reverts commit 652def4c63b99029fe8b898740f97329c26a2fd3. + +Eugeniu Rosca writes: + +On Thu, Jul 09, 2020 at 09:00:23AM +0200, Eugeniu Rosca wrote: +>After integrating v4.14.186 commit 5410d158ca2a50 ("usb/ehci-platform: +>Set PM runtime as active on resume") into downstream v4.14.x, we started +>to consistently experience below panic [1] on every second s2ram of +>R-Car H3 Salvator-X Renesas reference board. +> +>After some investigations, we concluded the following: +> - the issue does not exist in vanilla v5.8-rc4+ +> - [bisecting shows that] the panic on v4.14.186 is caused by the lack +> of v5.6-rc1 commit 987351e1ea7772 ("phy: core: Add consumer device +> link support"). Getting evidence for that is easy. Reverting +> 987351e1ea7772 in vanilla leads to a similar backtrace [2]. +> +>Questions: +> - Backporting 987351e1ea7772 ("phy: core: Add consumer device +> link support") to v4.14.187 looks challenging enough, so probably not +> worth it. Anybody to contradict this? +> - Assuming no plans to backport the missing mainline commit to v4.14.x, +> should the following three v4.14.186 commits be reverted on v4.14.x? +> * baef809ea497a4 ("usb/ohci-platform: Fix a warning when hibernating") +> * 9f33eff4958885 ("usb/xhci-plat: Set PM runtime as active on resume") +> * 5410d158ca2a50 ("usb/ehci-platform: Set PM runtime as active on resume") + +Signed-off-by: Sasha Levin +--- + drivers/usb/host/ohci-platform.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c +index 0e5580e6f35cb..c2669f185f658 100644 +--- a/drivers/usb/host/ohci-platform.c ++++ b/drivers/usb/host/ohci-platform.c +@@ -339,11 +339,6 @@ static int ohci_platform_resume(struct device *dev) + } + + ohci_resume(hcd, false); +- +- pm_runtime_disable(dev); +- pm_runtime_set_active(dev); +- pm_runtime_enable(dev); +- + return 0; + } + #endif /* CONFIG_PM_SLEEP */ +-- +2.25.1 + diff --git a/queue-4.4/revert-usb-xhci-plat-set-pm-runtime-as-active-on-res.patch b/queue-4.4/revert-usb-xhci-plat-set-pm-runtime-as-active-on-res.patch new file mode 100644 index 00000000000..75552501a2a --- /dev/null +++ b/queue-4.4/revert-usb-xhci-plat-set-pm-runtime-as-active-on-res.patch @@ -0,0 +1,63 @@ +From 518651eeb9ffa335513bc66bcd7d1b3ff2eef5f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 12:38:19 -0400 +Subject: Revert "usb/xhci-plat: Set PM runtime as active on resume" + +This reverts commit 737c975db35b0117fc5c702072ca2df6f2f7eb63. + +Eugeniu Rosca writes: + +On Thu, Jul 09, 2020 at 09:00:23AM +0200, Eugeniu Rosca wrote: +>After integrating v4.14.186 commit 5410d158ca2a50 ("usb/ehci-platform: +>Set PM runtime as active on resume") into downstream v4.14.x, we started +>to consistently experience below panic [1] on every second s2ram of +>R-Car H3 Salvator-X Renesas reference board. +> +>After some investigations, we concluded the following: +> - the issue does not exist in vanilla v5.8-rc4+ +> - [bisecting shows that] the panic on v4.14.186 is caused by the lack +> of v5.6-rc1 commit 987351e1ea7772 ("phy: core: Add consumer device +> link support"). Getting evidence for that is easy. Reverting +> 987351e1ea7772 in vanilla leads to a similar backtrace [2]. +> +>Questions: +> - Backporting 987351e1ea7772 ("phy: core: Add consumer device +> link support") to v4.14.187 looks challenging enough, so probably not +> worth it. Anybody to contradict this? +> - Assuming no plans to backport the missing mainline commit to v4.14.x, +> should the following three v4.14.186 commits be reverted on v4.14.x? +> * baef809ea497a4 ("usb/ohci-platform: Fix a warning when hibernating") +> * 9f33eff4958885 ("usb/xhci-plat: Set PM runtime as active on resume") +> * 5410d158ca2a50 ("usb/ehci-platform: Set PM runtime as active on resume") + +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-plat.c | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c +index 510fb7853f92a..c4c40e9d42471 100644 +--- a/drivers/usb/host/xhci-plat.c ++++ b/drivers/usb/host/xhci-plat.c +@@ -249,17 +249,8 @@ static int xhci_plat_resume(struct device *dev) + { + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct xhci_hcd *xhci = hcd_to_xhci(hcd); +- int ret; +- +- ret = xhci_resume(xhci, 0); +- if (ret) +- return ret; + +- pm_runtime_disable(dev); +- pm_runtime_set_active(dev); +- pm_runtime_enable(dev); +- +- return 0; ++ return xhci_resume(xhci, 0); + } + + static const struct dev_pm_ops xhci_plat_pm_ops = { +-- +2.25.1 + diff --git a/queue-4.4/series b/queue-4.4/series index b0e4110dfb9..adab6641ea6 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -27,3 +27,6 @@ tcp-md5-add-missing-memory-barriers-in-tcp_md5_do_add-tcp_md5_hash_key.patch tcp-md5-refine-tcp_md5_do_add-tcp_md5_hash_key-barriers.patch tcp-md5-allow-changing-md5-keys-in-all-socket-states.patch i2c-eg20t-load-module-automatically-if-id-matches.patch +revert-usb-ehci-platform-set-pm-runtime-as-active-on.patch +revert-usb-xhci-plat-set-pm-runtime-as-active-on-res.patch +revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch