Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1266901 > unrolled thread
| Started by | Tim Bird <tim.bird@sonymobile.com> |
|---|---|
| First post | 2015-11-11 01:50 +0100 |
| Last post | 2015-11-11 18:50 +0100 |
| Articles | 2 — 1 participant |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 2/2] usb: phy: msm: fix connect/disconnect bug for dragonboard OTG port Tim Bird <tim.bird@sonymobile.com> - 2015-11-11 01:50 +0100
Re: [PATCH 2/2] usb: phy: msm: fix connect/disconnect bug for dragonboard OTG port Tim Bird <tim.bird@sonymobile.com> - 2015-11-11 18:50 +0100
| From | Tim Bird <tim.bird@sonymobile.com> |
|---|---|
| Date | 2015-11-11 01:50 +0100 |
| Subject | [PATCH 2/2] usb: phy: msm: fix connect/disconnect bug for dragonboard OTG port |
| Message-ID | <qtrLP-3YD-3@gated-at.bofh.it> |
This fixes a bug where if you disconnect and re-connect the USB cable,
the gadget driver stops working.
Add support for async_irq to wake up driver from low power mode.
Without this, the power management code never calls resume.
Also, have the phy driver kick the gadget driver (chipidea otg)
by having the chipidea driver register with it, for vbus connect
notifications.
Signed-off-by: Tim Bird <tim.bird@sonymobile.com>
---
drivers/usb/chipidea/udc.c | 6 ++++++
drivers/usb/phy/phy-msm-usb.c | 16 ++++++++++++++++
include/linux/usb/msm_hsusb.h | 1 +
3 files changed, 23 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;
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 80eb991..eb80f92 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -1731,6 +1731,12 @@ static int msm_otg_probe(struct platform_device *pdev)
return motg->irq;
}
+ motg->async_irq = platform_get_irq_byname(pdev, "async_irq");
+ if (motg->async_irq < 0) {
+ dev_info(&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";
@@ -1780,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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Tim Bird <tim.bird@sonymobile.com> |
|---|---|
| Date | 2015-11-11 18:50 +0100 |
| Subject | Re: [PATCH 2/2] usb: phy: msm: fix connect/disconnect bug for dragonboard OTG port |
| Message-ID | <qtHGV-5Rq-7@gated-at.bofh.it> |
| In reply to | #1266901 |
On 11/10/2015 07:14 PM, Peter Chen wrote:
> On Tue, Nov 10, 2015 at 04:46:51PM -0800, Tim Bird wrote:
>> This fixes a bug where if you disconnect and re-connect the USB cable,
>> the gadget driver stops working.
>>
>> Add support for async_irq to wake up driver from low power mode.
>> Without this, the power management code never calls resume.
>> Also, have the phy driver kick the gadget driver (chipidea otg)
>> by having the chipidea driver register with it, for vbus connect
>> notifications.
>>
>> Signed-off-by: Tim Bird <tim.bird@sonymobile.com>
>> ---
>> drivers/usb/chipidea/udc.c | 6 ++++++
>> drivers/usb/phy/phy-msm-usb.c | 16 ++++++++++++++++
>> include/linux/usb/msm_hsusb.h | 1 +
>> 3 files changed, 23 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;
>
> Although it looks no affect for other drivers, it is better you
> can split patches between controller and phy, then I can have a test.
OK.
> In fact, most of phy-msm-usb.c's implementations (except USB PHY related)
> are included in chipidea drivers, hope you can try it in future.
I would like to do this. I'm pretty confused about the relationship between
ehci, chipidea and the phy code, with regard to managing the controller
hardware. Is there a phy in mainline that is a good example of having most
of the controller support in the chipidea driver rather than in the phy?
Thanks!
>> diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
>> index 80eb991..eb80f92 100644
>> --- a/drivers/usb/phy/phy-msm-usb.c
>> +++ b/drivers/usb/phy/phy-msm-usb.c
>> @@ -1731,6 +1731,12 @@ static int msm_otg_probe(struct platform_device *pdev)
>> return motg->irq;
>> }
>>
>> + motg->async_irq = platform_get_irq_byname(pdev, "async_irq");
>> + if (motg->async_irq < 0) {
>> + dev_info(&pdev->dev, "platform_get_irq for async_irq failed\n");
>> + motg->async_irq = 0;
>> + }
>> +
>
> dev_err
OK - I'll change this. I've listed the async_irq as optional in the binding doc,
so I don't actually error out, but I was unsure the appropriate error level for
this message.
Thanks for the feedback!
-- Tim
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web