Changeset 2fa43d1 in mainline

Timestamp:

2017-07-24T13:08:00Z (8 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

1b78a7c1

Parents:

3dc519f

Message:

Command handling is now less error prone as we search the list of commands for such tht has trb physical address equal to that of the command completion event trb. This will protect us from out of order event handling and also from crashes caused by CS/CA events, since those do not have command structs in the list.

File:

• uspace/drv/bus/usb/xhci/commands.c (modified) (2 diffs)

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

@@ -105 +105 @@
 }
 
-static inline xhci_cmd_t *get_next_command(xhci_hc_t *hc)
+static inline xhci_cmd_t *get_command(xhci_hc_t *hc, uint64_t phys)
 {
         link_t *cmd_link = list_first(&hc->commands);
+
+        while (cmd_link != NULL) {
+                xhci_cmd_t *cmd = list_get_instance(cmd_link, xhci_cmd_t, link);
+
+                if (addr_to_phys(cmd->trb) == phys)
+                        break;
+
+                cmd_link = list_next(cmd_link, &hc->commands);
+        }
 
         if (cmd_link != NULL) {
@@ -420 +429 @@
         assert(trb);
 
-        // TODO: STOP & ABORT may not have command structs in the list!
-
         usb_log_debug("HC(%p) Command completed.", hc);
 
         int code;
         uint32_t slot_id;
+        uint64_t phys;
         xhci_cmd_t *command;
         xhci_trb_t *command_trb;
 
-        command = get_next_command(hc);
-        assert(command);
+        code = XHCI_DWORD_EXTRACT(trb->status, 31, 24);
+        phys = XHCI_QWORD_EXTRACT(trb->parameter, 63, 4) << 4;
+        command = get_command(hc, phys);
+        if (command == NULL) {
+                // TODO: STOP & ABORT may not have command structs in the list!
+                usb_log_error("No command struct for this completion event");
+
+                if (code != XHCI_TRBC_SUCCESS)
+                        report_error(code);
+
+                return EOK;
+        }
 
         command_trb = command->trb;
 
-        code = XHCI_DWORD_EXTRACT(trb->status, 31, 24);
         command->status = code;