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

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

Merge tag 'usb-4.1-rc2' 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 fixes for 4.2-rc2.  They revert one
  problem patch, fix some minor things, and add some new quirks for
  "broken" devices.

  All have been in linux-next successfully"

* tag 'usb-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  cdc-acm: prevent infinite loop when parsing CDC headers.
  Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap"
  usb: chipidea: otg: remove mutex unlock and lock while stop and start role
  uas: Set max_sectors_240 quirk for ASM1053 devices
  uas: Add US_FL_MAX_SECTORS_240 flag
  uas: Allow uas_use_uas_driver to return usb-storage flags
parents 73be174c 0d3bba02

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -3787,6 +3787,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					READ_CAPACITY_16 command);

				f = NO_REPORT_OPCODES (don't use report opcodes

					command, uas only);

				g = MAX_SECTORS_240 (don't transfer more than

					240 sectors at a time, uas only);

				h = CAPACITY_HEURISTICS (decrease the

					reported device capacity by one

					sector if the number is odd);

drivers/usb/chipidea/otg_fsm.c

+0 −4
Original line number Diff line number Diff line
@@ -520,7 +520,6 @@ static int ci_otg_start_host(struct otg_fsm *fsm, int on) 
{

	struct ci_hdrc	*ci = container_of(fsm, struct ci_hdrc, fsm);



	mutex_unlock(&fsm->lock);

	if (on) {

		ci_role_stop(ci);

		ci_role_start(ci, CI_ROLE_HOST);
@@ -529,7 +528,6 @@ static int ci_otg_start_host(struct otg_fsm *fsm, int on) 
		hw_device_reset(ci);

		ci_role_start(ci, CI_ROLE_GADGET);

	}

	mutex_lock(&fsm->lock);

	return 0;

}
@@ -537,12 +535,10 @@ static int ci_otg_start_gadget(struct otg_fsm *fsm, int on) 
{

	struct ci_hdrc	*ci = container_of(fsm, struct ci_hdrc, fsm);



	mutex_unlock(&fsm->lock);

	if (on)

		usb_gadget_vbus_connect(&ci->gadget);

	else

		usb_gadget_vbus_disconnect(&ci->gadget);

	mutex_lock(&fsm->lock);



	return 0;

}

drivers/usb/class/cdc-acm.c

+6 −1
Original line number Diff line number Diff line
@@ -1142,11 +1142,16 @@ static int acm_probe(struct usb_interface *intf, 
	}



	while (buflen > 0) {

		elength = buffer[0];

		if (!elength) {

			dev_err(&intf->dev, "skipping garbage byte\n");

			elength = 1;

			goto next_desc;

		}

		if (buffer[1] != USB_DT_CS_INTERFACE) {

			dev_err(&intf->dev, "skipping garbage\n");

			goto next_desc;

		}

		elength = buffer[0];



		switch (buffer[2]) {

		case USB_CDC_UNION_TYPE: /* we've found it */

drivers/usb/host/ehci-msm.c

+10 −3
Original line number Diff line number Diff line
@@ -88,13 +88,20 @@ static int ehci_msm_probe(struct platform_device *pdev) 
	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	hcd->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(hcd->regs)) {

		ret = PTR_ERR(hcd->regs);

	if (!res) {

		dev_err(&pdev->dev, "Unable to get memory resource\n");

		ret = -ENODEV;

		goto put_hcd;

	}



	hcd->rsrc_start = res->start;

	hcd->rsrc_len = resource_size(res);

	hcd->regs = devm_ioremap(&pdev->dev, hcd->rsrc_start, hcd->rsrc_len);

	if (!hcd->regs) {

		dev_err(&pdev->dev, "ioremap failed\n");

		ret = -ENOMEM;

		goto put_hcd;

	}



	/*

	 * OTG driver takes care of PHY initialization, clock management,

drivers/usb/storage/uas-detect.h

+9 −2
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ static int uas_find_endpoints(struct usb_host_interface *alt, 
}



static int uas_use_uas_driver(struct usb_interface *intf,

			      const struct usb_device_id *id)

			      const struct usb_device_id *id,

			      unsigned long *flags_ret)

{

	struct usb_host_endpoint *eps[4] = { };

	struct usb_device *udev = interface_to_usbdev(intf);
@@ -73,7 +74,7 @@ static int uas_use_uas_driver(struct usb_interface *intf, 
	 * this writing the following versions exist:

	 * ASM1051 - no uas support version

	 * ASM1051 - with broken (*) uas support

	 * ASM1053 - with working uas support

	 * ASM1053 - with working uas support, but problems with large xfers

	 * ASM1153 - with working uas support

	 *

	 * Devices with these chips re-use a number of device-ids over the
@@ -103,6 +104,9 @@ static int uas_use_uas_driver(struct usb_interface *intf, 
		} else if (usb_ss_max_streams(&eps[1]->ss_ep_comp) == 32) {

			/* Possibly an ASM1051, disable uas */

			flags |= US_FL_IGNORE_UAS;

		} else {

			/* ASM1053, these have issues with large transfers */

			flags |= US_FL_MAX_SECTORS_240;

		}

	}
@@ -132,5 +136,8 @@ static int uas_use_uas_driver(struct usb_interface *intf, 
		return 0;

	}



	if (flags_ret)

		*flags_ret = flags;



	return 1;

}