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

Commit 99c605a3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v4.1-rc2' of... 

Merge tag 'fixes-for-v4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-linus

Felipe writes:

usb: fixes for v4.1-rc2

Here's the first pull request for v4.1-rc cycle,
it contains a few interesting fixes including a
fix to correct register offsets on dwc3, a fix
for Kconfig dependencies on isp1301 phy driver,
and a bug fix for our configfs gadget creation
interface.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parents 5ebe6afa c94e289f

drivers/usb/dwc3/dwc3-omap.c

+47 −47
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ 
#define USBOTGSS_IRQENABLE_SET_MISC		0x003c

#define USBOTGSS_IRQENABLE_CLR_MISC		0x0040

#define USBOTGSS_IRQMISC_OFFSET			0x03fc

#define USBOTGSS_UTMI_OTG_CTRL			0x0080

#define USBOTGSS_UTMI_OTG_STATUS		0x0084

#define USBOTGSS_UTMI_OTG_STATUS		0x0080

#define USBOTGSS_UTMI_OTG_CTRL			0x0084

#define USBOTGSS_UTMI_OTG_OFFSET		0x0480

#define USBOTGSS_TXFIFO_DEPTH			0x0508

#define USBOTGSS_RXFIFO_DEPTH			0x050c
@@ -98,20 +98,20 @@ 
#define USBOTGSS_IRQMISC_DISCHRGVBUS_FALL		(1 << 3)

#define USBOTGSS_IRQMISC_IDPULLUP_FALL		(1 << 0)



/* UTMI_OTG_CTRL REGISTER */

#define USBOTGSS_UTMI_OTG_CTRL_DRVVBUS		(1 << 5)

#define USBOTGSS_UTMI_OTG_CTRL_CHRGVBUS		(1 << 4)

#define USBOTGSS_UTMI_OTG_CTRL_DISCHRGVBUS	(1 << 3)

#define USBOTGSS_UTMI_OTG_CTRL_IDPULLUP		(1 << 0)



/* UTMI_OTG_STATUS REGISTER */

#define USBOTGSS_UTMI_OTG_STATUS_SW_MODE	(1 << 31)

#define USBOTGSS_UTMI_OTG_STATUS_POWERPRESENT	(1 << 9)

#define USBOTGSS_UTMI_OTG_STATUS_TXBITSTUFFENABLE (1 << 8)

#define USBOTGSS_UTMI_OTG_STATUS_IDDIG		(1 << 4)

#define USBOTGSS_UTMI_OTG_STATUS_SESSEND	(1 << 3)

#define USBOTGSS_UTMI_OTG_STATUS_SESSVALID	(1 << 2)

#define USBOTGSS_UTMI_OTG_STATUS_VBUSVALID	(1 << 1)

#define USBOTGSS_UTMI_OTG_STATUS_DRVVBUS	(1 << 5)

#define USBOTGSS_UTMI_OTG_STATUS_CHRGVBUS	(1 << 4)

#define USBOTGSS_UTMI_OTG_STATUS_DISCHRGVBUS	(1 << 3)

#define USBOTGSS_UTMI_OTG_STATUS_IDPULLUP	(1 << 0)



/* UTMI_OTG_CTRL REGISTER */

#define USBOTGSS_UTMI_OTG_CTRL_SW_MODE		(1 << 31)

#define USBOTGSS_UTMI_OTG_CTRL_POWERPRESENT	(1 << 9)

#define USBOTGSS_UTMI_OTG_CTRL_TXBITSTUFFENABLE (1 << 8)

#define USBOTGSS_UTMI_OTG_CTRL_IDDIG		(1 << 4)

#define USBOTGSS_UTMI_OTG_CTRL_SESSEND		(1 << 3)

#define USBOTGSS_UTMI_OTG_CTRL_SESSVALID	(1 << 2)

#define USBOTGSS_UTMI_OTG_CTRL_VBUSVALID	(1 << 1)



struct dwc3_omap {

	struct device		*dev;
@@ -119,7 +119,7 @@ struct dwc3_omap { 
	int			irq;

	void __iomem		*base;



	u32			utmi_otg_status;

	u32			utmi_otg_ctrl;

	u32			utmi_otg_offset;

	u32			irqmisc_offset;

	u32			irq_eoi_offset;
@@ -153,15 +153,15 @@ static inline void dwc3_omap_writel(void __iomem *base, u32 offset, u32 value) 
	writel(value, base + offset);

}



static u32 dwc3_omap_read_utmi_status(struct dwc3_omap *omap)

static u32 dwc3_omap_read_utmi_ctrl(struct dwc3_omap *omap)

{

	return dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS +

	return dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_CTRL +

							omap->utmi_otg_offset);

}



static void dwc3_omap_write_utmi_status(struct dwc3_omap *omap, u32 value)

static void dwc3_omap_write_utmi_ctrl(struct dwc3_omap *omap, u32 value)

{

	dwc3_omap_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS +

	dwc3_omap_writel(omap->base, USBOTGSS_UTMI_OTG_CTRL +

					omap->utmi_otg_offset, value);



}
@@ -235,25 +235,25 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap, 
			}

		}



		val = dwc3_omap_read_utmi_status(omap);

		val &= ~(USBOTGSS_UTMI_OTG_STATUS_IDDIG

				| USBOTGSS_UTMI_OTG_STATUS_VBUSVALID

				| USBOTGSS_UTMI_OTG_STATUS_SESSEND);

		val |= USBOTGSS_UTMI_OTG_STATUS_SESSVALID

				| USBOTGSS_UTMI_OTG_STATUS_POWERPRESENT;

		dwc3_omap_write_utmi_status(omap, val);

		val = dwc3_omap_read_utmi_ctrl(omap);

		val &= ~(USBOTGSS_UTMI_OTG_CTRL_IDDIG

				| USBOTGSS_UTMI_OTG_CTRL_VBUSVALID

				| USBOTGSS_UTMI_OTG_CTRL_SESSEND);

		val |= USBOTGSS_UTMI_OTG_CTRL_SESSVALID

				| USBOTGSS_UTMI_OTG_CTRL_POWERPRESENT;

		dwc3_omap_write_utmi_ctrl(omap, val);

		break;



	case OMAP_DWC3_VBUS_VALID:

		dev_dbg(omap->dev, "VBUS Connect\n");



		val = dwc3_omap_read_utmi_status(omap);

		val &= ~USBOTGSS_UTMI_OTG_STATUS_SESSEND;

		val |= USBOTGSS_UTMI_OTG_STATUS_IDDIG

				| USBOTGSS_UTMI_OTG_STATUS_VBUSVALID

				| USBOTGSS_UTMI_OTG_STATUS_SESSVALID

				| USBOTGSS_UTMI_OTG_STATUS_POWERPRESENT;

		dwc3_omap_write_utmi_status(omap, val);

		val = dwc3_omap_read_utmi_ctrl(omap);

		val &= ~USBOTGSS_UTMI_OTG_CTRL_SESSEND;

		val |= USBOTGSS_UTMI_OTG_CTRL_IDDIG

				| USBOTGSS_UTMI_OTG_CTRL_VBUSVALID

				| USBOTGSS_UTMI_OTG_CTRL_SESSVALID

				| USBOTGSS_UTMI_OTG_CTRL_POWERPRESENT;

		dwc3_omap_write_utmi_ctrl(omap, val);

		break;



	case OMAP_DWC3_ID_FLOAT:
@@ -263,13 +263,13 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap, 
	case OMAP_DWC3_VBUS_OFF:

		dev_dbg(omap->dev, "VBUS Disconnect\n");



		val = dwc3_omap_read_utmi_status(omap);

		val &= ~(USBOTGSS_UTMI_OTG_STATUS_SESSVALID

				| USBOTGSS_UTMI_OTG_STATUS_VBUSVALID

				| USBOTGSS_UTMI_OTG_STATUS_POWERPRESENT);

		val |= USBOTGSS_UTMI_OTG_STATUS_SESSEND

				| USBOTGSS_UTMI_OTG_STATUS_IDDIG;

		dwc3_omap_write_utmi_status(omap, val);

		val = dwc3_omap_read_utmi_ctrl(omap);

		val &= ~(USBOTGSS_UTMI_OTG_CTRL_SESSVALID

				| USBOTGSS_UTMI_OTG_CTRL_VBUSVALID

				| USBOTGSS_UTMI_OTG_CTRL_POWERPRESENT);

		val |= USBOTGSS_UTMI_OTG_CTRL_SESSEND

				| USBOTGSS_UTMI_OTG_CTRL_IDDIG;

		dwc3_omap_write_utmi_ctrl(omap, val);

		break;



	default:
@@ -422,22 +422,22 @@ static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap) 
	struct device_node	*node = omap->dev->of_node;

	int			utmi_mode = 0;



	reg = dwc3_omap_read_utmi_status(omap);

	reg = dwc3_omap_read_utmi_ctrl(omap);



	of_property_read_u32(node, "utmi-mode", &utmi_mode);



	switch (utmi_mode) {

	case DWC3_OMAP_UTMI_MODE_SW:

		reg |= USBOTGSS_UTMI_OTG_STATUS_SW_MODE;

		reg |= USBOTGSS_UTMI_OTG_CTRL_SW_MODE;

		break;

	case DWC3_OMAP_UTMI_MODE_HW:

		reg &= ~USBOTGSS_UTMI_OTG_STATUS_SW_MODE;

		reg &= ~USBOTGSS_UTMI_OTG_CTRL_SW_MODE;

		break;

	default:

		dev_dbg(omap->dev, "UNKNOWN utmi mode %d\n", utmi_mode);

	}



	dwc3_omap_write_utmi_status(omap, reg);

	dwc3_omap_write_utmi_ctrl(omap, reg);

}



static int dwc3_omap_extcon_register(struct dwc3_omap *omap)
@@ -614,7 +614,7 @@ static int dwc3_omap_suspend(struct device *dev) 
{

	struct dwc3_omap	*omap = dev_get_drvdata(dev);



	omap->utmi_otg_status = dwc3_omap_read_utmi_status(omap);

	omap->utmi_otg_ctrl = dwc3_omap_read_utmi_ctrl(omap);

	dwc3_omap_disable_irqs(omap);



	return 0;
@@ -624,7 +624,7 @@ static int dwc3_omap_resume(struct device *dev) 
{

	struct dwc3_omap	*omap = dev_get_drvdata(dev);



	dwc3_omap_write_utmi_status(omap, omap->utmi_otg_status);

	dwc3_omap_write_utmi_ctrl(omap, omap->utmi_otg_ctrl);

	dwc3_omap_enable_irqs(omap);



	pm_runtime_disable(dev);

drivers/usb/gadget/configfs.c

+1 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,7 @@ static void purge_configs_funcs(struct gadget_info *gi) 
			}

		}

		c->next_interface_id = 0;

		memset(c->interface, 0, sizeof(c->interface));

		c->superspeed = 0;

		c->highspeed = 0;

		c->fullspeed = 0;

drivers/usb/gadget/function/f_hid.c

+14 −2
Original line number Diff line number Diff line
@@ -437,12 +437,20 @@ static int hidg_setup(struct usb_function *f, 
		  | USB_REQ_GET_DESCRIPTOR):

		switch (value >> 8) {

		case HID_DT_HID:

		{

			struct hid_descriptor hidg_desc_copy = hidg_desc;



			VDBG(cdev, "USB_REQ_GET_DESCRIPTOR: HID\n");

			hidg_desc_copy.desc[0].bDescriptorType = HID_DT_REPORT;

			hidg_desc_copy.desc[0].wDescriptorLength =

				cpu_to_le16(hidg->report_desc_length);



			length = min_t(unsigned short, length,

						   hidg_desc.bLength);

			memcpy(req->buf, &hidg_desc, length);

						   hidg_desc_copy.bLength);

			memcpy(req->buf, &hidg_desc_copy, length);

			goto respond;

			break;

		}

		case HID_DT_REPORT:

			VDBG(cdev, "USB_REQ_GET_DESCRIPTOR: REPORT\n");

			length = min_t(unsigned short, length,
@@ -632,6 +640,10 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) 
	hidg_fs_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);

	hidg_hs_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);

	hidg_fs_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);

	/*

	 * We can use hidg_desc struct here but we should not relay

	 * that its content won't change after returning from this function.

	 */

	hidg_desc.desc[0].bDescriptorType = HID_DT_REPORT;

	hidg_desc.desc[0].wDescriptorLength =

		cpu_to_le16(hidg->report_desc_length);

drivers/usb/gadget/function/u_serial.c

+4 −1
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ struct gs_port { 
	int write_allocated;

	struct gs_buf		port_write_buf;

	wait_queue_head_t	drain_wait;	/* wait while writes drain */

	bool                    write_busy;



	/* REVISIT this state ... */

	struct usb_cdc_line_coding port_line_coding;	/* 8-N-1 etc */
@@ -363,7 +364,7 @@ __acquires(&port->port_lock) 
	int			status = 0;

	bool			do_tty_wake = false;



	while (!list_empty(pool)) {

	while (!port->write_busy && !list_empty(pool)) {

		struct usb_request	*req;

		int			len;
@@ -393,9 +394,11 @@ __acquires(&port->port_lock) 
		 * NOTE that we may keep sending data for a while after

		 * the TTY closed (dev->ioport->port_tty is NULL).

		 */

		port->write_busy = true;

		spin_unlock(&port->port_lock);

		status = usb_ep_queue(in, req, GFP_ATOMIC);

		spin_lock(&port->port_lock);

		port->write_busy = false;



		if (status) {

			pr_debug("%s: %s %s err %d\n",

drivers/usb/gadget/legacy/acm_ms.c

+5 −5
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static struct usb_function *f_msg; 
/*

 * We _always_ have both ACM and mass storage functions.

 */

static int __init acm_ms_do_config(struct usb_configuration *c)

static int acm_ms_do_config(struct usb_configuration *c)

{

	struct fsg_opts *opts;

	int	status;
@@ -174,7 +174,7 @@ static struct usb_configuration acm_ms_config_driver = { 


/*-------------------------------------------------------------------------*/



static int __init acm_ms_bind(struct usb_composite_dev *cdev)

static int acm_ms_bind(struct usb_composite_dev *cdev)

{

	struct usb_gadget	*gadget = cdev->gadget;

	struct fsg_opts		*opts;
@@ -249,7 +249,7 @@ fail_get_msg: 
	return status;

}



static int __exit acm_ms_unbind(struct usb_composite_dev *cdev)

static int acm_ms_unbind(struct usb_composite_dev *cdev)

{

	usb_put_function(f_msg);

	usb_put_function_instance(fi_msg);
@@ -258,13 +258,13 @@ static int __exit acm_ms_unbind(struct usb_composite_dev *cdev) 
	return 0;

}



static __refdata struct usb_composite_driver acm_ms_driver = {

static struct usb_composite_driver acm_ms_driver = {

	.name		= "g_acm_ms",

	.dev		= &device_desc,

	.max_speed	= USB_SPEED_SUPER,

	.strings	= dev_strings,

	.bind		= acm_ms_bind,

	.unbind		= __exit_p(acm_ms_unbind),

	.unbind		= acm_ms_unbind,

};



module_usb_composite_driver(acm_ms_driver);