Re: [PATCH v2 08/15] usb: dwc2: Move enter hibernation to dwc2_port_suspend() function

Minas Harutyunyan
2021-04-19T07:31:09Z

On 4/16/2021 4:47 PM, Artur Petrosyan wrote:
> This move is done to call enter hibernation handler in
> "dwc2_port_suspend()" function when core receives port suspend.
> Otherwise it could be confusing to enter to hibernation in
> "dwc2_hcd_hub_control()" function but other power saving modes
> in "dwc2_port_suspend()" function.
>
> Signed-off-by: Artur Petrosyan <Arthur.Petrosyan@synopsys.com>

Acked-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>

> ---
> Changes in v2:
> - None
>
> drivers/usb/dwc2/hcd.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
> index ff945c40ef8a..43a2298b7d42 100644
> --- a/drivers/usb/dwc2/hcd.c
> +++ b/drivers/usb/dwc2/hcd.c
> @@ -3321,6 +3321,18 @@ int dwc2_port_suspend(struct dwc2_hsotg *hsotg, u16 windex)
> "enter partial_power_down failed.\n");
> break;
> case DWC2_POWER_DOWN_PARAM_HIBERNATION:
> + /*
> + * Perform spin unlock and lock because in
> + * "dwc2_host_enter_hibernation()" function there is a spinlock
> + * logic which prevents servicing of any IRQ during entering
> + * hibernation.
> + */
> + spin_unlock_irqrestore(&hsotg->lock, flags);
> + ret = dwc2_enter_hibernation(hsotg, 1);
> + if (ret)
> + dev_err(hsotg->dev, "enter hibernation failed.\n");
> + spin_lock_irqsave(&hsotg->lock, flags);
> + break;
> case DWC2_POWER_DOWN_PARAM_NONE:
> /*
> * If not hibernation nor partial power down are supported,
> @@ -3650,10 +3662,8 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
> "SetPortFeature - USB_PORT_FEAT_SUSPEND\n");
> if (windex != hsotg->otg_port)
> goto error;
> - if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_HIBERNATION)
> - dwc2_enter_hibernation(hsotg, 1);
> - else
> - dwc2_port_suspend(hsotg, windex);
> + if (!hsotg->bus_suspended)
> + retval = dwc2_port_suspend(hsotg, windex);
> break;
>
> case USB_PORT_FEAT_POWER:
>