Changeset 913007f in mainline

Timestamp:

2017-10-19T21:40:57Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fe1c48d

Parents:

2896ff6

Message:

Final change with respect to command timeouts. Because communication channels are inherently noisy.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (1 diff)
• commands.h (modified) (2 diffs)
• endpoint.c (modified) (3 diffs)
• rh.c (modified) (3 diffs)

uspace/drv/bus/usb/xhci/commands.c

@@ -76 +76 @@
 }
 
-int xhci_cmd_wait(xhci_cmd_t *cmd)
-{
-        const suseconds_t timeout = 1000000;
+int xhci_cmd_wait(xhci_cmd_t *cmd, suseconds_t timeout)
+{
         int rv = EOK;
 

uspace/drv/bus/usb/xhci/commands.h

@@ -42 +42 @@
 #include "hw_struct/trb.h"
 
+/* Useful timeouts for `xhci_cmd_wait()` */
+#define XHCI_DEFAULT_TIMEOUT             1000000
+#define XHCI_BLOCK_INDEFINITELY              0
+
 typedef struct xhci_hc xhci_hc_t;
 typedef struct xhci_input_ctx xhci_input_ctx_t;
@@ -67 +71 @@
 xhci_cmd_t *xhci_cmd_alloc(void);
 void xhci_cmd_init(xhci_cmd_t *);
-int xhci_cmd_wait(xhci_cmd_t *);
+int xhci_cmd_wait(xhci_cmd_t *, suseconds_t);
 void xhci_cmd_fini(xhci_cmd_t *);
 void xhci_cmd_free(xhci_cmd_t *);

uspace/drv/bus/usb/xhci/endpoint.c

@@ -87 +87 @@
  *
  * For control endpoints >0, the IN endpoint index is used.
- * 
+ *
  * The index returned must be usually offset by a number of contexts preceding
  * the endpoint contexts themselves.
@@ -257 +257 @@
                 cmd.slot_id = dev->slot_id;
                 xhci_send_configure_endpoint_command(dev->hc, &cmd, ictx);
-                if ((err = xhci_cmd_wait(&cmd)) != EOK)
+                if ((err = xhci_cmd_wait(&cmd, XHCI_DEFAULT_TIMEOUT)) != EOK)
                         goto err_cmd;
 
@@ -324 +324 @@
         cmd.slot_id = dev->slot_id;
         xhci_send_configure_endpoint_command(hc, &cmd, ictx);
-        if ((err = xhci_cmd_wait(&cmd)) != EOK)
+        if ((err = xhci_cmd_wait(&cmd, XHCI_DEFAULT_TIMEOUT)) != EOK)
                 goto err_cmd;
 

uspace/drv/bus/usb/xhci/rh.c

@@ -91 +91 @@
 
         xhci_send_enable_slot_command(hc, &cmd);
-        if ((err = xhci_cmd_wait(&cmd)) != EOK)
+        if ((err = xhci_cmd_wait(&cmd, XHCI_DEFAULT_TIMEOUT)) != EOK)
                 return err;
 
@@ -155 +155 @@
         cmd.slot_id = slot_id;
         xhci_send_address_device_command(hc, &cmd, ictx);
-        if ((err = xhci_cmd_wait(&cmd)) != EOK)
+        if ((err = xhci_cmd_wait(&cmd, XHCI_DEFAULT_TIMEOUT)) != EOK)
                 goto err_dctx;
 
@@ -400 +400 @@
         xhci_get_port_bandwidth_command(dev->hc, &cmd, ctx, speed);
 
-        int err = xhci_cmd_wait(&cmd);
+        int err = xhci_cmd_wait(&cmd, XHCI_DEFAULT_TIMEOUT);
         if(err != EOK) {
                 free(ctx);