From 4c1b0486201488afade302132435b6f00ce3860c Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 17 Jul 2020 13:15:27 -0400 Subject: [PATCH] Fixes for 4.14 Signed-off-by: Sasha Levin --- ...platform-set-pm-runtime-as-active-on.patch | 56 +++++++++++++++++ ...platform-fix-a-warning-when-hibernat.patch | 56 +++++++++++++++++ ...plat-set-pm-runtime-as-active-on-res.patch | 61 +++++++++++++++++++ queue-4.14/series | 3 + 4 files changed, 176 insertions(+) create mode 100644 queue-4.14/revert-usb-ehci-platform-set-pm-runtime-as-active-on.patch create mode 100644 queue-4.14/revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch create mode 100644 queue-4.14/revert-usb-xhci-plat-set-pm-runtime-as-active-on-res.patch diff --git a/queue-4.14/revert-usb-ehci-platform-set-pm-runtime-as-active-on.patch b/queue-4.14/revert-usb-ehci-platform-set-pm-runtime-as-active-on.patch new file mode 100644 index 00000000000..14188a0f441 --- /dev/null +++ b/queue-4.14/revert-usb-ehci-platform-set-pm-runtime-as-active-on.patch @@ -0,0 +1,56 @@ +From fdd3f7c46f4b5a55984dc357e566ed08e717f156 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 12:57:05 -0400 +Subject: Revert "usb/ehci-platform: Set PM runtime as active on resume" + +This reverts commit 5410d158ca2a50bcf3f48c57f6cd73f4cf479e69. + +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 6fcd332880143..f1908ea9fbd86 100644 +--- a/drivers/usb/host/ehci-platform.c ++++ b/drivers/usb/host/ehci-platform.c +@@ -390,11 +390,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.14/revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch b/queue-4.14/revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch new file mode 100644 index 00000000000..5110d2a957f --- /dev/null +++ b/queue-4.14/revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch @@ -0,0 +1,56 @@ +From 41ac7275808ef6273a64bfbea88971895297bc28 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 12:56:32 -0400 +Subject: Revert "usb/ohci-platform: Fix a warning when hibernating" + +This reverts commit baef809ea497a4f21fa67814b61094bbcc191c39. + +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 742cefa22c2b5..61fe2b985070f 100644 +--- a/drivers/usb/host/ohci-platform.c ++++ b/drivers/usb/host/ohci-platform.c +@@ -355,11 +355,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.14/revert-usb-xhci-plat-set-pm-runtime-as-active-on-res.patch b/queue-4.14/revert-usb-xhci-plat-set-pm-runtime-as-active-on-res.patch new file mode 100644 index 00000000000..85bf1b59cce --- /dev/null +++ b/queue-4.14/revert-usb-xhci-plat-set-pm-runtime-as-active-on-res.patch @@ -0,0 +1,61 @@ +From fdb8dc126a5c448e0685e2e0cc8a068b5dd5a4ba Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Jul 2020 12:57:16 -0400 +Subject: Revert "usb/xhci-plat: Set PM runtime as active on resume" + +This reverts commit 9f33eff4958885f6fd64c18221c36d065ef8ba8a. + +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 | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c +index 7219cbf7c54c2..2a73592908e1e 100644 +--- a/drivers/usb/host/xhci-plat.c ++++ b/drivers/usb/host/xhci-plat.c +@@ -381,15 +381,7 @@ static int __maybe_unused xhci_plat_resume(struct device *dev) + if (ret) + return 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 int __maybe_unused xhci_plat_runtime_suspend(struct device *dev) +-- +2.25.1 + diff --git a/queue-4.14/series b/queue-4.14/series index 28270ccb27a..cf11cc80e6e 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -70,3 +70,6 @@ spi-spi-fsl-dspi-fix-lockup-if-device-is-shutdown-du.patch spi-fix-initial-spi_sr-value-in-spi-fsl-dspi.patch net-dsa-bcm_sf2-fix-node-reference-count.patch of-of_mdio-correct-loop-scanning-logic.patch +revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch +revert-usb-ehci-platform-set-pm-runtime-as-active-on.patch +revert-usb-xhci-plat-set-pm-runtime-as-active-on-res.patch -- 2.47.3