Changeset 3dc519f in mainline

Timestamp:

2017-07-24T01:46:36Z (8 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

2fa43d1

Parents:

60f7c590

Message:

Added the ability to stop and abort the command ring, though discovered a bug in qemu - see note in xhci_stop_command_ring. Also note that currently stopping/aborting result in assertion failure as command completion handler is not yet prepared for them, but they do stop the command ring

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (2 diffs)
• commands.h (modified) (1 diff)

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

@@ -155 +155 @@
 
         return cmd;
+}
+
+void xhci_stop_command_ring(xhci_hc_t *hc)
+{
+        assert(hc);
+
+        XHCI_REG_SET(hc->op_regs, XHCI_OP_CS, 1);
+
+        /**
+         * Note: There is a bug in qemu that checks CS only when CRCR_HI
+         *       is written, this (and the read/write in abort) ensures
+         *       the command rings stops.
+         */
+        XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_HI, XHCI_REG_RD(hc->op_regs, XHCI_OP_CRCR_HI));
+}
+
+void xhci_abort_command_ring(xhci_hc_t *hc)
+{
+        assert(hc);
+
+        XHCI_REG_WR(hc->op_regs, XHCI_OP_CA, 1);
+        XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_HI, XHCI_REG_RD(hc->op_regs, XHCI_OP_CRCR_HI));
+}
+
+void xhci_start_command_ring(xhci_hc_t *hc)
+{
+        assert(hc);
+
+        XHCI_REG_WR(hc->op_regs, XHCI_OP_CRR, 1);
+        ring_doorbell(hc, 0, 0);
 }
 
@@ -390 +420 @@
         assert(trb);
 
+        // TODO: STOP & ABORT may not have command structs in the list!
+
         usb_log_debug("HC(%p) Command completed.", hc);
 

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

@@ -62 +62 @@
 void xhci_free_command(xhci_cmd_t *);
 
+void xhci_stop_command_ring(xhci_hc_t *);
+void xhci_abort_command_ring(xhci_hc_t *);
+void xhci_start_command_ring(xhci_hc_t *);
+
 int xhci_send_no_op_command(xhci_hc_t *, xhci_cmd_t *);
 int xhci_send_enable_slot_command(xhci_hc_t *, xhci_cmd_t *);