Changeset 73e5b62 in mainline

Timestamp:

2017-07-31T19:58:08Z (8 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

7428b92

Parents:

c9bec1c

Message:

DCBAA now correctly holds physical addresses of the device contexts, a secondary array called dcbaa_virt was added that is used for deallocation.

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (3 diffs)
• hc.h (modified) (1 diff)
• scratchpad.c (modified) (2 diffs)

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

@@ -198 +198 @@
         int err;
 
-        hc->dcbaa = malloc32((1 + hc->max_slots) * sizeof(xhci_device_ctx_t*));
+        hc->dcbaa = malloc32((1 + hc->max_slots) * sizeof(uint64_t));
         if (!hc->dcbaa)
                 return ENOMEM;
 
+        hc->dcbaa_virt = malloc32((1 + hc->max_slots) * sizeof(xhci_device_ctx_t*));
+        if (!hc->dcbaa_virt) {
+                err = ENOMEM;
+                goto err_dcbaa;
+        }
+
         if ((err = xhci_trb_ring_init(&hc->command_ring, hc)))
-                goto err_dcbaa;
+                goto err_dcbaa_virt;
 
         if ((err = xhci_event_ring_init(&hc->event_ring, hc)))
@@ -220 +226 @@
 err_cmd_ring:
         xhci_trb_ring_fini(&hc->command_ring);
+err_dcbaa_virt:
+        free32(hc->dcbaa_virt);
 err_dcbaa:
         free32(hc->dcbaa);
@@ -468 +476 @@
         /* Idx 0 already deallocated by xhci_scratchpad_free. */
         for (unsigned i = 1; i < hc->max_slots + 1; ++i) {
-                if (hc->dcbaa[i] != NULL) {
-                        free32(hc->dcbaa[i]);
-                        hc->dcbaa[i] = NULL;
+                if (hc->dcbaa_virt[i] != NULL) {
+                        free32(hc->dcbaa_virt[i]);
+                        hc->dcbaa_virt[i] = NULL;
                 }
         }
 
         free32(hc->dcbaa);
+        free32(hc->dcbaa_virt);
 }
 

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

@@ -66 +66 @@
         xhci_trb_ring_t command_ring;
         xhci_event_ring_t event_ring;
-        xhci_device_ctx_t **dcbaa;
+        uint64_t *dcbaa;
+        xhci_device_ctx_t **dcbaa_virt;
         xhci_scratchpad_t *scratchpad;
 

uspace/drv/bus/usb/xhci/scratchpad.c ¶

@@ -92 +92 @@
         bufs->phys_bck = (uint64_t) phys_array;
 
-        hc->dcbaa[0] = (xhci_device_ctx_t *) bufs->phys_ptr;
+        hc->dcbaa[0] = bufs->phys_ptr;
         hc->scratchpad = bufs;
 
@@ -131 +131 @@
         free32((void *) scratchpad->phys_bck);
 
-        hc->dcbaa[0] = NULL;
+        hc->dcbaa[0] = 0;
+        hc->dcbaa_virt[0] = NULL;
         return;
 }