Changeset 2b61945 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-10-22T03:47:41Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2e5aea1

Parents:

766043c

Message:

xhci: use device_t for bookkeeping

This started as a little refactoring to move active transfer batch to endpoint. Finding the EP in handler needs devices indexed by slot id. Then I found out we do not use the device_t extendable mechanism. Then there were a lot of errors found while doing all this…

File:

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

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

@@ -196 +196 @@
                 return ENOMEM;
 
-        hc->dcbaa_virt = malloc((1 + hc->max_slots) * sizeof(xhci_virt_device_ctx_t));
-        if (!hc->dcbaa_virt) {
-                err = ENOMEM;
+        if ((err = xhci_trb_ring_init(&hc->command_ring)))
                 goto err_dcbaa;
-        }
-
-        if ((err = xhci_trb_ring_init(&hc->command_ring)))
-                goto err_dcbaa_virt;
 
         if ((err = xhci_event_ring_init(&hc->event_ring)))
@@ -214 +208 @@
                 goto err_scratch;
 
-        if ((err = xhci_init_transfers(hc)))
+        if ((err = xhci_rh_init(&hc->rh, hc, device)))
                 goto err_cmd;
 
-        if ((err = xhci_rh_init(&hc->rh, hc, device)))
-                goto err_transfers;
-
-        if ((err = xhci_bus_init(&hc->bus)))
+        if ((err = xhci_bus_init(&hc->bus, hc)))
                 goto err_rh;
 
@@ -228 +219 @@
 err_rh:
         xhci_rh_fini(&hc->rh);
-err_transfers:
-        xhci_fini_transfers(hc);
 err_cmd:
         xhci_fini_commands(hc);
@@ -238 +227 @@
 err_cmd_ring:
         xhci_trb_ring_fini(&hc->command_ring);
-err_dcbaa_virt:
-        free32(hc->dcbaa_virt);
 err_dcbaa:
         free32(hc->dcbaa);
@@ -527 +514 @@
         /* Update the ERDP to make room in the ring. */
         usb_log_debug2("Copying from ring finished, updating ERDP.");
-        hc->event_ring.dequeue_ptr = host2xhci(64, addr_to_phys(hc->event_ring.dequeue_trb));
         uint64_t erdp = hc->event_ring.dequeue_ptr;
         XHCI_REG_WR(intr, XHCI_INTR_ERDP_LO, LOWER32(erdp));
@@ -580 +566 @@
 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].dev_ctx) {
-                        free32(hc->dcbaa_virt[i].dev_ctx);
-                        hc->dcbaa_virt[i].dev_ctx = NULL;
-                }
-
-                for (unsigned i = 0; i < XHCI_EP_COUNT; ++i) {
-                        trb_ring = hc->dcbaa_virt[i].trs[i];
-                        if (trb_ring) {
-                                hc->dcbaa_virt[i].trs[i] = NULL;
-                                xhci_trb_ring_fini(trb_ring);
-                                free32(trb_ring);
-                        }
-                }
-        }
-
         free32(hc->dcbaa);
-        free32(hc->dcbaa_virt);
 }
 
@@ -610 +576 @@
         xhci_event_ring_fini(&hc->event_ring);
         hc_dcbaa_fini(hc);
-        xhci_fini_transfers(hc);
         xhci_fini_commands(hc);
         xhci_rh_fini(&hc->rh);