Changeset 35c37fc in mainline for uspace/drv/bus/usb/ehci/hc.c

Timestamp:

2018-01-05T20:15:08Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

9e5b162

Parents:

b60944b

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-05 16:11:04)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-05 20:15:08)

Message:

ehci: refactor to dma_buffers

One big hidden thing was refactored - now TDs are allocated in one
buffer together with setup and data buffers themselves. This reduces the
number of allocated pages per transfer to minimum.

File:

• uspace/drv/bus/usb/ehci/hc.c (modified) (5 diffs)

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

@@ -45 +45 @@
 #include <usb/debug.h>
 #include <usb/usb.h>
-#include <usb/host/utils/malloc32.h>
 
 #include "ehci_batch.h"
@@ -198 +197 @@
  * @param[in] instance Host controller structure to use.
  */
-int hc_gone(hc_device_t *instance)
-{
-        assert(instance);
-        return EOK;
-        //TODO: stop the hw
-#if 0
-        endpoint_list_fini(&instance->async_list);
-        endpoint_list_fini(&instance->int_list);
-        return_page(instance->periodic_list_base);
-#endif
+int hc_gone(hc_device_t *hcd)
+{
+        hc_t *hc = hcd_to_hc(hcd);
+        endpoint_list_fini(&hc->async_list);
+        endpoint_list_fini(&hc->int_list);
+        dma_buffer_free(&hc->dma_buffer);
+        return EOK;
 };
 
@@ -406 +402 @@
 
         /* Enable periodic list */
-        assert(instance->periodic_list_base);
+        assert(instance->periodic_list);
         uintptr_t phys_base =
-            addr_to_phys((void*)instance->periodic_list_base);
+            addr_to_phys((void*)instance->periodic_list);
         assert((phys_base & USB_PERIODIC_LIST_BASE_MASK) == phys_base);
         EHCI_WR(instance->registers->periodiclistbase, phys_base);
@@ -477 +473 @@
 
         /* Take 1024 periodic list heads, we ignore low mem options */
-        instance->periodic_list_base = get_page();
-        if (!instance->periodic_list_base) {
+        if (dma_buffer_alloc(&instance->dma_buffer, PAGE_SIZE)) {
                 usb_log_error("HC(%p): Failed to get ISO schedule page.",
                     instance);
@@ -485 +480 @@
                 return ENOMEM;
         }
+        instance->periodic_list = instance->dma_buffer.virt;
 
         usb_log_debug2("HC(%p): Initializing Periodic list.", instance);
-        for (unsigned i = 0;
-            i < PAGE_SIZE/sizeof(instance->periodic_list_base[0]); ++i)
+        for (unsigned i = 0; i < PAGE_SIZE/sizeof(link_pointer_t); ++i)
         {
                 /* Disable everything for now */
-                instance->periodic_list_base[i] =
+                instance->periodic_list[i] =
                     LINK_POINTER_QH(addr_to_phys(instance->int_list.list_head));
         }