Changeset adb4e683 in mainline

Timestamp:

2017-10-03T15:17:26Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

efe9463

Parents:

a1eb7c67

Message:

Refactored the way event handling works, now we fetch all of the event TRBs from the event ring, advance the dequeue pointer and clear EHB and then we handle all of the events.

File:

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

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

@@ -497 +497 @@
 {
         int err;
-        xhci_trb_t trb;
-
-        err = xhci_event_ring_dequeue(event_ring, &trb);;
+        size_t last_idx = 0;
+        size_t size = 16; // TODO: Define a macro, possibly do size += initial_size instead of *= 2.
+        xhci_trb_t *trbs = malloc32(sizeof(xhci_trb_t) * size);
+
+        err = xhci_event_ring_dequeue(event_ring, trbs + last_idx);
 
         while (err != ENOENT) {
                 if (err == EOK) {
                         usb_log_debug2("Dequeued trb from event ring: %s",
-                                        xhci_trb_str_type(TRB_TYPE(trb)));
-
-                        hc_handle_event(hc, &trb, intr);
+                                        xhci_trb_str_type(TRB_TYPE(trbs[last_idx])));
                 } else {
+                        --last_idx; /* If there are valid trbs they should still get handled. */
                         usb_log_warning("Error while accessing event ring: %s", str_error(err));
                         break;
                 }
 
-                err = xhci_event_ring_dequeue(event_ring, &trb);;
-        }
-        usb_log_debug2("Event ring processing finished.");
-
-        /* Update the ERDP to make room in the ring */
+                ++last_idx;
+                err = xhci_event_ring_dequeue(event_ring, trbs + last_idx);
+
+                /* Expand the array if needed. */
+                if (last_idx >= size) {
+                        xhci_trb_t *trbs_old = trbs;
+                        size_t size_old = size;
+
+                        size *= 2;
+                        trbs = malloc32(sizeof(xhci_trb_t) * size);
+
+                        for (size_t i = 0; i < size_old; ++i)
+                                xhci_trb_copy(trbs + i, trbs_old + i);
+                        free32(trbs_old);
+                }
+        }
+
+        /* Update the ERDP to make room in the ring. */
         hc->event_ring.dequeue_ptr = host2xhci(64, addr_to_phys(hc->event_ring.dequeue_trb));
         uint64_t erdp = hc->event_ring.dequeue_ptr;
@@ -522 +536 @@
         XHCI_REG_WR(intr, XHCI_INTR_ERDP_HI, UPPER32(erdp));
         XHCI_REG_SET(intr, XHCI_INTR_ERDP_EHB, 1);
+
+        /**
+         * After changing the way this function works, second port status change
+         * would not raise an interrupt because of IE being set to 0. This is
+         * a temporary hotfix that fixes this issue.
+         * TODO: Research & properly fix this.
+         */
+        XHCI_REG_SET(intr, XHCI_INTR_IE, 1);
+
+        /* Handle all of the collected events if possible. */
+        if (last_idx > 0) {
+                for (size_t i = 0; i < last_idx; ++i)
+                        hc_handle_event(hc, trbs + i, intr);
+                usb_log_debug2("Event ring processing finished.");
+        } else {
+                usb_log_warning("No events to be handled!");
+        }
+
+        free32(trbs);
 }