Changeset 370a1c8 in mainline

Timestamp:

2017-10-02T16:10:28Z (8 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

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

Children:

04df063

Parents:

4688350b

Message:

Extcap fix, not correctly determine if port is USB 2/3

Location:

uspace/drv/bus/usb/xhci

Files:

• debug.c (modified) (1 diff)
• endpoint.h (modified) (1 diff)
• hc.c (modified) (1 diff)
• hw_struct/context.h (modified) (1 diff)
• rh.c (modified) (8 diffs)
• rh.h (modified) (2 diffs)

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

@@ -287 +287 @@
                         name.packed = host2uint32_t_le(XHCI_REG_RD(ec, XHCI_EC_SP_NAME));
                         ports_from = XHCI_REG_RD(ec, XHCI_EC_SP_CP_OFF);
-                        ports_to = ports_from + XHCI_REG_RD(ec, XHCI_EC_SP_CP_OFF) - 1;
+                        ports_to = ports_from + XHCI_REG_RD(ec, XHCI_EC_SP_CP_COUNT) - 1;
                         usb_log_debug("\tProtocol %4s%u.%u, ports %u-%u", name.str,
                             XHCI_REG_RD(ec, XHCI_EC_SP_MAJOR),

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

@@ -43 +43 @@
 #include <usb/host/hcd.h>
 
+enum {
+        EP_TYPE_INVALID = 0,
+        EP_TYPE_ISOCH_OUT = 1,
+        EP_TYPE_BULK_OUT = 2,
+        EP_TYPE_INTERRUPT_OUT = 3,
+        EP_TYPE_CONTROL = 4,
+        EP_TYPE_ISOCH_IN = 5,
+        EP_TYPE_BULK_IN = 6,
+        EP_TYPE_INTERRUPT_IN = 7
+};
+
 /** Connector structure linking endpoint context to the endpoint. */
 typedef struct xhci_endpoint {

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

@@ -83 +83 @@
                                  * == 0.
                                  */
+
+                                unsigned ports_from = XHCI_REG_RD(ec, XHCI_EC_SP_CP_OFF);
+                                unsigned ports_to = ports_from
+                                        + XHCI_REG_RD(ec, XHCI_EC_SP_CP_COUNT) - 1;
+
                                 if (major == 2) {
                                         hc->speeds[1] = ps_default_full;
                                         hc->speeds[2] = ps_default_low;
                                         hc->speeds[3] = ps_default_high;
+                                        hc->rh.usb2_port_start = ports_from;
+                                        hc->rh.usb2_port_end = ports_to;
                                 } else if (major == 3) {
                                         hc->speeds[4] = ps_default_super;
+                                        hc->rh.usb3_port_start = ports_from;
+                                        hc->rh.usb3_port_end = ports_to;
                                 } else {
                                         return EINVAL;

uspace/drv/bus/usb/xhci/hw_struct/context.h

@@ -109 +109 @@
 #define XHCI_SLOT_CTX_ENTRIES_SET(ctx, val) \
     xhci_dword_set_bits(&(ctx).data[0], val, 31, 27)
+#define XHCI_SLOT_ROUTE_STRING_SET(ctx, val) \
+        xhci_dword_set_bits(&(ctx).data[0], (val & 0xFFFFF), 19, 0)
 
 #define XHCI_SLOT_ROUTE_STRING(ctx)     XHCI_DWORD_EXTRACT((ctx).data[0], 19,  0)

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

@@ -40 +40 @@
 #include "debug.h"
 #include "commands.h"
+#include "endpoint.h"
 #include "hc.h"
 #include "hw_struct/trb.h"
@@ -58 +59 @@
 // TODO: Check device deallocation, we free device_ctx in hc.c, not
 //       sure about the other structs.
-static int alloc_dev(xhci_hc_t *hc, uint8_t port)
+static int alloc_dev(xhci_hc_t *hc, uint8_t port, uint32_t route_str)
 {
         int err;
@@ -67 +68 @@
 
         xhci_send_enable_slot_command(hc, cmd);
-        if ((err = xhci_wait_for_command(cmd, 100000)) != EOK)
+        if ((err = xhci_wait_for_command(cmd, 100000)) != EOK) {
+                usb_log_error("Failed to enable a slot for the device.");
                 goto err_command;
+        }
 
         uint32_t slot_id = cmd->slot_id;
@@ -91 +94 @@
         XHCI_SLOT_ROOT_HUB_PORT_SET(ictx->slot_ctx, port);
         XHCI_SLOT_CTX_ENTRIES_SET(ictx->slot_ctx, 1);
-
-        // TODO: where do we save this? the ring should be associated with device structure somewhere
+        XHCI_SLOT_ROUTE_STRING_SET(ictx->slot_ctx, route_str);
+
         xhci_trb_ring_t *ep_ring = malloc32(sizeof(xhci_trb_ring_t));
         if (!ep_ring) {
@@ -103 +106 @@
                 goto err_ring;
 
-        xhci_port_regs_t *regs = &hc->op_regs->portrs[port - 1];
-        uint8_t port_speed_id = XHCI_REG_RD(regs, XHCI_PORT_PS);
-
-        XHCI_EP_TYPE_SET(ictx->endpoint_ctx[0], 4);
+        XHCI_EP_TYPE_SET(ictx->endpoint_ctx[0], EP_TYPE_CONTROL);
+        // TODO: must be changed with a command after USB descriptor is read
+        // See 4.6.5 in XHCI specification, first note
         XHCI_EP_MAX_PACKET_SIZE_SET(ictx->endpoint_ctx[0],
-            hc->speeds[port_speed_id].tx_bps);
+            xhci_is_usb3_port(&hc->rh, port) ? 512 : 8);
         XHCI_EP_MAX_BURST_SIZE_SET(ictx->endpoint_ctx[0], 0);
+        /* FIXME physical pointer? */
         XHCI_EP_TR_DPTR_SET(ictx->endpoint_ctx[0], ep_ring->dequeue);
         XHCI_EP_DCS_SET(ictx->endpoint_ctx[0], 1);
@@ -139 +142 @@
         ictx = NULL;
 
-        // TODO: Issue configure endpoint commands (sec 4.3.5).
+        // TODO: Issue configure endpoint commands (sec 4.3.5).
 
         return EOK;
@@ -171 +174 @@
         uint8_t link_state = XHCI_REG_RD(regs, XHCI_PORT_PLS);
         // FIXME: do we have a better way to detect if this is usb2 or usb3 device?
-        if (link_state == 0) {
-                /* USB3 is automatically advanced to enabled. */
-                uint8_t port_speed = XHCI_REG_RD(regs, XHCI_PORT_PS);
-                usb_log_debug2("Detected new device on port %u, port speed id %u.", port_id, port_speed);
-
-                alloc_dev(hc, port_id);
-        } else if (link_state == 5) {
-                /* USB 3 failed to enable. */
-                usb_log_debug("USB 3 port couldn't be enabled.");
-        } else if (link_state == 7) {
+        if (xhci_is_usb3_port(&hc->rh, port_id)) {
+                if(link_state == 0) {
+                        /* USB3 is automatically advanced to enabled. */
+                        uint8_t port_speed = XHCI_REG_RD(regs, XHCI_PORT_PS);
+                        usb_log_debug("Detected new device on port %u, port speed id %u.", port_id, port_speed);
+
+                        alloc_dev(hc, port_id, 0);
+                }
+                else if (link_state == 5) {
+                        /* USB 3 failed to enable. */
+                        usb_log_error("USB 3 port couldn't be enabled.");
+                }
+                else {
+                        usb_log_error("USB 3 port is in invalid state %u.", link_state);
+                }
+        }
+        else {
                 usb_log_debug("USB 2 device attached, issuing reset.");
                 xhci_reset_hub_port(hc, port_id);
+                /*
+                        FIXME: we need to wait for the event triggered by the reset
+                        and then alloc_dev()... can't it be done directly instead of
+                        going around?
+                */
         }
 
@@ -201 +216 @@
                 uint8_t port_speed = XHCI_REG_RD(regs, XHCI_PORT_PS);
                 usb_log_debug2("Detected port reset on port %u, port speed id %u.", port_id, port_speed);
-                alloc_dev(hc, port_id);
+                /** FIXME: only if that port is not yet initialized */
+                alloc_dev(hc, port_id, 0);
         }
 

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

@@ -55 +55 @@
         /** Interrupt transfer waiting for an actual interrupt to occur */
         usb_transfer_batch_t *unfinished_interrupt_transfer;
+
+        uint8_t usb2_port_start;
+        uint8_t usb2_port_end;
+        uint8_t usb3_port_start;
+        uint8_t usb3_port_end;
 } xhci_rh_t;
 
@@ -77 +82 @@
 }
 
+static inline bool xhci_is_usb3_port(xhci_rh_t* rh, uint8_t port) {
+        return port >= rh->usb3_port_start && port <= rh->usb3_port_end;
+}
+
 #endif