Changeset 4fa5342 in mainline

Timestamp:

2017-07-13T18:59:25Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

05aeee0e

Parents:

c9ce62a

Message:

Added more compact way to report error codes similar to the trb type reporting one.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (3 diffs)
• hw_struct/trb.h (modified) (1 diff)

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

@@ -63 +63 @@
 }
 
+static const char *trb_codes [] = {
+#define TRBC(t) [XHCI_TRBC_##t] = #t
+        TRBC(INVALID),
+        TRBC(SUCCESS),
+        TRBC(DATA_BUFFER_ERROR),
+        TRBC(BABBLE_DETECTED_ERROR),
+        TRBC(USB_TRANSACTION_ERROR),
+        TRBC(TRB_ERROR),
+        TRBC(STALL_ERROR),
+        TRBC(RESOURCE_ERROR),
+        TRBC(BANDWIDTH_ERROR),
+        TRBC(NO_SLOTS_ERROR),
+        TRBC(INVALID_STREAM_ERROR),
+        TRBC(SLOT_NOT_ENABLED_ERROR),
+        TRBC(EP_NOT_ENABLED_ERROR),
+        TRBC(SHORT_PACKET),
+        TRBC(RING_UNDERRUN),
+        TRBC(RING_OVERRUN),
+        TRBC(VF_EVENT_RING_FULL),
+        TRBC(PARAMETER_ERROR),
+        TRBC(BANDWIDTH_OVERRUN_ERROR),
+        TRBC(CONTEXT_STATE_ERROR),
+        TRBC(NO_PING_RESPONSE_ERROR),
+        TRBC(EVENT_RING_FULL_ERROR),
+        TRBC(INCOMPATIBLE_DEVICE_ERROR),
+        TRBC(MISSED_SERVICE_ERROR),
+        TRBC(COMMAND_RING_STOPPED),
+        TRBC(COMMAND_ABORTED),
+        TRBC(STOPPED),
+        TRBC(STOPPED_LENGTH_INVALID),
+        TRBC(STOPPED_SHORT_PACKET),
+        TRBC(MAX_EXIT_LATENCY_TOO_LARGE_ERROR),
+        [30] = "<reserved>",
+        TRBC(ISOCH_BUFFER_OVERRUN),
+        TRBC(EVENT_LOST_ERROR),
+        TRBC(UNDEFINED_ERROR),
+        TRBC(INVALID_STREAM_ID_ERROR),
+        TRBC(SECONDARY_BANDWIDTH_ERROR),
+        TRBC(SPLIT_TRANSACTION_ERROR),
+        [XHCI_TRBC_MAX] = NULL
+#undef TRBC
+};
+
+static void report_error(int code)
+{
+        if (code < XHCI_TRBC_MAX && trb_codes[code] != NULL)
+                usb_log_error("Command resulted in error: %s.", trb_codes[code]);
+        else
+                usb_log_error("Command resulted in reserved or vendor specific error.");
+}
+
 int xhci_send_no_op_command(xhci_hc_t *hc)
 {
@@ -164 +215 @@
 }
 
-static int report_error(int code)
-{
-        // TODO: Order these by their value.
-        switch (code) {
-        case XHCI_TRBC_NO_SLOTS_ERROR:
-                usb_log_error("Device slot not available.");
-                break;
-        case XHCI_TRBC_SLOT_NOT_ENABLE_ERROR:
-                usb_log_error("Slot ID is not enabled.");
-                break;
-        case XHCI_TRBC_CONTEXT_STATE_ERROR:
-                usb_log_error("Slot is not in enabled or default state.");
-                break;
-        case XHCI_TRBC_TRANSACTION_ERROR:
-                usb_log_error("Request to the USB device failed.");
-                break;
-        case XHCI_TRBC_BANDWIDTH_ERROR:
-                usb_log_error("Bandwidth required is not available.");
-                break;
-        case XHCI_TRBC_SECONDARY_BANDWIDTH_ERROR:
-                usb_log_error("Bandwidth error encountered in secondary domain.");
-                break;
-        case XHCI_TRBC_RESOURCE_ERROR:
-                usb_log_error("Resource required is not available.");
-                break;
-        case XHCI_TRBC_PARAMETER_ERROR:
-                usb_log_error("Parameter given is invalid.");
-                break;
-        default:
-                usb_log_error("Unknown error code.");
-                break;
-        }
-        return ENAK;
-}
-
 int xhci_handle_command_completion(xhci_hc_t *hc, xhci_trb_t *trb)
 {
@@ -211 +227 @@
         command = (xhci_trb_t *) XHCI_QWORD_EXTRACT(trb->parameter, 63, 4);
         slot_id = XHCI_DWORD_EXTRACT(trb->control, 31, 24);
+        (void) slot_id;
 
         if (TRB_TYPE(*command) != XHCI_TRB_TYPE_NO_OP_CMD) {
                 if (code != XHCI_TRBC_SUCCESS) {
-                        usb_log_debug2("Command resulted in failure.");
+                        report_error(code);
                         xhci_dump_trb(command);
                 }

uspace/drv/bus/usb/xhci/hw_struct/trb.h

@@ -192 +192 @@
         XHCI_TRBC_INVALID_STREAM_ID_ERROR,
         XHCI_TRBC_SECONDARY_BANDWIDTH_ERROR,
-        XHCI_TRBC_SPLIT_TRANSACTION_ERROR
+        XHCI_TRBC_SPLIT_TRANSACTION_ERROR,
+        XHCI_TRBC_MAX
         /**
          *  37 - 191 reserved