Changeset 8fe29a7c in mainline

Timestamp:

2018-01-18T17:12:53Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

41abf3c

Parents:

fb28cde

Message:

xhci: clear endpoint halted condition

Location:

uspace/drv/bus/usb/xhci

Files:

• endpoint.c (modified) (1 diff)
• endpoint.h (modified) (3 diffs)
• transfers.c (modified) (2 diffs)

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

@@ -316 +316 @@
 }
 
+uint8_t xhci_endpoint_get_state(xhci_endpoint_t *ep)
+{
+        assert(ep);
+
+        xhci_device_t *dev = xhci_device_get(ep->base.device);
+        if (!dev->slot_id)
+                return EP_STATE_DISABLED;
+
+        unsigned idx = xhci_endpoint_index(ep);
+        xhci_device_ctx_t *ctx = dev->dev_ctx.virt;
+        xhci_ep_ctx_t *ep_ctx = &ctx->endpoint_ctx[idx];
+
+        return XHCI_EP_STATE(*ep_ctx);
+}
+
+/**
+ * Clear endpoint halt condition by resetting the endpoint and skipping the
+ * offending transfer.
+ */
+int xhci_endpoint_clear_halt(xhci_endpoint_t *ep, unsigned stream_id)
+{
+        int err;
+
+        xhci_device_t * const dev = xhci_device_get(ep->base.device);
+        xhci_bus_t * const bus = bus_to_xhci_bus(dev->base.bus);
+        xhci_hc_t * const hc = bus->hc;
+
+        const unsigned slot_id = dev->slot_id;
+        const unsigned dci = xhci_endpoint_dci(ep);
+
+        if ((err = hc_reset_endpoint(hc, slot_id, dci)))
+                return err;
+
+        uintptr_t addr;
+
+        xhci_trb_ring_reset_dequeue_state(&ep->ring, &addr);
+
+        if ((err = xhci_cmd_sync_inline(hc, SET_TR_DEQUEUE_POINTER,
+                            .slot_id = slot_id,
+                            .endpoint_id = dci,
+                            .stream_id = stream_id,
+                            .dequeue_ptr = addr,
+                        )))
+                return err;
+
+        return EOK;
+}
+
 /**
  * @}

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

@@ -63 +63 @@
         EP_TYPE_BULK_IN = 6,
         EP_TYPE_INTERRUPT_IN = 7
+};
+
+enum {
+        EP_STATE_DISABLED = 0,
+        EP_STATE_RUNNING = 1,
+        EP_STATE_HALTED = 2,
+        EP_STATE_STOPPED = 3,
+        EP_STATE_ERROR = 4,
 };
 
@@ -141 +149 @@
 
 void xhci_setup_endpoint_context(xhci_endpoint_t *, xhci_ep_ctx_t *);
+int xhci_endpoint_clear_halt(xhci_endpoint_t *, unsigned);
 
 static inline xhci_device_t * xhci_device_get(device_t *dev)
@@ -160 +169 @@
 }
 
+uint8_t xhci_endpoint_get_state(xhci_endpoint_t *ep);
+
 #endif
 

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

@@ -358 +358 @@
 
                 case XHCI_TRBC_BABBLE_DETECTED_ERROR:
-                        usb_log_warning("Babble detected during the transfer. Resetting endpoint.");
+                        usb_log_warning("Babble detected during the transfer.");
                         batch->error = EAGAIN;
                         batch->transfered_size = 0;
-                        hc_reset_endpoint(hc, slot_id, ep_dci);
                         break;
 
                 case XHCI_TRBC_USB_TRANSACTION_ERROR:
-                        usb_log_warning("USB Transaction error. Resetting endpoint.");
+                        usb_log_warning("USB Transaction error.");
                         batch->error = ESTALL;
                         batch->transfered_size = 0;
-                        hc_reset_endpoint(hc, slot_id, ep_dci);
                         break;
 
@@ -392 +390 @@
                         usb_log_warning("Transfer not successfull: %u", completion_code);
                         batch->error = EIO;
+        }
+
+        
+        if (xhci_endpoint_get_state(ep) == EP_STATE_HALTED) {
+                usb_log_debug("Endpoint halted, resetting endpoint.");
+                xhci_endpoint_clear_halt(ep, batch->target.stream);
+                
         }