Changeset 35c37fc in mainline for uspace/drv/bus/usb/ehci/hw_struct

Timestamp:

2018-01-05T20:15:08Z (8 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.

Location:

uspace/drv/bus/usb/ehci/hw_struct

Files:

• queue_head.h (modified) (1 diff)
• transfer_descriptor.c (modified) (4 diffs)
• transfer_descriptor.h (modified) (3 diffs)

uspace/drv/bus/usb/ehci/hw_struct/queue_head.h

@@ -193 +193 @@
 }
 
-static inline void qh_set_next_td(qh_t *qh, td_t *td)
+static inline void qh_set_next_td(qh_t *qh, uintptr_t td)
 {
         assert(qh);
         assert(td);
-        EHCI_MEM32_WR(qh->next, LINK_POINTER_TD(addr_to_phys(td)));
+        EHCI_MEM32_WR(qh->next, LINK_POINTER_TD(td));
 }
 

uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c

@@ -39 +39 @@
 
 #include <usb/usb.h>
-#include <usb/host/utils/malloc32.h>
 
 #include "mem_access.h"
@@ -70 +69 @@
 };
 
+#include <usb/debug.h>
+
 /**
  * Initialize EHCI TD.
  * @param instance TD structure to initialize.
- * @param next Next TD in ED list.
+ * @param next_phys Next TD in ED list.
  * @param direction Used to determine PID, BOTH means setup PID.
  * @param buffer Pointer to the first byte of transferred data.
@@ -80 +81 @@
  *        any other value means that ED toggle will be used.
  */
-void td_init(td_t *instance, const td_t *next,
-    usb_direction_t direction, const void *buffer, size_t size, int toggle,
-    bool ioc)
+void td_init(td_t *instance, uintptr_t next_phys, uintptr_t buffer,
+    usb_direction_t direction, size_t size, int toggle, bool ioc)
 {
         assert(instance);
@@ -98 +98 @@
         }
 
-        if (buffer != NULL) {
+        if (buffer != 0) {
                 assert(size != 0);
                 for (unsigned i = 0; (i < ARRAY_SIZE(instance->buffer_pointer))
                     && size; ++i) {
-                        const uintptr_t page =
-                            (addr_to_phys(buffer) & TD_BUFFER_POINTER_MASK);
-                        const size_t offset =
-                            ((uintptr_t)buffer & TD_BUFFER_POINTER_OFFSET_MASK);
+                        const uintptr_t offset = buffer & TD_BUFFER_POINTER_OFFSET_MASK;
                         assert(offset == 0 || i == 0);
-                        size -= min((4096 - offset), size);
-                        buffer += min((4096 - offset), size);
-                        EHCI_MEM32_WR(instance->buffer_pointer[i],
-                            page | offset);
+                        const size_t this_size = min(size, 4096 - offset);
+                        EHCI_MEM32_WR(instance->buffer_pointer[i], buffer);
+                        size -= this_size;
+                        buffer += this_size;
                 }
         }
 
-        EHCI_MEM32_WR(instance->next, next ?
-            LINK_POINTER_TD(addr_to_phys(next)) : LINK_POINTER_TERM);
+        EHCI_MEM32_WR(instance->next, next_phys ?
+            LINK_POINTER_TD(next_phys) : LINK_POINTER_TERM);
 
         EHCI_MEM32_WR(instance->alternate, LINK_POINTER_TERM);

uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h

@@ -37 +37 @@
 #include <stddef.h>
 #include <stdint.h>
+#include <macros.h>
 #include "link_pointer.h"
 #include "mem_access.h"
@@ -75 +76 @@
         /* 64 bit struct only */
         volatile uint32_t extended_bp[5];
-} td_t;
+
+        /* TDs must be 32-byte aligned */
+        PADD32 [3];
+
+} __attribute__((packed)) td_t;
+
+static_assert(sizeof(td_t) % 32 == 0);
 
 static inline bool td_active(const td_t *td)
@@ -92 +99 @@
 int td_error(const td_t *td);
 
-void td_init(td_t *td, const td_t *next, usb_direction_t dir, const void * buf,
+void td_init(td_t *td, uintptr_t next_phys, uintptr_t buf, usb_direction_t dir,
     size_t buf_size, int toggle, bool ioc);