Hi Sascha,
Am Montag, dem 14.12.2020 um 14:58 +0100 schrieb Sascha Hauer:
> The usb host submit_control_msg() and submit_bulk_msg() hooks pass a
> timeout value. Honor these values in the XHCI driver instead of just
> ignoring them. The USB net driver in barebox polls for receive packets
> by submitting an URB with a very low timeout, expecting it to timeout
> when no incoming packet is present. With the default timeout of 5
> seconds the XHCI driver previously used barebox became unusable.
Seems like this patch has not been applied. USB net on a XHCI host is
still unusable with current master.
Regards,
Lucas
>
> Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> ---
> drivers/usb/host/xhci-ring.c | 29 +++++++++++------------------
> drivers/usb/host/xhci.c | 17 +++++++++--------
> drivers/usb/host/xhci.h | 8 +++++---
> 3 files changed, 25 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index 61b1b55a27..76c18e4615 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -436,7 +436,8 @@ static int event_ready(struct xhci_ctrl *ctrl)
> * @param expected TRB type expected from Event TRB
> * @return pointer to event trb
> */
> -union xhci_trb *xhci_wait_for_event(struct xhci_ctrl *ctrl, trb_type expected)
> +union xhci_trb *xhci_wait_for_event(struct xhci_ctrl *ctrl, trb_type expected,
> + unsigned int timeout_ms)
> {
> trb_type type;
> uint64_t start = get_time_ns();
> @@ -460,16 +461,8 @@ union xhci_trb *xhci_wait_for_event(struct xhci_ctrl *ctrl, trb_type expected)
> BUG_ON(GET_COMP_CODE(
> le32_to_cpu(event->generic.field[2])) !=
> COMP_SUCCESS);
> - else
> - dev_err(ctrl->dev, "Unexpected XHCI event TRB, skipping... "
> - "(%08x %08x %08x %08x)\n",
> - le32_to_cpu(event->generic.field[0]),
> - le32_to_cpu(event->generic.field[1]),
> - le32_to_cpu(event->generic.field[2]),
> - le32_to_cpu(event->generic.field[3]));
> -
> xhci_acknowledge_event(ctrl);
> - } while (!is_timeout_non_interruptible(start, 5 * SECOND));
> + } while (!is_timeout_non_interruptible(start, timeout_ms * MSECOND));
>
> if (expected == TRB_TRANSFER)
> return NULL;
> @@ -495,7 +488,7 @@ static void abort_td(struct usb_device *udev, int ep_index)
>
> xhci_queue_command(ctrl, NULL, udev->slot_id, ep_index, TRB_STOP_RING);
>
> - event = xhci_wait_for_event(ctrl, TRB_TRANSFER);
> + event = xhci_wait_for_event(ctrl, TRB_TRANSFER, XHCI_TIMEOUT_DEFAULT);
> field = le32_to_cpu(event->trans_event.flags);
> BUG_ON(TRB_TO_SLOT_ID(field) != udev->slot_id);
> BUG_ON(TRB_TO_EP_INDEX(field) != ep_index);
> @@ -503,7 +496,7 @@ static void abort_td(struct usb_device *udev, int ep_index)
> != COMP_STOP)));
> xhci_acknowledge_event(ctrl);
>
> - event = xhci_wait_for_event(ctrl, TRB_COMPLETION);
> + event = xhci_wait_for_event(ctrl, TRB_COMPLETION, XHCI_TIMEOUT_DEFAULT);
> BUG_ON(TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags))
> != udev->slot_id || GET_COMP_CODE(le32_to_cpu(
> event->event_cmd.status)) != COMP_SUCCESS);
> @@ -511,7 +504,7 @@ static void abort_td(struct usb_device *udev, int ep_index)
>
> xhci_queue_command(ctrl, (void *)((uintptr_t)ring->enqueue |
> ring->cycle_state), udev->slot_id, ep_index, TRB_SET_DEQ);
> - event = xhci_wait_for_event(ctrl, TRB_COMPLETION);
> + event = xhci_wait_for_event(ctrl, TRB_COMPLETION, XHCI_TIMEOUT_DEFAULT);
> BUG_ON(TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags))
> != udev->slot_id || GET_COMP_CODE(le32_to_cpu(
> event->event_cmd.status)) != COMP_SUCCESS);
> @@ -557,7 +550,7 @@ static void record_transfer_result(struct usb_device *udev,
> * @return returns 0 if successful else -1 on failure
> */
> int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,
> - int length, void *buffer)
> + int length, void *buffer, unsigned int timeout_ms)
> {
> int num_trbs = 0;
> struct xhci_generic_trb *start_trb;
> @@ -726,7 +719,7 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,
>
> giveback_first_trb(udev, ep_index, start_cycle, start_trb);
>
> - event = xhci_wait_for_event(ctrl, TRB_TRANSFER);
> + event = xhci_wait_for_event(ctrl, TRB_TRANSFER, timeout_ms);
> if (!event) {
> dev_dbg(&udev->dev, "XHCI bulk transfer timed out, aborting...\n");
> abort_td(udev, ep_index);
> @@ -767,7 +760,7 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,
> */
> int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe,
> struct devrequest *req, int length,
> - void *buffer)
> + void *buffer, unsigned int timeout_ms)
> {
> int ret;
> int start_cycle;
> @@ -936,7 +929,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe,
>
> giveback_first_trb(udev, ep_index, start_cycle, start_trb);
>
> - event = xhci_wait_for_event(ctrl, TRB_TRANSFER);
> + event = xhci_wait_for_event(ctrl, TRB_TRANSFER, timeout_ms);
> if (!event)
> goto abort;
> field = le32_to_cpu(event->trans_event.flags);
> @@ -959,7 +952,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe,
> if (GET_COMP_CODE(le32_to_cpu(event->trans_event.transfer_len))
> == COMP_SHORT_TX) {
> /* Short data stage, clear up additional status stage event */
> - event = xhci_wait_for_event(ctrl, TRB_TRANSFER);
> + event = xhci_wait_for_event(ctrl, TRB_TRANSFER, timeout_ms);
> if (!event)
> goto abort;
> BUG_ON(TRB_TO_SLOT_ID(field) != slot_id);
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 317000d650..a743e73479 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -443,7 +443,7 @@ static int xhci_configure_endpoints(struct usb_device *udev, bool ctx_change)
> xhci_flush_cache((uintptr_t)in_ctx->bytes, in_ctx->size);
> xhci_queue_command(ctrl, in_ctx->bytes, udev->slot_id, 0,
> ctx_change ? TRB_EVAL_CONTEXT : TRB_CONFIG_EP);
> - event = xhci_wait_for_event(ctrl, TRB_COMPLETION);
> + event = xhci_wait_for_event(ctrl, TRB_COMPLETION, XHCI_TIMEOUT_DEFAULT);
> BUG_ON(TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags))
> != udev->slot_id);
>
> @@ -629,7 +629,7 @@ static int xhci_address_device(struct usb_device *udev, int root_portnr)
> ctrl_ctx->drop_flags = 0;
>
> xhci_queue_command(ctrl, (void *)ctrl_ctx, slot_id, 0, TRB_ADDR_DEV);
> - event = xhci_wait_for_event(ctrl, TRB_COMPLETION);
> + event = xhci_wait_for_event(ctrl, TRB_COMPLETION, XHCI_TIMEOUT_DEFAULT);
> BUG_ON(TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags)) != slot_id);
>
> switch (GET_COMP_CODE(le32_to_cpu(event->event_cmd.status))) {
> @@ -704,7 +704,7 @@ static int _xhci_alloc_device(struct usb_device *udev)
> }
>
> xhci_queue_command(ctrl, NULL, 0, 0, TRB_ENABLE_SLOT);
> - event = xhci_wait_for_event(ctrl, TRB_COMPLETION);
> + event = xhci_wait_for_event(ctrl, TRB_COMPLETION, XHCI_TIMEOUT_DEFAULT);
> BUG_ON(GET_COMP_CODE(le32_to_cpu(event->event_cmd.status))
> != COMP_SUCCESS);
>
> @@ -1097,7 +1097,7 @@ static int _xhci_submit_int_msg(struct usb_device *udev, unsigned long pipe,
> * (at most) one TD. A TD (comprised of sg list entries) can
> * take several service intervals to transmit.
> */
> - return xhci_bulk_tx(udev, pipe, length, buffer);
> + return xhci_bulk_tx(udev, pipe, length, buffer, 0);
> }
>
> /**
> @@ -1115,7 +1115,7 @@ static int _xhci_submit_bulk_msg(struct usb_device *udev, unsigned long pipe,
> if (usb_pipetype(pipe) != PIPE_BULK)
> return -EINVAL;
>
> - return xhci_bulk_tx(udev, pipe, length, buffer);
> + return xhci_bulk_tx(udev, pipe, length, buffer, timeout_ms);
> }
>
> /**
> @@ -1131,7 +1131,8 @@ static int _xhci_submit_bulk_msg(struct usb_device *udev, unsigned long pipe,
> */
> static int _xhci_submit_control_msg(struct usb_device *udev, unsigned long pipe,
> void *buffer, int length,
> - struct devrequest *setup, int root_portnr)
> + struct devrequest *setup, int root_portnr,
> + unsigned int timeout_ms)
> {
> struct xhci_ctrl *ctrl = xhci_get_ctrl(udev);
> int ret = 0;
> @@ -1155,7 +1156,7 @@ static int _xhci_submit_control_msg(struct usb_device *udev, unsigned long pipe,
> }
> }
>
> - return xhci_ctrl_tx(udev, pipe, setup, length, buffer);
> + return xhci_ctrl_tx(udev, pipe, setup, length, buffer, timeout_ms);
> }
>
> static int xhci_lowlevel_init(struct xhci_ctrl *ctrl)
> @@ -1239,7 +1240,7 @@ static int xhci_submit_control_msg(struct usb_device *udev,
> }
>
> return _xhci_submit_control_msg(udev, pipe, buffer, length, setup,
> - root_portnr);
> + root_portnr, timeout_ms);
> }
>
> static int xhci_submit_bulk_msg(struct usb_device *udev,
> diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
> index 9ffbb103d5..be447ce5ed 100644
> --- a/drivers/usb/host/xhci.h
> +++ b/drivers/usb/host/xhci.h
> @@ -1247,11 +1247,13 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,
> void xhci_queue_command(struct xhci_ctrl *ctrl, u8 *ptr,
> u32 slot_id, u32 ep_index, trb_type cmd);
> void xhci_acknowledge_event(struct xhci_ctrl *ctrl);
> -union xhci_trb *xhci_wait_for_event(struct xhci_ctrl *ctrl, trb_type expected);
> +#define XHCI_TIMEOUT_DEFAULT 5000
> +union xhci_trb *xhci_wait_for_event(struct xhci_ctrl *ctrl, trb_type expected,
> + unsigned int timeout_ms);
> int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,
> - int length, void *buffer);
> + int length, void *buffer, unsigned int timeout_ms);
> int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe,
> - struct devrequest *req, int length, void *buffer);
> + struct devrequest *req, int length, void *buffer, unsigned int timeout_ms);
> int xhci_check_maxpacket(struct usb_device *udev);
> void xhci_flush_cache(uintptr_t addr, u32 type_len);
> void xhci_inval_cache(uintptr_t addr, u32 type_len);
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
