Changeset a312d8f in mainline

Timestamp:

2017-10-30T22:18:28Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

17873ac7

Parents:

ef1a3a8

Message:

uhci: fixed buffer copying on IN transaction

Lost in some refactoring, masked by deadlock.

Location:

uspace

Files:

• drv/bus/usb/uhci/hc.c (modified) (1 diff)
• drv/bus/usb/uhci/uhci_batch.c (modified) (2 diffs)
• drv/bus/usb/uhci/uhci_batch.h (modified) (1 diff)
• lib/usbhost/src/bus.c (modified) (2 diffs)

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

@@ -177 +177 @@
                         uhci_transfer_batch_t *batch =
                             uhci_transfer_batch_from_link(current);
-                        usb_transfer_batch_finish(&batch->base);
+                        uhci_transfer_batch_finish(batch);
                 }
         }

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -64 +64 @@
 }
 
+void uhci_transfer_batch_finish(uhci_transfer_batch_t *batch)
+{
+        if (batch->base.dir == USB_DIRECTION_IN) {
+                assert(batch->base.transfered_size <= batch->base.buffer_size);
+                memcpy(batch->base.buffer, uhci_transfer_batch_data_buffer(batch), batch->base.transfered_size);
+        }
+        usb_transfer_batch_finish(&batch->base);
+}
+
 /** Allocate memory and initialize internal data structure.
  *
@@ -131 +140 @@
         dest += setup_size;
         /* Copy generic data unless they are provided by the device */
-        if (usb_batch->ep->direction != USB_DIRECTION_IN) {
+        if (usb_batch->dir != USB_DIRECTION_IN) {
                 memcpy(dest, usb_batch->buffer, usb_batch->buffer_size);
         }

uspace/drv/bus/usb/uhci/uhci_batch.h

@@ -67 +67 @@
 } uhci_transfer_batch_t;
 
-uhci_transfer_batch_t * uhci_transfer_batch_create(endpoint_t *ep);
-int uhci_transfer_batch_prepare(uhci_transfer_batch_t *uhci_batch);
-bool uhci_transfer_batch_check_completed(uhci_transfer_batch_t *uhci_batch);
-void uhci_transfer_batch_destroy(uhci_transfer_batch_t *uhci_batch);
+uhci_transfer_batch_t * uhci_transfer_batch_create(endpoint_t *);
+int uhci_transfer_batch_prepare(uhci_transfer_batch_t *);
+bool uhci_transfer_batch_check_completed(uhci_transfer_batch_t *);
+void uhci_transfer_batch_finish(uhci_transfer_batch_t *);
+void uhci_transfer_batch_destroy(uhci_transfer_batch_t *);
 
 /** Get offset to setup buffer accessible to the HC hw.

uspace/lib/usbhost/src/bus.c

@@ -36 +36 @@
 #include <usb/host/bus.h>
 #include <usb/host/endpoint.h>
+#include <usb/debug.h>
 #include <ddf/driver.h>
 
@@ -127 +128 @@
 int bus_add_endpoint(bus_t *bus, device_t *device, const usb_endpoint_desc_t *desc, endpoint_t **out_ep)
 {
+        assert(bus);
+        assert(device);
+
+        fibril_mutex_lock(&bus->guard);
+
+        if (desc->max_packet_size == 0 || desc->packets == 0) {
+                usb_log_warning("Invalid endpoint description (mps %zu, %u packets)", desc->max_packet_size, desc->packets);
+                return EINVAL;
+        }
+
         int err = ENOMEM;
-
-        assert(bus);
-        assert(device);
-
-        fibril_mutex_lock(&bus->guard);
-
         endpoint_t *ep = bus->ops.create_endpoint(bus);
         if (!ep)