| From d2e8366278691632aae58079be785d2203695a5f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 17 Jul 2020 13:00:47 -0400 |
| Subject: [PATCH] Revert "usb/ohci-platform: Fix a warning when hibernating" |
| |
| This reverts commit 69e19f4392d53fdcd7774356cd0d2ab26f5d2f07 which was |
| commit 1cb3b0095c3d0bb96912bfbbce4fc006d41f367c upstream. |
| |
| 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 <sashal@kernel.org> |
| [PG: follow suit of v5.4.53-stable revert fbf719e5da12.] |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c |
| index f40112c5920d..65a1c3fdc88c 100644 |
| --- a/drivers/usb/host/ohci-platform.c |
| +++ b/drivers/usb/host/ohci-platform.c |
| @@ -301,11 +301,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.27.0 |
| |
