Changeset 706a3e2 in mainline

Timestamp:

2017-08-18T16:21:33Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

5ff9e1d

Parents:

e439f468

Message:

Dcbaa_virt now points to virtual device contexts that contain pointers to trb rings of each of their endpoints for deallocation.

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (1 diff)
• hc.h (modified) (2 diffs)
• hw_struct/context.h (modified) (4 diffs)
• rh.c (modified) (1 diff)

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

@@ -483 +483 @@
 static void hc_dcbaa_fini(xhci_hc_t *hc)
 {
+        xhci_trb_ring_t* trb_ring;
         xhci_scratchpad_free(hc);
 
         /* Idx 0 already deallocated by xhci_scratchpad_free. */
         for (unsigned i = 1; i < hc->max_slots + 1; ++i) {
-                if (hc->dcbaa_virt[i] != NULL) {
+                if (hc->dcbaa_virt[i]) {
+                        if (hc->dcbaa_virt[i]->dev_ctx)
+                                free32(hc->dcbaa_virt[i]->dev_ctx);
+
+                        for (unsigned i = 0; i < XHCI_EP_COUNT; ++i) {
+                                trb_ring = hc->dcbaa_virt[i]->trs[i];
+                                if (trb_ring) {
+                                        xhci_trb_ring_fini(trb_ring);
+                                        free32(trb_ring);
+                                }
+                        }
+
                         free32(hc->dcbaa_virt[i]);
                         hc->dcbaa_virt[i] = NULL;

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

@@ -43 +43 @@
 #include "trb_ring.h"
 
+typedef struct xhci_virt_device_ctx {
+    xhci_device_ctx_t *dev_ctx;
+    xhci_trb_ring_t *trs[XHCI_EP_COUNT];
+} xhci_virt_device_ctx_t;
+
 /**
  * xHCI lets the controller define speeds of ports it controls.
@@ -67 +72 @@
         xhci_event_ring_t event_ring;
         uint64_t *dcbaa;
-        xhci_device_ctx_t **dcbaa_virt;
+        xhci_virt_device_ctx_t **dcbaa_virt;
         xhci_scratchpad_t *scratchpad;
 

uspace/drv/bus/usb/xhci/hw_struct/context.h

@@ -51 +51 @@
         xhci_dword_t data[5];
         xhci_dword_t reserved[3];
+
+#define XHCI_EP_COUNT 31
 
 #define XHCI_EP_TYPE_ISOCH_OUT          1
@@ -132 +134 @@
 typedef struct xhci_device_ctx {
         xhci_slot_ctx_t slot_ctx;
-        xhci_ep_ctx_t endpoint_ctx [31];
+        xhci_ep_ctx_t endpoint_ctx[XHCI_EP_COUNT];
 } __attribute__((packed)) xhci_device_ctx_t;
 
@@ -165 +167 @@
 
 #define XHCI_INPUT_CTRL_CTX_ADD_SET(ctx, idx) (ctx).data[1] |= (1 << (idx))
-    
+
 #define XHCI_INPUT_CTRL_CTX_CONFIG_VALUE(ctx)   XHCI_DWORD_EXTRACT((ctx).data[7],  7,  0)
 #define XHCI_INPUT_CTRL_CTX_IFACE_NUMBER(ctx)   XHCI_DWORD_EXTRACT((ctx).data[7], 15,  8)
@@ -177 +179 @@
         xhci_input_ctrl_ctx_t ctrl_ctx;
         xhci_slot_ctx_t slot_ctx;
-        xhci_ep_ctx_t endpoint_ctx [31];
+        xhci_ep_ctx_t endpoint_ctx[XHCI_EP_COUNT];
 } __attribute__((packed)) xhci_input_ctx_t;
 

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

@@ -115 +115 @@
 
         hc->dcbaa[slot_id] = addr_to_phys(dctx);
-        hc->dcbaa_virt[slot_id] = dctx;
+        hc->dcbaa_virt[slot_id]->dev_ctx = dctx;
 
         cmd = xhci_alloc_command();