diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-11 15:23:53 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-11 15:23:53 -0800 |
| commit | 2991942f563c1bb22957568ef682561b17c54bff (patch) | |
| tree | a5eaedd2afe98eebb2268f67640f44530992f707 /include | |
| parent | 03b56329f9bb5a1cb73d7dc659d529a9a9bf3acc (diff) | |
| parent | 3d4b81eda2211f32886e2978daf6f39885042fc4 (diff) | |
Merge tag 'for-usb-linus-2014-02-11' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
Sarah writes:
xhci: Revert TD fragment hacks.
Hi Greg,
Recently, we found that commit "35773dac5f86 "usb: xhci: Link TRB must not
occur within a USB payload burst" causes a userspace regression. It will
cause larger transfers submitted through usbfs that would have succeeded
on older kernels to be rejected.
Commit 35773dac5f86 was designed to address an issue where an ASIX USB
ethernet device would get wedged when it was connected to a 1.0 xHCI
host. Only this particular ethernet device was impacted, because only the
ax88179_178a driver implemented scatter-gather in 3.12. The xHCI driver
doesn't currently support TD fragment rules, and commit 35773dac5f86 was a
quick hack that partially implemented one of the rules.
This is the third regression this patch has caused. There's yet another
quick hack to work around the issue, but I really want to support TD
fragments properly, rather than hacking around it. It will take us a
kernel release or two to get it implemented, since it is a big
architectural change.
This patchset backs out commit 35773dac5f86, and the two bug fix patches
for it. The first patch limits arbitrarily aligned scatter-gather under
xHCI 1.0 hosts.
As a result of this patchset:
1. usb-storage and uas will still be able to use scatter-gather, since
they submit max packet sized aligned transfers.
2. usbfs will behave exactly as before, no more userspace regressions.
3. The ax88179_178a driver works fine without scatter-gather (Mark Lord
confirms this).
Users of the ASIX chipset may still see occasional packet loss on 1.0 xHCI
hosts, if the xHCI driver needs to split a TRB across 64-KB boundaries,
and a link TRB happens to fall between those two TRBs. I expect this
corner case to be infrequent.
Sarah Sharp
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index c716da18c66..7f6eb859873 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1265,8 +1265,6 @@ typedef void (*usb_complete_t)(struct urb *); * @sg: scatter gather buffer list, the buffer size of each element in * the list (except the last) must be divisible by the endpoint's * max packet size if no_sg_constraint isn't set in 'struct usb_bus' - * (FIXME: scatter-gather under xHCI is broken for periodic transfers. - * Do not use urb->sg for interrupt endpoints for now, only bulk.) * @num_mapped_sgs: (internal) number of mapped sg entries * @num_sgs: number of entries in the sg list * @transfer_buffer_length: How big is transfer_buffer. The transfer may |