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

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

[Minas Harutyunyan]

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")
Reported-by: Tomasz Mon <tomasz.mon@nordicsemi.no>
Signed-off-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
---
 drivers/usb/dwc2/gadget.c | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index e7bf9cc635be..be6b792e9a7d 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -5345,20 +5345,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;

base-commit: 12393996c1b28cd944465d2f55500ca84399a7f1
-- 
2.41.0

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

[Greg Kroah-Hartman]

On Tue, Apr 22, 2025 at 06:59:54AM +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")
> Reported-by: Tomasz Mon <tomasz.mon@nordicsemi.no>
> Signed-off-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
> ---
>  drivers/usb/dwc2/gadget.c | 37 +++++++++++++++++++++++++------------
>  1 file changed, 25 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
> index e7bf9cc635be..be6b792e9a7d 100644
> --- a/drivers/usb/dwc2/gadget.c
> +++ b/drivers/usb/dwc2/gadget.c
> @@ -5345,20 +5345,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;
> 
> base-commit: 12393996c1b28cd944465d2f55500ca84399a7f1
> -- 
> 2.41.0
> 
> 

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman.  You have sent him
a patch that has triggered this response.  He used to manually respond
to these common problems, but in order to save his sanity (he kept
writing the same thing over and over, yet to different people), I was
created.  Hopefully you will not take offence and will fix the problem
in your patch and resubmit it so that it can be accepted into the Linux
kernel tree.

You are receiving this message because of the following common error(s)
as indicated below:

- You have marked a patch with a "Fixes:" tag for a commit that is in an
  older released kernel, yet you do not have a cc: stable line in the
  signed-off-by area at all, which means that the patch will not be
  applied to any older kernel releases.  To properly fix this, please
  follow the documented rules in the
  Documentation/process/stable-kernel-rules.rst file for how to resolve
  this.

If you wish to discuss this problem further, or you have questions about
how to resolve this issue, please feel free to respond to this email and
Greg will reply once he has dug out from the pending patches received
from other developers.

thanks,

greg k-h's patch email bot