[PATCH v4 1/3] Documentation: dt-bindings: add async_irq to msm_hsusb

[PATCH v4 1/3] Documentation: dt-bindings: add async_irq to msm_hsusb

[Tim Bird]

Add optional async_irq to msm_hsusb binding doc.

Signed-off-by: Tim Bird <tim.bird@sonymobile.com>
---
 Documentation/devicetree/bindings/usb/msm-hsusb.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/msm-hsusb.txt b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
index 8654a3e..2d13c1c 100644
--- a/Documentation/devicetree/bindings/usb/msm-hsusb.txt
+++ b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
@@ -23,7 +23,12 @@ Required properties:
   "qcom,usb-otg-snps" for chipsets with Synopsys 28nm PHY
 
 - regs:         Offset and length of the register set in the memory map
-- interrupts:   interrupt-specifier for the OTG interrupt.
+- interrupts:   interrupt-specifier for the OTG interrupts
+
+- interrupt-names: Should contain the following:
+  "core"        USB core interrupt
+  "async"       Asynchronous interrupt to wake up from low power mode
+                (optional)
 
 - clocks:       A list of phandle + clock-specifier pairs for the
                 clocks listed in clock-names
@@ -89,7 +94,8 @@ Example HSUSB OTG controller device node:
     usb@f9a55000 {
         compatible = "qcom,usb-otg-snps";
         reg = <0xf9a55000 0x400>;
-        interrupts = <0 134 0>;
+        interrupts = <0 134 0>, <0 140 0>;
+        interrupt-names = "core", "async";
         dr_mode = "peripheral";
 
         clocks = <&gcc GCC_XO_CLK>, <&gcc GCC_USB_HS_SYSTEM_CLK>,
-- 
1.8.2.2

[PATCH v4 2/3] usb: phy: msm: fix connect/disconnect bug for dragonboard OTG port

[Tim Bird]

Add support for async_irq to wake up driver from low power mode.
Without this, the power management code never calls resume.
Remove a spurious interrupt enable in the driver resume function.

Signed-off-by: Tim Bird <tim.bird@sonymobile.com>
---
 drivers/usb/phy/phy-msm-usb.c | 17 ++++++++++++++++-
 include/linux/usb/msm_hsusb.h |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index e40a071..04fb056 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -648,7 +648,6 @@ skip_phy_resume:
 	if (motg->async_int) {
 		motg->async_int = 0;
 		pm_runtime_put(phy->dev);
-		enable_irq(motg->irq);
 	}
 
 	dev_info(phy->dev, "USB exited from low power mode\n");
@@ -1732,6 +1731,12 @@ static int msm_otg_probe(struct platform_device *pdev)
 		return motg->irq;
 	}
 
+	motg->async_irq = platform_get_irq_byname(pdev, "async");
+	if (motg->async_irq < 0) {
+		dev_err(&pdev->dev, "platform_get_irq for async irq failed\n");
+		motg->async_irq = 0;
+	}
+
 	regs[0].supply = "vddcx";
 	regs[1].supply = "v3p3";
 	regs[2].supply = "v1p8";
@@ -1781,6 +1786,16 @@ static int msm_otg_probe(struct platform_device *pdev)
 		goto disable_ldo;
 	}
 
+	if (motg->async_irq) {
+		ret = devm_request_irq(&pdev->dev, motg->async_irq,
+				      msm_otg_irq, IRQF_TRIGGER_RISING,
+				      "msm_otg", motg);
+		if (ret) {
+			dev_err(&pdev->dev, "request irq failed (ASYNC INT)\n");
+			goto disable_ldo;
+		}
+	}
+
 	phy->init = msm_phy_init;
 	phy->set_power = msm_otg_set_power;
 	phy->notify_disconnect = msm_phy_notify_disconnect;
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
index 8c8f685..08c67a3 100644
--- a/include/linux/usb/msm_hsusb.h
+++ b/include/linux/usb/msm_hsusb.h
@@ -164,6 +164,7 @@ struct msm_otg {
 	struct usb_phy phy;
 	struct msm_otg_platform_data *pdata;
 	int irq;
+	int async_irq;
 	struct clk *clk;
 	struct clk *pclk;
 	struct clk *core_clk;
-- 
1.8.2.2

Re: [PATCH v4 2/3] usb: phy: msm: fix connect/disconnect bug for dragonboard OTG port

[Bjorn Andersson]

On Fri 20 Nov 15:47 PST 2015, Tim Bird wrote:

> Add support for async_irq to wake up driver from low power mode.
> Without this, the power management code never calls resume.
> Remove a spurious interrupt enable in the driver resume function.
> 
> Signed-off-by: Tim Bird <tim.bird@sonymobile.com>

Sorry Tim for missing these things and not jumping into the discussion
before.

> ---
>  drivers/usb/phy/phy-msm-usb.c | 17 ++++++++++++++++-
>  include/linux/usb/msm_hsusb.h |  1 +
>  2 files changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
[..]
> @@ -1732,6 +1731,12 @@ static int msm_otg_probe(struct platform_device *pdev)
>  		return motg->irq;
>  	}
>  
> +	motg->async_irq = platform_get_irq_byname(pdev, "async");
> +	if (motg->async_irq < 0) {
> +		dev_err(&pdev->dev, "platform_get_irq for async irq failed\n");

This is optional, so I must object to this being dev_err(). Except for
development purposes logging this is useless, can't we make it a
dev_dbg?

> +		motg->async_irq = 0;
> +	}
> +
[..]
> diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
> index 8c8f685..08c67a3 100644
> --- a/include/linux/usb/msm_hsusb.h
> +++ b/include/linux/usb/msm_hsusb.h
> @@ -164,6 +164,7 @@ struct msm_otg {
>  	struct usb_phy phy;
>  	struct msm_otg_platform_data *pdata;
>  	int irq;
> +	int async_irq;

This should be added to the kerneldoc above.

>  	struct clk *clk;
>  	struct clk *pclk;
>  	struct clk *core_clk;

Regards,
Bjorn

[PATCH v4 3/3] usb: chipidea: register driver as a peripheral with the phy

[Tim Bird]

Register the chipidea driver with the phy, so that the phy
driver can kick the gadget driver when it resumes from low power.
The phy-msm-usb (Qualcomm) driver requires this in order to
recover gadget operation after you disconnect the USB cable
and reconnect it.

Signed-off-by: Tim Bird <tim.bird@sonymobile.com>
---
 drivers/usb/chipidea/udc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 8223fe7..06234cd 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1890,6 +1890,12 @@ static int udc_start(struct ci_hdrc *ci)
 
 	ci->gadget.ep0 = &ci->ep0in->ep;
 
+	if (ci->usb_phy) {
+		retval = otg_set_peripheral(ci->usb_phy->otg, &ci->gadget);
+		if (retval)
+			goto destroy_eps;
+	}
+
 	retval = usb_add_gadget_udc(dev, &ci->gadget);
 	if (retval)
 		goto destroy_eps;
-- 
1.8.2.2

Re: [PATCH v4 3/3] usb: chipidea: register driver as a peripheral with the phy

[Peter Chen]

On Fri, Nov 20, 2015 at 03:47:20PM -0800, Tim Bird wrote:
> Register the chipidea driver with the phy, so that the phy
> driver can kick the gadget driver when it resumes from low power.
> The phy-msm-usb (Qualcomm) driver requires this in order to
> recover gadget operation after you disconnect the USB cable
> and reconnect it.
> 
> Signed-off-by: Tim Bird <tim.bird@sonymobile.com>
> ---
>  drivers/usb/chipidea/udc.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> index 8223fe7..06234cd 100644
> --- a/drivers/usb/chipidea/udc.c
> +++ b/drivers/usb/chipidea/udc.c
> @@ -1890,6 +1890,12 @@ static int udc_start(struct ci_hdrc *ci)
>  
>  	ci->gadget.ep0 = &ci->ep0in->ep;
>  
> +	if (ci->usb_phy) {
> +		retval = otg_set_peripheral(ci->usb_phy->otg, &ci->gadget);
> +		if (retval)
> +			goto destroy_eps;
> +	}
> +
>  	retval = usb_add_gadget_udc(dev, &ci->gadget);
>  	if (retval)
>  		goto destroy_eps;

Hi Tim,

I am afraid it can't work for current chipidea framework (find this
problem after testing), the chipidea core manages its host and device
function using its own API start/stop, it does not define struct usb_otg
APIs. In fact, it is not reasonable control host and device function
at PHY driver.

-- 

Best Regards,
Peter Chen

Re: [PATCH v4 3/3] usb: chipidea: register driver as a peripheral with the phy

[Tim Bird]

On 11/23/2015 12:29 AM, Peter Chen wrote:
> On Fri, Nov 20, 2015 at 03:47:20PM -0800, Tim Bird wrote:
>> Register the chipidea driver with the phy, so that the phy
>> driver can kick the gadget driver when it resumes from low power.
>> The phy-msm-usb (Qualcomm) driver requires this in order to
>> recover gadget operation after you disconnect the USB cable
>> and reconnect it.
>>
>> Signed-off-by: Tim Bird <tim.bird@sonymobile.com>
>> ---
>>  drivers/usb/chipidea/udc.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
>> index 8223fe7..06234cd 100644
>> --- a/drivers/usb/chipidea/udc.c
>> +++ b/drivers/usb/chipidea/udc.c
>> @@ -1890,6 +1890,12 @@ static int udc_start(struct ci_hdrc *ci)
>>  
>>  	ci->gadget.ep0 = &ci->ep0in->ep;
>>  
>> +	if (ci->usb_phy) {
>> +		retval = otg_set_peripheral(ci->usb_phy->otg, &ci->gadget);
>> +		if (retval)
>> +			goto destroy_eps;
>> +	}
>> +
>>  	retval = usb_add_gadget_udc(dev, &ci->gadget);
>>  	if (retval)
>>  		goto destroy_eps;
> 
> Hi Tim,
> 
> I am afraid it can't work for current chipidea framework (find this
> problem after testing), the chipidea core manages its host and device
> function using its own API start/stop, it does not define struct usb_otg
> APIs. In fact, it is not reasonable control host and device function
> at PHY driver.

OK.  I'm going to re-evaluate the phy-msm-usb.c code, and try to figure out
what it should look like under the current framework.

Thanks for looking at it and testing it.  I may have questions as I go.
 -- Tim

Re: [PATCH v4 1/3] Documentation: dt-bindings: add async_irq to msm_hsusb

[Rob Herring]

On Fri, Nov 20, 2015 at 03:47:18PM -0800, Tim Bird wrote:
> Add optional async_irq to msm_hsusb binding doc.
> 
> Signed-off-by: Tim Bird <tim.bird@sonymobile.com>

Acked-by: Rob Herring <robh@kernel.org>

> ---
>  Documentation/devicetree/bindings/usb/msm-hsusb.txt | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/usb/msm-hsusb.txt b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
> index 8654a3e..2d13c1c 100644
> --- a/Documentation/devicetree/bindings/usb/msm-hsusb.txt
> +++ b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
> @@ -23,7 +23,12 @@ Required properties:
>    "qcom,usb-otg-snps" for chipsets with Synopsys 28nm PHY
>  
>  - regs:         Offset and length of the register set in the memory map
> -- interrupts:   interrupt-specifier for the OTG interrupt.
> +- interrupts:   interrupt-specifier for the OTG interrupts
> +
> +- interrupt-names: Should contain the following:
> +  "core"        USB core interrupt
> +  "async"       Asynchronous interrupt to wake up from low power mode
> +                (optional)
>  
>  - clocks:       A list of phandle + clock-specifier pairs for the
>                  clocks listed in clock-names
> @@ -89,7 +94,8 @@ Example HSUSB OTG controller device node:
>      usb@f9a55000 {
>          compatible = "qcom,usb-otg-snps";
>          reg = <0xf9a55000 0x400>;
> -        interrupts = <0 134 0>;
> +        interrupts = <0 134 0>, <0 140 0>;
> +        interrupt-names = "core", "async";
>          dr_mode = "peripheral";
>  
>          clocks = <&gcc GCC_XO_CLK>, <&gcc GCC_USB_HS_SYSTEM_CLK>,
> -- 
> 1.8.2.2
>