[PATCH v 6] usb: dwc2: gadget: Fix enter to hibernation for UTMI+ PHY

[PATCH v 6] usb: dwc2: gadget: Fix enter to hibernation for UTMI+ PHY

[Minas Harutyunyan]

[-- Attachment #1: Type: text/plain, Size: 2861 bytes --]

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
Signed-off-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
---
Changes in v6:
 - Rabased on usb-next branch over commit 7481a97c5f49
Changes in v5:
 - Rebased on top of Linux 6.16-rc2
Changes in v4:
 - Rebased on top of Linux 6.15-rc6
Changes in v3:
 - Rebased on top of Linux 6.15-rc4
Changes in v2:
 - Added Cc: stable@vger.kernel.org

 drivers/usb/dwc2/gadget.c | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index d5b622f78cf3..0637bfbc054e 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -5389,20 +5389,34 @@ 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);
+               /* Suspend the Phy Clock */
+               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;

base-commit: 7481a97c5f49f10c7490bb990d0e863f23b9bb71
--
2.41.0

[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 14822 bytes --]

Re: [PATCH v 6] usb: dwc2: gadget: Fix enter to hibernation for UTMI+ PHY

[Greg Kroah-Hartman]

On Wed, Jul 02, 2025 at 12:21:22PM +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
> Signed-off-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
> ---
> Changes in v6:
>  - Rabased on usb-next branch over commit 7481a97c5f49
> Changes in v5:
>  - Rebased on top of Linux 6.16-rc2
> Changes in v4:
>  - Rebased on top of Linux 6.15-rc6
> Changes in v3:
>  - Rebased on top of Linux 6.15-rc4
> Changes in v2:
>  - Added Cc: stable@vger.kernel.org

This constant rebasing is just not working, as this _STILL_ does not
apply to either of my branches.  Are you sure you are doing this
properly?  No other changes in your tree?

Ah, I see the issue:

> 
>  drivers/usb/dwc2/gadget.c | 38 ++++++++++++++++++++++++++------------
>  1 file changed, 26 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
> index d5b622f78cf3..0637bfbc054e 100644
> --- a/drivers/usb/dwc2/gadget.c
> +++ b/drivers/usb/dwc2/gadget.c
> @@ -5389,20 +5389,34 @@ 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);

Your email client ate all the tabs and spit out spaces, making this
impossible to apply to any branch anywhere.  Please fix your email
client to be able to send patches out properly.

Try sending one to yourself, and seeing if that can apply properly
afterward.  If so, then try sending it out to the world again.

thanks,

greg k-h