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

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

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

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

Felipe writes:

usb: fixes for v4.4-rc2

First round of fixes for this -rc cycle. We have the
usual set of miscellaneous fixes. The important
thing here is support for Intel Broxton SoC on dwc3,
some fixes for Rockchip SoCs on dwc2 and a fix on
dwc3 to let it report lower speeds than
USB_SPEED_SUPER.
parents 8005c49d d134c48d

drivers/usb/dwc2/hcd.c

+5 −4
Original line number Diff line number Diff line
@@ -324,12 +324,13 @@ void dwc2_hcd_disconnect(struct dwc2_hsotg *hsotg) 
 */

static void dwc2_hcd_rem_wakeup(struct dwc2_hsotg *hsotg)

{

	if (hsotg->lx_state == DWC2_L2) {

	if (hsotg->bus_suspended) {

		hsotg->flags.b.port_suspend_change = 1;

		usb_hcd_resume_root_hub(hsotg->priv);

	} else {

		hsotg->flags.b.port_l1_change = 1;

	}



	if (hsotg->lx_state == DWC2_L1)

		hsotg->flags.b.port_l1_change = 1;

}



/**
@@ -1428,8 +1429,8 @@ static void dwc2_wakeup_detected(unsigned long data) 
	dev_dbg(hsotg->dev, "Clear Resume: HPRT0=%0x\n",

		dwc2_readl(hsotg->regs + HPRT0));



	hsotg->bus_suspended = 0;

	dwc2_hcd_rem_wakeup(hsotg);

	hsotg->bus_suspended = 0;



	/* Change to L0 state */

	hsotg->lx_state = DWC2_L0;

drivers/usb/dwc2/platform.c

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ static const struct dwc2_core_params params_rk3066 = { 
	.host_ls_low_power_phy_clk	= -1,

	.ts_dline			= -1,

	.reload_ctl			= -1,

	.ahbcfg				= 0x7, /* INCR16 */

	.ahbcfg				= GAHBCFG_HBSTLEN_INCR16 <<

					  GAHBCFG_HBSTLEN_SHIFT,

	.uframe_sched			= -1,

	.external_id_pin_ctl		= -1,

	.hibernation			= -1,

drivers/usb/dwc3/dwc3-pci.c

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#define PCI_DEVICE_ID_INTEL_BSW			0x22b7

#define PCI_DEVICE_ID_INTEL_SPTLP		0x9d30

#define PCI_DEVICE_ID_INTEL_SPTH		0xa130

#define PCI_DEVICE_ID_INTEL_BXT			0x0aaa

#define PCI_DEVICE_ID_INTEL_APL			0x5aaa



static const struct acpi_gpio_params reset_gpios = { 0, 0, false };

static const struct acpi_gpio_params cs_gpios = { 1, 0, false };
@@ -210,6 +212,8 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MRFLD), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SPTLP), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SPTH), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BXT), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_APL), },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), },

	{  }	/* Terminating Entry */

};

drivers/usb/dwc3/gadget.c

+23 −1
Original line number Diff line number Diff line
@@ -2744,11 +2744,33 @@ int dwc3_gadget_init(struct dwc3 *dwc) 
	}



	dwc->gadget.ops			= &dwc3_gadget_ops;

	dwc->gadget.max_speed		= USB_SPEED_SUPER;

	dwc->gadget.speed		= USB_SPEED_UNKNOWN;

	dwc->gadget.sg_supported	= true;

	dwc->gadget.name		= "dwc3-gadget";



	/*

	 * FIXME We might be setting max_speed to <SUPER, however versions

	 * <2.20a of dwc3 have an issue with metastability (documented

	 * elsewhere in this driver) which tells us we can't set max speed to

	 * anything lower than SUPER.

	 *

	 * Because gadget.max_speed is only used by composite.c and function

	 * drivers (i.e. it won't go into dwc3's registers) we are allowing this

	 * to happen so we avoid sending SuperSpeed Capability descriptor

	 * together with our BOS descriptor as that could confuse host into

	 * thinking we can handle super speed.

	 *

	 * Note that, in fact, we won't even support GetBOS requests when speed

	 * is less than super speed because we don't have means, yet, to tell

	 * composite.c that we are USB 2.0 + LPM ECN.

	 */

	if (dwc->revision < DWC3_REVISION_220A)

		dwc3_trace(trace_dwc3_gadget,

				"Changing max_speed on rev %08x\n",

				dwc->revision);



	dwc->gadget.max_speed		= dwc->maximum_speed;



	/*

	 * Per databook, DWC3 needs buffer size to be aligned to MaxPacketSize

	 * on ep out.

drivers/usb/gadget/function/f_loopback.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static int alloc_requests(struct usb_composite_dev *cdev, 
	for (i = 0; i < loop->qlen && result == 0; i++) {

		result = -ENOMEM;



		in_req = usb_ep_alloc_request(loop->in_ep, GFP_KERNEL);

		in_req = usb_ep_alloc_request(loop->in_ep, GFP_ATOMIC);

		if (!in_req)

			goto fail;