Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a69c9e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "The USB sub-maintainers woke up this past week and sent a bunch of
  tiny fixes. Here are a lot of small patches that that resolve a bunch
  of reported issues in the USB core, drivers, serial drivers, gadget
  drivers, and of course, xhci :)

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

* tag 'usb-5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (31 commits)
  usb: dwc3: gadget: fix race when disabling ep with cancelled xfers
  usb: cdns3: gadget: Fix g_audio use case when connected to Super-Speed host
  usb: cdns3: gadget: reset EP_CLAIMED flag while unloading
  USB: serial: whiteheat: fix line-speed endianness
  USB: serial: whiteheat: fix potential slab corruption
  USB: gadget: Reject endpoints with 0 maxpacket value
  UAS: Revert commit 3ae62a42 ("UAS: fix alignment of scatter/gather segments")
  usb-storage: Revert commit 747668db ("usb-storage: Set virt_boundary_mask to avoid SG overflows")
  usbip: Fix free of unallocated memory in vhci tx
  usbip: tools: Fix read_usb_vudc_device() error path handling
  usb: xhci: fix __le32/__le64 accessors in debugfs code
  usb: xhci: fix Immediate Data Transfer endianness
  xhci: Fix use-after-free regression in xhci clear hub TT implementation
  USB: ldusb: fix control-message timeout
  USB: ldusb: use unsigned size format specifiers
  USB: ldusb: fix ring-buffer locking
  USB: Skip endpoints with 0 maxpacket length
  usb: cdns3: gadget: Don't manage pullups
  usb: dwc3: remove the call trace of USBx_GFLADJ
  usb: gadget: configfs: fix concurrent issue between composite APIs
  ...
parents 56cfd250 d8eca64e

drivers/usb/cdns3/gadget.c

+28 −9
Original line number Diff line number Diff line
@@ -2329,8 +2329,6 @@ static void cdns3_gadget_config(struct cdns3_device *priv_dev) 
	writel(USB_CONF_CLK2OFFDS | USB_CONF_L1DS, &regs->usb_conf);



	cdns3_configure_dmult(priv_dev, NULL);



	cdns3_gadget_pullup(&priv_dev->gadget, 1);

}



/**
@@ -2345,9 +2343,35 @@ static int cdns3_gadget_udc_start(struct usb_gadget *gadget, 
{

	struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget);

	unsigned long flags;

	enum usb_device_speed max_speed = driver->max_speed;



	spin_lock_irqsave(&priv_dev->lock, flags);

	priv_dev->gadget_driver = driver;



	/* limit speed if necessary */

	max_speed = min(driver->max_speed, gadget->max_speed);



	switch (max_speed) {

	case USB_SPEED_FULL:

		writel(USB_CONF_SFORCE_FS, &priv_dev->regs->usb_conf);

		writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);

		break;

	case USB_SPEED_HIGH:

		writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);

		break;

	case USB_SPEED_SUPER:

		break;

	default:

		dev_err(priv_dev->dev,

			"invalid maximum_speed parameter %d\n",

			max_speed);

		/* fall through */

	case USB_SPEED_UNKNOWN:

		/* default to superspeed */

		max_speed = USB_SPEED_SUPER;

		break;

	}



	cdns3_gadget_config(priv_dev);

	spin_unlock_irqrestore(&priv_dev->lock, flags);

	return 0;
@@ -2381,6 +2405,8 @@ static int cdns3_gadget_udc_stop(struct usb_gadget *gadget) 
		writel(EP_CMD_EPRST, &priv_dev->regs->ep_cmd);

		readl_poll_timeout_atomic(&priv_dev->regs->ep_cmd, val,

					  !(val & EP_CMD_EPRST), 1, 100);



		priv_ep->flags &= ~EP_CLAIMED;

	}



	/* disable interrupt for device */
@@ -2575,12 +2601,7 @@ static int cdns3_gadget_start(struct cdns3 *cdns) 
	/* Check the maximum_speed parameter */

	switch (max_speed) {

	case USB_SPEED_FULL:

		writel(USB_CONF_SFORCE_FS, &priv_dev->regs->usb_conf);

		writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);

		break;

	case USB_SPEED_HIGH:

		writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);

		break;

	case USB_SPEED_SUPER:

		break;

	default:
@@ -2713,8 +2734,6 @@ static int cdns3_gadget_suspend(struct cdns3 *cdns, bool do_wakeup) 
	/* disable interrupt for device */

	writel(0, &priv_dev->regs->usb_ien);



	cdns3_gadget_pullup(&priv_dev->gadget, 0);



	return 0;

}

drivers/usb/cdns3/host-export.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#ifdef CONFIG_USB_CDNS3_HOST



int cdns3_host_init(struct cdns3 *cdns);

void cdns3_host_exit(struct cdns3 *cdns);



#else

drivers/usb/cdns3/host.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/platform_device.h>

#include "core.h"

#include "drd.h"

#include "host-export.h"



static int __cdns3_host_init(struct cdns3 *cdns)

{

drivers/usb/core/config.c

+5 −0
Original line number Diff line number Diff line
@@ -348,6 +348,11 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum, 


	/* Validate the wMaxPacketSize field */

	maxp = usb_endpoint_maxp(&endpoint->desc);

	if (maxp == 0) {

		dev_warn(ddev, "config %d interface %d altsetting %d endpoint 0x%X has wMaxPacketSize 0, skipping\n",

		    cfgno, inum, asnum, d->bEndpointAddress);

		goto skip_to_next_endpoint_or_interface_descriptor;

	}



	/* Find the highest legal maxpacket size for this endpoint */

	i = 0;		/* additional transactions per microframe */

drivers/usb/dwc3/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ config USB_DWC3_MESON_G12A 
       depends on ARCH_MESON || COMPILE_TEST

       default USB_DWC3

       select USB_ROLE_SWITCH

	select REGMAP_MMIO

       help

         Support USB2/3 functionality in Amlogic G12A platforms.

	 Say 'Y' or 'M' if you have one such device.