Changeset 2770b66 in mainline

Timestamp:

2017-10-15T15:05:06Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

816f5f4

Parents:

20eaa82

Message:

Fixed few bugs related to control transfers and some deadlocks. Registering control endpoint with HelenOS. Can read out device descriptors through MID and initialize mouse driver!

Location:

uspace/drv/bus/usb/xhci

Files:

• bus.c (modified) (1 diff)
• endpoint.h (modified) (1 diff)
• hc.c (modified) (4 diffs)
• rh.c (modified) (3 diffs)
• rh.h (modified) (2 diffs)
• transfers.c (modified) (4 diffs)

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

@@ -79 +79 @@
 
         /* Assign an address to the device */
-        if ((err = xhci_rh_address_device(&hc->rh, dev))) {
+        if ((err = xhci_rh_address_device(&hc->rh, dev, bus))) {
                 usb_log_error("Failed to setup address of the new device: %s", str_error(err));
                 return err;

uspace/drv/bus/usb/xhci/endpoint.h

@@ -66 +66 @@
         endpoint_t base;        /**< Inheritance. Keep this first. */
 
+        /** Parent device. */
         xhci_device_t *device;
 } xhci_endpoint_t;
 
 typedef struct xhci_device {
+        /** Unique USB address assigned to the device. */
         usb_address_t address;
 
+        /** Slot ID assigned to the device by xHC. */
         uint32_t slot_id;
 
+        /** Associated device in libusbhost. */
+        device_t *device;
+
+        /** All endpoints of the device. Inactive ones are NULL */
         xhci_endpoint_t *endpoints[XHCI_DEVICE_MAX_ENDPOINTS];
+
+        /** Number of non-NULL endpoints. Reference count of sorts. */
         uint8_t active_endpoint_count;
 } xhci_device_t;

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

@@ -213 +213 @@
                 goto err_scratch;
 
+        if ((err = xhci_init_transfers(hc)))
+                goto err_cmd;
+
         if ((err = xhci_rh_init(&hc->rh, hc)))
-                goto err_cmd;
+                goto err_transfers;
 
         if ((err = xhci_bus_init(&hc->bus)))
@@ -224 +227 @@
 err_rh:
         xhci_rh_fini(&hc->rh);
+err_transfers:
+        xhci_fini_transfers(hc);
 err_cmd:
         xhci_fini_commands(hc);
@@ -472 +477 @@
         case USB_TRANSFER_ISOCHRONOUS:
                 /* TODO: Implement me. */
-                break;
+                usb_log_error("Isochronous transfers are not yet implemented!");
+                return ENOTSUP;
         case USB_TRANSFER_BULK:
                 return xhci_schedule_bulk_transfer(hc, batch);
         case USB_TRANSFER_INTERRUPT:
                 /* TODO: Implement me. */
-                break;
+                usb_log_error("Interrupt transfers are not yet implemented!");
+                return ENOTSUP;
         }
 
@@ -617 +624 @@
         xhci_event_ring_fini(&hc->event_ring);
         hc_dcbaa_fini(hc);
+        xhci_fini_transfers(hc);
         xhci_fini_commands(hc);
         xhci_rh_fini(&hc->rh);

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

@@ -36 +36 @@
 #include <errno.h>
 #include <str_error.h>
+#include <usb/request.h>
 #include <usb/debug.h>
 #include <usb/host/utils/malloc32.h>
 #include <usb/host/bus.h>
 #include <usb/host/ddf_helpers.h>
+#include <usb/host/hcd.h>
 
 #include "debug.h"
@@ -74 +76 @@
 // TODO: This currently assumes the device is attached to rh directly.
 //       Also, we should consider moving a lot of functionailty to xhci bus
-int xhci_rh_address_device(xhci_rh_t *rh, device_t *dev)
+int xhci_rh_address_device(xhci_rh_t *rh, device_t *dev, xhci_bus_t *bus)
 {
         int err;
@@ -160 +162 @@
         usb_log_debug2("Obtained USB address: %d.\n", dev->address);
 
-        // TODO: Ask libusbhost to create a control endpoint for EP0.
-
-        // TODO: Save all data structures in the corresponding xhci_device_t.
-
-        return EOK;
-
+        // Ask libusbhost to create a control endpoint for EP0.
+        bus_t *bus_base = &bus->base;
+        usb_target_t ep0_target = { .address = dev->address, .endpoint = 0 };
+        usb_direction_t ep0_direction = USB_DIRECTION_BOTH;
+
+        // TODO: Should this call be unified with other calls to `bus_add_ep()`?
+        err = bus_add_ep(bus_base, dev, ep0_target.endpoint, ep0_direction,
+            USB_TRANSFER_CONTROL, CTRL_PIPE_MIN_PACKET_SIZE, CTRL_PIPE_MIN_PACKET_SIZE, 1);
+
+        if (err != EOK)
+                goto err_add_ep;
+
+        // Save all data structures in the corresponding xhci_device_t.
+        endpoint_t *ep0_base = bus_find_endpoint(bus_base, ep0_target, ep0_direction);
+        xhci_endpoint_t *ep0 = xhci_endpoint_get(ep0_base);
+        xhci_device_t *xhci_dev = ep0->device;
+
+        xhci_dev->device = dev;
+        xhci_dev->slot_id = slot_id;
+
+        // TODO: Save anything else?
+
+        return EOK;
+
+err_add_ep:
 err_dctx:
         if (dctx) {

uspace/drv/bus/usb/xhci/rh.h

@@ -54 +54 @@
 
 typedef struct hcd_roothub hcd_roothub_t;
+typedef struct xhci_bus xhci_bus_t;
 
 /* XHCI root hub instance */
@@ -84 +85 @@
 void xhci_rh_handle_port_change(xhci_rh_t *);
 
-int xhci_rh_address_device(xhci_rh_t *rh, device_t *dev);
+int xhci_rh_address_device(xhci_rh_t *rh, device_t *dev, xhci_bus_t *bus);
 
 #endif

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

@@ -145 +145 @@
         transfer->batch = batch;
         link_initialize(&transfer->link);
-        transfer->hc_buffer = malloc32(batch->buffer_size);
+        transfer->hc_buffer = batch->buffer_size > 0 ? malloc32(batch->buffer_size) : NULL;
 
         return transfer;
@@ -152 +152 @@
 void xhci_transfer_fini(xhci_transfer_t* transfer) {
         if (transfer) {
-                free32(transfer->hc_buffer);
+                if (transfer->batch->buffer_size > 0)
+                        free32(transfer->hc_buffer);
+
+                usb_transfer_batch_destroy(transfer->batch);
+
                 free(transfer);
         }
@@ -179 +183 @@
         /* For the TRB formats, see xHCI specification 6.4.1.2 */
         xhci_transfer_t *transfer = xhci_transfer_alloc(batch);
-        memcpy(transfer->hc_buffer, batch->buffer, batch->buffer_size);
+
+        if (!transfer->direction) {
+                // Sending stuff from host to device, we need to copy the actual data.
+                memcpy(transfer->hc_buffer, batch->buffer, batch->buffer_size);
+        }
 
         xhci_trb_t trb_setup;
@@ -318 +326 @@
         batch->transfered_size = batch->buffer_size - TRB_TRANSFER_LENGTH(*trb);
         if (transfer->direction) {
+                memcpy(batch->buffer, transfer->hc_buffer, batch->buffer_size);
+
                 /* Device-to-host, IN */
                 if (batch->callback_in)