diff mbox

[v2] usb: dwc3: core: move dwc3_cache_hwparams before dwc3_alloc_event_buffers

Message ID 1353069901-19217-1-git-send-email-kishon@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kishon Vijay Abraham I Nov. 16, 2012, 12:45 p.m. UTC 
commit 392142 (moved event buffer allocation out of dwc3_core_init()). But
event buffer allocation uses the cached copy of hwparams to determine
the number of event buffers and the caching is done in dwc3_core_init.
So moved dwc3_cache_hwparams function before dwc3_alloc_event_buffers so
that dwc3_alloc_event_buffers sees the correct number of event buffers.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
Changes from v1:
Added *parens* to the commit message as per Sergei's comments.

 drivers/usb/dwc3/core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Sergei Shtylyov Nov. 16, 2012, 1:06 p.m. UTC | #1 
Hello.

On 16-11-2012 16:45, Kishon Vijay Abraham I wrote:

> commit 392142 (moved event buffer allocation out of dwc3_core_init()). But

    The actual summary is "usb: dwc3: core: move event buffer allocation out 
of dwc3_core_init()".

> event buffer allocation uses the cached copy of hwparams to determine
> the number of event buffers and the caching is done in dwc3_core_init.
> So moved dwc3_cache_hwparams function before dwc3_alloc_event_buffers so
> that dwc3_alloc_event_buffers sees the correct number of event buffers.

> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> Signed-off-by: Felipe Balbi <balbi@ti.com>

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi Nov. 16, 2012, 1:42 p.m. UTC | #2 
On Fri, Nov 16, 2012 at 05:06:38PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 16-11-2012 16:45, Kishon Vijay Abraham I wrote:
> 
> >commit 392142 (moved event buffer allocation out of dwc3_core_init()). But
> 
>    The actual summary is "usb: dwc3: core: move event buffer
> allocation out of dwc3_core_init()".

too late for that. Already on Greg's tree. Let's just hope this won'
repeat on upcoming patches ;-)
diff mbox

Patch

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index b923183..88e8d31 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -356,8 +356,6 @@  static int __devinit dwc3_core_init(struct dwc3 *dwc)
 
 	dwc3_core_soft_reset(dwc);
 
-	dwc3_cache_hwparams(dwc);
-
 	reg = dwc3_readl(dwc->regs, DWC3_GCTL);
 	reg &= ~DWC3_GCTL_SCALEDOWN_MASK;
 	reg &= ~DWC3_GCTL_DISSCRAMBLE;
@@ -498,6 +496,8 @@  static int __devinit dwc3_probe(struct platform_device *pdev)
 	pm_runtime_get_sync(dev);
 	pm_runtime_forbid(dev);
 
+	dwc3_cache_hwparams(dwc);
+
 	ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
 	if (ret) {
 		dev_err(dwc->dev, "failed to allocate event buffers\n");