| From 9995d9b76ecb20dedb26627d47d0bf73c7ddbd52 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 17 Jul 2020 13:01:10 -0400 |
| Subject: [PATCH] Revert "usb/ehci-platform: Set PM runtime as active on |
| resume" |
| |
| This reverts commit 5e2e932a2a3511545b5e562f77937c6b4b543fe7 which was |
| commit 16bdc04cc98ab0c74392ceef2475ecc5e73fcf49 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 335d720bb4bd9d.] |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c |
| index cbc45941a699..8a45362155c5 100644 |
| --- a/drivers/usb/host/ehci-platform.c |
| +++ b/drivers/usb/host/ehci-platform.c |
| @@ -457,10 +457,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); |
| - |
| if (priv->quirk_poll) |
| quirk_poll_init(priv); |
| |
| -- |
| 2.27.0 |
| |
