xhci features for usb-next
Subsystems (2)
cover xhci features for usb-next
Hi Greg
A few features for usb next, mostly tracing and debugging features, but also support for Immediate Data Transfer for small (up to 8 bytes) data transfers
-Mathias
Mathias Nyman (3):
xhci: add port and bus number to port dynamic debugging
xhci: Add tracing for input control context
usb: xhci: add endpoint context tracing when an endpoint is added
Nicolas Saenz Julienne (1):
usb: xhci: add Immediate Data Transfer support
drivers/usb/host/xhci-hub.c | 44 +++++++++++++++++++++++++---------------- drivers/usb/host/xhci-ring.c | 24 ++++++++++++++++++---- drivers/usb/host/xhci-trace.h | 30 ++++++++++++++++++++++++++++ drivers/usb/host/xhci.c | 40 +++++++++++++++++++++++++++++++++---- drivers/usb/host/xhci.h | 46 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 159 insertions(+), 25 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/4 usb: xhci: add Immediate Data Transfer support
From: Nicolas Saenz Julienne <[email protected]>
Immediate data transfers (IDT) allow the HCD to copy small chunks of data (up to 8bytes) directly into its output transfer TRBs. This avoids the somewhat expensive DMA mappings that are performed by default on most URBs submissions.
In the case an URB was suitable for IDT. The data is directly copied into the "Data Buffer Pointer" region of the TRB and the IDT flag is set. Instead of triggering memory accesses the HC will use the data directly.
The implementation could cover all kind of output endpoints. Yet Isochronous endpoints are bypassed as I was unable to find one that matched IDT's constraints. As we try to bypass the default DMA mappings on URB buffers we'd need to find a Isochronous device with an urb->transfer_buffer_length <= 8 bytes.
The implementation takes into account that the 8 byte buffers provided by the URB will never cross a 64KB boundary.
--- drivers/usb/host/xhci-ring.c | 12 ++++++++++++ drivers/usb/host/xhci.c | 16 ++++++++++++++++ drivers/usb/host/xhci.h | 17 +++++++++++++++++ 3 files changed, 45 insertions(+)
drivers/usb/host/xhci-ring.c +12 -0
@@ -3275,6 +3275,12 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, field |=TRB_IOC ; more_trbs_coming = false; td->last_trb = ring->enqueue; + +if (xhci_urb_suitable_for_idt (urb)) { +memcpy (&send_addr, urb->transfer_buffer, + trb_buff_len); + field |=TRB_IDT ; + } }/* Only set interrupt on short packet for IN endpoints */
@@ -3414,6 +3420,12 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,if (urb->transfer_buffer_length >0 ) {u32 length_field, remainder; +if (xhci_urb_suitable_for_idt (urb)) { +memcpy (&urb->transfer_dma, urb->transfer_buffer, + urb->transfer_buffer_length); + field |=TRB_IDT ; + } + remainder = xhci_td_remainder(xhci, 0, urb->transfer_buffer_length, urb->transfer_buffer_length,
drivers/usb/host/xhci.c +16 -0
@@ -1238,6 +1238,21 @@ EXPORT_SYMBOL_GPL(xhci_resume);/*-------------------------------------------------------------------------*/ +/* +* Bypass the DMA mapping if URB is suitable for Immediate Transfer (IDT), +* we'll copy the actual data into the TRB address register. This is limited to +* transfers up to 8 bytes on output endpoints of any kind with wMaxPacketSize +* >= 8 bytes. If suitable for IDT only one Transfer TRB per TD is allowed. +*/ +static int xhci_map_urb_for_dma (struct usb_hcd *hcd,struct urb *urb, +gfp_t mem_flags) +{ +if (xhci_urb_suitable_for_idt (urb)) +return 0 ; + +return usb_hcd_map_urb_for_dma (hcd, urb, mem_flags); +} +/** * xhci_get_endpoint_index - Used for passing endpoint bitmasks between the core and * HCDs. Find the index for an endpoint given its descriptor. Use the return
@@ -5154,6 +5169,7 @@ static const struct hc_driver xhci_hc_driver = {/* * managing i/o requests and associated device resources */ + .map_urb_for_dma = xhci_map_urb_for_dma, .urb_enqueue = xhci_urb_enqueue, .urb_dequeue = xhci_urb_dequeue, .alloc_dev = xhci_alloc_dev,
drivers/usb/host/xhci.h +17 -0
@@ -1303,6 +1303,8 @@ enum xhci_setup_dev {#define TRB_IOC (1<<5)/* The buffer pointer contains immediate data */ #define TRB_IDT (1<<6) +/* TDs smaller than this might use IDT */ +#define TRB_IDT_MAX_SIZE 8/* Block Event Interrupt */ #define TRB_BEI (1<<9)
@@ -2149,6 +2151,21 @@ static inline struct xhci_ring *xhci_urb_to_transfer_ring(struct xhci_hcd *xhci, urb->stream_id); } +/* +* TODO: As per spec Isochronous IDT transmissions are supported. We bypass +* them anyways as we where unable to find a device that matches the +* constraints. +*/ +static inline bool xhci_urb_suitable_for_idt (struct urb *urb) +{ +if (!usb_endpoint_xfer_isoc (&urb->ep->desc) &&usb_urb_dir_out (urb) && +usb_endpoint_maxp (&urb->ep->desc) >=TRB_IDT_MAX_SIZE && + urb->transfer_buffer_length <=TRB_IDT_MAX_SIZE ) +return true; + +return false; +} +static inline char *xhci_slot_state_string (u32 state) {switch (state) {
Signature · 1 line
2.7.4
PATCH 3/4 xhci: Add tracing for input control context
In reply to Mathias NymanAdd tracing for the add and drop bits in the input control context used in Address device, configure endpoint, evaluate context commands.
The add and drop bits tell xHC which enpoints are added and dropped.
--- drivers/usb/host/xhci-trace.h | 25 +++++++++++++++++++++++++ drivers/usb/host/xhci.c | 3 +++ drivers/usb/host/xhci.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+)
drivers/usb/host/xhci-trace.h +25 -0
@@ -432,6 +432,31 @@ DEFINE_EVENT(xhci_log_slot_ctx, xhci_configure_endpoint,TP_ARGS (ctx) ); +DECLARE_EVENT_CLASS (xhci_log_ctrl_ctx, + TP_PROTO(struct xhci_input_control_ctx *ctrl_ctx), +TP_ARGS (ctrl_ctx), +TP_STRUCT__entry ( + __field(u32, drop) +__field (u32, add) + ), +TP_fast_assign ( + __entry->drop = le32_to_cpu(ctrl_ctx->drop_flags); + __entry->add = le32_to_cpu(ctrl_ctx->add_flags); + ), +TP_printk ("%s" ,xhci_decode_ctrl_ctx (__entry->drop, __entry->add) + ) +); + +DEFINE_EVENT (xhci_log_ctrl_ctx, xhci_address_ctrl_ctx, + TP_PROTO(struct xhci_input_control_ctx *ctrl_ctx), +TP_ARGS (ctrl_ctx) +); + +DEFINE_EVENT (xhci_log_ctrl_ctx, xhci_configure_endpoint_ctrl_ctx, + TP_PROTO(struct xhci_input_control_ctx *ctrl_ctx), +TP_ARGS (ctrl_ctx) +); + DECLARE_EVENT_CLASS(xhci_log_ring, TP_PROTO(struct xhci_ring *ring), TP_ARGS(ring),
drivers/usb/host/xhci.c +3 -0
@@ -2771,6 +2771,8 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci, } slot_ctx =xhci_get_slot_ctx (xhci, command->in_ctx); + +trace_xhci_configure_endpoint_ctrl_ctx (ctrl_ctx);trace_xhci_configure_endpoint (slot_ctx);if (!ctx_change)
@@ -4036,6 +4038,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,trace_xhci_address_ctx (xhci, virt_dev->in_ctx,le32_to_cpu (slot_ctx->dev_info) >>27 ); +trace_xhci_address_ctrl_ctx (ctrl_ctx);spin_lock_irqsave (&xhci->lock, flags);trace_xhci_setup_device (virt_dev); ret = xhci_queue_address_device(xhci, command, virt_dev->in_ctx->dma,
drivers/usb/host/xhci.h +29 -0
@@ -2401,6 +2401,35 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,return str; } +static inline const char *xhci_decode_ctrl_ctx (unsigned long drop, +unsigned long add) +{ +static char str[1024 ]; +unsigned int bit; +int ret =0 ; + +if (drop) { + ret =sprintf (str,"Drop:" ); +for_each_set_bit (bit, &drop,32 ) + ret +=sprintf (str + ret," %d%s" , + bit /2 , + bit %2 ?"in" :"out" ); + ret +=sprintf (str + ret,", " ); + } + +if (add) { + ret +=sprintf (str + ret,"Add:%s%s" , + (add &SLOT_FLAG ) ?" slot" :"" , + (add &EP0_FLAG ) ?" ep0" :"" ); + add &= ~(SLOT_FLAG |EP0_FLAG ); +for_each_set_bit (bit, &add,32 ) + ret +=sprintf (str + ret," %d%s" , + bit /2 , + bit %2 ?"in" :"out" ); + } +return str; +} +static inline const char *xhci_decode_slot_context (u32 info,u32 info2,u32 tt_info,u32 state) {
Signature · 1 line
2.7.4
PATCH 4/4 usb: xhci: add endpoint context tracing when an endpoint is added
In reply to Mathias NymanThe configure endpoint command configures all the endpoints that were flagged to be added or dropped.
To know the content of each of the added endpoints we need to add tracing to the .add_endpoint() callback, just after initializing all the context values.
--- drivers/usb/host/xhci-trace.h | 5 +++++ drivers/usb/host/xhci.c | 4 ++++ 2 files changed, 9 insertions(+)
drivers/usb/host/xhci-trace.h +5 -0
@@ -366,6 +366,11 @@ DEFINE_EVENT(xhci_log_ep_ctx, xhci_handle_cmd_config_ep,TP_ARGS (ctx) ); +DEFINE_EVENT (xhci_log_ep_ctx, xhci_add_endpoint, + TP_PROTO(struct xhci_ep_ctx *ctx), +TP_ARGS (ctx) +); + DECLARE_EVENT_CLASS(xhci_log_slot_ctx, TP_PROTO(struct xhci_slot_ctx *ctx), TP_ARGS(ctx),
drivers/usb/host/xhci.c +4 -0
@@ -1807,6 +1807,7 @@ static int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev,struct xhci_container_ctx *in_ctx;unsigned int ep_index;struct xhci_input_control_ctx *ctrl_ctx; +struct xhci_ep_ctx *ep_ctx;u32 added_ctxs;u32 new_add_flags, new_drop_flags;struct xhci_virt_device *virt_dev;
@@ -1897,6 +1898,9 @@ static int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev,/* Store the usb_device pointer for later use */ ep->hcpriv = udev; + ep_ctx =xhci_get_ep_ctx (xhci, virt_dev->in_ctx, ep_index); +trace_xhci_add_endpoint (ep_ctx); +xhci_debugfs_create_endpoint (xhci, virt_dev, ep_index); xhci_dbg(xhci, "add ep 0x%x, slot id %d, new drop flags = %#x, new add flags = %#x\n",
Signature · 1 line
2.7.4
Re: [PATCH 1/4] usb: xhci: add Immediate Data Transfer support
In reply to Mathias NymanDear All,
Quoted 18 lines · Mathias Nyman
From: Nicolas Saenz Julienne <[email protected]>
Immediate data transfers (IDT) allow the HCD to copy small chunks of data (up to 8bytes) directly into its output transfer TRBs. This avoids the somewhat expensive DMA mappings that are performed by default on most URBs submissions.
In the case an URB was suitable for IDT. The data is directly copied into the "Data Buffer Pointer" region of the TRB and the IDT flag is set. Instead of triggering memory accesses the HC will use the data directly.
The implementation could cover all kind of output endpoints. Yet Isochronous endpoints are bypassed as I was unable to find one that matched IDT's constraints. As we try to bypass the default DMA mappings on URB buffers we'd need to find a Isochronous device with an
urb->transfer_buffer_length<= 8 bytes.
Quoted 6 lines
The implementation takes into account that the 8 byte buffers provided by the URB will never cross a 64KB boundary.
Signed-off-by Nicolas Saenz Julienne <[email protected]>Reviewed-by Felipe Balbi <[email protected]>Signed-off-by Mathias Nyman <[email protected]>
I've noticed that this patch causes regression on various Samsung Exynos 5420/5422/5800 boards, which have USB3.0 host ports provided by DWC3/XHCI hardware module. The regression can be observed with ASIX USB 2.0 ethernet dongle, which stops working after applying this patch (eth0 interface is registered, but no packets are transmitted/received). I can provide more debugging information or do some tests, just let me know what do you need. Reverting this commit makes ASIX USB ethernet dongle operational again.
Here are some more information from one of my test systems:
# lsusb Bus 006 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 005 Device 002: ID 0b95:772b ASIX Electronics Corp. AX88772B Bus 005 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 002 Device 001: ID 1d6b:0001 Linux Foundation 1.1 root hub Bus 001 Device 002: ID 2232:1056 Silicon Motion Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
# lsusb -t /: Bus 06.Port 1: Dev 1, Class=root_hub, Driver=xhci-hcd/1p, 5000M /: Bus 05.Port 1: Dev 1, Class=root_hub, Driver=xhci-hcd/1p, 480M |__ Port 1: Dev 2, If 0, Class=Vendor Specific Class, Driver=asix, 480M /: Bus 04.Port 1: Dev 1, Class=root_hub, Driver=xhci-hcd/1p, 5000M /: Bus 03.Port 1: Dev 1, Class=root_hub, Driver=xhci-hcd/1p, 480M /: Bus 02.Port 1: Dev 1, Class=root_hub, Driver=exynos-ohci/3p, 12M /: Bus 01.Port 1: Dev 1, Class=root_hub, Driver=exynos-ehci/3p, 480M |__ Port 1: Dev 2, If 0, Class=Video, Driver=, 480M |__ Port 1: Dev 2, If 1, Class=Video, Driver=, 480M
# dmesg | grep usb [ 1.484210] reg-fixed-voltage regulator-usb300: GPIO lookup for consumer (null) [ 1.484219] reg-fixed-voltage regulator-usb300: using device tree for GPIO lookup [ 1.484241] of_get_named_gpiod_flags: can't parse 'gpios' property of node '/regulator-usb300[0]' [ 1.484276] of_get_named_gpiod_flags: parsed 'gpio' property of node '/regulator-usb300[0]' - status (0) [ 1.484749] reg-fixed-voltage regulator-usb301: GPIO lookup for consumer (null) [ 1.484758] reg-fixed-voltage regulator-usb301: using device tree for GPIO lookup [ 1.484777] of_get_named_gpiod_flags: can't parse 'gpios' property of node '/regulator-usb301[0]' [ 1.484807] of_get_named_gpiod_flags: parsed 'gpio' property of node '/regulator-usb301[0]' - status (0) [ 1.490275] usbcore: registered new interface driver usbfs [ 1.495521] usbcore: registered new interface driver hub [ 1.500897] usbcore: registered new device driver usb [ 2.014966] samsung-usb2-phy 12130000.phy: 12130000.phy supply vbus not found, using dummy regulator [ 2.024093] exynos5_usb3drd_phy 12100000.phy: 12100000.phy supply vbus-boost not found, using dummy regulator [ 2.033232] exynos5_usb3drd_phy 12500000.phy: 12500000.phy supply vbus-boost not found, using dummy regulator [ 2.347306] usbcore: registered new interface driver r8152 [ 2.352427] usbcore: registered new interface driver asix [ 2.357877] usbcore: registered new interface driver ax88179_178a [ 2.363860] usbcore: registered new interface driver cdc_ether [ 2.369730] usbcore: registered new interface driver smsc75xx [ 2.375421] usbcore: registered new interface driver smsc95xx [ 2.381198] usbcore: registered new interface driver net1080 [ 2.386760] usbcore: registered new interface driver cdc_subset [ 2.392699] usbcore: registered new interface driver zaurus [ 2.398280] usbcore: registered new interface driver cdc_ncm [ 2.404280] exynos-dwc3 soc:usb3-0: soc:usb3-0 supply vdd33 not found, using dummy regulator [ 2.412485] exynos-dwc3 soc:usb3-0: soc:usb3-0 supply vdd10 not found, using dummy regulator [ 2.427570] exynos-dwc3 soc:usb3-1: soc:usb3-1 supply vdd33 not found, using dummy regulator [ 2.434748] exynos-dwc3 soc:usb3-1: soc:usb3-1 supply vdd10 not found, using dummy regulator [ 2.459866] of_get_named_gpiod_flags: can't parse 'samsung,vbus-gpio' property of node '/soc/usb@12110000[0]' [ 2.460177] exynos-ehci 12110000.usb: EHCI Host Controller [ 2.465329] exynos-ehci 12110000.usb: new USB bus registered, assigned bus number 1 [ 2.473161] exynos-ehci 12110000.usb: irq 90, io mem 0x12110000 [ 2.507027] exynos-ehci 12110000.usb: USB 2.0 started, EHCI 1.00 [ 2.512197] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.01 [ 2.519880] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 2.527075] usb usb1: Product: EHCI Host Controller [ 2.531875] usb usb1: Manufacturer: Linux 5.1.0-rc3-00114-g95e060e68bd9 ehci_hcd [ 2.539298] usb usb1: SerialNumber: 12110000.usb [ 2.562423] exynos-ohci 12120000.usb: USB Host Controller [ 2.567689] exynos-ohci 12120000.usb: new USB bus registered, assigned bus number 2 [ 2.575502] exynos-ohci 12120000.usb: irq 90, io mem 0x12120000 [ 2.651364] usb usb2: New USB device found, idVendor=1d6b, idProduct=0001, bcdDevice= 5.01 [ 2.658219] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 2.665376] usb usb2: Product: USB Host Controller [ 2.670180] usb usb2: Manufacturer: Linux 5.1.0-rc3-00114-g95e060e68bd9 ohci_hcd [ 2.677560] usb usb2: SerialNumber: 12120000.usb [ 2.719349] usb usb3: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.01 [ 2.726870] usb usb3: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 2.734107] usb usb3: Product: xHCI Host Controller [ 2.738947] usb usb3: Manufacturer: Linux 5.1.0-rc3-00114-g95e060e68bd9 xhci-hcd [ 2.746297] usb usb3: SerialNumber: xhci-hcd.3.auto [ 2.778642] usb usb4: We don't know the algorithms for LPM for this host, disabling LPM. [ 2.786800] usb usb4: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.01 [ 2.794836] usb usb4: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 2.802022] usb usb4: Product: xHCI Host Controller [ 2.806837] usb usb4: Manufacturer: Linux 5.1.0-rc3-00114-g95e060e68bd9 xhci-hcd [ 2.814258] usb usb4: SerialNumber: xhci-hcd.3.auto [ 2.855879] usb usb5: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.01 [ 2.863456] usb usb5: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 2.870894] usb usb5: Product: xHCI Host Controller [ 2.875457] usb usb5: Manufacturer: Linux 5.1.0-rc3-00114-g95e060e68bd9 xhci-hcd [ 2.882884] usb usb5: SerialNumber: xhci-hcd.4.auto [ 2.915149] usb usb6: We don't know the algorithms for LPM for this host, disabling LPM. [ 2.917137] usb 1-1: new high-speed USB device number 2 using exynos-ehci [ 2.923623] usb usb6: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.01 [ 2.938433] usb usb6: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 2.945302] usb usb6: Product: xHCI Host Controller [ 2.950196] usb usb6: Manufacturer: Linux 5.1.0-rc3-00114-g95e060e68bd9 xhci-hcd [ 2.957579] usb usb6: SerialNumber: xhci-hcd.4.auto [ 2.970795] usbcore: registered new interface driver uas [ 2.975423] usbcore: registered new interface driver usb-storage [ 3.208523] usb 1-1: New USB device found, idVendor=2232, idProduct=1056, bcdDevice= 0.35 [ 3.219999] usb 1-1: New USB device strings: Mfr=3, Product=1, SerialNumber=2 [ 3.227034] usb 1-1: Product: WebCam SC-10HDM13631N [ 3.227041] usb 1-1: Manufacturer: Generic [ 3.235923] usb 1-1: SerialNumber: 200901010001 [ 3.257013] usb 5-1: new high-speed USB device number 2 using xhci-hcd [ 3.459744] usb 5-1: New USB device found, idVendor=0b95, idProduct=772b, bcdDevice= 0.01 [ 3.460560] usbcore: registered new interface driver usbhid [ 3.460572] usbhid: USB HID core driver [ 3.474443] usb 5-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 3.491163] usb 5-1: Product: AX88772B [ 3.500613] usb 5-1: Manufacturer: ASIX Elec. Corp. [ 3.509275] usb 5-1: SerialNumber: 1892F2 [ 4.133358] asix 5-1:1.0 eth0: register 'asix' at usb-xhci-hcd.4.auto-1, ASIX AX88772B USB 2.0 Ethernet, 00:50:b6:18:92:f2
Quoted 95 lines
--- drivers/usb/host/xhci-ring.c | 12 ++++++++++++ drivers/usb/host/xhci.c | 16 ++++++++++++++++ drivers/usb/host/xhci.h | 17 +++++++++++++++++ 3 files changed, 45 insertions(+)drivers/usb/host/xhci-ring.c +12
-0@@ -3275,6 +3275,12 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, field |=TRB_IOC ; more_trbs_coming = false; td->last_trb = ring->enqueue; + +if (xhci_urb_suitable_for_idt (urb)) { +memcpy (&send_addr, urb->transfer_buffer, + trb_buff_len); + field |=TRB_IDT ; + } }/* Only set interrupt on short packet for IN endpoints */ @@ -3414,6 +3420,12 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,if (urb->transfer_buffer_length >0 ) {u32 length_field, remainder; +if (xhci_urb_suitable_for_idt (urb)) { +memcpy (&urb->transfer_dma, urb->transfer_buffer, + urb->transfer_buffer_length); + field |=TRB_IDT ; + } + remainder = xhci_td_remainder(xhci, 0, urb->transfer_buffer_length, urb->transfer_buffer_length,drivers/usb/host/xhci.c +16
-0@@ -1238,6 +1238,21 @@ EXPORT_SYMBOL_GPL(xhci_resume);/*-------------------------------------------------------------------------*/ +/* +* Bypass the DMA mapping if URB is suitable for Immediate Transfer (IDT), +* we'll copy the actual data into the TRB address register. This is limited to +* transfers up to 8 bytes on output endpoints of any kind with wMaxPacketSize +* >= 8 bytes. If suitable for IDT only one Transfer TRB per TD is allowed. +*/ +static int xhci_map_urb_for_dma (struct usb_hcd *hcd,struct urb *urb, +gfp_t mem_flags) +{ +if (xhci_urb_suitable_for_idt (urb)) +return 0 ; + +return usb_hcd_map_urb_for_dma (hcd, urb, mem_flags); +} +/** * xhci_get_endpoint_index - Used for passing endpoint bitmasks between the core and * HCDs. Find the index for an endpoint given its descriptor. Use the return @@ -5154,6 +5169,7 @@ static const struct hc_driver xhci_hc_driver = {/* * managing i/o requests and associated device resources */ + .map_urb_for_dma = xhci_map_urb_for_dma, .urb_enqueue = xhci_urb_enqueue, .urb_dequeue = xhci_urb_dequeue, .alloc_dev = xhci_alloc_dev,drivers/usb/host/xhci.h +10
-0@@ -1303,6 +1303,8 @@ enum xhci_setup_dev {#define TRB_IOC (1<<5)/* The buffer pointer contains immediate data */ #define TRB_IDT (1<<6) +/* TDs smaller than this might use IDT */ +#define TRB_IDT_MAX_SIZE 8/* Block Event Interrupt */ #define TRB_BEI (1<<9)@@ -2149,6 +2151,21 @@ static inline struct xhci_ring *xhci_urb_to_transfer_ring(struct xhci_hcd *xhci, urb->stream_id); } +/* +* TODO: As per spec Isochronous IDT transmissions are supported. We bypass +* them anyways as we where unable to find a device that matches the +* constraints. +*/ +static inline bool xhci_urb_suitable_for_idt (struct urb *urb) +{ + if (!usb_endpoint_xfer_isoc(&urb->ep->desc) && usb_urb_dir_out(urb) &&
drivers/usb/host/xhci.h static inline struct xhci_ring *xhci_urb_to_transfer_ring(struct xhci_hcd *xhci, · line 2171
Quoted 10 lines
drivers/usb/host/xhci.h +7
-0+ usb_endpoint_maxp(&urb->ep->desc) >= TRB_IDT_MAX_SIZE && + urb->transfer_buffer_length <= TRB_IDT_MAX_SIZE) +return true; + +return false; +} +static inline char *xhci_slot_state_string (u32 state) {switch (state) {
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland
Re: [PATCH 1/4] usb: xhci: add Immediate Data Transfer support
Quoted 28 lines · Marek Szyprowski
Dear All,
Quoted 18 lines · Mathias Nyman
From: Nicolas Saenz Julienne <[email protected]>
Immediate data transfers (IDT) allow the HCD to copy small chunks of data (up to 8bytes) directly into its output transfer TRBs. This avoids the somewhat expensive DMA mappings that are performed by default on most URBs submissions.
In the case an URB was suitable for IDT. The data is directly copied into the "Data Buffer Pointer" region of the TRB and the IDT flag is set. Instead of triggering memory accesses the HC will use the data directly.
The implementation could cover all kind of output endpoints. Yet Isochronous endpoints are bypassed as I was unable to find one that matched IDT's constraints. As we try to bypass the default DMA mappings on URB buffers we'd need to find a Isochronous device with an
urb->transfer_buffer_length<= 8 bytes.Quoted 6 lines
The implementation takes into account that the 8 byte buffers provided by the URB will never cross a 64KB boundary.
Signed-off-by Nicolas Saenz Julienne <[email protected]>Reviewed-by Felipe Balbi <[email protected]>Signed-off-by Mathias Nyman <[email protected]>
Quoted 9 lines
I've noticed that this patch causes regression on various Samsung Exynos 5420/5422/5800 boards, which have USB3.0 host ports provided by DWC3/XHCI hardware module. The regression can be observed with ASIX USB 2.0 ethernet dongle, which stops working after applying this patch (eth0 interface is registered, but no packets are transmitted/received). I can provide more debugging information or do some tests, just let me know what do you need. Reverting this commit makes ASIX USB ethernet dongle operational again.
Thanks for reporting.
Would it be possible to check if your ASIX ethernet dongle works on some desktop/laptop setup with this same IDT patch?
Also Exynos xhci traces could help, they would show the content of the TRBs using IDT. Maybe byte order gets messed up?
Take traces with:
mount -t debugfs none /sys/kernel/debug
echo 81920 > /sys/kernel/debug/tracing/buffer_size_kb echo 1 > /sys/kernel/debug/tracing/events/xhci-hcd/enable
<connect ASIX eth dongle, try to use it>
send /sys/kernel/debug/tracing/trace content to me
If we can't get this fixed I'll revert the IDT patch
Thanks
Mathias
Re: [PATCH 1/4] usb: xhci: add Immediate Data Transfer support
Quoted 54 lines · Mathias Nyman
Quoted 28 lines · Marek Szyprowski
Dear All,
Quoted 18 lines · Mathias Nyman
From: Nicolas Saenz Julienne <[email protected]>
Immediate data transfers (IDT) allow the HCD to copy small chunks of data (up to 8bytes) directly into its output transfer TRBs. This avoids the somewhat expensive DMA mappings that are performed by default on most URBs submissions.
In the case an URB was suitable for IDT. The data is directly copied into the "Data Buffer Pointer" region of the TRB and the IDT flag is set. Instead of triggering memory accesses the HC will use the data directly.
The implementation could cover all kind of output endpoints. Yet Isochronous endpoints are bypassed as I was unable to find one that matched IDT's constraints. As we try to bypass the default DMA mappings on URB buffers we'd need to find a Isochronous device with an
urb->transfer_buffer_length<= 8 bytes.Quoted 6 lines
The implementation takes into account that the 8 byte buffers provided by the URB will never cross a 64KB boundary.
Signed-off-by Nicolas Saenz Julienne <[email protected]>Reviewed-by Felipe Balbi <[email protected]>Signed-off-by Mathias Nyman <[email protected]>Quoted 9 lines
I've noticed that this patch causes regression on various Samsung Exynos 5420/5422/5800 boards, which have USB3.0 host ports provided by DWC3/XHCI hardware module. The regression can be observed with ASIX USB 2.0 ethernet dongle, which stops working after applying this patch (eth0 interface is registered, but no packets are transmitted/received). I can provide more debugging information or do some tests, just let me know what do you need. Reverting this commit makes ASIX USB ethernet dongle operational again.
Thanks for reporting.
Would it be possible to check if your ASIX ethernet dongle works on some desktop/laptop setup with this same IDT patch?
Also Exynos xhci traces could help, they would show the content of the TRBs using IDT.
Maybe byte order gets messed up?Take traces with:
mount -t debugfs none
/sys/kernel/debug
echo 81920 >/sys/kernel/debug/tracing/buffer_size_kbecho 1 >/sys/kernel/debug/tracing/events/xhci-hcd/enable
Quoted 5 lines
<connect ASIX eth dongle, try to use it>
send
/sys/kernel/debug/tracing/tracecontent to meIf we can't get this fixed I'll revert the IDT patch
Hi Matthias, thanks for your help.
I'll also be looking into it, so please send me the logs too.
Regards,
Nicolas
Re: [PATCH 1/4] usb: xhci: add Immediate Data Transfer support
Quoted 57 lines · Nicolas Saenz Julienne
Quoted 56 lines · Mathias Nyman
Quoted 28 lines · Marek Szyprowski
Dear All,
Quoted 18 lines · Mathias Nyman
From: Nicolas Saenz Julienne <[email protected]>
Immediate data transfers (IDT) allow the HCD to copy small chunks of data (up to 8bytes) directly into its output transfer TRBs. This avoids the somewhat expensive DMA mappings that are performed by default on most URBs submissions.
In the case an URB was suitable for IDT. The data is directly copied into the "Data Buffer Pointer" region of the TRB and the IDT flag is set. Instead of triggering memory accesses the HC will use the data directly.
The implementation could cover all kind of output endpoints. Yet Isochronous endpoints are bypassed as I was unable to find one that matched IDT's constraints. As we try to bypass the default DMA mappings on URB buffers we'd need to find a Isochronous device with an
urb->transfer_buffer_length<= 8 bytes.Quoted 6 lines
The implementation takes into account that the 8 byte buffers provided by the URB will never cross a 64KB boundary.
Signed-off-by Nicolas Saenz Julienne <[email protected]>Reviewed-by Felipe Balbi <[email protected]>Signed-off-by Mathias Nyman <[email protected]>Quoted 9 lines
I've noticed that this patch causes regression on various Samsung Exynos 5420/5422/5800 boards, which have USB3.0 host ports provided by DWC3/XHCI hardware module. The regression can be observed with ASIX USB 2.0 ethernet dongle, which stops working after applying this patch (eth0 interface is registered, but no packets are transmitted/received). I can provide more debugging information or do some tests, just let me know what do you need. Reverting this commit makes ASIX USB ethernet dongle operational again.
Thanks for reporting.
Would it be possible to check if your ASIX ethernet dongle works on some desktop/laptop setup with this same IDT patch?
Also Exynos xhci traces could help, they would show the content of the TRBs using IDT.
Maybe byte order gets messed up?Take traces with:
mount -t debugfs none
/sys/kernel/debug
echo 81920 >/sys/kernel/debug/tracing/buffer_size_kbecho 1 >/sys/kernel/debug/tracing/events/xhci-hcd/enable<connect ASIX eth dongle, try to use it>
Quoted 8 lines
Quoted 3 lines
send
/sys/kernel/debug/tracing/tracecontent to meIf we can't get this fixed I'll revert the IDT patch
Hi Matthias, thanks for your help.
I'll also be looking into it, so please send me the logs too.
Got the logs off list, thanks
The "Buffer" data in Control transfer Data stage look suspicious.
grep "flags I:" trace_fail | grep Data
kworker/0:2-124 [000] d..1 63.092399: xhci_queue_trb: CTRL: Buffer 0000000018b65000 length 6 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [005] d..1 93.181231: xhci_queue_trb: CTRL: Buffer 0000000018b65000 length 6 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C ifconfig-1429 [007] dn.2 93.182050: xhci_queue_trb: CTRL: Buffer 0000000000000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C ifconfig-1429 [007] d..2 93.182499: xhci_queue_trb: CTRL: Buffer 0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C ifconfig-1429 [007] d..2 93.182736: xhci_queue_trb: CTRL: Buffer 0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
kworker/0:3-1409 [000] d..3 93.382630: xhci_queue_trb: CTRL: Buffer 0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
First guess would be that in case URB has URB_NO_TRANSFER_DMA_MAP set then data will be mapped and urb->transfer_dma is already set.
The IDT patch uses urb->trabfer_dma as a temporary buffer, and copies the urb->transfer_buffer there.
if transfer buffer is already dma mapped the urb->transfer_buffer can be garbage, (shouldn't, but it can be)
Below code avoids IDT if URB_NO_TRANSFER_DMA_MAP is set, and doesn't touch urb->transfer_dma (patch attached)
drivers/usb/host/xhci-ring.c +6 -3
@@ -3423,11 +3423,14 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,if (urb->transfer_buffer_length >0 ) {u32 length_field, remainder; +u64 addr;if (xhci_urb_suitable_for_idt (urb)) { -memcpy (&urb->transfer_dma, urb->transfer_buffer, +memcpy (&addr, urb->transfer_buffer, urb->transfer_buffer_length); field |=TRB_IDT ; + }else { + addr = (u64 ) urb->transfer_dma; } remainder = xhci_td_remainder(xhci, 0,
@@ -3440,8 +3443,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,if (setup->bRequestType &USB_DIR_IN ) field |=TRB_DIR_IN ;queue_trb (xhci, ep_ring, true, -lower_32_bits (urb->transfer_dma), -upper_32_bits (urb->transfer_dma), +lower_32_bits (addr), +upper_32_bits (addr), length_field, field | ep_ring->cycle_state); }
drivers/usb/host/xhci.h +2 -1
@@ -2160,7 +2160,8 @@ static inline bool xhci_urb_suitable_for_idt(struct urb *urb) {if (!usb_endpoint_xfer_isoc (&urb->ep->desc) &&usb_urb_dir_out (urb) &&usb_endpoint_maxp (&urb->ep->desc) >=TRB_IDT_MAX_SIZE && - urb->transfer_buffer_length <=TRB_IDT_MAX_SIZE ) + urb->transfer_buffer_length <=TRB_IDT_MAX_SIZE && + !(urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP ))return true;return false;
If that doesn't help, then it's possible DATA trbs in control transfer can't use IDT at all. IDT is supported for Normal TRBs, which have a different trb type than DATA trbs in control transfers.
Also xhci specs 4.11.7 limit IDT usage:
"If the IDT flag is set in one TRB of a TD, then it shall be the only Transfer
TRB of the TD"
A whole control transfer is one TD, and it already contains a SETUP transfer TRB which is using the IDT flag.
Following disables IDT for control transfers (testpatch attached as well)
drivers/usb/host/xhci-ring.c +0 -6
@@ -3424,12 +3424,6 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,if (urb->transfer_buffer_length >0 ) {u32 length_field, remainder; -if (xhci_urb_suitable_for_idt (urb)) { -memcpy (&urb->transfer_dma, urb->transfer_buffer, - urb->transfer_buffer_length); - field |=TRB_IDT ; - } - remainder = xhci_td_remainder(xhci, 0, urb->transfer_buffer_length, urb->transfer_buffer_length,
drivers/usb/host/xhci.h +4 -2
@@ -2158,9 +2158,11 @@ static inline struct xhci_ring *xhci_urb_to_transfer_ring(struct xhci_hcd *xhci,*/ static inline bool xhci_urb_suitable_for_idt (struct urb *urb) { -if (!usb_endpoint_xfer_isoc (&urb->ep->desc) &&usb_urb_dir_out (urb) && +if (!usb_endpoint_xfer_control (&urb->ep->desc) && + !usb_endpoint_xfer_isoc (&urb->ep->desc) &&usb_urb_dir_out (urb) &&usb_endpoint_maxp (&urb->ep->desc) >=TRB_IDT_MAX_SIZE && - urb->transfer_buffer_length <=TRB_IDT_MAX_SIZE ) + urb->transfer_buffer_length <=TRB_IDT_MAX_SIZE && + !(urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP ))return true;return false;
-Mathias
From c92d0e83f24d9a8f401ef5c91ebc8263fd9d2a56 Mon Sep 17 00:00:00 2001
From: Mathias Nyman <[email protected]>
Date: Thu, 9 May 2019 17:47:28 +0300
Subject: [TESTPATCH2] xhci: Don't use IDT tranfers when not supported
control tranfer data stage can't support IDT as xHCI can't have two IDT flags in the same TD.
The SETUP stage is already using IDT
see xhci 4.11.7 for details
Also don't use IDT if tranfer buffer is already dma mapped. There is no benefit with IDT then.
--- drivers/usb/host/xhci-ring.c | 6 ------ drivers/usb/host/xhci.h | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/usb/host/xhci-ring.c +0 -6
@@ -3424,12 +3424,6 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,if (urb->transfer_buffer_length >0 ) {u32 length_field, remainder; -if (xhci_urb_suitable_for_idt (urb)) { -memcpy (&urb->transfer_dma, urb->transfer_buffer, - urb->transfer_buffer_length); - field |=TRB_IDT ; - } - remainder = xhci_td_remainder(xhci, 0, urb->transfer_buffer_length, urb->transfer_buffer_length,
drivers/usb/host/xhci.h +4 -2
@@ -2158,9 +2158,11 @@ static inline struct xhci_ring *xhci_urb_to_transfer_ring(struct xhci_hcd *xhci,*/ static inline bool xhci_urb_suitable_for_idt (struct urb *urb) { -if (!usb_endpoint_xfer_isoc (&urb->ep->desc) &&usb_urb_dir_out (urb) && +if (!usb_endpoint_xfer_control (&urb->ep->desc) && + !usb_endpoint_xfer_isoc (&urb->ep->desc) &&usb_urb_dir_out (urb) &&usb_endpoint_maxp (&urb->ep->desc) >=TRB_IDT_MAX_SIZE && - urb->transfer_buffer_length <=TRB_IDT_MAX_SIZE ) + urb->transfer_buffer_length <=TRB_IDT_MAX_SIZE && + !(urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP ))return true;return false;
Signature · 1 line
2.7.4
From 485c5ede4d2e237c7f28f0cbb891151f88718e5b Mon Sep 17 00:00:00 2001
From: Mathias Nyman <[email protected]>
Date: Thu, 9 May 2019 17:47:28 +0300
Subject: [TESTPATCH1] xhci: don't use IDT transfer buffer is already dma
mapped
Limit IDT usage if transfer buffer is already mapped. Also don't use urb->transfer_dma as a temporary buffer
--- drivers/usb/host/xhci-ring.c | 9 ++++++--- drivers/usb/host/xhci.h | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-ring.c +6 -3
@@ -3423,11 +3423,14 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,if (urb->transfer_buffer_length >0 ) {u32 length_field, remainder; +u64 addr;if (xhci_urb_suitable_for_idt (urb)) { -memcpy (&urb->transfer_dma, urb->transfer_buffer, +memcpy (&addr, urb->transfer_buffer, urb->transfer_buffer_length); field |=TRB_IDT ; + }else { + addr = (u64 ) urb->transfer_dma; } remainder = xhci_td_remainder(xhci, 0,
@@ -3440,8 +3443,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,if (setup->bRequestType &USB_DIR_IN ) field |=TRB_DIR_IN ;queue_trb (xhci, ep_ring, true, -lower_32_bits (urb->transfer_dma), -upper_32_bits (urb->transfer_dma), +lower_32_bits (addr), +upper_32_bits (addr), length_field, field | ep_ring->cycle_state); }
drivers/usb/host/xhci.h +2 -1
@@ -2160,7 +2160,8 @@ static inline bool xhci_urb_suitable_for_idt(struct urb *urb) {if (!usb_endpoint_xfer_isoc (&urb->ep->desc) &&usb_urb_dir_out (urb) &&usb_endpoint_maxp (&urb->ep->desc) >=TRB_IDT_MAX_SIZE && - urb->transfer_buffer_length <=TRB_IDT_MAX_SIZE ) + urb->transfer_buffer_length <=TRB_IDT_MAX_SIZE && + !(urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP ))return true;return false;
Signature · 1 line
2.7.4
Re: [PATCH 1/4] usb: xhci: add Immediate Data Transfer support
Hi Matthias, thanks for spending the time debugging this :)
Quoted 80 lines · Mathias Nyman
Got the logs off list, thanks
The "Buffer" data in Control transfer Data stage look suspicious.
grep "flags I:"
trace_fail| grep Data
kworker/0:2-124 [000] d..1 63.092399:xhci_queue_trb: CTRL: Buffer0000000018b65000length 6 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [005] d..1 93.181231:xhci_queue_trb: CTRL: Buffer0000000018b65000length 6 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [007] dn.2 93.182050:xhci_queue_trb: CTRL: Buffer
0000000000000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [007] d..2 93.182499:xhci_queue_trb: CTRL: Buffer
0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [007] d..2 93.182736:xhci_queue_trb: CTRL: Buffer
0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
kworker/0:3-1409 [000] d..3 93.382630:xhci_queue_trb: CTRL: Buffer
0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:CFirst guess would be that in case URB has
URB_NO_TRANSFER_DMA_MAPset then data
will be mapped andurb->transfer_dmais already set.
The IDT patch usesurb->trabfer_dmaas a temporary buffer, and copies theurb->transfer_bufferthere.
if transfer buffer is already dma mapped theurb->transfer_buffercan be garbage,
(shouldn't, but it can be)Below code avoids IDT if
URB_NO_TRANSFER_DMA_MAPis set, and doesn't touchurb->transfer_dma(patch attached)drivers/usb/host/xhci-ring.c +4
-1@@ -3423,11 +3423,14 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, if (urb->transfer_buffer_length > 0) {u32 length_field, remainder; +u64 addr;if (xhci_urb_suitable_for_idt (urb)) { -memcpy (&urb->transfer_dma, urb->transfer_buffer, +memcpy (&addr, urb->transfer_buffer, urb->transfer_buffer_length); field |=TRB_IDT ; + }else { + addr = (u64 ) urb->transfer_dma; }remainder = xhci_td_remainder(xhci, 0,
drivers/usb/host/xhci-ring.c +2
-2@@ -3440,8 +3443,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, if (setup->bRequestType & USB_DIR_IN) field |= TRB_DIR_IN;queue_trb (xhci, ep_ring, true, -lower_32_bits (urb->transfer_dma), -upper_32_bits (urb->transfer_dma), +lower_32_bits (addr), +upper_32_bits (addr), length_field, field | ep_ring->cycle_state);}drivers/usb/host/xhci.h +0
-0@@ -2160,7 +2160,8 @@ static inline bool xhci_urb_suitable_for_idt(struct urb *urb) { if (!usb_endpoint_xfer_isoc(&urb->ep->desc) && usb_urb_dir_out(urb)&&
usb_endpoint_maxp(&urb->ep->desc) >= TRB_IDT_MAX_SIZE &&
drivers/usb/host/xhci.h static inline bool xhci_urb_suitable_for_idt(struct urb *urb) · line 2167
Quoted 6 lines
drivers/usb/host/xhci.h +2
-1- urb->transfer_buffer_length <= TRB_IDT_MAX_SIZE) + urb->transfer_buffer_length <= TRB_IDT_MAX_SIZE && + !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP))return true;return false;
This could be it, I broadly checked and assumed everyone was playing nice with the transfer_dma pointer, but I guess I might have missed something.
Quoted 6 lines
If that doesn't help, then it's possible DATA trbs in control transfer can't use IDT at all. IDT is supported for Normal TRBs, which have a different trb type than DATA trbs in control transfers.
Also xhci specs 4.11.7 limit IDT usage:
Quoted 8 lines
"If the IDT flag is set in one TRB of a TD, then it shall be the only Transfer
TRB of the TD"A whole control transfer is one TD, and it already contains a SETUP transfer TRB
which is using the IDT flag.Following disables IDT for control transfers (testpatch attached as well)
This one I'm not so sure as the standard defines a control transfer as a 2 or 3 TD operation (see 4.11.2.2):
"The Control Transfer Ring may contain Setup Stage and Status Stage TDs, and optionally Data Stage TDs."
Also, for what is worth, I spent some time testing that specific case on my intel laptop while preparing the patch.
Regards,
Nicolas
Re: [PATCH 1/4] usb: xhci: add Immediate Data Transfer support
Quoted 32 lines · Nicolas Saenz Julienne
Hi Mathias, thanks for spending the time debugging this :)
Quoted 4 lines · Mathias Nyman
Got the logs off list, thanks
The "Buffer" data in Control transfer Data stage look suspicious.
Quoted 8 lines
First guess would be that in case URB has
URB_NO_TRANSFER_DMA_MAPset then data
will be mapped andurb->transfer_dmais already set.
The IDT patch usesurb->trabfer_dmaas a temporary buffer, and copies theurb->transfer_bufferthere.
if transfer buffer is already dma mapped theurb->transfer_buffercan be garbage,
(shouldn't, but it can be)This could be it, I broadly checked and assumed everyone was playing nice with the
transfer_dmapointer, but I guess I might have missed something.Quoted 4 lines
If that doesn't help, then it's possible DATA trbs in control transfer can't use IDT at all. IDT is supported for Normal TRBs, which have a different trb type than DATA trbs in control transfers.
Quoted 8 lines
Also xhci specs 4.11.7 limit IDT usage:
"If the IDT flag is set in one TRB of a TD, then it shall be the only Transfer
TRB of the TD"A whole control transfer is one TD, and it already contains a SETUP transfer TRB
which is using the IDT flag.
Quoted 5 lines
This one I'm not so sure as the standard defines a control transfer as a 2 or 3 TD operation (see 4.11.2.2):
"The Control Transfer Ring may contain Setup Stage and Status Stage TDs, and optionally Data Stage TDs."
True, xhci driver treats a control transfer as one TD, but TRBs aren't chained so from hw point of view they are separate TDs
Quoted 3 lines
Also, for what is worth, I spent some time testing that specific case on my intel laptop while preparing the patch.
And a closer look at the spec shows that both Normal and Data Stage TRB support IDT. So this is not likely the cause.
-Mathias
Marek Szyprowski
Tested-byRe: [PATCH 1/4] usb: xhci: add Immediate Data Transfer support
In reply to Mathias NymanHi Mathias,
Quoted 160 lines · Mathias Nyman
Quoted 66 lines · Nicolas Saenz Julienne
Quoted 65 lines · Mathias Nyman
Quoted 31 lines · Marek Szyprowski
Dear All,
Quoted 20 lines · Mathias Nyman
From: Nicolas Saenz Julienne <[email protected]>
Immediate data transfers (IDT) allow the HCD to copy small chunks of data (up to 8bytes) directly into its output transfer TRBs. This avoids
the somewhat expensive DMA mappings that are performed by default on most URBs submissions.In the case an URB was suitable for IDT. The data is directly copied into the "Data Buffer Pointer" region of the TRB and the IDT flag is set. Instead of triggering memory accesses the HC will use the data directly.
The implementation could cover all kind of output endpoints. Yet Isochronous endpoints are bypassed as I was unable to find one that matched IDT's constraints. As we try to bypass the default DMA mappings
on URB buffers we'd need to find a Isochronous device with anurb->transfer_buffer_length<= 8 bytes.Quoted 7 lines
The implementation takes into account that the 8 byte buffers provided
by the URB will never cross a 64KB boundary.Signed-off-by Nicolas Saenz Julienne <[email protected]>Reviewed-by Felipe Balbi <[email protected]>Signed-off-by Mathias Nyman <[email protected]>Quoted 13 lines
I've noticed that this patch causes regression on various Samsung Exynos
5420/5422/5800 boards, which have USB3.0 host ports provided by DWC3/XHCI hardware module. The regression can be observed with ASIX USB
2.0 ethernet dongle, which stops working after applying this patch (eth0
interface is registered, but no packets are transmitted/received). I can
provide more debugging information or do some tests, just let me know what do you need. Reverting this commit makes ASIX USB ethernet dongle operational again.Thanks for reporting.
Would it be possible to check if your ASIX ethernet dongle works on some
desktop/laptop setup with this same IDT patch?Also Exynos xhci traces could help, they would show the content of the TRBs
using IDT.
Maybe byte order gets messed up?Take traces with:
mount -t debugfs none
/sys/kernel/debug
echo 81920 >/sys/kernel/debug/tracing/buffer_size_kbecho 1 >/sys/kernel/debug/tracing/events/xhci-hcd/enable<connect ASIX eth dongle, try to use it>
Quoted 8 lines
Quoted 3 lines
send
/sys/kernel/debug/tracing/tracecontent to meIf we can't get this fixed I'll revert the IDT patch
Hi Matthias, thanks for your help.
I'll also be looking into it, so please send me the logs too.
Got the logs off list, thanks
The "Buffer" data in Control transfer Data stage look suspicious.
grep "flags I:" trace_fail | grep Data
kworker/0:2-124 [000] d..1 63.092399:xhci_queue_trb: CTRL:
Buffer0000000018b65000length 6 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [005] d..1 93.181231:xhci_queue_trb: CTRL: Buffer0000000018b65000length 6 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [007] dn.2 93.182050:xhci_queue_trb: CTRL: Buffer 0000000000000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [007] d..2 93.182499:xhci_queue_trb: CTRL: Buffer 0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [007] d..2 93.182736:xhci_queue_trb: CTRL: Buffer 0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
kworker/0:3-1409 [000] d..3 93.382630:xhci_queue_trb: CTRL:
Buffer 0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:CFirst guess would be that in case URB has
URB_NO_TRANSFER_DMA_MAPset then data
will be mapped andurb->transfer_dmais already set.
The IDT patch usesurb->trabfer_dmaas a temporary buffer, and copies theurb->transfer_bufferthere.
if transfer buffer is already dma mapped theurb->transfer_buffercan be garbage,
(shouldn't, but it can be)Below code avoids IDT if
URB_NO_TRANSFER_DMA_MAPis set, and doesn't touchurb->transfer_dma(patch attached)drivers/usb/host/xhci-ring.c +4
-1@@ -3423,11 +3423,14 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, if (urb->transfer_buffer_length > 0) { u32 length_field, remainder; + u64 addr; if (xhci_urb_suitable_for_idt(urb)) { - memcpy(&urb->transfer_dma, urb->transfer_buffer, + memcpy(&addr, urb->transfer_buffer, urb->transfer_buffer_length); field |= TRB_IDT; + } else { + addr = (u64) urb->transfer_dma; }remainder = xhci_td_remainder(xhci, 0,
drivers/usb/host/xhci-ring.c +2
-2@@ -3440,8 +3443,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, if (setup->bRequestType & USB_DIR_IN) field |= TRB_DIR_IN; queue_trb(xhci, ep_ring, true, -lower_32_bits (urb->transfer_dma), -upper_32_bits (urb->transfer_dma), + lower_32_bits(addr), + upper_32_bits(addr), length_field, field | ep_ring->cycle_state);}
drivers/usb/host/xhci.h +0
-0@@ -2160,7 +2160,8 @@ static inline bool xhci_urb_suitable_for_idt(struct urb *urb) {if (!usb_endpoint_xfer_isoc(&urb->ep->desc) &&
usb_urb_dir_out(urb)&&
usb_endpoint_maxp(&urb->ep->desc)>=TRB_IDT_MAX_SIZE&& -urb->transfer_buffer_length<=TRB_IDT_MAX_SIZE) +urb->transfer_buffer_length<=TRB_IDT_MAX_SIZE&& + !(urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP)) return true;
Quoted 3 lines
return false;
If that doesn't help, then it's possible DATA trbs in control
transfer can't
Quoted 54 lines
use IDT at all. IDT is supported for Normal TRBs, which have a different trb
type than DATA trbs in control transfers.Also xhci specs 4.11.7 limit IDT usage:
"If the IDT flag is set in one TRB of a TD, then it shall be the only Transfer
TRB of the TD"A whole control transfer is one TD, and it already contains a SETUP transfer TRB
which is using the IDT flag.Following disables IDT for control transfers (testpatch attached as well)
drivers/usb/host/xhci-ring.c +0
-6@@ -3424,12 +3424,6 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, if (urb->transfer_buffer_length > 0) { u32 length_field, remainder; - if (xhci_urb_suitable_for_idt(urb)) { - memcpy(&urb->transfer_dma, urb->transfer_buffer, - urb->transfer_buffer_length); - field |= TRB_IDT; - } - remainder = xhci_td_remainder(xhci, 0, urb->transfer_buffer_length,
urb->transfer_buffer_length,drivers/usb/host/xhci.h +0
-1@@ -2158,9 +2158,11 @@ static inline struct xhci_ring*xhci_urb_to_transfer_ring(struct xhci_hcd *xhci, */ static inline bool xhci_urb_suitable_for_idt(struct urb *urb) { - if (!usb_endpoint_xfer_isoc(&urb->ep->desc) &&
usb_urb_dir_out(urb)&&
+ if (!usb_endpoint_xfer_control(&urb->ep->desc) && + !usb_endpoint_xfer_isoc(&urb->ep->desc) &&usb_urb_dir_out(urb)&&
usb_endpoint_maxp(&urb->ep->desc)>=TRB_IDT_MAX_SIZE&& -urb->transfer_buffer_length<=TRB_IDT_MAX_SIZE) +urb->transfer_buffer_length<=TRB_IDT_MAX_SIZE&& + !(urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP)) return true;
Quoted 3 lines
return false;
-Mathias
Thanks for the patches to test! Both patches applied separately (without the other one) fixes the issue with ASIX USB dongle, but from the discussion I assume that the first one (0001-xhci-don-t-use-IDT-transfer-buffer-is-already-dma-ma.patch) really fixes the issue, while the second one is just a workaround.
You can add:
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland
Re: [PATCH 1/4] usb: xhci: add Immediate Data Transfer support
Quoted 232 lines · Marek Szyprowski
Hi Mathias,
Quoted 160 lines · Mathias Nyman
Quoted 66 lines · Nicolas Saenz Julienne
Quoted 65 lines · Mathias Nyman
Quoted 31 lines · Marek Szyprowski
Dear All,
Quoted 20 lines · Mathias Nyman
From: Nicolas Saenz Julienne <[email protected]>
Immediate data transfers (IDT) allow the HCD to copy small chunks of data (up to 8bytes) directly into its output transfer TRBs. This avoids
the somewhat expensive DMA mappings that are performed by default on most URBs submissions.In the case an URB was suitable for IDT. The data is directly copied into the "Data Buffer Pointer" region of the TRB and the IDT flag is set. Instead of triggering memory accesses the HC will use the data directly.
The implementation could cover all kind of output endpoints. Yet Isochronous endpoints are bypassed as I was unable to find one that matched IDT's constraints. As we try to bypass the default DMA mappings
on URB buffers we'd need to find a Isochronous device with anurb->transfer_buffer_length<= 8 bytes.Quoted 7 lines
The implementation takes into account that the 8 byte buffers provided
by the URB will never cross a 64KB boundary.Signed-off-by Nicolas Saenz Julienne <[email protected]>Reviewed-by Felipe Balbi <[email protected]>Signed-off-by Mathias Nyman <[email protected]>Quoted 13 lines
I've noticed that this patch causes regression on various Samsung Exynos
5420/5422/5800 boards, which have USB3.0 host ports provided by DWC3/XHCI hardware module. The regression can be observed with ASIX USB
2.0 ethernet dongle, which stops working after applying this patch (eth0
interface is registered, but no packets are transmitted/received). I can
provide more debugging information or do some tests, just let me know what do you need. Reverting this commit makes ASIX USB ethernet dongle operational again.Thanks for reporting.
Would it be possible to check if your ASIX ethernet dongle works on some
desktop/laptop setup with this same IDT patch?Also Exynos xhci traces could help, they would show the content of the TRBs
using IDT.
Maybe byte order gets messed up?Take traces with:
mount -t debugfs none
/sys/kernel/debug
echo 81920 >/sys/kernel/debug/tracing/buffer_size_kbecho 1 >/sys/kernel/debug/tracing/events/xhci-hcd/enable<connect ASIX eth dongle, try to use it>
Quoted 8 lines
Quoted 3 lines
send
/sys/kernel/debug/tracing/tracecontent to meIf we can't get this fixed I'll revert the IDT patch
Hi Matthias, thanks for your help.
I'll also be looking into it, so please send me the logs too.
Got the logs off list, thanks
The "Buffer" data in Control transfer Data stage look suspicious.
grep "flags I:" trace_fail | grep Data
kworker/0:2-124 [000] d..1 63.092399:xhci_queue_trb: CTRL:
Buffer0000000018b65000length 6 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [005] d..1 93.181231:xhci_queue_trb: CTRL: Buffer0000000018b65000length 6 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [007] dn.2 93.182050:xhci_queue_trb: CTRL: Buffer 0000000000000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [007] d..2 93.182499:xhci_queue_trb: CTRL: Buffer 0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
ifconfig-1429 [007] d..2 93.182736:xhci_queue_trb: CTRL: Buffer 0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:C
kworker/0:3-1409 [000] d..3 93.382630:xhci_queue_trb: CTRL:
Buffer 0000000080000000 length 8 TD size 0 intr 0 type 'Data Stage' flags I:i:c:s:i:e:CFirst guess would be that in case URB has
URB_NO_TRANSFER_DMA_MAPset then data
will be mapped andurb->transfer_dmais already set.
The IDT patch usesurb->trabfer_dmaas a temporary buffer, and copies theurb->transfer_bufferthere.
if transfer buffer is already dma mapped theurb->transfer_buffercan be garbage,
(shouldn't, but it can be)Below code avoids IDT if
URB_NO_TRANSFER_DMA_MAPis set, and doesn't touchurb->transfer_dma(patch attached)drivers/usb/host/xhci-ring.c +4
-1@@ -3423,11 +3423,14 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, if (urb->transfer_buffer_length > 0) { u32 length_field, remainder; + u64 addr; if (xhci_urb_suitable_for_idt(urb)) { - memcpy(&urb->transfer_dma, urb->transfer_buffer, + memcpy(&addr, urb->transfer_buffer, urb->transfer_buffer_length); field |= TRB_IDT; + } else { + addr = (u64) urb->transfer_dma; }remainder = xhci_td_remainder(xhci, 0,
drivers/usb/host/xhci-ring.c +2
-2@@ -3440,8 +3443,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, if (setup->bRequestType & USB_DIR_IN) field |= TRB_DIR_IN; queue_trb(xhci, ep_ring, true, -lower_32_bits (urb->transfer_dma), -upper_32_bits (urb->transfer_dma), + lower_32_bits(addr), + upper_32_bits(addr), length_field, field | ep_ring->cycle_state);}
drivers/usb/host/xhci.h +0
-0@@ -2160,7 +2160,8 @@ static inline bool xhci_urb_suitable_for_idt(struct urb *urb) { if (!usb_endpoint_xfer_isoc(&urb->ep->desc) &&
usb_urb_dir_out(urb)&&
usb_endpoint_maxp(&urb->ep->desc)>=TRB_IDT_MAX_SIZE&&
-urb->transfer_buffer_length<=TRB_IDT_MAX_SIZE) +urb->transfer_buffer_length<=TRB_IDT_MAX_SIZE&& + !(urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP))
return true;Quoted 3 lines
return false;
If that doesn't help, then it's possible DATA trbs in control
transfer can't
Quoted 54 lines
use IDT at all. IDT is supported for Normal TRBs, which have a different trb
type than DATA trbs in control transfers.Also xhci specs 4.11.7 limit IDT usage:
"If the IDT flag is set in one TRB of a TD, then it shall be the only Transfer
TRB of the TD"A whole control transfer is one TD, and it already contains a SETUP transfer TRB
which is using the IDT flag.Following disables IDT for control transfers (testpatch attached as well)
drivers/usb/host/xhci-ring.c +0
-6@@ -3424,12 +3424,6 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, if (urb->transfer_buffer_length > 0) { u32 length_field, remainder; - if (xhci_urb_suitable_for_idt(urb)) { - memcpy(&urb->transfer_dma, urb->transfer_buffer, - urb->transfer_buffer_length); - field |= TRB_IDT; - } - remainder = xhci_td_remainder(xhci, 0, urb->transfer_buffer_length,
urb->transfer_buffer_length,drivers/usb/host/xhci.h +0
-1@@ -2158,9 +2158,11 @@ static inline struct xhci_ring*xhci_urb_to_transfer_ring(struct xhci_hcd *xhci, */ static inline bool xhci_urb_suitable_for_idt(struct urb *urb) { - if (!usb_endpoint_xfer_isoc(&urb->ep->desc) &&
usb_urb_dir_out(urb)&&
+ if (!usb_endpoint_xfer_control(&urb->ep->desc) && + !usb_endpoint_xfer_isoc(&urb->ep->desc) &&usb_urb_dir_out(urb)&&
usb_endpoint_maxp(&urb->ep->desc)>=TRB_IDT_MAX_SIZE&&
-urb->transfer_buffer_length<=TRB_IDT_MAX_SIZE) +urb->transfer_buffer_length<=TRB_IDT_MAX_SIZE&& + !(urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP))
return true;Quoted 3 lines
return false;
-Mathias
Thanks for the patches to test! Both patches applied separately (without the other one) fixes the issue with ASIX USB dongle, but from the discussion I assume that the first one (0001-xhci-don-t-use-IDT-transfer-buffer-is-already-dma-ma.patch) really fixes the issue, while the second one is just a workaround.
Quoted 6 lines
You can add:
Reported-by Marek Szyprowski <[email protected]>Tested-by Marek Szyprowski <[email protected]>
Great, thanks, I'll send the first patch forward after the merge window
Mathias