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

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

Pull USB fixes from Greg KH:
 "Here are some small USB fixes for 5.10-rc7 that resolve a number of
  reported issues, and add some new device ids.

  Nothing major here, but these solve some problems that people were
  having with the 5.10-rc tree:

   - reverts for USB storage dma settings that broke working devices

   - thunderbolt use-after-free fix

   - cdns3 driver fixes

   - gadget driver userspace copy fix

   - new device ids

  All of these except for the reverts have been in linux-next with no
  reported issues. The reverts are "clean" and were tested by Hans, as
  well as passing the 0-day tests"

* tag 'usb-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: gadget: f_fs: Use local copy of descriptors for userspace copy
  usb: ohci-omap: Fix descriptor conversion
  Revert "usb-storage: fix sdev->host->dma_dev"
  Revert "uas: fix sdev->host->dma_dev"
  Revert "uas: bump hw_max_sectors to 2048 blocks for SS or faster drives"
  USB: serial: kl5kusb105: fix memleak on open
  USB: serial: ch341: sort device-id entries
  USB: serial: ch341: add new Product ID for CH341A
  USB: serial: option: fix Quectel BG96 matching
  usb: cdns3: core: fix goto label for error path
  usb: cdns3: gadget: clear trb->length as zero after preparing every trb
  usb: cdns3: Fix hardware based role switch
  USB: serial: option: add support for Thales Cinterion EXS82
  USB: serial: option: add Fibocom NL668 variants
  thunderbolt: Fix use-after-free in remove_unplugged_switch()
parents 8100a580 a4b98a75

arch/arm/mach-omap1/board-osk.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static struct gpiod_lookup_table osk_usb_gpio_table = { 
	.dev_id = "ohci",

	.table = {

		/* Power GPIO on the I2C-attached TPS65010 */

		GPIO_LOOKUP("i2c-tps65010", 1, "power", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("tps65010", 0, "power", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP(OMAP_GPIO_LABEL, 9, "overcurrent",

			    GPIO_ACTIVE_HIGH),

	},

drivers/thunderbolt/icm.c

+7 −3
Original line number Diff line number Diff line
@@ -1976,7 +1976,9 @@ static int complete_rpm(struct device *dev, void *data) 


static void remove_unplugged_switch(struct tb_switch *sw)

{

	pm_runtime_get_sync(sw->dev.parent);

	struct device *parent = get_device(sw->dev.parent);



	pm_runtime_get_sync(parent);



	/*

	 * Signal this and switches below for rpm_complete because
@@ -1987,8 +1989,10 @@ static void remove_unplugged_switch(struct tb_switch *sw) 
	bus_for_each_dev(&tb_bus_type, &sw->dev, NULL, complete_rpm);

	tb_switch_remove(sw);



	pm_runtime_mark_last_busy(sw->dev.parent);

	pm_runtime_put_autosuspend(sw->dev.parent);

	pm_runtime_mark_last_busy(parent);

	pm_runtime_put_autosuspend(parent);



	put_device(parent);

}



static void icm_free_unplugged_children(struct tb_switch *sw)

drivers/usb/cdns3/core.c

+16 −13
Original line number Diff line number Diff line
@@ -427,7 +427,6 @@ static irqreturn_t cdns3_wakeup_irq(int irq, void *data) 
 */

static int cdns3_probe(struct platform_device *pdev)

{

	struct usb_role_switch_desc sw_desc = { };

	struct device *dev = &pdev->dev;

	struct resource	*res;

	struct cdns3 *cdns;
@@ -529,11 +528,13 @@ static int cdns3_probe(struct platform_device *pdev) 
	if (ret)

		goto err2;



	if (device_property_read_bool(dev, "usb-role-switch")) {

		struct usb_role_switch_desc sw_desc = { };



		sw_desc.set = cdns3_role_set;

		sw_desc.get = cdns3_role_get;

		sw_desc.allow_userspace_control = true;

		sw_desc.driver_data = cdns;

	if (device_property_read_bool(dev, "usb-role-switch"))

		sw_desc.fwnode = dev->fwnode;



		cdns->role_sw = usb_role_switch_register(dev, &sw_desc);
@@ -542,6 +543,7 @@ static int cdns3_probe(struct platform_device *pdev) 
			dev_warn(dev, "Unable to register Role Switch\n");

			goto err3;

		}

	}



	if (cdns->wakeup_irq) {

		ret = devm_request_irq(cdns->dev, cdns->wakeup_irq,
@@ -551,7 +553,7 @@ static int cdns3_probe(struct platform_device *pdev) 


		if (ret) {

			dev_err(cdns->dev, "couldn't register wakeup irq handler\n");

			goto err3;

			goto err4;

		}

	}
@@ -582,6 +584,7 @@ static int cdns3_probe(struct platform_device *pdev) 
	return 0;

err4:

	cdns3_drd_exit(cdns);

	if (cdns->role_sw)

		usb_role_switch_unregister(cdns->role_sw);

err3:

	set_phy_power_off(cdns);

drivers/usb/cdns3/gadget.c

+1 −0
Original line number Diff line number Diff line
@@ -1260,6 +1260,7 @@ static int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep, 
		priv_req->end_trb = priv_ep->enqueue;

		cdns3_ep_inc_enq(priv_ep);

		trb = priv_ep->trb_pool + priv_ep->enqueue;

		trb->length = 0;

	} while (sg_iter < num_trb);



	trb = priv_req->trb;

drivers/usb/gadget/function/f_fs.c

+4 −2
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ static long ffs_epfile_ioctl(struct file *file, unsigned code, 
	case FUNCTIONFS_ENDPOINT_DESC:

	{

		int desc_idx;

		struct usb_endpoint_descriptor *desc;

		struct usb_endpoint_descriptor desc1, *desc;



		switch (epfile->ffs->gadget->speed) {

		case USB_SPEED_SUPER:
@@ -1336,10 +1336,12 @@ static long ffs_epfile_ioctl(struct file *file, unsigned code, 
		default:

			desc_idx = 0;

		}



		desc = epfile->ep->descs[desc_idx];

		memcpy(&desc1, desc, desc->bLength);



		spin_unlock_irq(&epfile->ffs->eps_lock);

		ret = copy_to_user((void __user *)value, desc, desc->bLength);

		ret = copy_to_user((void __user *)value, &desc1, desc1.bLength);

		if (ret)

			ret = -EFAULT;

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE