xHCI 1.0: Setup Stage TRB Transfer Type flag

Setup Stage Transfer Type field is added to indicate the presence and the
direction of the Data Stage TD, and determines the direction of the Status
Stage TD so the wLength length field should be ignored by the xHC.

Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 396f8d2a2e8dbf1a813690d9cf66401349c6d0f3..3e759af049b7e2a0b7a3909bb13c0eab8f4350d5 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -3053,6 +3053,17 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
        field |= TRB_IDT | TRB_TYPE(TRB_SETUP);
        if (start_cycle == 0)
                field |= 0x1;
+
+       /* xHCI 1.0 6.4.1.2.1: Transfer Type field */
+       if (xhci->hci_version == 0x100) {
+               if (urb->transfer_buffer_length > 0) {
+                       if (setup->bRequestType & USB_DIR_IN)
+                               field |= TRB_TX_TYPE(TRB_DATA_IN);
+                       else
+                               field |= TRB_TX_TYPE(TRB_DATA_OUT);
+               }
+       }
+
        queue_trb(xhci, ep_ring, false, true,
                  setup->bRequestType | setup->bRequest << 8 | le16_to_cpu(setup->wValue) << 16,
                  le16_to_cpu(setup->wIndex) | le16_to_cpu(setup->wLength) << 16,

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index db661543a805c4d898341c6eef67e7537bf681cb..af8b66f2fd0050d9dc4a08fdd1ecf6fffba72b85 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -967,6 +967,9 @@ struct xhci_event_cmd {
 
 /* Control transfer TRB specific fields */
 #define TRB_DIR_IN             (1<<16)
+#define        TRB_TX_TYPE(p)          ((p) << 16)
+#define        TRB_DATA_OUT            2
+#define        TRB_DATA_IN             3
 
 /* Isochronous TRB specific fields */
 #define TRB_SIA                        (1<<31)