Changeset 3256a6c in mainline

Timestamp:

2017-07-09T18:10:15Z (8 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

afa347e

Parents:

b19131c5

Message:

Added deallocation of dcbaa and device contexts.

File:

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

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

@@ -401 +401 @@
         }
 
-        /* Update the ERDP to make room inthe ring */
+        /* Update the ERDP to make room in the ring */
         uint64_t erstptr = addr_to_phys(hc->event_ring.erst);
         XHCI_REG_WR(intr, XHCI_INTR_ERDP_LO, LOWER32(erstptr));
@@ -433 +433 @@
 }
 
+static void hc_dcbaa_fini(xhci_hc_t *hc)
+{
+        xhci_scratchpad_free(hc);
+
+        /**
+         * Idx 0 already deallocated by xhci_scratchpad_free.
+         */
+        for (int i = 1; i < hc->max_slots + 1; ++i) {
+                if (hc->dcbaa[i] != NULL) {
+                        free32(hc->dcbaa[i]);
+                        hc->dcbaa[i] = NULL;
+                }
+        }
+
+        free32(hc->dcbaa);
+}
+
 void hc_fini(xhci_hc_t *hc)
 {
         xhci_trb_ring_fini(&hc->command_ring);
         xhci_event_ring_fini(&hc->event_ring);
-        xhci_scratchpad_free(hc);
+        hc_dcbaa_fini(hc);
         pio_disable(hc->base, RNGSZ(hc->mmio_range));
         usb_log_info("HC(%p): Finalized.", hc);