Changeset 33d19a7 in mainline

Timestamp:

2011-05-18T10:40:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

68b9f148

Parents:

c7b5826

Message:

Fix OHCI buffer access.

Consider more than one data transaction when computing transfered size.
Reduce max transfer size to 4KB to guarantee that max 2 pages will be used.

Location:

uspace/drv/ohci

Files:

• batch.c (modified) (4 diffs)
• hw_struct/transfer_descriptor.h (modified) (1 diff)

uspace/drv/ohci/batch.c

@@ -151 +151 @@
 
         /* NOTE: OHCI is capable of handling buffer that crosses page boundaries
-         * it is, however, not capable of handling buffer that accupies more
-         * than two pages (the first page is computete using start pointer, the
-         * other using end pointer)*/
+         * it is, however, not capable of handling buffer that occupies more
+         * than two pages (the first page is computed using start pointer, the
+         * other using the end pointer) */
         if (setup_size + buffer_size > 0) {
                 data->device_buffer = malloc32(setup_size + buffer_size);
@@ -180 +180 @@
         ohci_transfer_batch_t *data = instance->private_data;
         assert(data);
-        size_t tds = data->td_count;
         usb_log_debug("Batch(%p) checking %zu td(s) for completion.\n",
-            instance, tds);
+            instance, data->td_count);
         usb_log_debug("ED: %x:%x:%x:%x.\n",
             data->ed->status, data->ed->td_head, data->ed->td_tail,
@@ -188 +187 @@
         size_t i = 0;
         instance->transfered_size = instance->buffer_size;
-        for (; i < tds; ++i) {
+        for (; i < data->td_count; ++i) {
                 assert(data->tds[i] != NULL);
                 usb_log_debug("TD %zu: %x:%x:%x:%x.\n", i,
@@ -213 +212 @@
         assert(hcd_ep);
         hcd_ep->td = data->tds[i];
-        if (i > 0)
-                instance->transfered_size -= td_remain_size(data->tds[i - 1]);
+        assert(i > 0);
+        for (--i;i < data->td_count; ++i)
+                instance->transfered_size -= td_remain_size(data->tds[i]);
 
         /* Clear possible ED HALT */

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -41 +41 @@
 #include "completion_codes.h"
 
-/* OHCI TDs can handle up to 8KB buffers */
-#define OHCI_TD_MAX_TRANSFER (8 * 1024)
+/* OHCI TDs can handle up to 8KB buffers, however, it can use max 2 pages.
+ * Using 4KB buffers guarantees the page count condition.
+ * (OHCI assumes 4KB pages) */
+#define OHCI_TD_MAX_TRANSFER (4 * 1024)
 
 typedef struct td {