Changeset b7db009 in mainline

Timestamp:

2017-10-15T21:35:13Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

3afcf68

Parents:

9b2f69e

Message:

xhci: fix crashing QEMU

Location:

uspace/drv/bus/usb/xhci

Files:

• endpoint.c (modified) (4 diffs)
• transfers.c (modified) (1 diff)

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

@@ -34 +34 @@
  */
 
+#include <usb/host/utils/malloc32.h>
 #include <usb/host/endpoint.h>
 #include <usb/descriptor.h>
@@ -84 +85 @@
         /* 0 is slot ctx, 1 is EP0, then it's EP1 out, in, EP2 out, in, etc. */
 
-        uint8_t off = 2 + 2 * (ep->base.target.endpoint - 1);
-        if (ep->base.direction == USB_DIRECTION_IN)
+        uint8_t off = 2 * (ep->base.target.endpoint);
+        if (ep->base.direction == USB_DIRECTION_IN || ep->base.target.endpoint == 0)
                 ++off;
 
@@ -197 +198 @@
 
                 // Prepare input context.
-                ictx = malloc(sizeof(xhci_input_ctx_t));
+                ictx = malloc32(sizeof(xhci_input_ctx_t));
                 if (!ictx) {
                         return ENOMEM;
@@ -226 +227 @@
                 switch (ep->base.transfer_type) {
                 case USB_TRANSFER_CONTROL:
-                        setup_control_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset], ep_ring);
+                        setup_control_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset - 1], ep_ring);
                         break;
 
                 case USB_TRANSFER_BULK:
-                        setup_bulk_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset], ep_ring, &ss_desc);
+                        setup_bulk_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset - 1], ep_ring, &ss_desc);
                         break;
 
                 case USB_TRANSFER_ISOCHRONOUS:
-                        setup_isoch_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset], ep_ring, &ss_desc);
+                        setup_isoch_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset - 1], ep_ring, &ss_desc);
                         break;
 
                 case USB_TRANSFER_INTERRUPT:
-                        setup_interrupt_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset], ep_ring, &ss_desc);
+                        setup_interrupt_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset - 1], ep_ring, &ss_desc);
                         break;
 

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

@@ -306 +306 @@
 int xhci_schedule_interrupt_transfer(xhci_hc_t* hc, usb_transfer_batch_t* batch)
 {
-        /* FIXME: Removing the next 2 rows causes QEMU to crash lol */
-        usb_log_warning("Interrupt transfers not yet implemented!");
-        return ENOTSUP;
-
         if (batch->setup_size) {
                 usb_log_warning("Setup packet present for a interrupt transfer.");