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

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

Pull USB fixes from Greg KH:
 "Here are some small fixes for reported issues with some USB drivers.
  They include:

   - xhci fixes for xhci-mtk platform driver

   - typec driver fixes for reported problems.

   - cdc-wdm read-stuck fix

   - gadget driver fix for reported race condition

   - new usb-serial driver ids

  All of these have been in linux-next with no reported problems"

* tag 'usb-5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: xhci-mtk: remove bandwidth budget table
  usb: xhci-mtk: fix fs isoc's transfer error
  usb: gadget: fix race when gadget driver register via ioctl
  usb: typec: tcpci_mt6360: Update for BMC PHY setting
  usb: gadget: uvc: allow for application to cleanly shutdown
  usb: typec: tcpci: Don't skip cleanup in .remove() on error
  usb: cdc-wdm: fix reading stuck on device close
  USB: serial: qcserial: add support for Sierra Wireless EM7590
  USB: serial: option: add Fibocom MA510 modem
  USB: serial: option: add Fibocom L610 modem
  USB: serial: pl2303: add device id for HP LM930 Display
parents bc403203 757b9f6e

drivers/usb/class/cdc-wdm.c

+1 −0
Original line number Diff line number Diff line
@@ -774,6 +774,7 @@ static int wdm_release(struct inode *inode, struct file *file) 
			poison_urbs(desc);

			spin_lock_irq(&desc->iuspin);

			desc->resp_count = 0;

			clear_bit(WDM_RESPONDING, &desc->flags);

			spin_unlock_irq(&desc->iuspin);

			desc->manage_power(desc->intf, 0);

			unpoison_urbs(desc);

drivers/usb/gadget/function/f_uvc.c

+25 −0
Original line number Diff line number Diff line
@@ -890,13 +890,37 @@ static void uvc_function_unbind(struct usb_configuration *c, 
{

	struct usb_composite_dev *cdev = c->cdev;

	struct uvc_device *uvc = to_uvc(f);

	long wait_ret = 1;



	uvcg_info(f, "%s()\n", __func__);



	/* If we know we're connected via v4l2, then there should be a cleanup

	 * of the device from userspace either via UVC_EVENT_DISCONNECT or

	 * though the video device removal uevent. Allow some time for the

	 * application to close out before things get deleted.

	 */

	if (uvc->func_connected) {

		uvcg_dbg(f, "waiting for clean disconnect\n");

		wait_ret = wait_event_interruptible_timeout(uvc->func_connected_queue,

				uvc->func_connected == false, msecs_to_jiffies(500));

		uvcg_dbg(f, "done waiting with ret: %ld\n", wait_ret);

	}



	device_remove_file(&uvc->vdev.dev, &dev_attr_function_name);

	video_unregister_device(&uvc->vdev);

	v4l2_device_unregister(&uvc->v4l2_dev);



	if (uvc->func_connected) {

		/* Wait for the release to occur to ensure there are no longer any

		 * pending operations that may cause panics when resources are cleaned

		 * up.

		 */

		uvcg_warn(f, "%s no clean disconnect, wait for release\n", __func__);

		wait_ret = wait_event_interruptible_timeout(uvc->func_connected_queue,

				uvc->func_connected == false, msecs_to_jiffies(1000));

		uvcg_dbg(f, "done waiting for release with ret: %ld\n", wait_ret);

	}



	usb_ep_free_request(cdev->gadget->ep0, uvc->control_req);

	kfree(uvc->control_buf);
@@ -915,6 +939,7 @@ static struct usb_function *uvc_alloc(struct usb_function_instance *fi) 


	mutex_init(&uvc->video.mutex);

	uvc->state = UVC_STATE_DISCONNECTED;

	init_waitqueue_head(&uvc->func_connected_queue);

	opts = fi_to_f_uvc_opts(fi);



	mutex_lock(&opts->lock);

drivers/usb/gadget/function/uvc.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/spinlock.h>

#include <linux/usb/composite.h>

#include <linux/videodev2.h>

#include <linux/wait.h>



#include <media/v4l2-device.h>

#include <media/v4l2-dev.h>
@@ -129,6 +130,7 @@ struct uvc_device { 
	struct usb_function func;

	struct uvc_video video;

	bool func_connected;

	wait_queue_head_t func_connected_queue;



	/* Descriptors */

	struct {

drivers/usb/gadget/function/uvc_v4l2.c

+2 −1
Original line number Diff line number Diff line
@@ -253,10 +253,11 @@ uvc_v4l2_subscribe_event(struct v4l2_fh *fh, 


static void uvc_v4l2_disable(struct uvc_device *uvc)

{

	uvc->func_connected = false;

	uvc_function_disconnect(uvc);

	uvcg_video_enable(&uvc->video, 0);

	uvcg_free_buffers(&uvc->video.queue);

	uvc->func_connected = false;

	wake_up_interruptible(&uvc->func_connected_queue);

}



static int

drivers/usb/gadget/legacy/raw_gadget.c

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ enum dev_state { 
	STATE_DEV_INVALID = 0,

	STATE_DEV_OPENED,

	STATE_DEV_INITIALIZED,

	STATE_DEV_REGISTERING,

	STATE_DEV_RUNNING,

	STATE_DEV_CLOSED,

	STATE_DEV_FAILED
@@ -508,6 +509,7 @@ static int raw_ioctl_run(struct raw_dev *dev, unsigned long value) 
		ret = -EINVAL;

		goto out_unlock;

	}

	dev->state = STATE_DEV_REGISTERING;

	spin_unlock_irqrestore(&dev->lock, flags);



	ret = usb_gadget_probe_driver(&dev->driver);