diff mbox

[v2] usb: dwc2: Register interrupt handler only once gadget is correctly initialized

Message ID 1423241438-1682-1-git-send-email-romain.perier@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Romain Perier Feb. 6, 2015, 4:50 p.m. UTC
Don't register interrupt handler before usb gadget is correctly initialized.
For some embedded platforms which don't have a usb-phy, it crashes the driver
because an interrupt is emitted with non-initialized hardware.
According to devm_request_irq documentation, an interrupt can be emitted
at any time once the interrupt is registered, so we have to care about driver
and hardware initialization.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
---

Changes for v2: fix typos in commit log

 drivers/usb/dwc2/platform.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Comments

Romain Perier Feb. 12, 2015, 12:42 p.m. UTC | #1
ping

2015-02-06 17:50 GMT+01:00 Romain Perier <romain.perier@gmail.com>:
> Don't register interrupt handler before usb gadget is correctly initialized.
> For some embedded platforms which don't have a usb-phy, it crashes the driver
> because an interrupt is emitted with non-initialized hardware.
> According to devm_request_irq documentation, an interrupt can be emitted
> at any time once the interrupt is registered, so we have to care about driver
> and hardware initialization.
>
> Signed-off-by: Romain Perier <romain.perier@gmail.com>
> ---
>
> Changes for v2: fix typos in commit log
>
>  drivers/usb/dwc2/platform.c | 17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
> index ae095f0..b26cf8c 100644
> --- a/drivers/usb/dwc2/platform.c
> +++ b/drivers/usb/dwc2/platform.c
> @@ -196,14 +196,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
>                 return irq;
>         }
>
> -       dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
> -               irq);
> -       retval = devm_request_irq(hsotg->dev, irq,
> -                                 dwc2_handle_common_intr, IRQF_SHARED,
> -                                 dev_name(hsotg->dev), hsotg);
> -       if (retval)
> -               return retval;
> -
>         res = platform_get_resource(dev, IORESOURCE_MEM, 0);
>         hsotg->regs = devm_ioremap_resource(&dev->dev, res);
>         if (IS_ERR(hsotg->regs))
> @@ -237,6 +229,15 @@ static int dwc2_driver_probe(struct platform_device *dev)
>         retval = dwc2_gadget_init(hsotg, irq);
>         if (retval)
>                 return retval;
> +
> +        dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
> +                irq);
> +        retval = devm_request_irq(hsotg->dev, irq,
> +                                dwc2_handle_common_intr, IRQF_SHARED,
> +                                dev_name(hsotg->dev), hsotg);
> +        if (retval)
> +                return retval;
> +
>         retval = dwc2_hcd_init(hsotg, irq, params);
>         if (retval)
>                 return retval;
> --
> 1.9.1
>
John Youn Feb. 13, 2015, 2:47 a.m. UTC | #2
On 2/12/2015 4:42 AM, Romain Perier wrote:
> ping
> 
> 2015-02-06 17:50 GMT+01:00 Romain Perier <romain.perier@gmail.com>:
>> Don't register interrupt handler before usb gadget is correctly initialized.
>> For some embedded platforms which don't have a usb-phy, it crashes the driver
>> because an interrupt is emitted with non-initialized hardware.
>> According to devm_request_irq documentation, an interrupt can be emitted
>> at any time once the interrupt is registered, so we have to care about driver
>> and hardware initialization.
>>
>> Signed-off-by: Romain Perier <romain.perier@gmail.com>
>> ---
>>
>> Changes for v2: fix typos in commit log
>>
>>  drivers/usb/dwc2/platform.c | 17 +++++++++--------
>>  1 file changed, 9 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
>> index ae095f0..b26cf8c 100644
>> --- a/drivers/usb/dwc2/platform.c
>> +++ b/drivers/usb/dwc2/platform.c
>> @@ -196,14 +196,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
>>                 return irq;
>>         }
>>
>> -       dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
>> -               irq);
>> -       retval = devm_request_irq(hsotg->dev, irq,
>> -                                 dwc2_handle_common_intr, IRQF_SHARED,
>> -                                 dev_name(hsotg->dev), hsotg);
>> -       if (retval)
>> -               return retval;
>> -
>>         res = platform_get_resource(dev, IORESOURCE_MEM, 0);
>>         hsotg->regs = devm_ioremap_resource(&dev->dev, res);
>>         if (IS_ERR(hsotg->regs))
>> @@ -237,6 +229,15 @@ static int dwc2_driver_probe(struct platform_device *dev)
>>         retval = dwc2_gadget_init(hsotg, irq);
>>         if (retval)
>>                 return retval;
>> +
>> +        dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
>> +                irq);
>> +        retval = devm_request_irq(hsotg->dev, irq,
>> +                                dwc2_handle_common_intr, IRQF_SHARED,
>> +                                dev_name(hsotg->dev), hsotg);
>> +        if (retval)
>> +                return retval;
>> +
>>         retval = dwc2_hcd_init(hsotg, irq, params);
>>         if (retval)
>>                 return retval;

Hi,

I'm going to be away until Wednesday, Feb 18. I'll take a look at
this and other pending dwc2 patches at that time.

Regards,
John
Romain Perier Feb. 13, 2015, 6:50 a.m. UTC | #3
No problem

Regards,
Romain

2015-02-13 3:47 GMT+01:00 John Youn <John.Youn@synopsys.com>:
> On 2/12/2015 4:42 AM, Romain Perier wrote:
>> ping
>>
>> 2015-02-06 17:50 GMT+01:00 Romain Perier <romain.perier@gmail.com>:
>>> Don't register interrupt handler before usb gadget is correctly initialized.
>>> For some embedded platforms which don't have a usb-phy, it crashes the driver
>>> because an interrupt is emitted with non-initialized hardware.
>>> According to devm_request_irq documentation, an interrupt can be emitted
>>> at any time once the interrupt is registered, so we have to care about driver
>>> and hardware initialization.
>>>
>>> Signed-off-by: Romain Perier <romain.perier@gmail.com>
>>> ---
>>>
>>> Changes for v2: fix typos in commit log
>>>
>>>  drivers/usb/dwc2/platform.c | 17 +++++++++--------
>>>  1 file changed, 9 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
>>> index ae095f0..b26cf8c 100644
>>> --- a/drivers/usb/dwc2/platform.c
>>> +++ b/drivers/usb/dwc2/platform.c
>>> @@ -196,14 +196,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
>>>                 return irq;
>>>         }
>>>
>>> -       dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
>>> -               irq);
>>> -       retval = devm_request_irq(hsotg->dev, irq,
>>> -                                 dwc2_handle_common_intr, IRQF_SHARED,
>>> -                                 dev_name(hsotg->dev), hsotg);
>>> -       if (retval)
>>> -               return retval;
>>> -
>>>         res = platform_get_resource(dev, IORESOURCE_MEM, 0);
>>>         hsotg->regs = devm_ioremap_resource(&dev->dev, res);
>>>         if (IS_ERR(hsotg->regs))
>>> @@ -237,6 +229,15 @@ static int dwc2_driver_probe(struct platform_device *dev)
>>>         retval = dwc2_gadget_init(hsotg, irq);
>>>         if (retval)
>>>                 return retval;
>>> +
>>> +        dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
>>> +                irq);
>>> +        retval = devm_request_irq(hsotg->dev, irq,
>>> +                                dwc2_handle_common_intr, IRQF_SHARED,
>>> +                                dev_name(hsotg->dev), hsotg);
>>> +        if (retval)
>>> +                return retval;
>>> +
>>>         retval = dwc2_hcd_init(hsotg, irq, params);
>>>         if (retval)
>>>                 return retval;
>
> Hi,
>
> I'm going to be away until Wednesday, Feb 18. I'll take a look at
> this and other pending dwc2 patches at that time.
>
> Regards,
> John
>
>
John Youn Feb. 21, 2015, 1:45 a.m. UTC | #4
On 2/6/2015 8:50 AM, Romain Perier wrote:
> Don't register interrupt handler before usb gadget is correctly initialized.
> For some embedded platforms which don't have a usb-phy, it crashes the driver
> because an interrupt is emitted with non-initialized hardware.
> According to devm_request_irq documentation, an interrupt can be emitted
> at any time once the interrupt is registered, so we have to care about driver
> and hardware initialization.
> 
> Signed-off-by: Romain Perier <romain.perier@gmail.com>
> ---
> 
> Changes for v2: fix typos in commit log
> 
>  drivers/usb/dwc2/platform.c | 17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
> index ae095f0..b26cf8c 100644
> --- a/drivers/usb/dwc2/platform.c
> +++ b/drivers/usb/dwc2/platform.c
> @@ -196,14 +196,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
>  		return irq;
>  	}
>  
> -	dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
> -		irq);
> -	retval = devm_request_irq(hsotg->dev, irq,
> -				  dwc2_handle_common_intr, IRQF_SHARED,
> -				  dev_name(hsotg->dev), hsotg);
> -	if (retval)
> -		return retval;
> -
>  	res = platform_get_resource(dev, IORESOURCE_MEM, 0);
>  	hsotg->regs = devm_ioremap_resource(&dev->dev, res);
>  	if (IS_ERR(hsotg->regs))
> @@ -237,6 +229,15 @@ static int dwc2_driver_probe(struct platform_device *dev)
>  	retval = dwc2_gadget_init(hsotg, irq);
>  	if (retval)
>  		return retval;
> +
> +        dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
> +                irq);
> +        retval = devm_request_irq(hsotg->dev, irq,
> +                                dwc2_handle_common_intr, IRQF_SHARED,
> +                                dev_name(hsotg->dev), hsotg);
> +        if (retval)
> +                return retval;
> +
>  	retval = dwc2_hcd_init(hsotg, irq, params);
>  	if (retval)
>  		return retval;
> 

This patch fails checkpatch.pl.

Which interrupt is being emitted?

You are only initializing the gadget side before registering the handler. Could it affect the host side as well, say if you config for HOST only? In that case none of the dwc2_gadget_init() will be done (as it is a no-op).

Thanks,
John
diff mbox

Patch

diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index ae095f0..b26cf8c 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -196,14 +196,6 @@  static int dwc2_driver_probe(struct platform_device *dev)
 		return irq;
 	}
 
-	dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
-		irq);
-	retval = devm_request_irq(hsotg->dev, irq,
-				  dwc2_handle_common_intr, IRQF_SHARED,
-				  dev_name(hsotg->dev), hsotg);
-	if (retval)
-		return retval;
-
 	res = platform_get_resource(dev, IORESOURCE_MEM, 0);
 	hsotg->regs = devm_ioremap_resource(&dev->dev, res);
 	if (IS_ERR(hsotg->regs))
@@ -237,6 +229,15 @@  static int dwc2_driver_probe(struct platform_device *dev)
 	retval = dwc2_gadget_init(hsotg, irq);
 	if (retval)
 		return retval;
+
+        dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
+                irq);
+        retval = devm_request_irq(hsotg->dev, irq,
+                                dwc2_handle_common_intr, IRQF_SHARED,
+                                dev_name(hsotg->dev), hsotg);
+        if (retval)
+                return retval;
+
 	retval = dwc2_hcd_init(hsotg, irq, params);
 	if (retval)
 		return retval;