| Message ID | 6242fbe1b81f16adeb96079448f0df92b6b8b664.1746442461.git.Minas.Harutyunyan@synopsys.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v,3] usb: dwc2: gadget: Fix enter to hibernation for UTMI+ PHY | expand |
On Mon, May 05, 2025 at 11:48:02AM +0000, Minas Harutyunyan wrote: > For UTMI+ PHY, according to programming guide, first should be set > PMUACTV bit then STOPPCLK bit. Otherwise, when the device issues > Remote Wakeup, then host notices disconnect instead. > For ULPI PHY, above mentioned bits must be set in reversed order: > STOPPCLK then PMUACTV. > > Fixes: 4483ef3c1685 ("usb: dwc2: Add hibernation updates for ULPI PHY") > Cc: stable@vger.kernel.org > Reported-by: Tomasz Mon <tomasz.mon@nordicsemi.no> > Signed-off-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com> > --- > Changes in v3: > - Rebased on top of 6.15-rc4 > Changes in v2: > - Added Cc: stable@vger.kernel.org AS it's too late for 6.15-final, I tried to apply this to the usb-next branch and it fails there due to other changes to this codepath. Can you rebase it and submit it there? thanks, greg k-h
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 300ea4969f0c..b817002bdee0 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -5383,20 +5383,33 @@ int dwc2_gadget_enter_hibernation(struct dwc2_hsotg *hsotg) if (gusbcfg & GUSBCFG_ULPI_UTMI_SEL) { /* ULPI interface */ gpwrdn |= GPWRDN_ULPI_LATCH_EN_DURING_HIB_ENTRY; - } - dwc2_writel(hsotg, gpwrdn, GPWRDN); - udelay(10); + dwc2_writel(hsotg, gpwrdn, GPWRDN); + udelay(10); - /* Suspend the Phy Clock */ - pcgcctl = dwc2_readl(hsotg, PCGCTL); - pcgcctl |= PCGCTL_STOPPCLK; - dwc2_writel(hsotg, pcgcctl, PCGCTL); - udelay(10); + pcgcctl = dwc2_readl(hsotg, PCGCTL); + pcgcctl |= PCGCTL_STOPPCLK; + dwc2_writel(hsotg, pcgcctl, PCGCTL); + udelay(10); - gpwrdn = dwc2_readl(hsotg, GPWRDN); - gpwrdn |= GPWRDN_PMUACTV; - dwc2_writel(hsotg, gpwrdn, GPWRDN); - udelay(10); + gpwrdn = dwc2_readl(hsotg, GPWRDN); + gpwrdn |= GPWRDN_PMUACTV; + dwc2_writel(hsotg, gpwrdn, GPWRDN); + udelay(10); + } else { + /* UTMI+ Interface */ + dwc2_writel(hsotg, gpwrdn, GPWRDN); + udelay(10); + + gpwrdn = dwc2_readl(hsotg, GPWRDN); + gpwrdn |= GPWRDN_PMUACTV; + dwc2_writel(hsotg, gpwrdn, GPWRDN); + udelay(10); + + pcgcctl = dwc2_readl(hsotg, PCGCTL); + pcgcctl |= PCGCTL_STOPPCLK; + dwc2_writel(hsotg, pcgcctl, PCGCTL); + udelay(10); + } /* Set flag to indicate that we are in hibernation */ hsotg->hibernated = 1;
For UTMI+ PHY, according to programming guide, first should be set PMUACTV bit then STOPPCLK bit. Otherwise, when the device issues Remote Wakeup, then host notices disconnect instead. For ULPI PHY, above mentioned bits must be set in reversed order: STOPPCLK then PMUACTV. Fixes: 4483ef3c1685 ("usb: dwc2: Add hibernation updates for ULPI PHY") Cc: stable@vger.kernel.org Reported-by: Tomasz Mon <tomasz.mon@nordicsemi.no> Signed-off-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com> --- Changes in v3: - Rebased on top of 6.15-rc4 Changes in v2: - Added Cc: stable@vger.kernel.org drivers/usb/dwc2/gadget.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) base-commit: b4432656b36e5cc1d50a1f2dc15357543add530e -- 2.41.0