Commit 5c7bdbf8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a small number of USB fixes for 5.12-rc3 to resolve a bunch
  of reported issues:

   - usbip fixups for issues found by syzbot

   - xhci driver fixes and quirk additions

   - gadget driver fixes

   - dwc3 QCOM driver fix

   - usb-serial new ids and fixes

   - usblp fix for a long-time issue

   - cdc-acm quirk addition

   - other tiny fixes for reported problems

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (25 commits)
  xhci: Fix repeated xhci wake after suspend due to uncleared internal wake state
  usb: xhci: Fix ASMedia ASM1042A and ASM3242 DMA addressing
  xhci: Improve detection of device initiated wake signal.
  usb: xhci: do not perform Soft Retry for some xHCI hosts
  usbip: fix vudc usbip_sockfd_store races leading to gpf
  usbip: fix vhci_hcd attach_store() races leading to gpf
  usbip: fix stub_dev usbip_sockfd_store() races leading to gpf
  usbip: fix vudc to check for stream socket
  usbip: fix vhci_hcd to check for stream socket
  usbip: fix stub_dev to check for stream socket
  usb: dwc3: qcom: Add missing DWC3 OF node refcount decrement
  USB: usblp: fix a hang in poll() if disconnected
  USB: gadget: udc: s3c2410_udc: fix return value check in s3c2410_udc_probe()
  usb: renesas_usbhs: Clear PIPECFG for re-enabling pipe with other EPNUM
  usb: dwc3: qcom: Honor wakeup enabled/disabled state
  usb: gadget: f_uac1: stop playback on function disable
  usb: gadget: f_uac2: always increase endpoint max_packet_size by one audio slot
  USB: gadget: u_ether: Fix a configfs return code
  usb: dwc3: qcom: add ACPI device id for sc8180x
  Goodix Fingerprint device is not a modem
  ...
parents 42062343 d26c00e7

drivers/usb/class/cdc-acm.c

+5 −0
Original line number Diff line number Diff line
@@ -1935,6 +1935,11 @@ static const struct usb_device_id acm_ids[] = { 
	.driver_info = SEND_ZERO_PACKET,

	},



	/* Exclude Goodix Fingerprint Reader */

	{ USB_DEVICE(0x27c6, 0x5395),

	.driver_info = IGNORE_DEVICE,

	},



	/* control interfaces without any protocol set */

	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,

		USB_CDC_PROTO_NONE) },

drivers/usb/class/usblp.c

+12 −4
Original line number Diff line number Diff line
@@ -494,16 +494,24 @@ static int usblp_release(struct inode *inode, struct file *file) 
/* No kernel lock - fine */

static __poll_t usblp_poll(struct file *file, struct poll_table_struct *wait)

{

	__poll_t ret;

	struct usblp *usblp = file->private_data;

	__poll_t ret = 0;

	unsigned long flags;



	struct usblp *usblp = file->private_data;

	/* Should we check file->f_mode & FMODE_WRITE before poll_wait()? */

	poll_wait(file, &usblp->rwait, wait);

	poll_wait(file, &usblp->wwait, wait);



	mutex_lock(&usblp->mut);

	if (!usblp->present)

		ret |= EPOLLHUP;

	mutex_unlock(&usblp->mut);



	spin_lock_irqsave(&usblp->lock, flags);

	ret = ((usblp->bidir && usblp->rcomplete) ? EPOLLIN  | EPOLLRDNORM : 0) |

	   ((usblp->no_paper || usblp->wcomplete) ? EPOLLOUT | EPOLLWRNORM : 0);

	if (usblp->bidir && usblp->rcomplete)

		ret |= EPOLLIN  | EPOLLRDNORM;

	if (usblp->no_paper || usblp->wcomplete)

		ret |= EPOLLOUT | EPOLLWRNORM;

	spin_unlock_irqrestore(&usblp->lock, flags);

	return ret;

}

drivers/usb/dwc3/dwc3-qcom.c

+13 −5
Original line number Diff line number Diff line
@@ -358,9 +358,11 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom) 
	if (ret)

		dev_warn(qcom->dev, "failed to disable interconnect: %d\n", ret);



	qcom->is_suspended = true;

	if (device_may_wakeup(qcom->dev))

		dwc3_qcom_enable_interrupts(qcom);



	qcom->is_suspended = true;



	return 0;

}
@@ -372,6 +374,7 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom) 
	if (!qcom->is_suspended)

		return 0;



	if (device_may_wakeup(qcom->dev))

		dwc3_qcom_disable_interrupts(qcom);



	for (i = 0; i < qcom->num_clocks; i++) {
@@ -650,16 +653,19 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev) 
	ret = of_platform_populate(np, NULL, NULL, dev);

	if (ret) {

		dev_err(dev, "failed to register dwc3 core - %d\n", ret);

		return ret;

		goto node_put;

	}



	qcom->dwc3 = of_find_device_by_node(dwc3_np);

	if (!qcom->dwc3) {

		ret = -ENODEV;

		dev_err(dev, "failed to get dwc3 platform device\n");

		return -ENODEV;

	}



	return 0;

node_put:

	of_node_put(dwc3_np);



	return ret;

}



static struct platform_device *
@@ -938,6 +944,8 @@ static const struct dwc3_acpi_pdata sdm845_acpi_urs_pdata = { 
static const struct acpi_device_id dwc3_qcom_acpi_match[] = {

	{ "QCOM2430", (unsigned long)&sdm845_acpi_pdata },

	{ "QCOM0304", (unsigned long)&sdm845_acpi_urs_pdata },

	{ "QCOM0497", (unsigned long)&sdm845_acpi_urs_pdata },

	{ "QCOM04A6", (unsigned long)&sdm845_acpi_pdata },

	{ },

};

MODULE_DEVICE_TABLE(acpi, dwc3_qcom_acpi_match);

drivers/usb/gadget/function/f_uac1.c

+1 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ static void f_audio_disable(struct usb_function *f) 
	uac1->as_out_alt = 0;

	uac1->as_in_alt = 0;



	u_audio_stop_playback(&uac1->g_audio);

	u_audio_stop_capture(&uac1->g_audio);

}

drivers/usb/gadget/function/f_uac2.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static int set_ep_max_packet_size(const struct f_uac2_opts *uac2_opts, 
	}



	max_size_bw = num_channels(chmask) * ssize *

		DIV_ROUND_UP(srate, factor / (1 << (ep_desc->bInterval - 1)));

		((srate / (factor / (1 << (ep_desc->bInterval - 1)))) + 1);

	ep_desc->wMaxPacketSize = cpu_to_le16(min_t(u16, max_size_bw,

						    max_size_ep));