Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1540867 > unrolled thread
| Started by | John Stultz <john.stultz@linaro.org> |
|---|---|
| First post | 2016-12-13 08:20 +0100 |
| Last post | 2016-12-13 22:20 +0100 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[RFC][PATCH 0/5] Fixes and workarounds for dwc2 on HiKey board John Stultz <john.stultz@linaro.org> - 2016-12-13 08:20 +0100
[RFC][PATCH 2/5] usb: dwc2: Workaround case where GOTGCTL state is wrong John Stultz <john.stultz@linaro.org> - 2016-12-13 08:20 +0100
Re: [RFC][PATCH 2/5] usb: dwc2: Workaround case where GOTGCTL state is wrong Vardan Mikayelyan <Vardan.Mikayelyan@synopsys.com> - 2016-12-13 13:30 +0100
Re: [RFC][PATCH 2/5] usb: dwc2: Workaround case where GOTGCTL state is wrong John Stultz <john.stultz@linaro.org> - 2016-12-13 22:20 +0100
| From | John Stultz <john.stultz@linaro.org> |
|---|---|
| Date | 2016-12-13 08:20 +0100 |
| Subject | [RFC][PATCH 0/5] Fixes and workarounds for dwc2 on HiKey board |
| Message-ID | <sNPxv-6Ga-3@gated-at.bofh.it> |
I just wanted to send out my current queue of patches for dwc2 controller on the HiKey board. This does exclude my patchset[1] to add extcon support to dwc2, which John Youn suspects a pending rework of the dwc2 fifo init logic might make unnecssary. So in the meantime, I wanted to send out the other patches I have to use, so that they can get feedback and be consdiered for the next (4.11) merge window. Feedback would be greatly appreciated! thanks -john [1] https://lkml.org/lkml/2016/12/6/69 Cc: Wei Xu <xuwei5@hisilicon.com> Cc: Guodong Xu <guodong.xu@linaro.org> Cc: Amit Pundir <amit.pundir@linaro.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: John Youn <johnyoun@synopsys.com> Cc: Douglas Anderson <dianders@chromium.org> Cc: Chen Yu <chenyu56@huawei.com> Cc: Kishon Vijay Abraham I <kishon@ti.com> Cc: Felipe Balbi <felipe.balbi@linux.intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-usb@vger.kernel.org Chen Yu (2): usb: dwc2: Force port resume on switching to device mode usb: dwc2: Add a quirk to allow speed negotiation for Hisilicon Hi6220 John Stultz (3): usb: dwc2: Avoid sleeping while holding hsotg->lock usb: dwc2: Workaround case where GOTGCTL state is wrong usb: dwc2: Avoid suspending if we're in gadget mode drivers/usb/dwc2/core.c | 6 ++-- drivers/usb/dwc2/core.h | 8 ++++- drivers/usb/dwc2/gadget.c | 2 +- drivers/usb/dwc2/hcd.c | 75 ++++++++++++++++++++++++++++++++++++++++++++- drivers/usb/dwc2/platform.c | 1 + 5 files changed, 86 insertions(+), 6 deletions(-) -- 2.7.4
[toc] | [next] | [standalone]
| From | John Stultz <john.stultz@linaro.org> |
|---|---|
| Date | 2016-12-13 08:20 +0100 |
| Subject | [RFC][PATCH 2/5] usb: dwc2: Workaround case where GOTGCTL state is wrong |
| Message-ID | <sNPxw-6Ga-19@gated-at.bofh.it> |
| In reply to | #1540867 |
When removing a USB-A to USB-otg adapter cable, we get a change
status irq, and then in dwc2_conn_id_status_change, we
erroniously see the GOTGCTL_CONID_B flag set. This causes us to
get stuck in the "while (!dwc2_is_device_mode(hsotg))" loop,
spitting out "Waiting for Peripheral Mode, Mode=Host" warnings
until it fails out many seconds later.
This patch works around the issue by re-reading the GOTGCTL
state to check if the GOTGCTL_CONID_B is still set and if not
restarting the change status logic.
I suspect this isn't the best solution, but it seems to work
well for me.
Feedback would be greatly appreciated!
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Guodong Xu <guodong.xu@linaro.org>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: John Youn <johnyoun@synopsys.com>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Chen Yu <chenyu56@huawei.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
drivers/usb/dwc2/hcd.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index df5a065..a3f34dd 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -3199,7 +3199,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
dev_dbg(hsotg->dev, "gotgctl=%0x\n", gotgctl);
dev_dbg(hsotg->dev, "gotgctl.b.conidsts=%d\n",
!!(gotgctl & GOTGCTL_CONID_B));
-
+again:
/* B-Device connector (Device Mode) */
if (gotgctl & GOTGCTL_CONID_B) {
/* Wait for switch to device mode */
@@ -3210,6 +3210,9 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
dwc2_is_host_mode(hsotg) ? "Host" :
"Peripheral");
usleep_range(20000, 40000);
+ gotgctl = dwc2_readl(hsotg->regs + GOTGCTL);
+ if (!(gotgctl & GOTGCTL_CONID_B))
+ goto again;
if (++count > 250)
break;
}
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Vardan Mikayelyan <Vardan.Mikayelyan@synopsys.com> |
|---|---|
| Date | 2016-12-13 13:30 +0100 |
| Subject | Re: [RFC][PATCH 2/5] usb: dwc2: Workaround case where GOTGCTL state is wrong |
| Message-ID | <sNUnw-18c-29@gated-at.bofh.it> |
| In reply to | #1540868 |
On 12/13/2016 11:12 AM, John Stultz wrote:
> When removing a USB-A to USB-otg adapter cable, we get a change
> status irq, and then in dwc2_conn_id_status_change, we
> erroniously see the GOTGCTL_CONID_B flag set. This causes us to
> get stuck in the "while (!dwc2_is_device_mode(hsotg))" loop,
> spitting out "Waiting for Peripheral Mode, Mode=Host" warnings
> until it fails out many seconds later.
>
> This patch works around the issue by re-reading the GOTGCTL
> state to check if the GOTGCTL_CONID_B is still set and if not
> restarting the change status logic.
>
> I suspect this isn't the best solution, but it seems to work
> well for me.
>
> Feedback would be greatly appreciated!
>
> Cc: Wei Xu <xuwei5@hisilicon.com>
> Cc: Guodong Xu <guodong.xu@linaro.org>
> Cc: Amit Pundir <amit.pundir@linaro.org>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: John Youn <johnyoun@synopsys.com>
> Cc: Douglas Anderson <dianders@chromium.org>
> Cc: Chen Yu <chenyu56@huawei.com>
> Cc: Kishon Vijay Abraham I <kishon@ti.com>
> Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-usb@vger.kernel.org
> Acked-by: John Youn <johnyoun@synopsys.com>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
> drivers/usb/dwc2/hcd.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
> index df5a065..a3f34dd 100644
> --- a/drivers/usb/dwc2/hcd.c
> +++ b/drivers/usb/dwc2/hcd.c
> @@ -3199,7 +3199,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
> dev_dbg(hsotg->dev, "gotgctl=%0x\n", gotgctl);
> dev_dbg(hsotg->dev, "gotgctl.b.conidsts=%d\n",
> !!(gotgctl & GOTGCTL_CONID_B));
> -
> +again:
> /* B-Device connector (Device Mode) */
> if (gotgctl & GOTGCTL_CONID_B) {
> /* Wait for switch to device mode */
> @@ -3210,6 +3210,9 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
> dwc2_is_host_mode(hsotg) ? "Host" :
> "Peripheral");
> usleep_range(20000, 40000);
> + gotgctl = dwc2_readl(hsotg->regs + GOTGCTL);
> + if (!(gotgctl & GOTGCTL_CONID_B))
> + goto again;
> if (++count > 250)
> break;
> }
>
Hi John Stultz,
When it goes to ":again", it will go to else anyways. I'll suggest
alternative way to do this. Please see below.
Also you can add "Reviewed-by: Vardan Mikayelyan <mvardan@synopsys.com>"
Thanks,
Vardan.
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index b7311a6..128311b 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -3242,6 +3242,9 @@ static void dwc2_conn_id_status_change(struct
work_struct *work)
dwc2_is_host_mode(hsotg) ? "Host" :
"Peripheral");
usleep_range(20000, 40000);
+ gotgctl = dwc2_readl(hsotg->regs + GOTGCTL);
+ if (!(gotgctl & GOTGCTL_CONID_B))
+ goto host;
if (++count > 250)
break;
}
@@ -3256,6 +3259,7 @@ static void dwc2_conn_id_status_change(struct
work_struct *work)
spin_unlock_irqrestore(&hsotg->lock, flags);
dwc2_hsotg_core_connect(hsotg);
} else {
+host:
/* A-Device connector (Host Mode) */
dev_dbg(hsotg->dev, "connId A\n");
while (!dwc2_is_host_mode(hsotg)) {
[toc] | [prev] | [next] | [standalone]
| From | John Stultz <john.stultz@linaro.org> |
|---|---|
| Date | 2016-12-13 22:20 +0100 |
| Subject | Re: [RFC][PATCH 2/5] usb: dwc2: Workaround case where GOTGCTL state is wrong |
| Message-ID | <sO2Ep-6bg-19@gated-at.bofh.it> |
| In reply to | #1541037 |
On Tue, Dec 13, 2016 at 4:28 AM, Vardan Mikayelyan
<Vardan.Mikayelyan@synopsys.com> wrote:
> On 12/13/2016 11:12 AM, John Stultz wrote:
>> When removing a USB-A to USB-otg adapter cable, we get a change
>> status irq, and then in dwc2_conn_id_status_change, we
>> erroniously see the GOTGCTL_CONID_B flag set. This causes us to
>> get stuck in the "while (!dwc2_is_device_mode(hsotg))" loop,
>> spitting out "Waiting for Peripheral Mode, Mode=Host" warnings
>> until it fails out many seconds later.
>>
>> This patch works around the issue by re-reading the GOTGCTL
>> state to check if the GOTGCTL_CONID_B is still set and if not
>> restarting the change status logic.
>>
>> I suspect this isn't the best solution, but it seems to work
>> well for me.
>>
>> Feedback would be greatly appreciated!
>>
>> Cc: Wei Xu <xuwei5@hisilicon.com>
>> Cc: Guodong Xu <guodong.xu@linaro.org>
>> Cc: Amit Pundir <amit.pundir@linaro.org>
>> Cc: Rob Herring <robh+dt@kernel.org>
>> Cc: John Youn <johnyoun@synopsys.com>
>> Cc: Douglas Anderson <dianders@chromium.org>
>> Cc: Chen Yu <chenyu56@huawei.com>
>> Cc: Kishon Vijay Abraham I <kishon@ti.com>
>> Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
>> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> Cc: linux-usb@vger.kernel.org
>> Acked-by: John Youn <johnyoun@synopsys.com>
>> Signed-off-by: John Stultz <john.stultz@linaro.org>
>> ---
>> drivers/usb/dwc2/hcd.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
>> index df5a065..a3f34dd 100644
>> --- a/drivers/usb/dwc2/hcd.c
>> +++ b/drivers/usb/dwc2/hcd.c
>> @@ -3199,7 +3199,7 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
>> dev_dbg(hsotg->dev, "gotgctl=%0x\n", gotgctl);
>> dev_dbg(hsotg->dev, "gotgctl.b.conidsts=%d\n",
>> !!(gotgctl & GOTGCTL_CONID_B));
>> -
>> +again:
>> /* B-Device connector (Device Mode) */
>> if (gotgctl & GOTGCTL_CONID_B) {
>> /* Wait for switch to device mode */
>> @@ -3210,6 +3210,9 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
>> dwc2_is_host_mode(hsotg) ? "Host" :
>> "Peripheral");
>> usleep_range(20000, 40000);
>> + gotgctl = dwc2_readl(hsotg->regs + GOTGCTL);
>> + if (!(gotgctl & GOTGCTL_CONID_B))
>> + goto again;
>> if (++count > 250)
>> break;
>> }
>>
> Hi John Stultz,
>
> When it goes to ":again", it will go to else anyways. I'll suggest
> alternative way to do this. Please see below.
Sounds good. I've made the change.
> Also you can add "Reviewed-by: Vardan Mikayelyan <mvardan@synopsys.com>"
Thanks so much for your review!
-john
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web