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

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

Merge tag 'dwc3-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next 

Felipe writes:
	usb: dwc3: patches for v3.9 merge window

	We're saving some extra memory now by being a lot
	more conservative when allocating our event buffers.

	Our default HIRD threshold value was mistakenly set
	as one of the unsupported which would cause undefined
	behavior. Turns out that it broke OMAP5 ES2.0, so we're
	fixing it now by setting the maximum allowed HIRD
	threshold (12).

	Quite a few fixes to Isochronous transfers and scatter/gather
	support from Pratyush.

	We're also starting to support devicetree-based probe with
	the latest changes from Kishon.

	The usual set of cleanups also available: converting debugfs
	regdump utility to regsets, better "compatible" strings for
	Exynos platforms and the removal of the dependency for
	Host and Gadget; now dwc3 can be compiled host-only, device-only,
	and/or Dual-Role.
parents 46823498 52758bcb

drivers/usb/dwc3/Kconfig

+30 −1
Original line number Diff line number Diff line 
config USB_DWC3

	tristate "DesignWare USB3 DRD Core Support"

	depends on (USB && USB_GADGET)

	depends on (USB || USB_GADGET)

	select USB_OTG_UTILS

	select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD

	help
@@ -12,6 +12,35 @@ config USB_DWC3 


if USB_DWC3



choice

	bool "DWC3 Mode Selection"

	default USB_DWC3_DUAL_ROLE if (USB && USB_GADGET)

	default USB_DWC3_HOST if (USB && !USB_GADGET)

	default USB_DWC3_GADGET if (!USB && USB_GADGET)



config USB_DWC3_HOST

	bool "Host only mode"

	depends on USB

	help

	  Select this when you want to use DWC3 in host mode only,

	  thereby the gadget feature will be regressed.



config USB_DWC3_GADGET

	bool "Gadget only mode"

	depends on USB_GADGET

	help

	  Select this when you want to use DWC3 in gadget mode only,

	  thereby the host feature will be regressed.



config USB_DWC3_DUAL_ROLE

	bool "Dual Role mode"

	depends on (USB && USB_GADGET)

	help

	  This is the default mode of working of DWC3 controller where

	  both host and gadget features are enabled.



endchoice



config USB_DWC3_DEBUG

	bool "Enable Debugging Messages"

	help

drivers/usb/dwc3/Makefile

+8 −2
Original line number Diff line number Diff line
@@ -4,8 +4,14 @@ ccflags-$(CONFIG_USB_DWC3_VERBOSE) += -DVERBOSE_DEBUG 
obj-$(CONFIG_USB_DWC3)			+= dwc3.o



dwc3-y					:= core.o



ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)),)

	dwc3-y				+= host.o

endif



ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET) $(CONFIG_USB_DWC3_DUAL_ROLE)),)

	dwc3-y				+= gadget.o ep0.o

endif



ifneq ($(CONFIG_DEBUG_FS),)

	dwc3-y				+= debugfs.o

drivers/usb/dwc3/core.c

+5 −2
Original line number Diff line number Diff line
@@ -432,6 +432,9 @@ static int dwc3_probe(struct platform_device *pdev) 
		return -EPROBE_DEFER;

	}



	usb_phy_set_suspend(dwc->usb2_phy, 0);

	usb_phy_set_suspend(dwc->usb3_phy, 0);



	spin_lock_init(&dwc->lock);

	platform_set_drvdata(pdev, dwc);
@@ -550,9 +553,9 @@ static int dwc3_probe(struct platform_device *pdev) 
static int dwc3_remove(struct platform_device *pdev)

{

	struct dwc3	*dwc = platform_get_drvdata(pdev);

	struct resource	*res;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	usb_phy_set_suspend(dwc->usb2_phy, 1);

	usb_phy_set_suspend(dwc->usb3_phy, 1);



	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

drivers/usb/dwc3/core.h

+20 −4
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ 
#define DWC3_ENDPOINTS_NUM	32

#define DWC3_XHCI_RESOURCES_NUM	2



#define DWC3_EVENT_BUFFERS_SIZE	PAGE_SIZE

#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_TYPE_MASK	0xfe



#define DWC3_EVENT_TYPE_DEV	0
@@ -405,7 +407,6 @@ struct dwc3_event_buffer { 
 * @number: endpoint number (1 - 15)

 * @type: set to bmAttributes & USB_ENDPOINT_XFERTYPE_MASK

 * @resource_index: Resource transfer index

 * @current_uf: Current uf received through last event parameter

 * @interval: the intervall on which the ISOC transfer is started

 * @name: a human readable name e.g. ep1out-bulk

 * @direction: true for TX, false for RX
@@ -439,7 +440,6 @@ struct dwc3_ep { 
	u8			number;

	u8			type;

	u8			resource_index;

	u16			current_uf;

	u32			interval;



	char			name[20];
@@ -581,6 +581,7 @@ struct dwc3_request { 
	struct usb_request	request;

	struct list_head	list;

	struct dwc3_ep		*dep;

	u32			start_slot;



	u8			epnum;

	struct dwc3_trb		*trb;
@@ -721,6 +722,7 @@ struct dwc3 { 


	struct dwc3_hwparams	hwparams;

	struct dentry		*root;

	struct debugfs_regset32	*regset;



	u8			test_mode;

	u8			test_mode_nr;
@@ -862,10 +864,24 @@ union dwc3_event { 
void dwc3_set_mode(struct dwc3 *dwc, u32 mode);

int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc);



#if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)

int dwc3_host_init(struct dwc3 *dwc);

void dwc3_host_exit(struct dwc3 *dwc);



#else

static inline int dwc3_host_init(struct dwc3 *dwc)

{ return 0; }

static inline void dwc3_host_exit(struct dwc3 *dwc)

{ }

#endif



#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)

int dwc3_gadget_init(struct dwc3 *dwc);

void dwc3_gadget_exit(struct dwc3 *dwc);

#else

static inline int dwc3_gadget_init(struct dwc3 *dwc)

{ return 0; }

static inline void dwc3_gadget_exit(struct dwc3 *dwc)

{ }

#endif



#endif /* __DRIVERS_USB_DWC3_CORE_H */

drivers/usb/dwc3/debugfs.c

+14 −24
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
	.offset	= DWC3_ ##nm - DWC3_GLOBALS_REGS_START,	\

}



static const struct debugfs_reg32 dwc3_regs[] = {

static struct debugfs_reg32 dwc3_regs[] = {

	dump_register(GSBUSCFG0),

	dump_register(GSBUSCFG1),

	dump_register(GTXTHRCFG),
@@ -376,27 +376,6 @@ static const struct debugfs_reg32 dwc3_regs[] = { 
	dump_register(OSTS),

};



static int dwc3_regdump_show(struct seq_file *s, void *unused)

{

	struct dwc3		*dwc = s->private;



	seq_printf(s, "DesignWare USB3 Core Register Dump\n");

	debugfs_print_regs32(s, dwc3_regs, ARRAY_SIZE(dwc3_regs),

			     dwc->regs, "");

	return 0;

}



static int dwc3_regdump_open(struct inode *inode, struct file *file)

{

	return single_open(file, dwc3_regdump_show, inode->i_private);

}



static const struct file_operations dwc3_regdump_fops = {

	.open			= dwc3_regdump_open,

	.read			= seq_read,

	.release		= single_release,

};



static int dwc3_mode_show(struct seq_file *s, void *unused)

{

	struct dwc3		*dwc = s->private;
@@ -666,13 +645,23 @@ int dwc3_debugfs_init(struct dwc3 *dwc) 


	dwc->root = root;



	file = debugfs_create_file("regdump", S_IRUGO, root, dwc,

			&dwc3_regdump_fops);

	dwc->regset = kzalloc(sizeof(*dwc->regset), GFP_KERNEL);

	if (!dwc->regset) {

		ret = -ENOMEM;

		goto err1;

	}



	dwc->regset->regs = dwc3_regs;

	dwc->regset->nregs = ARRAY_SIZE(dwc3_regs);

	dwc->regset->base = dwc->regs;



	file = debugfs_create_regset32("regdump", S_IRUGO, root, dwc->regset);

	if (!file) {

		ret = -ENOMEM;

		goto err1;

	}



#if IS_ENABLED(CONFIG_USB_DWC3_GADGET)

	file = debugfs_create_file("mode", S_IRUGO | S_IWUSR, root,

			dwc, &dwc3_mode_fops);

	if (!file) {
@@ -693,6 +682,7 @@ int dwc3_debugfs_init(struct dwc3 *dwc) 
		ret = -ENOMEM;

		goto err1;

	}

#endif



	return 0;