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

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

Merge tag 'fixes-for-v4.10-rc3' of... 

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

Felipe writes:

usb: fixes for v4.10-rc3

The first set of fixes for v4.10-rc cycle. The most
important of which is a big regression on dwc3-pci
which prevents it from probing altogether.

There's also a fix to avoid Overflow events on DWC3
and another to make sure we don't starve DMA
resources.

Dummy HCD got some love after a long hiatus and DWC2
got a couple fixes related to DMA usage. Other than
these, we have a set of minor fixes here and there.
parents 0c744ea4 43aef5c2

drivers/usb/dwc2/gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -3753,7 +3753,7 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep, 
		hs_ep->desc_list = dma_alloc_coherent(hsotg->dev,

			MAX_DMA_DESC_NUM_GENERIC *

			sizeof(struct dwc2_dma_desc),

			&hs_ep->desc_list_dma, GFP_KERNEL);

			&hs_ep->desc_list_dma, GFP_ATOMIC);

		if (!hs_ep->desc_list) {

			ret = -ENOMEM;

			goto error2;

drivers/usb/dwc2/params.c

+9 −21
Original line number Diff line number Diff line
@@ -247,8 +247,6 @@ MODULE_DEVICE_TABLE(of, dwc2_of_match_table); 
static void dwc2_get_device_property(struct dwc2_hsotg *hsotg,

				     char *property, u8 size, u64 *value)

{

	u8 val8;

	u16 val16;

	u32 val32;



	switch (size) {
@@ -256,17 +254,7 @@ static void dwc2_get_device_property(struct dwc2_hsotg *hsotg, 
		*value = device_property_read_bool(hsotg->dev, property);

		break;

	case 1:

		if (device_property_read_u8(hsotg->dev, property, &val8))

			return;



		*value = val8;

		break;

	case 2:

		if (device_property_read_u16(hsotg->dev, property, &val16))

			return;



		*value = val16;

		break;

	case 4:

		if (device_property_read_u32(hsotg->dev, property, &val32))

			return;
@@ -1100,13 +1088,13 @@ static void dwc2_set_gadget_dma(struct dwc2_hsotg *hsotg) 
	/* Buffer DMA */

	dwc2_set_param_bool(hsotg, &p->g_dma,

			    false, "gadget-dma",

			    true, false,

			    dma_capable, false,

			    dma_capable);



	/* DMA Descriptor */

	dwc2_set_param_bool(hsotg, &p->g_dma_desc, false,

			    "gadget-dma-desc",

			    p->g_dma, false,

			    !!hw->dma_desc_enable, false,

			    !!hw->dma_desc_enable);

}
@@ -1130,8 +1118,14 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg, 


		dwc2_set_param_bool(hsotg, &p->host_dma,

				    false, "host-dma",

				    true, false,

				    dma_capable, false,

				    dma_capable);

		dwc2_set_param_host_rx_fifo_size(hsotg,

				params->host_rx_fifo_size);

		dwc2_set_param_host_nperio_tx_fifo_size(hsotg,

				params->host_nperio_tx_fifo_size);

		dwc2_set_param_host_perio_tx_fifo_size(hsotg,

				params->host_perio_tx_fifo_size);

	}

	dwc2_set_param_dma_desc_enable(hsotg, params->dma_desc_enable);

	dwc2_set_param_dma_desc_fs_enable(hsotg, params->dma_desc_fs_enable);
@@ -1140,12 +1134,6 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg, 
			params->host_support_fs_ls_low_power);

	dwc2_set_param_enable_dynamic_fifo(hsotg,

			params->enable_dynamic_fifo);

	dwc2_set_param_host_rx_fifo_size(hsotg,

			params->host_rx_fifo_size);

	dwc2_set_param_host_nperio_tx_fifo_size(hsotg,

			params->host_nperio_tx_fifo_size);

	dwc2_set_param_host_perio_tx_fifo_size(hsotg,

			params->host_perio_tx_fifo_size);

	dwc2_set_param_max_transfer_size(hsotg,

			params->max_transfer_size);

	dwc2_set_param_max_packet_count(hsotg,

drivers/usb/dwc3/core.h

+3 −7
Original line number Diff line number Diff line
@@ -45,9 +45,7 @@ 
#define DWC3_XHCI_RESOURCES_NUM	2



#define DWC3_SCRATCHBUF_SIZE	4096	/* each buffer is assumed to be 4KiB */

#define DWC3_EVENT_SIZE		4	/* bytes */

#define DWC3_EVENT_MAX_NUM	64	/* 2 events/endpoint */

#define DWC3_EVENT_BUFFERS_SIZE	(DWC3_EVENT_SIZE * DWC3_EVENT_MAX_NUM)

#define DWC3_EVENT_BUFFERS_SIZE	4096

#define DWC3_EVENT_TYPE_MASK	0xfe



#define DWC3_EVENT_TYPE_DEV	0
@@ -311,9 +309,8 @@ 
#define DWC3_DCFG_SUPERSPEED_PLUS (5 << 0)  /* DWC_usb31 only */

#define DWC3_DCFG_SUPERSPEED	(4 << 0)

#define DWC3_DCFG_HIGHSPEED	(0 << 0)

#define DWC3_DCFG_FULLSPEED2	(1 << 0)

#define DWC3_DCFG_FULLSPEED	(1 << 0)

#define DWC3_DCFG_LOWSPEED	(2 << 0)

#define DWC3_DCFG_FULLSPEED1	(3 << 0)



#define DWC3_DCFG_NUMP_SHIFT	17

#define DWC3_DCFG_NUMP(n)	(((n) >> DWC3_DCFG_NUMP_SHIFT) & 0x1f)
@@ -405,9 +402,8 @@ 
#define DWC3_DSTS_SUPERSPEED_PLUS	(5 << 0) /* DWC_usb31 only */

#define DWC3_DSTS_SUPERSPEED		(4 << 0)

#define DWC3_DSTS_HIGHSPEED		(0 << 0)

#define DWC3_DSTS_FULLSPEED2		(1 << 0)

#define DWC3_DSTS_FULLSPEED		(1 << 0)

#define DWC3_DSTS_LOWSPEED		(2 << 0)

#define DWC3_DSTS_FULLSPEED1		(3 << 0)



/* Device Generic Command Register */

#define DWC3_DGCMD_SET_LMP		0x01

drivers/usb/dwc3/dwc3-omap.c

+4 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/platform_data/dwc3-omap.h>
@@ -510,7 +511,7 @@ static int dwc3_omap_probe(struct platform_device *pdev) 


	/* check the DMA Status */

	reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG);



	irq_set_status_flags(omap->irq, IRQ_NOAUTOEN);

	ret = devm_request_threaded_irq(dev, omap->irq, dwc3_omap_interrupt,

					dwc3_omap_interrupt_thread, IRQF_SHARED,

					"dwc3-omap", omap);
@@ -531,7 +532,7 @@ static int dwc3_omap_probe(struct platform_device *pdev) 
	}



	dwc3_omap_enable_irqs(omap);



	enable_irq(omap->irq);

	return 0;



err2:
@@ -552,6 +553,7 @@ static int dwc3_omap_remove(struct platform_device *pdev) 
	extcon_unregister_notifier(omap->edev, EXTCON_USB, &omap->vbus_nb);

	extcon_unregister_notifier(omap->edev, EXTCON_USB_HOST, &omap->id_nb);

	dwc3_omap_disable_irqs(omap);

	disable_irq(omap->irq);

	of_platform_depopulate(omap->dev);

	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

drivers/usb/dwc3/dwc3-pci.c

+6 −11
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#define PCI_DEVICE_ID_INTEL_BXT_M		0x1aaa

#define PCI_DEVICE_ID_INTEL_APL			0x5aaa

#define PCI_DEVICE_ID_INTEL_KBP			0xa2b0

#define PCI_DEVICE_ID_INTEL_GLK			0x31aa



#define PCI_INTEL_BXT_DSM_UUID		"732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"

#define PCI_INTEL_BXT_FUNC_PMU_PWR	4
@@ -73,16 +74,6 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc) 
{

	struct platform_device		*dwc3 = dwc->dwc3;

	struct pci_dev			*pdev = dwc->pci;

	int				ret;



	struct property_entry sysdev_property[] = {

		PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),

		{ },

	};



	ret = platform_device_add_properties(dwc3, sysdev_property);

	if (ret)

		return ret;



	if (pdev->vendor == PCI_VENDOR_ID_AMD &&

	    pdev->device == PCI_DEVICE_ID_AMD_NL_USB) {
@@ -105,6 +96,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc) 
			PROPERTY_ENTRY_BOOL("snps,disable_scramble_quirk"),

			PROPERTY_ENTRY_BOOL("snps,dis_u3_susphy_quirk"),

			PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),

			PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),

			{ },

		};
@@ -115,7 +107,8 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc) 
		int ret;



		struct property_entry properties[] = {

			PROPERTY_ENTRY_STRING("dr-mode", "peripheral"),

			PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),

			PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),

			{ }

		};
@@ -167,6 +160,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc) 
			PROPERTY_ENTRY_BOOL("snps,usb3_lpm_capable"),

			PROPERTY_ENTRY_BOOL("snps,has-lpm-erratum"),

			PROPERTY_ENTRY_BOOL("snps,dis_enblslpm_quirk"),

			PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),

			{ },

		};
@@ -274,6 +268,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BXT_M), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_APL), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_KBP), },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GLK), },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), },

	{  }	/* Terminating Entry */

};