Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10cec917 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a number of small USB driver fixes and new device ids for
  4.13-rc5. There is the usual gadget driver fixes, some new quirks for
  "messy" hardware, and some new device ids.

  All have been in linux-next with no reported issues"

* tag 'usb-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: serial: pl2303: add new ATEN device id
  usb: quirks: Add no-lpm quirk for Moshi USB to Ethernet Adapter
  USB: Check for dropped connection before switching to full speed
  usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume
  usb: renesas_usbhs: gadget: fix unused-but-set-variable warning
  usb: renesas_usbhs: Fix UGCTRL2 value for R-Car Gen3
  usb: phy: phy-msm-usb: Fix usage of devm_regulator_bulk_get()
  usb: gadget: udc: renesas_usb3: Fix usb_gadget_giveback_request() calling
  usb: dwc3: gadget: Correct ISOC DATA PIDs for short packets
  USB: serial: option: add D-Link DWM-222 device ID
  usb: musb: fix tx fifo flush handling again
  usb: core: unlink urbs from the tail of the endpoint's urb_list
  usb-storage: fix deadlock involving host lock and scsi_done
  uas: Add US_FL_IGNORE_RESIDUE for Initio Corporation INIC-3069
  USB: hcd: Mark secondary HCD as dead if the primary one died
  USB: serial: cp210x: add support for Qivicon USB ZigBee dongle
parents 89a55278 3b6bcd3d

drivers/usb/core/hcd.c

+3 −1
Original line number Diff line number Diff line
@@ -1888,7 +1888,7 @@ void usb_hcd_flush_endpoint(struct usb_device *udev, 
	/* No more submits can occur */

	spin_lock_irq(&hcd_urb_list_lock);

rescan:

	list_for_each_entry (urb, &ep->urb_list, urb_list) {

	list_for_each_entry_reverse(urb, &ep->urb_list, urb_list) {

		int	is_in;



		if (urb->unlinked)
@@ -2485,6 +2485,8 @@ void usb_hc_died (struct usb_hcd *hcd) 
	}

	if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) {

		hcd = hcd->shared_hcd;

		clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);

		set_bit(HCD_FLAG_DEAD, &hcd->flags);

		if (hcd->rh_registered) {

			clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

drivers/usb/core/hub.c

+6 −4
Original line number Diff line number Diff line
@@ -4725,7 +4725,8 @@ hub_power_remaining(struct usb_hub *hub) 
static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,

		u16 portchange)

{

	int status, i;

	int status = -ENODEV;

	int i;

	unsigned unit_load;

	struct usb_device *hdev = hub->hdev;

	struct usb_hcd *hcd = bus_to_hcd(hdev->bus);
@@ -4929,9 +4930,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, 


done:

	hub_port_disable(hub, port1, 1);

	if (hcd->driver->relinquish_port && !hub->hdev->parent)

	if (hcd->driver->relinquish_port && !hub->hdev->parent) {

		if (status != -ENOTCONN && status != -ENODEV)

			hcd->driver->relinquish_port(hcd, port1);



	}

}



/* Handle physical or logical connection change events.

drivers/usb/core/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* appletouch */

	{ USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Genesys Logic hub, internally used by Moshi USB to Ethernet Adapter */

	{ USB_DEVICE(0x05e3, 0x0616), .driver_info = USB_QUIRK_NO_LPM },



	/* Avision AV600U */

	{ USB_DEVICE(0x0638, 0x0a13), .driver_info =

	  USB_QUIRK_STRING_FETCH_255 },
@@ -249,6 +252,7 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { 
	{ USB_DEVICE(0x093a, 0x2500), .driver_info = USB_QUIRK_RESET_RESUME },

	{ USB_DEVICE(0x093a, 0x2510), .driver_info = USB_QUIRK_RESET_RESUME },

	{ USB_DEVICE(0x093a, 0x2521), .driver_info = USB_QUIRK_RESET_RESUME },

	{ USB_DEVICE(0x03f0, 0x2b4a), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Optical Mouse M90/M100 */

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

drivers/usb/dwc3/gadget.c

+32 −1
Original line number Diff line number Diff line
@@ -896,9 +896,40 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, 
		if (!node) {

			trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS_FIRST;



			/*

			 * USB Specification 2.0 Section 5.9.2 states that: "If

			 * there is only a single transaction in the microframe,

			 * only a DATA0 data packet PID is used.  If there are

			 * two transactions per microframe, DATA1 is used for

			 * the first transaction data packet and DATA0 is used

			 * for the second transaction data packet.  If there are

			 * three transactions per microframe, DATA2 is used for

			 * the first transaction data packet, DATA1 is used for

			 * the second, and DATA0 is used for the third."

			 *

			 * IOW, we should satisfy the following cases:

			 *

			 * 1) length <= maxpacket

			 *	- DATA0

			 *

			 * 2) maxpacket < length <= (2 * maxpacket)

			 *	- DATA1, DATA0

			 *

			 * 3) (2 * maxpacket) < length <= (3 * maxpacket)

			 *	- DATA2, DATA1, DATA0

			 */

			if (speed == USB_SPEED_HIGH) {

				struct usb_ep *ep = &dep->endpoint;

				trb->size |= DWC3_TRB_SIZE_PCM1(ep->mult - 1);

				unsigned int mult = ep->mult - 1;

				unsigned int maxp = usb_endpoint_maxp(ep->desc);



				if (length <= (2 * maxp))

					mult--;



				if (length <= maxp)

					mult--;



				trb->size |= DWC3_TRB_SIZE_PCM1(mult);

			}

		} else {

			trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS;

drivers/usb/gadget/udc/renesas_usb3.c

+16 −5
Original line number Diff line number Diff line
@@ -838,21 +838,32 @@ static struct renesas_usb3_request *usb3_get_request(struct renesas_usb3_ep 
	return usb3_req;

}



static void usb3_request_done(struct renesas_usb3_ep *usb3_ep,

			      struct renesas_usb3_request *usb3_req, int status)

static void __usb3_request_done(struct renesas_usb3_ep *usb3_ep,

				struct renesas_usb3_request *usb3_req,

				int status)

{

	struct renesas_usb3 *usb3 = usb3_ep_to_usb3(usb3_ep);

	unsigned long flags;



	dev_dbg(usb3_to_dev(usb3), "giveback: ep%2d, %u, %u, %d\n",

		usb3_ep->num, usb3_req->req.length, usb3_req->req.actual,

		status);

	usb3_req->req.status = status;

	spin_lock_irqsave(&usb3->lock, flags);

	usb3_ep->started = false;

	list_del_init(&usb3_req->queue);

	spin_unlock_irqrestore(&usb3->lock, flags);

	spin_unlock(&usb3->lock);

	usb_gadget_giveback_request(&usb3_ep->ep, &usb3_req->req);

	spin_lock(&usb3->lock);

}



static void usb3_request_done(struct renesas_usb3_ep *usb3_ep,

			      struct renesas_usb3_request *usb3_req, int status)

{

	struct renesas_usb3 *usb3 = usb3_ep_to_usb3(usb3_ep);

	unsigned long flags;



	spin_lock_irqsave(&usb3->lock, flags);

	__usb3_request_done(usb3_ep, usb3_req, status);

	spin_unlock_irqrestore(&usb3->lock, flags);

}



static void usb3_irq_epc_pipe0_status_end(struct renesas_usb3 *usb3)