Commit cf8bf7cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-3.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are 4 USB fixes for your current tree.

  Two of them are reverts to hopefully resolve the nasty XHCI
  regressions we have been having on some types of devices.  The other
  two are quirks for some Logitech video devices"

* tag 'usb-3.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  Revert "USBNET: ax88179_178a: enable tso if usb host supports sg dma"
  Revert "xhci 1.0: Limit arbitrarily-aligned scatter gather."
  usb: Make DELAY_INIT quirk wait 100ms between Get Configuration requests
  usb: Add device quirk for Logitech HD Pro Webcams C920 and C930e
parents a491ce72 469d417b

drivers/net/usb/ax88179_178a.c

+0 −8
Original line number Diff line number Diff line
@@ -1029,20 +1029,12 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf) 
	dev->mii.phy_id = 0x03;

	dev->mii.supports_gmii = 1;



	if (usb_device_no_sg_constraint(dev->udev))

		dev->can_dma_sg = 1;



	dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |

			      NETIF_F_RXCSUM;



	dev->net->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |

				 NETIF_F_RXCSUM;



	if (dev->can_dma_sg) {

		dev->net->features |= NETIF_F_SG | NETIF_F_TSO;

		dev->net->hw_features |= NETIF_F_SG | NETIF_F_TSO;

	}



	/* Enable checksum offload */

	*tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |

	       AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6;

drivers/usb/core/config.c

+4 −0
Original line number Diff line number Diff line
@@ -717,6 +717,10 @@ int usb_get_configuration(struct usb_device *dev) 
			result = -ENOMEM;

			goto err;

		}



		if (dev->quirks & USB_QUIRK_DELAY_INIT)

			msleep(100);



		result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno,

		    bigbuffer, length);

		if (result < 0) {

drivers/usb/core/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Microsoft LifeCam-VX700 v2.0 */

	{ USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech HD Pro Webcams C920 and C930e */

	{ USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT },

	{ USB_DEVICE(0x046d, 0x0843), .driver_info = USB_QUIRK_DELAY_INIT },



	/* Logitech Quickcam Fusion */

	{ USB_DEVICE(0x046d, 0x08c1), .driver_info = USB_QUIRK_RESET_RESUME },

drivers/usb/host/xhci.c

+3 −11
Original line number Diff line number Diff line
@@ -4733,6 +4733,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) 
	/* Accept arbitrarily long scatter-gather lists */

	hcd->self.sg_tablesize = ~0;



	/* 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;
@@ -4757,14 +4760,6 @@ 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;

	}
@@ -4793,9 +4788,6 @@ 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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE