Commit 247bf557 authored Jan 31, 2014 by Sarah Sharp

xhci 1.0: Limit arbitrarily-aligned scatter gather.



xHCI 1.0 hosts have a set of requirements on how to align transfer
buffers on the endpoint rings called "TD fragment" rules.  When the
ax88179_178a driver added support for scatter gather in 3.12, with
commit 804fad45411b48233b48003e33a78f290d227c8 "USBNET: ax88179_178a:
enable tso if usb host supports sg dma", it broke the device under xHCI
1.0 hosts.  Under certain network loads, the device would see an
unexpected short packet from the host, which would cause the device to
stop sending ethernet packets, even through USB packets would still be
sent.

Commit 35773dac "usb: xhci: Link TRB must not occur within a USB
payload burst" attempted to fix this.  It was a quick hack to partially
implement the TD fragment rules.  However, it caused regressions in the
usb-storage layer and userspace USB drivers using libusb.  The patches
to attempt to fix this are too far reaching into the USB core, and we
really need to implement the TD fragment rules correctly in the xHCI
driver, instead of continuing to wallpaper over the issues.

Disable arbitrarily-aligned scatter-gather in the xHCI driver for 1.0
hosts.  Only the ax88179_178a driver checks the no_sg_constraint flag,
so don't set it for 1.0 hosts.  This should not impact usb-storage or
usbfs behavior, since they pass down max packet sized aligned sg-list
entries (512 for USB 2.0 and 1024 for USB 3.0).

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Tested-by: Mark Lord <mlord@pobox.com>
Cc: David Laight <David.Laight@ACULAB.COM>
Cc: Bjørn Mork <bjorn@mork.no>
Cc: Freddy Xin <freddy@asix.com.tw>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: stable@vger.kernel.org # 3.12

parent 03b56329

drivers/usb/host/xhci.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -4733,9 +4733,6 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
		/* Limit the block layer scatter-gather lists to half a segment. */
		hcd->self.sg_tablesize = TRBS_PER_SEGMENT / 2;

		/* support to build packet from discontinuous buffers */
		hcd->self.no_sg_constraint = 1;

		/* XHCI controllers don't stop the ep queue on short packets :\| */
		hcd->self.no_stop_on_short = 1;

		@@ -4760,6 +4757,14 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
		/* xHCI private pointer was set in xhci_pci_probe for the second
		* registered roothub.
		*/
		xhci = hcd_to_xhci(hcd);
		/*
		* Support arbitrarily aligned sg-list entries on hosts without
		* TD fragment rules (which are currently unsupported).
		*/
		if (xhci->hci_version < 0x100)
		hcd->self.no_sg_constraint = 1;

		return 0;
		}

		@@ -4788,6 +4793,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
		if (xhci->hci_version > 0x96)
		xhci->quirks \|= XHCI_SPURIOUS_SUCCESS;

		if (xhci->hci_version < 0x100)
		hcd->self.no_sg_constraint = 1;

		/* Make sure the HC is halted. */
		retval = xhci_halt(xhci);
		if (retval)

Admin message