Changeset fb154e13 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2018-01-12T22:48:57Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

0e7380f

Parents:

7242ba21

Message:

xhci: revised roothub event handling

According to the xHCI specification, Port Status Change Event is
generated per port. Also, the PCD bit can be safely ignored. Added
mutual exclusion to roothub event handling to avoid duplicate device
adding.

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (4 diffs)

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

@@ -476 +476 @@
          * not cause an interrupt.
          */
-        xhci_rh_handle_port_change(&hc->rh);
+        for (uint8_t port = 1; port <= hc->rh.max_ports; ++port)
+                xhci_rh_handle_port_change(&hc->rh, port);
 
         return EOK;
@@ -508 +509 @@
 }
 
+static int handle_port_status_change_event(xhci_hc_t *hc, xhci_trb_t *trb)
+{
+        uint8_t port_id = XHCI_QWORD_EXTRACT(trb->parameter, 31, 24);
+        usb_log_debug("Port status change event detected for port %u.", port_id);
+        xhci_rh_handle_port_change(&hc->rh, port_id);
+        return EOK;
+}
+
 typedef int (*event_handler) (xhci_hc_t *, xhci_trb_t *trb);
 
 static event_handler event_handlers [] = {
         [XHCI_TRB_TYPE_COMMAND_COMPLETION_EVENT] = &xhci_handle_command_completion,
-        [XHCI_TRB_TYPE_PORT_STATUS_CHANGE_EVENT] = &xhci_rh_handle_port_status_change_event,
+        [XHCI_TRB_TYPE_PORT_STATUS_CHANGE_EVENT] = &handle_port_status_change_event,
         [XHCI_TRB_TYPE_TRANSFER_EVENT] = &xhci_handle_transfer_event,
         [XHCI_TRB_TYPE_MFINDEX_WRAP_EVENT] = &xhci_handle_mfindex_wrap_event,
@@ -578 +587 @@
         status = xhci2host(32, status);
 
-        if (status & XHCI_REG_MASK(XHCI_OP_PCD)) {
-                usb_log_debug2("Root hub interrupt.");
-                xhci_rh_handle_port_change(&hc->rh);
-                status &= ~XHCI_REG_MASK(XHCI_OP_PCD);
-        }
-
         if (status & XHCI_REG_MASK(XHCI_OP_HSE)) {
                 usb_log_error("Host controller error occured. Bad things gonna happen...");
@@ -599 +602 @@
                 status &= ~XHCI_REG_MASK(XHCI_OP_SRE);
         }
+
+        /* According to Note on p. 302, we may safely ignore the PCD bit. */
+        status &= ~XHCI_REG_MASK(XHCI_OP_PCD);
 
         if (status) {