Changeset 60af4cdb in mainline

Timestamp:

2017-10-19T14:01:18Z (8 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

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

Children:

0f6b50f

Parents:

95c675b

Message:

Added get port bandwidth command

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (2 diffs)
• commands.h (modified) (2 diffs)
• hw_struct/context.h (modified) (1 diff)
• rh.c (modified) (1 diff)

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

@@ -50 +50 @@
 #define TRB_SET_SUSP(trb, susp) (trb).control |= host2xhci(32, ((susp) & 0x1) << 23)
 #define TRB_SET_SLOT(trb, slot) (trb).control |= host2xhci(32, (slot) << 24)
+#define TRB_SET_DEV_SPEED(trb, speed)   (trb).control |= host2xhci(32, (speed & 0xF) << 16)
 
 /**
@@ -418 +419 @@
 }
 
+int xhci_get_port_bandwidth_command(xhci_hc_t *hc, xhci_cmd_t *cmd,
+        xhci_port_bandwidth_ctx_t *ctx, uint8_t device_speed)
+{
+        assert(hc);
+        assert(cmd);
+
+        xhci_trb_clean(&cmd->trb);
+
+        uint64_t phys_addr = (uint64_t) addr_to_phys(ctx);
+        TRB_SET_ICTX(cmd->trb, phys_addr);
+
+        TRB_SET_TYPE(cmd->trb, XHCI_TRB_TYPE_GET_PORT_BANDWIDTH_CMD);
+        TRB_SET_SLOT(cmd->trb, cmd->slot_id);
+        TRB_SET_DEV_SPEED(cmd->trb, device_speed);
+
+        return enqueue_command(hc, cmd, 0, 0);
+}
+
 int xhci_handle_command_completion(xhci_hc_t *hc, xhci_trb_t *trb)
 {

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

@@ -44 +44 @@
 typedef struct xhci_hc xhci_hc_t;
 typedef struct xhci_input_ctx xhci_input_ctx_t;
+typedef struct xhci_port_bandwidth_ctx xhci_port_bandwidth_ctx_t;
 
 typedef struct xhci_command {
@@ -87 +88 @@
 // TODO: Negotiate bandwidth (optional normative, section 4.6.13).
 // TODO: Set latency tolerance value (optional normative, section 4.6.14).
+int xhci_get_port_bandwidth_command(xhci_hc_t *, xhci_cmd_t *, xhci_port_bandwidth_ctx_t *, uint8_t);
 // TODO: Get port bandwidth (mandatory, but needs root hub implementation, section 4.6.15).
 // TODO: Force header (mandatory, but needs root hub implementation, section 4.6.16).

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

@@ -192 +192 @@
 } __attribute__((packed)) xhci_input_ctx_t;
 
+/**
+ * Port bandwidth context: section 6.2.6
+ * The number of ports depends on the amount of ports available to the hub.
+ */
+typedef struct xhci_port_bandwidth_ctx {
+        uint8_t reserved;
+        uint8_t ports [];
+} __attribute__((packed)) xhci_port_bandwidth_ctx_t;
+
 #endif

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

@@ -382 +382 @@
 }
 
+static inline int get_hub_available_bandwidth(xhci_device_t* dev, uint8_t speed, xhci_port_bandwidth_ctx_t *ctx) {
+        // TODO: find a correct place for this function + API
+        // We need speed, because a root hub device has both USB 2 and USB 3 speeds
+        // and the command can query only one of them
+        // ctx is an out parameter as of now
+        assert(dev);
+
+        ctx = malloc(sizeof(xhci_port_bandwidth_ctx_t));
+        if(!ctx)
+                return ENOMEM;
+
+        xhci_cmd_t cmd;
+        xhci_cmd_init(&cmd);
+
+        xhci_get_port_bandwidth_command(dev->hc, &cmd, ctx, speed);
+
+        int err = xhci_cmd_wait(&cmd, 100000);
+        if(err != EOK) {
+                free(ctx);
+                ctx = NULL;
+        }
+
+        return EOK;
+}
+
 const xhci_port_speed_t *xhci_rh_get_port_speed(xhci_rh_t *rh, uint8_t port)
 {