Commit 8e95cb33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some USB driver fixes for 4.17-rc4.

  The majority of them are some USB gadget fixes that missed my last
  pull request. The "largest" patch in here is a fix for the old visor
  driver that syzbot found 6 months or so ago and I finally remembered
  to fix it.

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

* tag 'usb-4.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  Revert "usb: host: ehci: Use dma_pool_zalloc()"
  usb: typec: tps6598x: handle block reads separately with plain-I2C adapters
  usb: typec: tcpm: Release the role mux when exiting
  USB: Accept bulk endpoints with 1024-byte maxpacket
  xhci: Fix use-after-free in xhci_free_virt_device
  USB: serial: visor: handle potential invalid device configuration
  USB: serial: option: adding support for ublox R410M
  usb: musb: trace: fix NULL pointer dereference in musb_g_tx()
  usb: musb: host: fix potential NULL pointer dereference
  usb: gadget: composite Allow for larger configuration descriptors
  usb: dwc3: gadget: Fix list_del corruption in dwc3_ep_dequeue
  usb: dwc3: gadget: dwc3_gadget_del_and_unmap_request() can be static
  usb: dwc2: pci: Fix error return code in dwc2_pci_probe()
  usb: dwc2: WA for Full speed ISOC IN in DDMA mode.
  usb: dwc2: dwc2_vbus_supply_init: fix error check
  usb: gadget: f_phonet: fix pn_net_xmit()'s return type
parents c1c07416 6844dc42

drivers/usb/core/config.c

+3 −1
Original line number Diff line number Diff line
@@ -191,7 +191,9 @@ static const unsigned short full_speed_maxpacket_maxes[4] = { 
static const unsigned short high_speed_maxpacket_maxes[4] = {

	[USB_ENDPOINT_XFER_CONTROL] = 64,

	[USB_ENDPOINT_XFER_ISOC] = 1024,

	[USB_ENDPOINT_XFER_BULK] = 512,



	/* Bulk should be 512, but some devices use 1024: we will warn below */

	[USB_ENDPOINT_XFER_BULK] = 1024,

	[USB_ENDPOINT_XFER_INT] = 1024,

};

static const unsigned short super_speed_maxpacket_maxes[4] = {

drivers/usb/dwc2/core.h

+2 −0
Original line number Diff line number Diff line
@@ -985,6 +985,7 @@ struct dwc2_hsotg { 


	/* DWC OTG HW Release versions */

#define DWC2_CORE_REV_2_71a	0x4f54271a

#define DWC2_CORE_REV_2_72a     0x4f54272a

#define DWC2_CORE_REV_2_80a	0x4f54280a

#define DWC2_CORE_REV_2_90a	0x4f54290a

#define DWC2_CORE_REV_2_91a	0x4f54291a
@@ -992,6 +993,7 @@ struct dwc2_hsotg { 
#define DWC2_CORE_REV_2_94a	0x4f54294a

#define DWC2_CORE_REV_3_00a	0x4f54300a

#define DWC2_CORE_REV_3_10a	0x4f54310a

#define DWC2_CORE_REV_4_00a	0x4f54400a

#define DWC2_FS_IOT_REV_1_00a	0x5531100a

#define DWC2_HS_IOT_REV_1_00a	0x5532100a

drivers/usb/dwc2/gadget.c

+21 −0
Original line number Diff line number Diff line
@@ -3928,6 +3928,27 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep, 
	if (index && !hs_ep->isochronous)

		epctrl |= DXEPCTL_SETD0PID;



	/* WA for Full speed ISOC IN in DDMA mode.

	 * By Clear NAK status of EP, core will send ZLP

	 * to IN token and assert NAK interrupt relying

	 * on TxFIFO status only

	 */



	if (hsotg->gadget.speed == USB_SPEED_FULL &&

	    hs_ep->isochronous && dir_in) {

		/* The WA applies only to core versions from 2.72a

		 * to 4.00a (including both). Also for FS_IOT_1.00a

		 * and HS_IOT_1.00a.

		 */

		u32 gsnpsid = dwc2_readl(hsotg->regs + GSNPSID);



		if ((gsnpsid >= DWC2_CORE_REV_2_72a &&

		     gsnpsid <= DWC2_CORE_REV_4_00a) ||

		     gsnpsid == DWC2_FS_IOT_REV_1_00a ||

		     gsnpsid == DWC2_HS_IOT_REV_1_00a)

			epctrl |= DXEPCTL_CNAK;

	}



	dev_dbg(hsotg->dev, "%s: write DxEPCTL=0x%08x\n",

		__func__, epctrl);

drivers/usb/dwc2/hcd.c

+8 −5
Original line number Diff line number Diff line
@@ -358,9 +358,14 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg *hsotg) 


static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)

{

	int ret;



	hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");

	if (IS_ERR(hsotg->vbus_supply))

		return 0;

	if (IS_ERR(hsotg->vbus_supply)) {

		ret = PTR_ERR(hsotg->vbus_supply);

		hsotg->vbus_supply = NULL;

		return ret == -ENODEV ? 0 : ret;

	}



	return regulator_enable(hsotg->vbus_supply);

}
@@ -4342,9 +4347,7 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd) 


	spin_unlock_irqrestore(&hsotg->lock, flags);



	dwc2_vbus_supply_init(hsotg);



	return 0;

	return dwc2_vbus_supply_init(hsotg);

}



/*

drivers/usb/dwc2/pci.c

+3 −1
Original line number Diff line number Diff line
@@ -141,8 +141,10 @@ static int dwc2_pci_probe(struct pci_dev *pci, 
		goto err;



	glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL);

	if (!glue)

	if (!glue) {

		ret = -ENOMEM;

		goto err;

	}



	ret = platform_device_add(dwc2);

	if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE