Changeset 889146e in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-12-10T21:49:12Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

53db806

Parents:

6ef407b

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-10 21:43:47)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-10 21:49:12)

Message:

xhci: commands shall not just timeout

Previous behavior was breaking semantic: if a command was successful,
but just took too long to complete, we returned an error, and the caller
had no way to know if the command's effect has taken place.

This commit implements command aborting. The wait_for_command now cannot
just timeout - instead it aborts currently running (probably blocked)
command, and then gets back to waiting. So now, if command_sync returns
an error, it means the command was really unsuccessful.

If aborting the command takes too long, we should reset the whole HC.
This is not yet implemented.

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (6 diffs)

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

@@ -44 +44 @@
 #include "hw_struct/context.h"
 #include "endpoint.h"
-#include "commands.h"
 #include "transfers.h"
 #include "trb_ring.h"
@@ -204 +203 @@
         hc->dcbaa = hc->dcbaa_dma.virt;
 
-        if ((err = xhci_trb_ring_init(&hc->command_ring)))
+        if ((err = xhci_event_ring_init(&hc->event_ring)))
                 goto err_dcbaa;
-
-        if ((err = xhci_event_ring_init(&hc->event_ring)))
-                goto err_cmd_ring;
 
         if ((err = xhci_scratchpad_alloc(hc)))
@@ -233 +229 @@
 err_event_ring:
         xhci_event_ring_fini(&hc->event_ring);
-err_cmd_ring:
-        xhci_trb_ring_fini(&hc->command_ring);
 err_dcbaa:
         hc->dcbaa = NULL;
@@ -399 +393 @@
                 return err;
 
+        // FIXME: Waiting forever.
         while (XHCI_REG_RD(hc->op_regs, XHCI_OP_CNR))
                 async_usleep(1000);
@@ -407 +402 @@
         XHCI_REG_WR(hc->op_regs, XHCI_OP_MAX_SLOTS_EN, 0);
 
-        uint64_t crptr = xhci_trb_ring_get_dequeue_ptr(&hc->command_ring);
+        uint64_t crptr = xhci_trb_ring_get_dequeue_ptr(&hc->cr.trb_ring);
         XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_LO, LOWER32(crptr) >> 6);
         XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_HI, UPPER32(crptr));
@@ -578 +573 @@
 {
         xhci_bus_fini(&hc->bus);
-        xhci_trb_ring_fini(&hc->command_ring);
         xhci_event_ring_fini(&hc->event_ring);
         hc_dcbaa_fini(hc);