diff mbox series

[v2,1/4] usb: dwc2: gadget: move gadget resume after the core is in L0 state

Message ID 1587642956-8157-2-git-send-email-fabrice.gasnier@st.com (mailing list archive)
State Mainlined
Commit 8c935deacebb8fac8f41378701eb79d12f3c2e2d
Headers show
Series usb: gadget: serial: add supend resume support | expand

Commit Message

Fabrice Gasnier April 23, 2020, 11:55 a.m. UTC
When the remote wakeup interrupt is triggered, lx_state is resumed from L2
to L0 state. But when the gadget resume is called, lx_state is still L2.
This prevents the resume callback to queue any request. Any attempt
to queue a request from resume callback will result in:
- "submit request only in active state" debug message to be issued
- dwc2_hsotg_ep_queue() returns -EAGAIN

Call the gadget resume routine after the core is in L0 state.

Fixes: f81f46e1f530 ("usb: dwc2: implement hibernation during bus suspend/resume")

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
---
Changes in v2:
- Minor update to follow Minas suggestions
---
 drivers/usb/dwc2/core_intr.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Minas Harutyunyan April 23, 2020, 1:06 p.m. UTC | #1
On 4/23/2020 3:55 PM, Fabrice Gasnier wrote:
> When the remote wakeup interrupt is triggered, lx_state is resumed from L2
> to L0 state. But when the gadget resume is called, lx_state is still L2.
> This prevents the resume callback to queue any request. Any attempt
> to queue a request from resume callback will result in:
> - "submit request only in active state" debug message to be issued
> - dwc2_hsotg_ep_queue() returns -EAGAIN
> 
> Call the gadget resume routine after the core is in L0 state.
> 
> Fixes: f81f46e1f530 ("usb: dwc2: implement hibernation during bus suspend/resume")
> 
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Acked-by: Minas Harutyunyan <hminas@synopsys.com>

> ---
> Changes in v2:
> - Minor update to follow Minas suggestions
> ---
>   drivers/usb/dwc2/core_intr.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
> index 876ff31..55f1d14 100644
> --- a/drivers/usb/dwc2/core_intr.c
> +++ b/drivers/usb/dwc2/core_intr.c
> @@ -416,10 +416,13 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg)
>   			if (ret && (ret != -ENOTSUPP))
>   				dev_err(hsotg->dev, "exit power_down failed\n");
>   
> +			/* Change to L0 state */
> +			hsotg->lx_state = DWC2_L0;
>   			call_gadget(hsotg, resume);
> +		} else {
> +			/* Change to L0 state */
> +			hsotg->lx_state = DWC2_L0;
>   		}
> -		/* Change to L0 state */
> -		hsotg->lx_state = DWC2_L0;
>   	} else {
>   		if (hsotg->params.power_down)
>   			return;
>
diff mbox series

Patch

diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
index 876ff31..55f1d14 100644
--- a/drivers/usb/dwc2/core_intr.c
+++ b/drivers/usb/dwc2/core_intr.c
@@ -416,10 +416,13 @@  static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg)
 			if (ret && (ret != -ENOTSUPP))
 				dev_err(hsotg->dev, "exit power_down failed\n");
 
+			/* Change to L0 state */
+			hsotg->lx_state = DWC2_L0;
 			call_gadget(hsotg, resume);
+		} else {
+			/* Change to L0 state */
+			hsotg->lx_state = DWC2_L0;
 		}
-		/* Change to L0 state */
-		hsotg->lx_state = DWC2_L0;
 	} else {
 		if (hsotg->params.power_down)
 			return;