Changeset 3d8a3bd in mainline

Timestamp:

2017-08-20T19:12:12Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

6da6039

Parents:

decfc8d1

Message:

Fixed the issue that cause waiting for command completion in alloc_dev to timeout with a quick hotfix, this

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (3 diffs)
• trb_ring.c (modified) (1 diff)

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

@@ -402 +402 @@
 }
 
-static void hc_handle_event(xhci_hc_t *hc, xhci_trb_t *trb)
+static void hc_handle_event(xhci_hc_t *hc, xhci_trb_t *trb, xhci_interrupter_regs_t *intr)
 {
         usb_log_debug2("TRB event encountered.");
@@ -410 +410 @@
                 break;
         case XHCI_TRB_TYPE_PORT_STATUS_CHANGE_EVENT:
+                /**
+                 * TODO: This is a very crude hotfix, I'm not sure if
+                 *       we can do this one level above in the event handling
+                 *       loop (incase the xHC adds more events while we process events).
+                 */
+                hc->event_ring.dequeue_ptr = host2xhci(64, addr_to_phys(hc->event_ring.dequeue_trb));
+                uint64_t erdp = hc->event_ring.dequeue_ptr;
+                XHCI_REG_WR(intr, XHCI_INTR_ERDP_LO, LOWER32(erdp));
+                XHCI_REG_WR(intr, XHCI_INTR_ERDP_HI, UPPER32(erdp));
+                XHCI_REG_SET(intr, XHCI_INTR_ERDP_EHB, 1);
                 xhci_handle_port_status_change_event(hc, trb);
                 break;
@@ -430 +440 @@
                                         xhci_trb_str_type(TRB_TYPE(trb)));
 
-                        hc_handle_event(hc, &trb);
+                        hc_handle_event(hc, &trb, intr);
                 } else {
                         usb_log_warning("Error while accessing event ring: %s", str_error(err));

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

@@ -121 +121 @@
 int xhci_trb_ring_fini(xhci_trb_ring_t *ring)
 {
+        if (!ring)
+                return EOK;
+
         list_foreach(ring->segments, segments_link, trb_segment_t, segment)
                 dmamem_unmap_anonymous(segment);