Commit 0a0b96b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.7-rc5' 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.7-rc5 to resolve some reported
  issues:

   - syzbot found problems fixed

   - usbfs dma mapping fix

   - typec bugfixs

   - chipidea bugfix

   - usb4/thunderbolt fix

   - new device ids/quirks

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

* tag 'usb-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: chipidea: msm: Ensure proper controller reset using role switch API
  usb: typec: mux: intel: Handle alt mode HPD_HIGH
  usb: usbfs: correct kernel->user page attribute mismatch
  usb: typec: intel_pmc_mux: Fix the property names
  USB: core: Fix misleading driver bug report
  USB: serial: qcserial: Add DW5816e support
  USB: uas: add quirk for LaCie 2Big Quadra
  thunderbolt: Check return value of tb_sw_read() in usb4_switch_op()
  USB: serial: garmin_gps: add sanity checking for data length
parents 775a8e03 91edf63d

drivers/thunderbolt/usb4.c

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ static int usb4_switch_op(struct tb_switch *sw, u16 opcode, u8 *status) 
		return ret;



	ret = tb_sw_read(sw, &val, TB_CFG_SWITCH, ROUTER_CS_26, 1);

	if (ret)

		return ret;



	if (val & ROUTER_CS_26_ONS)

		return -EOPNOTSUPP;

drivers/usb/chipidea/ci_hdrc_msm.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) 
			hw_write_id_reg(ci, HS_PHY_GENCONFIG_2,

					HS_PHY_ULPI_TX_PKT_EN_CLR_FIX, 0);



		if (!IS_ERR(ci->platdata->vbus_extcon.edev)) {

		if (!IS_ERR(ci->platdata->vbus_extcon.edev) || ci->role_switch) {

			hw_write_id_reg(ci, HS_PHY_GENCONFIG_2,

					HS_PHY_SESS_VLD_CTRL_EN,

					HS_PHY_SESS_VLD_CTRL_EN);

drivers/usb/core/devio.c

+2 −3
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma) 
{

	struct usb_memory *usbm = NULL;

	struct usb_dev_state *ps = file->private_data;

	struct usb_hcd *hcd = bus_to_hcd(ps->dev->bus);

	size_t size = vma->vm_end - vma->vm_start;

	void *mem;

	unsigned long flags;
@@ -250,9 +251,7 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma) 
	usbm->vma_use_count = 1;

	INIT_LIST_HEAD(&usbm->memlist);



	if (remap_pfn_range(vma, vma->vm_start,

			virt_to_phys(usbm->mem) >> PAGE_SHIFT,

			size, vma->vm_page_prot) < 0) {

	if (dma_mmap_coherent(hcd->self.sysdev, vma, mem, dma_handle, size)) {

		dec_usb_memory_use_count(usbm, &usbm->vma_use_count);

		return -EAGAIN;

	}

drivers/usb/core/message.c

+2 −2
Original line number Diff line number Diff line
@@ -1144,11 +1144,11 @@ void usb_disable_endpoint(struct usb_device *dev, unsigned int epaddr, 


	if (usb_endpoint_out(epaddr)) {

		ep = dev->ep_out[epnum];

		if (reset_hardware)

		if (reset_hardware && epnum != 0)

			dev->ep_out[epnum] = NULL;

	} else {

		ep = dev->ep_in[epnum];

		if (reset_hardware)

		if (reset_hardware && epnum != 0)

			dev->ep_in[epnum] = NULL;

	}

	if (ep) {

drivers/usb/serial/garmin_gps.c

+2 −2
Original line number Diff line number Diff line
@@ -1138,8 +1138,8 @@ static void garmin_read_process(struct garmin_data *garmin_data_p, 
		   send it directly to the tty port */

		if (garmin_data_p->flags & FLAGS_QUEUING) {

			pkt_add(garmin_data_p, data, data_length);

		} else if (bulk_data ||

			   getLayerId(data) == GARMIN_LAYERID_APPL) {

		} else if (bulk_data || (data_length >= sizeof(u32) &&

				getLayerId(data) == GARMIN_LAYERID_APPL)) {



			spin_lock_irqsave(&garmin_data_p->lock, flags);

			garmin_data_p->flags |= APP_RESP_SEEN;

CRA Git | Maintained and supported by SUSTech CRA and CCSE