usb: dwc2: resume root hub when device detect with suspend state
diff mbox

Message ID 1416230077-17535-1-git-send-email-kever.yang@rock-chips.com
State New, archived
Headers show

Commit Message

Kever Yang Nov. 17, 2014, 1:14 p.m. UTC
After we implement the bus_suspend/resume, auto suspend id enabled.
The root hub will be auto suspend if there is no device connected,
we need to resume the root hub when a device connect detect.

This patch tested on rk3288.

Signed-off-by: Roy Li <roy.li@rock-chips.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
---

 drivers/usb/dwc2/hcd_intr.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Kever Yang Nov. 17, 2014, 3:21 p.m. UTC | #1
This patch is no complete, Sorry for that, I will upload a new version 
tomorrow.

- Kever

On 11/17/2014 09:14 PM, Kever Yang wrote:
> After we implement the bus_suspend/resume, auto suspend id enabled.
> The root hub will be auto suspend if there is no device connected,
> we need to resume the root hub when a device connect detect.
>
> This patch tested on rk3288.
>
> Signed-off-by: Roy Li <roy.li@rock-chips.com>
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> ---
>
>   drivers/usb/dwc2/hcd_intr.c | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
> index 551ba87..c8299fd 100644
> --- a/drivers/usb/dwc2/hcd_intr.c
> +++ b/drivers/usb/dwc2/hcd_intr.c
> @@ -355,6 +355,13 @@ static void dwc2_port_intr(struct dwc2_hsotg *hsotg)
>   		hprt0_modify |= HPRT0_CONNDET;
>   
>   		/*
> +		 * Check if root hub is in suspend state
> +		 * if root hub in suspend, resume it.
> +		 */
> +		if ((bus->root_hub) && (hcd->state == HC_STATE_SUSPENDED))
> +			usb_hcd_resume_root_hub(hcd);
> +
> +		/*
>   		 * The Hub driver asserts a reset when it sees port connect
>   		 * status change flag
>   		 */
Sergei Shtylyov Nov. 17, 2014, 6:16 p.m. UTC | #2
Hello.

On 11/17/2014 04:14 PM, Kever Yang wrote:

> After we implement the bus_suspend/resume, auto suspend id enabled.
> The root hub will be auto suspend if there is no device connected,
> we need to resume the root hub when a device connect detect.

> This patch tested on rk3288.

> Signed-off-by: Roy Li <roy.li@rock-chips.com>
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> ---

>   drivers/usb/dwc2/hcd_intr.c | 7 +++++++
>   1 file changed, 7 insertions(+)

> diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
> index 551ba87..c8299fd 100644
> --- a/drivers/usb/dwc2/hcd_intr.c
> +++ b/drivers/usb/dwc2/hcd_intr.c
> @@ -355,6 +355,13 @@ static void dwc2_port_intr(struct dwc2_hsotg *hsotg)
>   		hprt0_modify |= HPRT0_CONNDET;
>
>   		/*
> +		 * Check if root hub is in suspend state
> +		 * if root hub in suspend, resume it.
> +		 */
> +		if ((bus->root_hub) && (hcd->state == HC_STATE_SUSPENDED))

    Inner parens are not needed, especially the first ones.

[...]

WBR, Sergei
Julius Werner Nov. 17, 2014, 9:21 p.m. UTC | #3
On Mon, Nov 17, 2014 at 5:14 AM, Kever Yang <kever.yang@rock-chips.com> wrote:
> After we implement the bus_suspend/resume, auto suspend id enabled.
> The root hub will be auto suspend if there is no device connected,
> we need to resume the root hub when a device connect detect.
>
> This patch tested on rk3288.
>
> Signed-off-by: Roy Li <roy.li@rock-chips.com>
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> ---
>
>  drivers/usb/dwc2/hcd_intr.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
> index 551ba87..c8299fd 100644
> --- a/drivers/usb/dwc2/hcd_intr.c
> +++ b/drivers/usb/dwc2/hcd_intr.c
> @@ -355,6 +355,13 @@ static void dwc2_port_intr(struct dwc2_hsotg *hsotg)
>                 hprt0_modify |= HPRT0_CONNDET;
>
>                 /*
> +                * Check if root hub is in suspend state
> +                * if root hub in suspend, resume it.
> +                */
> +               if ((bus->root_hub) && (hcd->state == HC_STATE_SUSPENDED))

What is bus->root_hub checking for? Is there any chance that this
could be NULL here?

> +                       usb_hcd_resume_root_hub(hcd);
> +
> +               /*
>                  * The Hub driver asserts a reset when it sees port connect
>                  * status change flag
>                  */
> --
> 1.9.1

Seems sensible in general. Does this actually fix the problem Doug was
reporting?
Kever Yang Nov. 18, 2014, 1:11 a.m. UTC | #4
Hi Julius,

On 11/18/2014 05:21 AM, Julius Werner wrote:
> On Mon, Nov 17, 2014 at 5:14 AM, Kever Yang <kever.yang@rock-chips.com> wrote:
>> After we implement the bus_suspend/resume, auto suspend id enabled.
>> The root hub will be auto suspend if there is no device connected,
>> we need to resume the root hub when a device connect detect.
>>
>> This patch tested on rk3288.
>>
>> Signed-off-by: Roy Li <roy.li@rock-chips.com>
>> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
>> ---
>>
>>   drivers/usb/dwc2/hcd_intr.c | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
>> index 551ba87..c8299fd 100644
>> --- a/drivers/usb/dwc2/hcd_intr.c
>> +++ b/drivers/usb/dwc2/hcd_intr.c
>> @@ -355,6 +355,13 @@ static void dwc2_port_intr(struct dwc2_hsotg *hsotg)
>>                  hprt0_modify |= HPRT0_CONNDET;
>>
>>                  /*
>> +                * Check if root hub is in suspend state
>> +                * if root hub in suspend, resume it.
>> +                */
>> +               if ((bus->root_hub) && (hcd->state == HC_STATE_SUSPENDED))
> What is bus->root_hub checking for? Is there any chance that this
> could be NULL here?
I add bus->root_hub check because the _dwc2_hcd_start check this before it
call the usb_hcd_resume_root_hub.
I think we don't need this check for the root_hub must be there if we 
register
the HCD success, right?
I will remove this in next version.
>
>> +                       usb_hcd_resume_root_hub(hcd);
>> +
>> +               /*
>>                   * The Hub driver asserts a reset when it sees port connect
>>                   * status change flag
>>                   */
>> --
>> 1.9.1
> Seems sensible in general. Does this actually fix the problem Doug was
> reporting?
Yes, this fix the problem Doug reported with my dwc2 hcd suspend/resume 
patch.

- Kever

Patch
diff mbox

diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
index 551ba87..c8299fd 100644
--- a/drivers/usb/dwc2/hcd_intr.c
+++ b/drivers/usb/dwc2/hcd_intr.c
@@ -355,6 +355,13 @@  static void dwc2_port_intr(struct dwc2_hsotg *hsotg)
 		hprt0_modify |= HPRT0_CONNDET;
 
 		/*
+		 * Check if root hub is in suspend state
+		 * if root hub in suspend, resume it.
+		 */
+		if ((bus->root_hub) && (hcd->state == HC_STATE_SUSPENDED))
+			usb_hcd_resume_root_hub(hcd);
+
+		/*
 		 * The Hub driver asserts a reset when it sees port connect
 		 * status change flag
 		 */