Commit 447e238f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a few tiny USB fixes for reported issues with some USB
  drivers.

  These fixes include:

   - gadget driver fixes for regressions

   - tcpm driver fix

   - dwc3 driver fixes

   - xhci renesas firmware loading fix, again.

   - usb serial option driver device id addition

   - usb serial ch341 revert for regression

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

* tag 'usb-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: gadget: u_audio: fix race condition on endpoint stop
  usb: gadget: f_uac2: fixup feedback endpoint stop
  usb: typec: tcpm: Raise vdm_sm_running flag only when VDM SM is running
  usb: renesas-xhci: Prefer firmware loading on unknown ROM state
  usb: dwc3: gadget: Stop EP0 transfers during pullup disable
  usb: dwc3: gadget: Fix dwc3_calc_trbs_left()
  Revert "USB: serial: ch341: fix character loss at high transfer rates"
  USB: serial: option: add new VID/PID to support Fibocom FG150
parents 9f73eacd 068fdad2

drivers/usb/dwc3/gadget.c

+11 −12
Original line number Diff line number Diff line
@@ -940,19 +940,19 @@ static struct dwc3_trb *dwc3_ep_prev_trb(struct dwc3_ep *dep, u8 index) 


static u32 dwc3_calc_trbs_left(struct dwc3_ep *dep)

{

	struct dwc3_trb		*tmp;

	u8			trbs_left;



	/*

	 * If enqueue & dequeue are equal than it is either full or empty.

	 *

	 * One way to know for sure is if the TRB right before us has HWO bit

	 * set or not. If it has, then we're definitely full and can't fit any

	 * more transfers in our ring.

	 * If the enqueue & dequeue are equal then the TRB ring is either full

	 * or empty. It's considered full when there are DWC3_TRB_NUM-1 of TRBs

	 * pending to be processed by the driver.

	 */

	if (dep->trb_enqueue == dep->trb_dequeue) {

		tmp = dwc3_ep_prev_trb(dep, dep->trb_enqueue);

		if (tmp->ctrl & DWC3_TRB_CTRL_HWO)

		/*

		 * If there is any request remained in the started_list at

		 * this point, that means there is no TRB available.

		 */

		if (!list_empty(&dep->started_list))

			return 0;



		return DWC3_TRB_NUM - 1;
@@ -2243,10 +2243,8 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) 


		ret = wait_for_completion_timeout(&dwc->ep0_in_setup,

				msecs_to_jiffies(DWC3_PULL_UP_TIMEOUT));

		if (ret == 0) {

			dev_err(dwc->dev, "timed out waiting for SETUP phase\n");

			return -ETIMEDOUT;

		}

		if (ret == 0)

			dev_warn(dwc->dev, "timed out waiting for SETUP phase\n");

	}



	/*
@@ -2458,6 +2456,7 @@ static int __dwc3_gadget_start(struct dwc3 *dwc) 
	/* begin to receive SETUP packets */

	dwc->ep0state = EP0_SETUP_PHASE;

	dwc->link_state = DWC3_LINK_STATE_SS_DIS;

	dwc->delayed_status = false;

	dwc3_ep0_out_start(dwc);



	dwc3_gadget_enable_irq(dwc);

drivers/usb/gadget/function/u_audio.c

+15 −8
Original line number Diff line number Diff line
@@ -230,7 +230,13 @@ static void u_audio_iso_fback_complete(struct usb_ep *ep, 
	int status = req->status;



	/* i/f shutting down */

	if (!prm->fb_ep_enabled || req->status == -ESHUTDOWN)

	if (!prm->fb_ep_enabled) {

		kfree(req->buf);

		usb_ep_free_request(ep, req);

		return;

	}



	if (req->status == -ESHUTDOWN)

		return;



	/*
@@ -388,8 +394,6 @@ static inline void free_ep(struct uac_rtd_params *prm, struct usb_ep *ep) 
	if (!prm->ep_enabled)

		return;



	prm->ep_enabled = false;



	audio_dev = uac->audio_dev;

	params = &audio_dev->params;
@@ -407,6 +411,8 @@ static inline void free_ep(struct uac_rtd_params *prm, struct usb_ep *ep) 
		}

	}



	prm->ep_enabled = false;



	if (usb_ep_disable(ep))

		dev_err(uac->card->dev, "%s:%d Error!\n", __func__, __LINE__);

}
@@ -418,15 +424,16 @@ static inline void free_ep_fback(struct uac_rtd_params *prm, struct usb_ep *ep) 
	if (!prm->fb_ep_enabled)

		return;



	prm->fb_ep_enabled = false;



	if (prm->req_fback) {

		usb_ep_dequeue(ep, prm->req_fback);

		if (usb_ep_dequeue(ep, prm->req_fback)) {

			kfree(prm->req_fback->buf);

			usb_ep_free_request(ep, prm->req_fback);

		}

		prm->req_fback = NULL;

	}



	prm->fb_ep_enabled = false;



	if (usb_ep_disable(ep))

		dev_err(uac->card->dev, "%s:%d Error!\n", __func__, __LINE__);

}

drivers/usb/host/xhci-pci-renesas.c

+23 −12
Original line number Diff line number Diff line
@@ -207,7 +207,8 @@ static int renesas_check_rom_state(struct pci_dev *pdev) 
			return 0;



		case RENESAS_ROM_STATUS_NO_RESULT: /* No result yet */

			return 0;

			dev_dbg(&pdev->dev, "Unknown ROM status ...\n");

			return -ENOENT;



		case RENESAS_ROM_STATUS_ERROR: /* Error State */

		default: /* All other states are marked as "Reserved states" */
@@ -224,14 +225,6 @@ static int renesas_fw_check_running(struct pci_dev *pdev) 
	u8 fw_state;

	int err;



	/* Check if device has ROM and loaded, if so skip everything */

	err = renesas_check_rom(pdev);

	if (err) { /* we have rom */

		err = renesas_check_rom_state(pdev);

		if (!err)

			return err;

	}



	/*

	 * Test if the device is actually needing the firmware. As most

	 * BIOSes will initialize the device for us. If the device is
@@ -591,21 +584,39 @@ int renesas_xhci_check_request_fw(struct pci_dev *pdev, 
			(struct xhci_driver_data *)id->driver_data;

	const char *fw_name = driver_data->firmware;

	const struct firmware *fw;

	bool has_rom;

	int err;



	/* Check if device has ROM and loaded, if so skip everything */

	has_rom = renesas_check_rom(pdev);

	if (has_rom) {

		err = renesas_check_rom_state(pdev);

		if (!err)

			return 0;

		else if (err != -ENOENT)

			has_rom = false;

	}



	err = renesas_fw_check_running(pdev);

	/* Continue ahead, if the firmware is already running. */

	if (err == 0)

		return 0;



	/* no firmware interface available */

	if (err != 1)

		return err;

		return has_rom ? 0 : err;



	pci_dev_get(pdev);

	err = request_firmware(&fw, fw_name, &pdev->dev);

	err = firmware_request_nowarn(&fw, fw_name, &pdev->dev);

	pci_dev_put(pdev);

	if (err) {

		dev_err(&pdev->dev, "request_firmware failed: %d\n", err);

		if (has_rom) {

			dev_info(&pdev->dev, "failed to load firmware %s, fallback to ROM\n",

				 fw_name);

			return 0;

		}

		dev_err(&pdev->dev, "failed to load firmware %s: %d\n",

			fw_name, err);

		return err;

	}

drivers/usb/serial/ch341.c

+0 −1
Original line number Diff line number Diff line
@@ -851,7 +851,6 @@ static struct usb_serial_driver ch341_device = { 
		.owner	= THIS_MODULE,

		.name	= "ch341-uart",

	},

	.bulk_in_size      = 512,

	.id_table          = id_table,

	.num_ports         = 1,

	.open              = ch341_open,

drivers/usb/serial/option.c

+2 −0
Original line number Diff line number Diff line
@@ -2074,6 +2074,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(4) | RSVD(5) },

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff),			/* Fibocom NL678 series */

	  .driver_info = RSVD(6) },

	{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) },	/* Fibocom FG150 Diag */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) },		/* Fibocom FG150 AT */

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) },			/* Fibocom NL668-AM/NL652-EU (laptop MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) },			/* LongSung M5710 */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) },			/* GosunCn GM500 RNDIS */