Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b16163f authored by Minas Harutyunyan's avatar Minas Harutyunyan Committed by Greg Kroah-Hartman
Browse files

usb: dwc2: host: Fix remote wakeup from hibernation 



commit bae2bc73a59c200db53b6c15fb26bb758e2c6108 upstream.

Starting from core v4.30a changed order of programming
GPWRDN_PMUACTV to 0 in case of exit from hibernation on
remote wakeup signaling from device.

Fixes: c5c403dc ("usb: dwc2: Add host/device hibernation functions")
CC: stable@vger.kernel.org
Signed-off-by: default avatarMinas Harutyunyan <Minas.Harutyunyan@synopsys.com>
Link: https://lore.kernel.org/r/99385ec55ce73445b6fbd0f471c9bd40eb1c9b9e.1708939799.git.Minas.Harutyunyan@synopsys.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 832580af

drivers/usb/dwc2/core.h

+1 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,7 @@ struct dwc2_hsotg { 
	bool needs_byte_swap;



	/* DWC OTG HW Release versions */

#define DWC2_CORE_REV_4_30a	0x4f54430a

#define DWC2_CORE_REV_2_71a	0x4f54271a

#define DWC2_CORE_REV_2_72a     0x4f54272a

#define DWC2_CORE_REV_2_80a	0x4f54280a

drivers/usb/dwc2/hcd.c

+13 −4
Original line number Diff line number Diff line
@@ -5684,10 +5684,12 @@ int dwc2_host_exit_hibernation(struct dwc2_hsotg *hsotg, int rem_wakeup, 
	dwc2_writel(hsotg, hr->hcfg, HCFG);



	/* De-assert Wakeup Logic */

	if (!(rem_wakeup && hsotg->hw_params.snpsid >= DWC2_CORE_REV_4_30a)) {

		gpwrdn = dwc2_readl(hsotg, GPWRDN);

		gpwrdn &= ~GPWRDN_PMUACTV;

		dwc2_writel(hsotg, gpwrdn, GPWRDN);

		udelay(10);

	}



	hprt0 = hr->hprt0;

	hprt0 |= HPRT0_PWR;
@@ -5712,6 +5714,13 @@ int dwc2_host_exit_hibernation(struct dwc2_hsotg *hsotg, int rem_wakeup, 
		hprt0 |= HPRT0_RES;

		dwc2_writel(hsotg, hprt0, HPRT0);



		/* De-assert Wakeup Logic */

		if ((rem_wakeup && hsotg->hw_params.snpsid >= DWC2_CORE_REV_4_30a)) {

			gpwrdn = dwc2_readl(hsotg, GPWRDN);

			gpwrdn &= ~GPWRDN_PMUACTV;

			dwc2_writel(hsotg, gpwrdn, GPWRDN);

			udelay(10);

		}

		/* Wait for Resume time and then program HPRT again */

		mdelay(100);

		hprt0 &= ~HPRT0_RES;