Commit 11a6ff1d authored Jul 17, 2020 by Sasha Levin Committed by Greg Kroah-Hartman Jul 22, 2020

Revert "usb/xhci-plat: Set PM runtime as active on resume"



This reverts commit 57a1cd87.

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>

parent 4cf55dcd

drivers/usb/host/xhci-plat.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -410,15 +410,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)