Changeset 5c5c9407 in mainline

Timestamp:

2017-10-03T23:12:40Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

816335c

Parents:

7776cb1

Message:

Implemented GetPortStatus request using XHCI port registers.

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (1 diff)
• rh.c (modified) (5 diffs)
• rh.h (modified) (2 diffs)

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

@@ -202 +202 @@
                 goto err_scratch;
 
-        if ((err = xhci_rh_init(&hc->rh)))
+        if ((err = xhci_rh_init(&hc->rh, hc->op_regs)))
                 goto err_cmd;
 

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

@@ -51 +51 @@
 static usbvirt_device_ops_t ops;
 
-int xhci_rh_init(xhci_rh_t *rh)
-{
+int xhci_rh_init(xhci_rh_t *rh, xhci_op_regs_t *op_regs)
+{
+        assert(rh);
+        rh->op_regs = op_regs;
+
         usb_hub_descriptor_header_t *header = &rh->hub_descriptor.header;
         header->length = sizeof(usb_hub_descriptor_header_t);
@@ -316 +319 @@
 }
 
+#define XHCI_TO_USB(usb_feat, reg_set, ...) \
+        (((XHCI_REG_RD(reg_set, ##__VA_ARGS__)) ? 1 : 0) << (usb_feat))
+
 /** Port status request handler.
  * @param device Virtual hub device
@@ -328 +334 @@
     uint8_t *data, size_t *act_size)
 {
-        /* TODO: Implement me! */
-        usb_log_debug2("Called req_get_port_status().");
+        xhci_rh_t *hub = virthub_get_data(device);
+        assert(hub);
+
+        const uint16_t ports = 255; /* FIXME: Fetch this from somewhere. */
+        if (!setup_packet->index || setup_packet->index > ports) {
+                return ESTALL;
+        }
+
+        /* The index is 1-based. */
+        xhci_port_regs_t* regs = &hub->op_regs->portrs[setup_packet->index - 1];
+
+        const uint32_t status = uint32_host2usb(
+            XHCI_TO_USB(USB_HUB_FEATURE_C_PORT_CONNECTION, regs, XHCI_PORT_CSC) |
+            XHCI_TO_USB(USB_HUB_FEATURE_C_PORT_ENABLE, regs, XHCI_PORT_PEC) |
+            XHCI_TO_USB(USB_HUB_FEATURE_C_PORT_OVER_CURRENT, regs, XHCI_PORT_OCC) |
+            XHCI_TO_USB(USB_HUB_FEATURE_C_PORT_RESET, regs, XHCI_PORT_PRC) |
+            XHCI_TO_USB(USB_HUB_FEATURE_PORT_CONNECTION, regs, XHCI_PORT_CCS) |
+            XHCI_TO_USB(USB_HUB_FEATURE_PORT_ENABLE, regs, XHCI_PORT_PED) |
+            XHCI_TO_USB(USB_HUB_FEATURE_PORT_OVER_CURRENT, regs, XHCI_PORT_OCA) |
+            XHCI_TO_USB(USB_HUB_FEATURE_PORT_RESET, regs, XHCI_PORT_PR) |
+            XHCI_TO_USB(USB_HUB_FEATURE_PORT_POWER, regs, XHCI_PORT_PP)
+        );
+
+        usb_log_debug2("RH: GetPortStatus(%hu) = %u.", setup_packet->index,
+                uint32_usb2host(status));
+
+        memcpy(data, &status, sizeof(status));
+        *act_size = sizeof(status);
         return EOK;
 }
@@ -374 +406 @@
  * @param buffer_size Bytes available in buffer
  * @param actual_size Size us the used part of the dest buffer.
+ *
+ * Produces status mask. Bit 0 indicates hub status change the other bits
+ * represent port status change.
  */
 static int req_status_change_handler(usbvirt_device_t *device,
@@ -380 +415 @@
 {
         usb_log_debug2("Called req_status_change_handler().");
+        xhci_rh_t *hub = virthub_get_data(device);
+        assert(hub);
+
+        if (buffer_size < 16)
+                return ESTALL;
+
+        /* TODO: Set this based on the received event TRBs. */
+        memset(buffer, 0, 16);
+        *actual_size = 16;
+
+        /* TODO: Set to EOK if something happened. */
         return ENAK;
 }

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

@@ -48 +48 @@
         /** Virtual hub instance */
         virthub_base_t base;
+        /** XHCI operational registers */
+        xhci_op_regs_t *op_regs;
         /** USB hub descriptor describing the XHCI root hub */
         struct {
@@ -62 +64 @@
 } xhci_rh_t;
 
-int xhci_rh_init(xhci_rh_t *);
+int xhci_rh_init(xhci_rh_t *, xhci_op_regs_t *);
 int xhci_rh_fini(xhci_rh_t *);
 int xhci_handle_port_status_change_event(xhci_hc_t *, xhci_trb_t *);