When core soft reset timeout happens, pullup doesn't check for the
return value and proceeds setting up of event buffers and starts the
controller.
In this scneario, it is observed sometimes that the GEVTADDR LO/HI
registers read zero while we are setting the run stop bit and we end
up accessing address 0x00 leading to a crash. This series tries to
address this issue by handling the timeout and return back appropriate
error code to configfs for it to retry enumeration if it chooses to.
Link to v1: https://lore.kernel.org/all/[email protected]/
Link to v2: https://lore.kernel.org/all/[email protected]/
changes in v3:
Rebased on top of latest usb-next to resolve merge issues
Fixed comments from v2 related to code styling
changes in v2:
Fixed comments addressing incomplete error handling in udc core
Krishna Kurapati (2):
usb: dwc3: gadget: Bail out in pullup if soft reset timeout happens
usb: gadget: udc: Handle gadget_connect failure during bind operation
drivers/usb/dwc3/gadget.c | 5 ++++-
drivers/usb/gadget/udc/core.c | 21 +++++++++++++++++----
2 files changed, 21 insertions(+), 5 deletions(-)
--
2.40.0
In the event, gadget_connect call (which invokes pullup) fails,
propagate the error to udc bind operation which inturn sends the
error to configfs. The userspace can then retry enumeartion if
it chooses to.
Signed-off-by: Krishna Kurapati <[email protected]>
Acked-by: Alan Stern <[email protected]>
---
changes in v3: Rebase on top of usb-next
drivers/usb/gadget/udc/core.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index 4641153e9706..69041cca5d24 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -1122,12 +1122,16 @@ EXPORT_SYMBOL_GPL(usb_gadget_set_state);
/* ------------------------------------------------------------------------- */
/* Acquire connect_lock before calling this function. */
-static void usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
+static int usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
{
+ int ret;
+
if (udc->vbus && udc->started)
- usb_gadget_connect_locked(udc->gadget);
+ ret = usb_gadget_connect_locked(udc->gadget);
else
- usb_gadget_disconnect_locked(udc->gadget);
+ ret = usb_gadget_disconnect_locked(udc->gadget);
+
+ return ret;
}
/**
@@ -1583,12 +1587,21 @@ static int gadget_bind_driver(struct device *dev)
goto err_start;
}
usb_gadget_enable_async_callbacks(udc);
- usb_udc_connect_control_locked(udc);
+ ret = usb_udc_connect_control_locked(udc);
+ if (ret)
+ goto err_connect_control;
+
mutex_unlock(&udc->connect_lock);
kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
return 0;
+ err_connect_control:
+ usb_gadget_disable_async_callbacks(udc);
+ if (gadget->irq)
+ synchronize_irq(gadget->irq);
+ usb_gadget_udc_stop_locked(udc);
+
err_start:
driver->unbind(udc->gadget);
--
2.40.0
Hello!
On 5/10/23 10:52 AM, Krishna Kurapati wrote:
> In the event, gadget_connect call (which invokes pullup) fails,
> propagate the error to udc bind operation which inturn sends the
> error to configfs. The userspace can then retry enumeartion if
> it chooses to.
>
> Signed-off-by: Krishna Kurapati <[email protected]>
> Acked-by: Alan Stern <[email protected]>
> ---
> changes in v3: Rebase on top of usb-next
>
> drivers/usb/gadget/udc/core.c | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
> index 4641153e9706..69041cca5d24 100644
> --- a/drivers/usb/gadget/udc/core.c
> +++ b/drivers/usb/gadget/udc/core.c
> @@ -1122,12 +1122,16 @@ EXPORT_SYMBOL_GPL(usb_gadget_set_state);
> /* ------------------------------------------------------------------------- */
>
> /* Acquire connect_lock before calling this function. */
> -static void usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
> +static int usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
> {
> + int ret;
> +
> if (udc->vbus && udc->started)
> - usb_gadget_connect_locked(udc->gadget);
> + ret = usb_gadget_connect_locked(udc->gadget);
Why not just:
return usb_gadget_connect_locked(udc->gadget)
> else
> - usb_gadget_disconnect_locked(udc->gadget);
> + ret = usb_gadget_disconnect_locked(udc->gadget);
Likewise here?
> +
> + return ret;
> }
>
> /**
[...]
MBR, Sergey