Changeset 548c123 in mainline for uspace/drv/bus/usb/xhci/trb_ring.c

Timestamp:

2017-09-29T21:46:08Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

cc9ac7c

Parents:

ab5a0830

Message:

xhci commands: embed TRB into the command structure

Previously, a pointer into the TRB ring itself was contained. That could cause
problems, because the ring does not care and can move/deallocate segments, or
overwrite TRBs inside. To solve the original issue, xhci_trb_ring_enqueue can
now fill physical address of the TRB enqueued.

Also, this eliminates the need to track ownage of TRB.

File:

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

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

@@ -164 +164 @@
  *
  * @param td the first TRB of TD
+ * @param phys returns address of the first TRB enqueued
  * @return EOK on success,
  *         EAGAIN when the ring is too full to fit all TRBs (temporary)
  */
-int xhci_trb_ring_enqueue(xhci_trb_ring_t *ring, xhci_trb_t *td)
+int xhci_trb_ring_enqueue(xhci_trb_ring_t *ring, xhci_trb_t *td, uintptr_t *phys)
 {
         xhci_trb_t * const saved_enqueue_trb = ring->enqueue_trb;
         trb_segment_t * const saved_enqueue_segment = ring->enqueue_segment;
+        if (phys)
+                *phys = NULL;
 
         /*
@@ -189 +192 @@
         ring->enqueue_segment = saved_enqueue_segment;
         ring->enqueue_trb = saved_enqueue_trb;
+        if (phys)
+                *phys = trb_ring_enqueue_phys(ring);
 
         /*