* [PATCH] usb: dwc2: host: use msleep() for long delays
@ 2017-01-12 15:54 Nicholas Mc Guire
2017-01-13 0:40 ` John Youn
0 siblings, 1 reply; 3+ messages in thread
From: Nicholas Mc Guire @ 2017-01-12 15:54 UTC (permalink / raw)
To: John Youn; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel, Nicholas Mc Guire
ulseep_range() uses hrtimers and provides no advantage over msleep()
for larger delays. Fix up the 20+ ms delays here passing the adjusted "min"
value to msleep(). This helps reduce the load on the hrtimer subsystem.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---
Patch was compile tested with: x86_64_defconfig + CONFIG_USB_DWC2
(1 sparse and 6 coccinelle warning - preparing separate patches for that)
Patch is against 4.10-rc3 (localversion-next is next-20170112)
drivers/usb/dwc2/hcd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 911c3b3..37ee72d 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -2150,7 +2150,7 @@ static int dwc2_hcd_endpoint_disable(struct dwc2_hsotg *hsotg,
}
spin_unlock_irqrestore(&hsotg->lock, flags);
- usleep_range(20000, 40000);
+ msleep(20);
spin_lock_irqsave(&hsotg->lock, flags);
qh = ep->hcpriv;
if (!qh) {
@@ -3240,7 +3240,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
"Waiting for Peripheral Mode, Mode=%s\n",
dwc2_is_host_mode(hsotg) ? "Host" :
"Peripheral");
- usleep_range(20000, 40000);
+ msleep(20);
if (++count > 250)
break;
}
@@ -3261,7 +3261,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
dev_info(hsotg->dev, "Waiting for Host Mode, Mode=%s\n",
dwc2_is_host_mode(hsotg) ?
"Host" : "Peripheral");
- usleep_range(20000, 40000);
+ msleep(20);
if (++count > 250)
break;
}
@@ -3354,7 +3354,7 @@ static void dwc2_port_suspend(struct dwc2_hsotg *hsotg, u16 windex)
spin_unlock_irqrestore(&hsotg->lock, flags);
- usleep_range(200000, 250000);
+ msleep(200);
} else {
spin_unlock_irqrestore(&hsotg->lock, flags);
}
@@ -3378,7 +3378,7 @@ static void dwc2_port_resume(struct dwc2_hsotg *hsotg)
pcgctl &= ~PCGCTL_STOPPCLK;
dwc2_writel(pcgctl, hsotg->regs + PCGCTL);
spin_unlock_irqrestore(&hsotg->lock, flags);
- usleep_range(20000, 40000);
+ msleep(20);
spin_lock_irqsave(&hsotg->lock, flags);
}
@@ -3691,7 +3691,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
}
/* Clear reset bit in 10ms (FS/LS) or 50ms (HS) */
- usleep_range(50000, 70000);
+ msleep(50);
hprt0 &= ~HPRT0_RST;
dwc2_writel(hprt0, hsotg->regs + HPRT0);
hsotg->lx_state = DWC2_L0; /* Now back to On state */
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] usb: dwc2: host: use msleep() for long delays
2017-01-12 15:54 [PATCH] usb: dwc2: host: use msleep() for long delays Nicholas Mc Guire
@ 2017-01-13 0:40 ` John Youn
2017-01-16 10:37 ` Felipe Balbi
0 siblings, 1 reply; 3+ messages in thread
From: John Youn @ 2017-01-13 0:40 UTC (permalink / raw)
To: Nicholas Mc Guire, John Youn, Felipe Balbi
Cc: Greg Kroah-Hartman, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org
On 1/12/2017 7:52 AM, Nicholas Mc Guire wrote:
> ulseep_range() uses hrtimers and provides no advantage over msleep()
> for larger delays. Fix up the 20+ ms delays here passing the adjusted "min"
> value to msleep(). This helps reduce the load on the hrtimer subsystem.
>
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
> ---
>
> Patch was compile tested with: x86_64_defconfig + CONFIG_USB_DWC2
> (1 sparse and 6 coccinelle warning - preparing separate patches for that)
>
> Patch is against 4.10-rc3 (localversion-next is next-20170112)
>
> drivers/usb/dwc2/hcd.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
> index 911c3b3..37ee72d 100644
> --- a/drivers/usb/dwc2/hcd.c
> +++ b/drivers/usb/dwc2/hcd.c
> @@ -2150,7 +2150,7 @@ static int dwc2_hcd_endpoint_disable(struct dwc2_hsotg *hsotg,
> }
>
> spin_unlock_irqrestore(&hsotg->lock, flags);
> - usleep_range(20000, 40000);
> + msleep(20);
> spin_lock_irqsave(&hsotg->lock, flags);
> qh = ep->hcpriv;
> if (!qh) {
> @@ -3240,7 +3240,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
> "Waiting for Peripheral Mode, Mode=%s\n",
> dwc2_is_host_mode(hsotg) ? "Host" :
> "Peripheral");
> - usleep_range(20000, 40000);
> + msleep(20);
> if (++count > 250)
> break;
> }
> @@ -3261,7 +3261,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
> dev_info(hsotg->dev, "Waiting for Host Mode, Mode=%s\n",
> dwc2_is_host_mode(hsotg) ?
> "Host" : "Peripheral");
> - usleep_range(20000, 40000);
> + msleep(20);
> if (++count > 250)
> break;
> }
> @@ -3354,7 +3354,7 @@ static void dwc2_port_suspend(struct dwc2_hsotg *hsotg, u16 windex)
>
> spin_unlock_irqrestore(&hsotg->lock, flags);
>
> - usleep_range(200000, 250000);
> + msleep(200);
> } else {
> spin_unlock_irqrestore(&hsotg->lock, flags);
> }
> @@ -3378,7 +3378,7 @@ static void dwc2_port_resume(struct dwc2_hsotg *hsotg)
> pcgctl &= ~PCGCTL_STOPPCLK;
> dwc2_writel(pcgctl, hsotg->regs + PCGCTL);
> spin_unlock_irqrestore(&hsotg->lock, flags);
> - usleep_range(20000, 40000);
> + msleep(20);
> spin_lock_irqsave(&hsotg->lock, flags);
> }
>
> @@ -3691,7 +3691,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
> }
>
> /* Clear reset bit in 10ms (FS/LS) or 50ms (HS) */
> - usleep_range(50000, 70000);
> + msleep(50);
> hprt0 &= ~HPRT0_RST;
> dwc2_writel(hprt0, hsotg->regs + HPRT0);
> hsotg->lx_state = DWC2_L0; /* Now back to On state */
>
+Felipe
Acked-by: John Youn <johnyoun@synopsys.com>
I've also fixed this up locally to apply against recent dwc2 patches
for next.
Hi Felipe,
If/when you queue the pending dwc2 patches on testing/next I can
resend this to you.
Regards,
John
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] usb: dwc2: host: use msleep() for long delays
2017-01-13 0:40 ` John Youn
@ 2017-01-16 10:37 ` Felipe Balbi
0 siblings, 0 replies; 3+ messages in thread
From: Felipe Balbi @ 2017-01-16 10:37 UTC (permalink / raw)
To: John Youn, Nicholas Mc Guire, John Youn
Cc: Greg Kroah-Hartman, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 3166 bytes --]
Hi,
John Youn <John.Youn@synopsys.com> writes:
> On 1/12/2017 7:52 AM, Nicholas Mc Guire wrote:
>> ulseep_range() uses hrtimers and provides no advantage over msleep()
>> for larger delays. Fix up the 20+ ms delays here passing the adjusted "min"
>> value to msleep(). This helps reduce the load on the hrtimer subsystem.
>>
>> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
>> ---
>>
>> Patch was compile tested with: x86_64_defconfig + CONFIG_USB_DWC2
>> (1 sparse and 6 coccinelle warning - preparing separate patches for that)
>>
>> Patch is against 4.10-rc3 (localversion-next is next-20170112)
>>
>> drivers/usb/dwc2/hcd.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
>> index 911c3b3..37ee72d 100644
>> --- a/drivers/usb/dwc2/hcd.c
>> +++ b/drivers/usb/dwc2/hcd.c
>> @@ -2150,7 +2150,7 @@ static int dwc2_hcd_endpoint_disable(struct dwc2_hsotg *hsotg,
>> }
>>
>> spin_unlock_irqrestore(&hsotg->lock, flags);
>> - usleep_range(20000, 40000);
>> + msleep(20);
>> spin_lock_irqsave(&hsotg->lock, flags);
>> qh = ep->hcpriv;
>> if (!qh) {
>> @@ -3240,7 +3240,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
>> "Waiting for Peripheral Mode, Mode=%s\n",
>> dwc2_is_host_mode(hsotg) ? "Host" :
>> "Peripheral");
>> - usleep_range(20000, 40000);
>> + msleep(20);
>> if (++count > 250)
>> break;
>> }
>> @@ -3261,7 +3261,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
>> dev_info(hsotg->dev, "Waiting for Host Mode, Mode=%s\n",
>> dwc2_is_host_mode(hsotg) ?
>> "Host" : "Peripheral");
>> - usleep_range(20000, 40000);
>> + msleep(20);
>> if (++count > 250)
>> break;
>> }
>> @@ -3354,7 +3354,7 @@ static void dwc2_port_suspend(struct dwc2_hsotg *hsotg, u16 windex)
>>
>> spin_unlock_irqrestore(&hsotg->lock, flags);
>>
>> - usleep_range(200000, 250000);
>> + msleep(200);
>> } else {
>> spin_unlock_irqrestore(&hsotg->lock, flags);
>> }
>> @@ -3378,7 +3378,7 @@ static void dwc2_port_resume(struct dwc2_hsotg *hsotg)
>> pcgctl &= ~PCGCTL_STOPPCLK;
>> dwc2_writel(pcgctl, hsotg->regs + PCGCTL);
>> spin_unlock_irqrestore(&hsotg->lock, flags);
>> - usleep_range(20000, 40000);
>> + msleep(20);
>> spin_lock_irqsave(&hsotg->lock, flags);
>> }
>>
>> @@ -3691,7 +3691,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
>> }
>>
>> /* Clear reset bit in 10ms (FS/LS) or 50ms (HS) */
>> - usleep_range(50000, 70000);
>> + msleep(50);
>> hprt0 &= ~HPRT0_RST;
>> dwc2_writel(hprt0, hsotg->regs + HPRT0);
>> hsotg->lx_state = DWC2_L0; /* Now back to On state */
>>
>
> +Felipe
>
> Acked-by: John Youn <johnyoun@synopsys.com>
>
> I've also fixed this up locally to apply against recent dwc2 patches
> for next.
>
> Hi Felipe,
>
> If/when you queue the pending dwc2 patches on testing/next I can
> resend this to you.
it actually applied just fine ;-)
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-16 10:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-12 15:54 [PATCH] usb: dwc2: host: use msleep() for long delays Nicholas Mc Guire
2017-01-13 0:40 ` John Youn
2017-01-16 10:37 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox