Changeset 665368c in mainline

Timestamp:

2018-01-11T17:59:21Z (7 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

f3baab1

Parents:

69a93d02

Message:

xhci: Start tracking mfindex wraps

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (7 diffs)
• hc.h (modified) (1 diff)

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

@@ -192 +192 @@
         hc->ac64 = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_AC64);
         hc->max_slots = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_MAX_SLOTS);
+        hc->wrap_count = 0;
         unsigned ist = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_IST);
         hc->ist = (ist & 0x10 >> 1) * (ist & 0xf);
@@ -377 +378 @@
 
 /**
- * Ask the xHC to reset its state. Implements sequence 
+ * Ask the xHC to reset its state. Implements sequence
  */
 static int hc_reset(xhci_hc_t *hc)
@@ -422 +423 @@
         XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_LO, LOWER32(crcr));
         XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_HI, UPPER32(crcr));
+
+        XHCI_REG_SET(hc->op_regs, XHCI_OP_EWE, 1);
 
         xhci_interrupter_regs_t *intr0 = &hc->rt_regs->ir[0];
@@ -432 +435 @@
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA_HI, UPPER32(erstptr));
 
+
         if (irq) {
                 XHCI_REG_SET(intr0, XHCI_INTR_IE, 1);
@@ -470 +474 @@
 }
 
+static int xhci_handle_mfindex_wrap_event(xhci_hc_t *hc, xhci_trb_t *trb)
+{
+        ++hc->wrap_count;
+        return EOK;
+}
+
 typedef int (*event_handler) (xhci_hc_t *, xhci_trb_t *trb);
 
@@ -476 +486 @@
         [XHCI_TRB_TYPE_PORT_STATUS_CHANGE_EVENT] = &xhci_rh_handle_port_status_change_event,
         [XHCI_TRB_TYPE_TRANSFER_EVENT] = &xhci_handle_transfer_event,
+        [XHCI_TRB_TYPE_MFINDEX_WRAP_EVENT] = &xhci_handle_mfindex_wrap_event,
 };
 
@@ -650 +661 @@
  * Issue a Disable Slot command for a slot occupied by device.
  *
- * Frees the device context 
+ * Frees the device context
  */
 int hc_disable_slot(xhci_hc_t *hc, xhci_device_t *dev)

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

@@ -84 +84 @@
         unsigned max_slots;
         bool ac64;
+        uint32_t wrap_count;    /** Amount of mfindex wraps HC has done */
         unsigned ist;                   /**< IST in microframes */