* [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU
@ 2014-08-18 14:28 Kishon Vijay Abraham I
2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 01/13] include: linux: preparation for porting dwc3 from linux kernel Kishon Vijay Abraham I
` (14 more replies)
0 siblings, 15 replies; 57+ messages in thread
From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw)
To: u-boot
Ported DWC3 driver from linux kernel v3.16 to uboot and enabled DFU in DRA7xx.
Tested only with DFU ram.
While I kept the dwc3 driver pretty much the same from linux kernel, I have
created a single driver for both USB2 and USB3 PHY programming. I have also
adapted udc-core from linux kernel so that we can cleanly link the gadet
driver with the controller driver.
This series was created on top of
commit 61e76f53708cf082ef9061a140b57df3513b8ba1
Merge: 76b2102 3d83e67
Author: Tom Rini <trini@ti.com>
Date: Tue Jun 10 20:37:00 2014 -0400
Merge branch 'master' of git://git.denx.de/u-boot-usb
Let me know of any feedback and suggestions.
Known Issues:
DWC3 is not enumerating consistently.
Kishon Vijay Abraham I (13):
include: linux: preparation for porting dwc3 from linux kernel
usb: gadget: udc-core: Add minimal udc-core from linux kernel
ARM: DRA7: Enable clocks for USB OTGSS and USB PHY
usb: dwc3: Add dwc3 driver
usb: dwc3-omap: Add dwc3 glue driver for OMAP
usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms
usb: gadget: g_dnl: Explicitly set the max packet size in descriptor
common: cmd_dfu: invoke board_usb_cleanup() for cleaning up
common: cmd_dfu: add an API that takes controller index for handling
interrupts
board: ti: DRA7: added USB initializtion code
commom: usb: implement "__weak" functions to make compiler happy
include: configs: Enable DWC3 and DFU in DRA7xx
dwc3: core: Change the bounce buffer size to 4096
Makefile | 1 +
arch/arm/cpu/armv7/omap5/hw_data.c | 14 +
arch/arm/cpu/armv7/omap5/prcm-regs.c | 6 +-
arch/arm/include/asm/arch-omap5/omap.h | 12 +
arch/arm/include/asm/omap_common.h | 4 +-
board/ti/dra7xx/evm.c | 106 ++
common/cmd_dfu.c | 2 +
common/usb.c | 18 +
drivers/usb/dwc3/Makefile | 10 +
drivers/usb/dwc3/core.c | 640 +++++++
drivers/usb/dwc3/core.h | 961 +++++++++++
drivers/usb/dwc3/dwc3-omap.c | 447 +++++
drivers/usb/dwc3/ep0.c | 1045 ++++++++++++
drivers/usb/dwc3/gadget.c | 2841 ++++++++++++++++++++++++++++++++
drivers/usb/dwc3/gadget.h | 163 ++
drivers/usb/dwc3/io.h | 52 +
drivers/usb/dwc3/linux-compat.h | 132 ++
drivers/usb/dwc3/ti_usb_phy.c | 269 +++
drivers/usb/gadget/Makefile | 1 +
drivers/usb/gadget/composite.c | 3 +-
drivers/usb/gadget/g_dnl.c | 1 +
drivers/usb/gadget/udc-core.c | 229 +++
include/configs/dra7xx_evm.h | 59 +
include/configs/ti_omap5_common.h | 1 +
include/dwc3-omap-uboot.h | 32 +
include/dwc3-uboot.h | 26 +
include/linux/compat.h | 12 +-
include/linux/usb/composite.h | 12 +
include/linux/usb/dwc3-omap.h | 19 +
include/linux/usb/gadget.h | 75 +-
include/linux/usb/otg.h | 20 +
include/ti-usb-phy-uboot.h | 22 +
include/usb.h | 7 +
include/usb/lin_gadget_compat.h | 8 +-
34 files changed, 7236 insertions(+), 14 deletions(-)
create mode 100644 drivers/usb/dwc3/Makefile
create mode 100644 drivers/usb/dwc3/core.c
create mode 100644 drivers/usb/dwc3/core.h
create mode 100644 drivers/usb/dwc3/dwc3-omap.c
create mode 100644 drivers/usb/dwc3/ep0.c
create mode 100644 drivers/usb/dwc3/gadget.c
create mode 100644 drivers/usb/dwc3/gadget.h
create mode 100644 drivers/usb/dwc3/io.h
create mode 100644 drivers/usb/dwc3/linux-compat.h
create mode 100644 drivers/usb/dwc3/ti_usb_phy.c
create mode 100644 drivers/usb/gadget/udc-core.c
create mode 100644 include/dwc3-omap-uboot.h
create mode 100644 include/dwc3-uboot.h
create mode 100644 include/linux/usb/dwc3-omap.h
create mode 100644 include/linux/usb/otg.h
create mode 100644 include/ti-usb-phy-uboot.h
--
1.9.1
^ permalink raw reply [flat|nested] 57+ messages in thread* [U-Boot] [UBOOT RFC PATCH 01/13] include: linux: preparation for porting dwc3 from linux kernel 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core " Kishon Vijay Abraham I ` (13 subsequent siblings) 14 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Fixes a bunch of header files in linux/usb in order to seamlessly port dwc3 usb driver from linux kernel to uboot. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- include/linux/compat.h | 12 +++++-- include/linux/usb/composite.h | 12 +++++++ include/linux/usb/gadget.h | 75 ++++++++++++++++++++++++++++++++++++++--- include/linux/usb/otg.h | 20 +++++++++++ include/usb/lin_gadget_compat.h | 8 ++++- 5 files changed, 119 insertions(+), 8 deletions(-) create mode 100644 include/linux/usb/otg.h diff --git a/include/linux/compat.h b/include/linux/compat.h index 3fdfb39..d54ff18 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -1,6 +1,8 @@ #ifndef _LINUX_COMPAT_H_ #define _LINUX_COMPAT_H_ +#include <common.h> + #define ndelay(x) udelay(1) #define dev_dbg(dev, fmt, args...) \ @@ -53,8 +55,14 @@ #define BUG_ON(condition) do { if (condition) BUG(); } while(0) #endif /* BUG */ -#define WARN_ON(x) if (x) {printf("WARNING in %s line %d\n" \ - , __FILE__, __LINE__); } +#define WARN_ON(x) _WARN_ON((int)(x), __FILE__, __LINE__) +static inline int _WARN_ON(int x, char *file, int line) +{ + if (x) { + printf("WARNING in %s line %d\n", file, line); + } + return x; +} #define PAGE_SIZE 4096 #endif diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index f833d10..9063aee 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -27,6 +27,18 @@ #include <linux/usb/gadget.h> #include <usb/lin_gadget_compat.h> +/* + * USB function drivers should return USB_GADGET_DELAYED_STATUS if they + * wish to delay the data/status stages of the control transfer till they + * are ready. The control transfer will then be kept from completing till + * all the function drivers that requested for USB_GADGET_DELAYED_STAUS + * invoke usb_composite_setup_continue(). + * + * TODO: Fully port "usb: gadget: composite: Allow function drivers to + * pause control transfers" to uboot + */ +#define USB_GADGET_DELAYED_STATUS 0x7fff /* Impossibly large value */ + struct usb_configuration; /** diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index a8a5763..3d533f0 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -30,6 +30,10 @@ struct usb_ep; * @dma: DMA address corresponding to 'buf'. If you don't set this * field, and the usb controller needs one, it is responsible * for mapping and unmapping the buffer. + * @sg: a scatterlist for SG-capable controllers. + * @num_sgs: number of SG entries + * @num_mapped_sgs: number of SG entries mapped to DMA (internal) + * @stream_id: The stream id, when USB3.0 bulk streams are being used * @length: Length of that data * @no_interrupt: If true, hints that no completion irq is needed. * Helpful sometimes with deep request queues that are handled @@ -84,6 +88,11 @@ struct usb_request { unsigned length; dma_addr_t dma; + struct scatterlist *sg; + unsigned num_sgs; + unsigned num_mapped_sgs; + + unsigned stream_id:16; unsigned no_interrupt:1; unsigned zero:1; unsigned short_not_ok:1; @@ -120,6 +129,7 @@ struct usb_ep_ops { int (*dequeue) (struct usb_ep *ep, struct usb_request *req); int (*set_halt) (struct usb_ep *ep, int value); + int (*set_wedge) (struct usb_ep *ep); int (*fifo_status) (struct usb_ep *ep); void (*fifo_flush) (struct usb_ep *ep); }; @@ -132,8 +142,18 @@ struct usb_ep_ops { * @maxpacket:The maximum packet size used on this endpoint. The initial * value can sometimes be reduced (hardware allowing), according to * the endpoint descriptor used to configure the endpoint. + * @maxpacket_limit:The maximum packet size value which can be handled by this + * endpoint. It's set once by UDC driver when endpoint is initialized, and + * should not be changed. Should not be confused with maxpacket. + * @max_streams: The maximum number of streams supported + * by this EP (0 - 16, actual number is 2^n) + * @maxburst: the maximum number of bursts supported by this EP (for usb3) * @driver_data:for use by the gadget driver. all other fields are * read-only to gadget drivers. + * @desc: endpoint descriptor. This pointer is set before the endpoint is + * enabled and remains valid until the endpoint is disabled. + * @comp_desc: In case of SuperSpeed support, this is the endpoint companion + * descriptor that is used to configure the endpoint * * the bus controller driver lists all the general purpose endpoints in * gadget->ep_list. the control endpoint (gadget->ep0) is not in that list, @@ -145,11 +165,31 @@ struct usb_ep { const struct usb_ep_ops *ops; struct list_head ep_list; unsigned maxpacket:16; + unsigned maxpacket_limit:16; + unsigned max_streams:16; + unsigned maxburst:5; + const struct usb_endpoint_descriptor *desc; + const struct usb_ss_ep_comp_descriptor *comp_desc; }; /*-------------------------------------------------------------------------*/ /** + * usb_ep_set_maxpacket_limit - set maximum packet size limit for endpoint + * @ep:the endpoint being configured + * @maxpacket_limit:value of maximum packet size limit + * + * This function shoud be used only in UDC drivers to initialize endpoint + * (usually in probe function). + */ +static inline void usb_ep_set_maxpacket_limit(struct usb_ep *ep, + unsigned maxpacket_limit) +{ + ep->maxpacket_limit = maxpacket_limit; + ep->maxpacket = maxpacket_limit; +} + +/** * usb_ep_enable - configure endpoint, making it usable * @ep:the endpoint being configured. may not be the endpoint named "ep0". * drivers discover endpoints through the ep_list of a usb_gadget. @@ -395,7 +435,7 @@ static inline void usb_ep_fifo_flush(struct usb_ep *ep) /*-------------------------------------------------------------------------*/ struct usb_gadget; - +struct usb_gadget_driver; /* the rest of the api to the controller hardware: device operations, * which don't involve endpoints (or i/o). */ @@ -408,9 +448,13 @@ struct usb_gadget_ops { int (*pullup) (struct usb_gadget *, int is_on); int (*ioctl)(struct usb_gadget *, unsigned code, unsigned long param); + int (*udc_start)(struct usb_gadget *, + struct usb_gadget_driver *); + int (*udc_stop)(struct usb_gadget *, + struct usb_gadget_driver *); }; -struct device { +struct usb_gadget_device { void *driver_data; /* data private to the driver */ void *device_data; /* data private to the device */ }; @@ -422,6 +466,10 @@ struct device { * driver setup() requests * @ep_list: List of other endpoints supported by the device. * @speed: Speed of current connection to USB host. + * @max_speed: Maximal speed the UDC can handle. UDC must support this + * and all slower speeds. + * @state: the state we are now (attached, suspended, configured, etc) + * @sg_supported: true if we can handle scatter-gather * @is_dualspeed: true if the controller supports both high and full speed * operation. If it does, the gadget driver must also support both. * @is_otg: true if the USB device port uses a Mini-AB jack, so that the @@ -438,6 +486,8 @@ struct device { * @name: Identifies the controller hardware type. Used in diagnostics * and sometimes configuration. * @dev: Driver model state for this abstract device. + * @quirk_ep_out_aligned_size: epout requires buffer size to be aligned to + * MaxPacketSize. * * Gadgets have a mostly-portable "gadget driver" implementing device * functions, handling all usb configurations and interfaces. Gadget @@ -463,6 +513,9 @@ struct usb_gadget { struct usb_ep *ep0; struct list_head ep_list; /* of usb_ep */ enum usb_device_speed speed; + enum usb_device_speed max_speed; + unsigned sg_supported:1; + enum usb_device_state state; unsigned is_dualspeed:1; unsigned is_otg:1; unsigned is_a_peripheral:1; @@ -470,7 +523,8 @@ struct usb_gadget { unsigned a_hnp_support:1; unsigned a_alt_hnp_support:1; const char *name; - struct device dev; + struct usb_gadget_device dev; + unsigned quirk_ep_out_aligned_size:1; }; static inline void set_gadget_data(struct usb_gadget *gadget, void *data) @@ -483,7 +537,8 @@ static inline void *get_gadget_data(struct usb_gadget *gadget) return gadget->dev.driver_data; } -static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev) +static inline +struct usb_gadget *dev_to_usb_gadget(struct usb_gadget_device *dev) { return container_of(dev, struct usb_gadget, dev); } @@ -689,7 +744,8 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget) /*-------------------------------------------------------------------------*/ /** - * struct usb_gadget_driver - driver for usb 'slave' devices + * struct usb_gadget_driver - driver for uisb 'slave' devices + * @function: String describing the gadget's function * @speed: Highest speed the driver handles. * @bind: Invoked when the driver is bound to a gadget, usually * after registering the driver. @@ -757,6 +813,7 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget) * power is maintained. */ struct usb_gadget_driver { + char *function; enum usb_device_speed speed; int (*bind)(struct usb_gadget *); void (*unbind)(struct usb_gadget *); @@ -861,4 +918,12 @@ extern void usb_ep_autoconfig_reset(struct usb_gadget *); extern int usb_gadget_handle_interrupts(void); +/* utility to set gadget state properly */ + +extern void usb_gadget_set_state(struct usb_gadget *gadget, + enum usb_device_state state); +extern int usb_add_gadget_udc_release(struct usb_gadget *gadget); +extern int usb_add_gadget_udc(struct usb_gadget *gadget); +extern void usb_del_gadget_udc(struct usb_gadget *gadget); + #endif /* __LINUX_USB_GADGET_H */ diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h new file mode 100644 index 0000000..08bed6f --- /dev/null +++ b/include/linux/usb/otg.h @@ -0,0 +1,20 @@ +/* include/linux/usb/otg.h + * + * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * USB OTG (On The Go) defines + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __LINUX_USB_OTG_H +#define __LINUX_USB_OTG_H + +enum usb_dr_mode { + USB_DR_MODE_UNKNOWN, + USB_DR_MODE_HOST, + USB_DR_MODE_PERIPHERAL, + USB_DR_MODE_OTG, +}; + +#endif /* __LINUX_USB_OTG_H */ diff --git a/include/usb/lin_gadget_compat.h b/include/usb/lin_gadget_compat.h index a25e9d9..58be177 100644 --- a/include/usb/lin_gadget_compat.h +++ b/include/usb/lin_gadget_compat.h @@ -27,7 +27,13 @@ #define GFP_KERNEL 0 -#define IRQ_HANDLED 1 +enum irqreturn { + IRQ_NONE, + IRQ_HANDLED, + IRQ_WAKE_THREAD, +}; + +typedef enum irqreturn irqreturn_t; #define ENOTSUPP 524 /* Operation is not supported */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 01/13] include: linux: preparation for porting dwc3 from linux kernel Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:36 ` Felipe Balbi 2014-08-19 8:52 ` Lukasz Majewski 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 03/13] ARM: DRA7: Enable clocks for USB OTGSS and USB PHY Kishon Vijay Abraham I ` (12 subsequent siblings) 14 siblings, 2 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot In order to support multiple USB device controllers in uboot, udc-core is needed. udc-core also helps to cleanly link the USB peripheral driver with the gadget driver. Hence Ported minimal udc-core from linux kernel. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/udc-core.c | 229 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+) create mode 100644 drivers/usb/gadget/udc-core.c diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 66becdc..74875a2 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o obj-$(CONFIG_DFU_FUNCTION) += f_dfu.o obj-$(CONFIG_USB_GADGET_MASS_STORAGE) += f_mass_storage.o obj-$(CONFIG_CMD_FASTBOOT) += f_fastboot.o +obj-y += udc-core.o endif ifdef CONFIG_USB_ETHER obj-y += ether.o diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c new file mode 100644 index 0000000..bbe919c --- /dev/null +++ b/drivers/usb/gadget/udc-core.c @@ -0,0 +1,229 @@ +/** + * udc-core.c - Core UDC Framework + * + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Author: Felipe Balbi <balbi@ti.com> + * + * Taken from Linux Kernel v3.16 (drivers/usb/gadget/udc-core.c) and ported + * to uboot. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <linux/compat.h> +#include <malloc.h> +#include <asm/cache.h> +#include <common.h> + +#include <linux/usb/ch9.h> +#include <linux/usb/gadget.h> + +/** + * struct usb_udc - describes one usb device controller + * @driver - the gadget driver pointer. For use by the class code + * @dev - the child device to the actual controller + * @gadget - the gadget. For use by the class code + * @list - for use by the udc class driver + * + * This represents the internal data structure which is used by the UDC-class + * to hold information about udc driver and gadget together. + */ +struct usb_udc { + struct usb_gadget_driver *driver; + struct usb_gadget *gadget; + struct list_head list; +}; + +static LIST_HEAD(udc_list); + +void usb_gadget_set_state(struct usb_gadget *gadget, + enum usb_device_state state) +{ + gadget->state = state; +} + +/** + * usb_gadget_udc_start - tells usb device controller to start up + * @gadget: The gadget we want to get started + * @driver: The driver we want to bind to @gadget + * + * This call is issued by the UDC Class driver when it's about + * to register a gadget driver to the device controller, before + * calling gadget driver's bind() method. + * + * It allows the controller to be powered off until strictly + * necessary to have it powered on. + * + * Returns zero on success, else negative errno. + */ +static inline int usb_gadget_udc_start(struct usb_gadget *gadget, + struct usb_gadget_driver *driver) +{ + return gadget->ops->udc_start(gadget, driver); +} + +/** + * usb_gadget_udc_stop - tells usb device controller we don't need it anymore + * @gadget: The device we want to stop activity + * @driver: The driver to unbind from @gadget + * + * This call is issued by the UDC Class driver after calling + * gadget driver's unbind() method. + * + * The details are implementation specific, but it can go as + * far as powering off UDC completely and disable its data + * line pullups. + */ +static inline void usb_gadget_udc_stop(struct usb_gadget *gadget, + struct usb_gadget_driver *driver) +{ + gadget->ops->udc_stop(gadget, driver); +} + +/** + * usb_add_gadget_udc_release - adds a new gadget to the udc class driver list + * @parent: the parent device to this udc. Usually the controller driver's + * device. + * @gadget: the gadget to be added to the list. + * @release: a gadget release function. + * + * Returns zero on success, negative errno otherwise. + */ +int usb_add_gadget_udc_release(struct usb_gadget *gadget) +{ + struct usb_udc *udc; + int ret = -ENOMEM; + + udc = kzalloc(sizeof(*udc), GFP_KERNEL); + if (!udc) + return ret; + + udc->gadget = gadget; + list_add_tail(&udc->list, &udc_list); + usb_gadget_set_state(gadget, USB_STATE_NOTATTACHED); + return 0; +} + +/** + * usb_add_gadget_udc - adds a new gadget to the udc class driver list + * @parent: the parent device to this udc. Usually the controller + * driver's device. + * @gadget: the gadget to be added to the list + * + * Returns zero on success, negative errno otherwise. + */ +int usb_add_gadget_udc(struct usb_gadget *gadget) +{ + return usb_add_gadget_udc_release(gadget); +} + +static void usb_gadget_remove_driver(struct usb_udc *udc) +{ + dev_dbg(&udc->dev, "unregistering UDC driver [%s]\n", + udc->gadget->name); + usb_gadget_disconnect(udc->gadget); + udc->driver->disconnect(udc->gadget); + udc->driver->unbind(udc->gadget); + usb_gadget_udc_stop(udc->gadget, NULL); + + udc->driver = NULL; +} + +/** + * usb_del_gadget_udc - deletes @udc from udc_list + * @gadget: the gadget to be removed. + * + * This, will call usb_gadget_unregister_driver() if + * the @udc is still busy. + */ +void usb_del_gadget_udc(struct usb_gadget *gadget) +{ + struct usb_udc *udc = NULL; + list_for_each_entry(udc, &udc_list, list) + if (udc->gadget == gadget) + goto found; + + dev_err(gadget->dev.parent, "gadget not registered.\n"); + return; + +found: + dev_vdbg(gadget->dev.parent, "unregistering gadget\n"); + + list_del(&udc->list); + + if (udc->driver) + usb_gadget_remove_driver(udc); + + kfree(udc); +} + +static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *driver) +{ + int ret; + + dev_dbg(&udc->dev, "registering UDC driver [%s]\n", + driver->function); + + udc->driver = driver; + + ret = driver->bind(udc->gadget); + if (ret) + goto err1; + + ret = usb_gadget_udc_start(udc->gadget, driver); + if (ret) { + driver->unbind(udc->gadget); + goto err1; + } + usb_gadget_connect(udc->gadget); + + return 0; +err1: + if (ret != -EISNAM) + dev_err(&udc->dev, "failed to start %s: %d\n", + udc->driver->function, ret); + udc->driver = NULL; + return ret; +} + +int usb_gadget_register_driver(struct usb_gadget_driver *driver) +{ + struct usb_udc *udc = NULL; + int ret; + + if (!driver || !driver->bind || !driver->setup) + return -EINVAL; + + list_for_each_entry(udc, &udc_list, list) { + /* For now we take the first one */ + if (!udc->driver) + goto found; + } + + debug("couldn't find an available UDC\n"); + return -ENODEV; +found: + ret = udc_bind_to_driver(udc, driver); + return ret; +} + +int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) +{ + struct usb_udc *udc = NULL; + int ret = -ENODEV; + + if (!driver || !driver->unbind) + return -EINVAL; + + list_for_each_entry(udc, &udc_list, list) + if (udc->driver == driver) { + usb_gadget_remove_driver(udc); + usb_gadget_set_state(udc->gadget, + USB_STATE_NOTATTACHED); + ret = 0; + break; + } + + return ret; +} -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core " Kishon Vijay Abraham I @ 2014-08-18 14:36 ` Felipe Balbi 2014-08-19 14:58 ` Kishon Vijay Abraham I 2014-08-19 8:52 ` Lukasz Majewski 1 sibling, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-18 14:36 UTC (permalink / raw) To: u-boot On Mon, Aug 18, 2014 at 07:58:24PM +0530, Kishon Vijay Abraham I wrote: > In order to support multiple USB device controllers in uboot, > udc-core is needed. udc-core also helps to cleanly link the USB peripheral > driver with the gadget driver. Hence Ported minimal udc-core from > linux kernel. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > drivers/usb/gadget/Makefile | 1 + > drivers/usb/gadget/udc-core.c | 229 ++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 230 insertions(+) > create mode 100644 drivers/usb/gadget/udc-core.c > > diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile > index 66becdc..74875a2 100644 > --- a/drivers/usb/gadget/Makefile > +++ b/drivers/usb/gadget/Makefile > @@ -19,6 +19,7 @@ obj-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o > obj-$(CONFIG_DFU_FUNCTION) += f_dfu.o > obj-$(CONFIG_USB_GADGET_MASS_STORAGE) += f_mass_storage.o > obj-$(CONFIG_CMD_FASTBOOT) += f_fastboot.o > +obj-y += udc-core.o > endif > ifdef CONFIG_USB_ETHER > obj-y += ether.o > diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c > new file mode 100644 > index 0000000..bbe919c > --- /dev/null > +++ b/drivers/usb/gadget/udc-core.c > @@ -0,0 +1,229 @@ > +/** > + * udc-core.c - Core UDC Framework > + * > + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com > + * > + * Author: Felipe Balbi <balbi@ti.com> > + * > + * Taken from Linux Kernel v3.16 (drivers/usb/gadget/udc-core.c) and ported > + * to uboot. > + * > + * SPDX-License-Identifier: GPL-2.0+ why are you relicensing this file ? In kernel this is gpl v2 only. -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140818/a7bcc94b/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-18 14:36 ` Felipe Balbi @ 2014-08-19 14:58 ` Kishon Vijay Abraham I 0 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 14:58 UTC (permalink / raw) To: u-boot On Monday 18 August 2014 08:06 PM, Felipe Balbi wrote: > On Mon, Aug 18, 2014 at 07:58:24PM +0530, Kishon Vijay Abraham I wrote: >> In order to support multiple USB device controllers in uboot, >> udc-core is needed. udc-core also helps to cleanly link the USB peripheral >> driver with the gadget driver. Hence Ported minimal udc-core from >> linux kernel. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> drivers/usb/gadget/Makefile | 1 + >> drivers/usb/gadget/udc-core.c | 229 ++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 230 insertions(+) >> create mode 100644 drivers/usb/gadget/udc-core.c >> >> diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile >> index 66becdc..74875a2 100644 >> --- a/drivers/usb/gadget/Makefile >> +++ b/drivers/usb/gadget/Makefile >> @@ -19,6 +19,7 @@ obj-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o >> obj-$(CONFIG_DFU_FUNCTION) += f_dfu.o >> obj-$(CONFIG_USB_GADGET_MASS_STORAGE) += f_mass_storage.o >> obj-$(CONFIG_CMD_FASTBOOT) += f_fastboot.o >> +obj-y += udc-core.o >> endif >> ifdef CONFIG_USB_ETHER >> obj-y += ether.o >> diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c >> new file mode 100644 >> index 0000000..bbe919c >> --- /dev/null >> +++ b/drivers/usb/gadget/udc-core.c >> @@ -0,0 +1,229 @@ >> +/** >> + * udc-core.c - Core UDC Framework >> + * >> + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com >> + * >> + * Author: Felipe Balbi <balbi@ti.com> >> + * >> + * Taken from Linux Kernel v3.16 (drivers/usb/gadget/udc-core.c) and ported >> + * to uboot. >> + * >> + * SPDX-License-Identifier: GPL-2.0+ > > why are you relicensing this file ? In kernel this is gpl v2 only. ah.. copy paste error. Will fix it. Thanks Kishon > ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core " Kishon Vijay Abraham I 2014-08-18 14:36 ` Felipe Balbi @ 2014-08-19 8:52 ` Lukasz Majewski 2014-08-19 15:11 ` Felipe Balbi 2014-08-19 15:18 ` Kishon Vijay Abraham I 1 sibling, 2 replies; 57+ messages in thread From: Lukasz Majewski @ 2014-08-19 8:52 UTC (permalink / raw) To: u-boot Hi Kishon, > In order to support multiple USB device controllers in uboot, > udc-core is needed. Is it? In u-boot at best only one UDC is operational at a time. > udc-core also helps to cleanly link the USB > peripheral driver with the gadget driver. Hence Ported minimal > udc-core from linux kernel. I'd appreciate the exact SHA for this udc-core.c code. And the SHA should be from some already released mainline code (like final 3.16), not any private branch nor linux-next. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > drivers/usb/gadget/Makefile | 1 + > drivers/usb/gadget/udc-core.c | 229 > ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 230 > insertions(+) create mode 100644 drivers/usb/gadget/udc-core.c > > diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile > index 66becdc..74875a2 100644 > --- a/drivers/usb/gadget/Makefile > +++ b/drivers/usb/gadget/Makefile > @@ -19,6 +19,7 @@ obj-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o > obj-$(CONFIG_DFU_FUNCTION) += f_dfu.o > obj-$(CONFIG_USB_GADGET_MASS_STORAGE) += f_mass_storage.o > obj-$(CONFIG_CMD_FASTBOOT) += f_fastboot.o > +obj-y += udc-core.o > endif > ifdef CONFIG_USB_ETHER > obj-y += ether.o > diff --git a/drivers/usb/gadget/udc-core.c > b/drivers/usb/gadget/udc-core.c new file mode 100644 > index 0000000..bbe919c > --- /dev/null > +++ b/drivers/usb/gadget/udc-core.c > @@ -0,0 +1,229 @@ > +/** > + * udc-core.c - Core UDC Framework > + * > + * Copyright (C) 2014 Texas Instruments Incorporated - > http://www.ti.com > + * > + * Author: Felipe Balbi <balbi@ti.com> > + * > + * Taken from Linux Kernel v3.16 (drivers/usb/gadget/udc-core.c) and > ported > + * to uboot. > + * > + * SPDX-License-Identifier: GPL-2.0+ It seems like the author is the same, but the GPL license is different: Original file ./drivers/usb/gadget/udc/udc-core.c /** * udc.c - Core UDCFramework * * Copyright (C) 2010 TexasInstruments * Author: Felipe Balbi<balbi@ti.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 of * the License as published by the Free Software Foundation. If Felipe don't mind then he should give you the permission to add + to the GPL2. > + */ > + > +#include <linux/compat.h> > +#include <malloc.h> > +#include <asm/cache.h> > +#include <common.h> > + > +#include <linux/usb/ch9.h> > +#include <linux/usb/gadget.h> > + > +/** > + * struct usb_udc - describes one usb device controller > + * @driver - the gadget driver pointer. For use by the class code > + * @dev - the child device to the actual controller > + * @gadget - the gadget. For use by the class code > + * @list - for use by the udc class driver > + * > + * This represents the internal data structure which is used by the > UDC-class > + * to hold information about udc driver and gadget together. > + */ > +struct usb_udc { > + struct usb_gadget_driver *driver; > + struct usb_gadget *gadget; > + struct list_head list; > +}; > + > +static LIST_HEAD(udc_list); > + > +void usb_gadget_set_state(struct usb_gadget *gadget, > + enum usb_device_state state) > +{ > + gadget->state = state; > +} > + > +/** > + * usb_gadget_udc_start - tells usb device controller to start up > + * @gadget: The gadget we want to get started > + * @driver: The driver we want to bind to @gadget > + * > + * This call is issued by the UDC Class driver when it's about > + * to register a gadget driver to the device controller, before > + * calling gadget driver's bind() method. > + * > + * It allows the controller to be powered off until strictly > + * necessary to have it powered on. > + * > + * Returns zero on success, else negative errno. > + */ > +static inline int usb_gadget_udc_start(struct usb_gadget *gadget, > + struct usb_gadget_driver *driver) > +{ > + return gadget->ops->udc_start(gadget, driver); > +} > + > +/** > + * usb_gadget_udc_stop - tells usb device controller we don't need > it anymore > + * @gadget: The device we want to stop activity > + * @driver: The driver to unbind from @gadget > + * > + * This call is issued by the UDC Class driver after calling > + * gadget driver's unbind() method. > + * > + * The details are implementation specific, but it can go as > + * far as powering off UDC completely and disable its data > + * line pullups. > + */ > +static inline void usb_gadget_udc_stop(struct usb_gadget *gadget, > + struct usb_gadget_driver *driver) > +{ > + gadget->ops->udc_stop(gadget, driver); > +} > + > +/** > + * usb_add_gadget_udc_release - adds a new gadget to the udc class > driver list > + * @parent: the parent device to this udc. Usually the controller > driver's > + * device. > + * @gadget: the gadget to be added to the list. > + * @release: a gadget release function. > + * > + * Returns zero on success, negative errno otherwise. > + */ > +int usb_add_gadget_udc_release(struct usb_gadget *gadget) > +{ > + struct usb_udc *udc; > + int ret = -ENOMEM; > + > + udc = kzalloc(sizeof(*udc), GFP_KERNEL); > + if (!udc) > + return ret; > + > + udc->gadget = gadget; > + list_add_tail(&udc->list, &udc_list); > + usb_gadget_set_state(gadget, USB_STATE_NOTATTACHED); > + return 0; > +} > + > +/** > + * usb_add_gadget_udc - adds a new gadget to the udc class driver > list > + * @parent: the parent device to this udc. Usually the controller > + * driver's device. > + * @gadget: the gadget to be added to the list > + * > + * Returns zero on success, negative errno otherwise. > + */ > +int usb_add_gadget_udc(struct usb_gadget *gadget) > +{ > + return usb_add_gadget_udc_release(gadget); > +} > + > +static void usb_gadget_remove_driver(struct usb_udc *udc) > +{ > + dev_dbg(&udc->dev, "unregistering UDC driver [%s]\n", > + udc->gadget->name); > + usb_gadget_disconnect(udc->gadget); > + udc->driver->disconnect(udc->gadget); > + udc->driver->unbind(udc->gadget); > + usb_gadget_udc_stop(udc->gadget, NULL); > + > + udc->driver = NULL; > +} > + > +/** > + * usb_del_gadget_udc - deletes @udc from udc_list > + * @gadget: the gadget to be removed. > + * > + * This, will call usb_gadget_unregister_driver() if > + * the @udc is still busy. > + */ > +void usb_del_gadget_udc(struct usb_gadget *gadget) > +{ > + struct usb_udc *udc = NULL; > + list_for_each_entry(udc, &udc_list, list) > + if (udc->gadget == gadget) > + goto found; > + > + dev_err(gadget->dev.parent, "gadget not registered.\n"); > + return; > + > +found: > + dev_vdbg(gadget->dev.parent, "unregistering gadget\n"); > + > + list_del(&udc->list); > + > + if (udc->driver) > + usb_gadget_remove_driver(udc); > + > + kfree(udc); > +} > + > +static int udc_bind_to_driver(struct usb_udc *udc, struct > usb_gadget_driver *driver) +{ > + int ret; > + > + dev_dbg(&udc->dev, "registering UDC driver [%s]\n", > + driver->function); > + > + udc->driver = driver; > + > + ret = driver->bind(udc->gadget); > + if (ret) > + goto err1; > + > + ret = usb_gadget_udc_start(udc->gadget, driver); > + if (ret) { > + driver->unbind(udc->gadget); > + goto err1; > + } > + usb_gadget_connect(udc->gadget); > + > + return 0; > +err1: > + if (ret != -EISNAM) > + dev_err(&udc->dev, "failed to start %s: %d\n", > + udc->driver->function, ret); > + udc->driver = NULL; > + return ret; > +} > + > +int usb_gadget_register_driver(struct usb_gadget_driver *driver) > +{ > + struct usb_udc *udc = NULL; > + int ret; > + > + if (!driver || !driver->bind || !driver->setup) > + return -EINVAL; > + > + list_for_each_entry(udc, &udc_list, list) { > + /* For now we take the first one */ > + if (!udc->driver) > + goto found; > + } > + > + debug("couldn't find an available UDC\n"); > + return -ENODEV; > +found: > + ret = udc_bind_to_driver(udc, driver); > + return ret; > +} > + > +int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) > +{ > + struct usb_udc *udc = NULL; > + int ret = -ENODEV; > + > + if (!driver || !driver->unbind) > + return -EINVAL; > + > + list_for_each_entry(udc, &udc_list, list) > + if (udc->driver == driver) { > + usb_gadget_remove_driver(udc); > + usb_gadget_set_state(udc->gadget, > + USB_STATE_NOTATTACHED); > + ret = 0; > + break; > + } > + > + return ret; > +} -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-19 8:52 ` Lukasz Majewski @ 2014-08-19 15:11 ` Felipe Balbi 2014-08-19 15:18 ` Kishon Vijay Abraham I 1 sibling, 0 replies; 57+ messages in thread From: Felipe Balbi @ 2014-08-19 15:11 UTC (permalink / raw) To: u-boot On Tue, Aug 19, 2014 at 10:52:29AM +0200, Lukasz Majewski wrote: > > diff --git a/drivers/usb/gadget/udc-core.c > > b/drivers/usb/gadget/udc-core.c new file mode 100644 > > index 0000000..bbe919c > > --- /dev/null > > +++ b/drivers/usb/gadget/udc-core.c > > @@ -0,0 +1,229 @@ > > +/** > > + * udc-core.c - Core UDC Framework > > + * > > + * Copyright (C) 2014 Texas Instruments Incorporated - > > http://www.ti.com > > + * > > + * Author: Felipe Balbi <balbi@ti.com> > > + * > > + * Taken from Linux Kernel v3.16 (drivers/usb/gadget/udc-core.c) and > > ported > > + * to uboot. > > + * > > + * SPDX-License-Identifier: GPL-2.0+ > > It seems like the author is the same, but the GPL license is different: > > Original file ./drivers/usb/gadget/udc/udc-core.c > > > /** > * udc.c - Core UDCFramework > * > * Copyright (C) 2010 TexasInstruments > * Author: Felipe Balbi<balbi@ti.com> > * > * This program is free software: you can redistribute it and/or > modify > * it under the terms of the GNU General Public License version 2 > of > * the License as published by the Free Software Foundation. > > If Felipe don't mind then he should give you the permission to add + to > the GPL2. I mind :-) -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140819/a89e8b6b/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-19 8:52 ` Lukasz Majewski 2014-08-19 15:11 ` Felipe Balbi @ 2014-08-19 15:18 ` Kishon Vijay Abraham I 2014-08-19 15:28 ` Felipe Balbi 1 sibling, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 15:18 UTC (permalink / raw) To: u-boot Hi Lukasz, On Tuesday 19 August 2014 02:22 PM, Lukasz Majewski wrote: > Hi Kishon, > >> In order to support multiple USB device controllers in uboot, >> udc-core is needed. > > Is it? In u-boot at best only one UDC is operational at a time. I didn't mean operational at the same time. dra7xx has 4 USB controllers and we should allow the user to use any USB port for DFU. The current DFU code re-initializes the controller every time, but that can be optimized. > >> udc-core also helps to cleanly link the USB >> peripheral driver with the gadget driver. Hence Ported minimal >> udc-core from linux kernel. > > I'd appreciate the exact SHA for this udc-core.c code. And the SHA > should be from some already released mainline code (like final 3.16), > not any private branch nor linux-next. We can't have the exact udc-core.c from linux kernel as it deals with kernel driver model stuff and vfs which is not needed for kernel. Trying to have the exact same code from kernel complicates it. Thanks Kishon > >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> drivers/usb/gadget/Makefile | 1 + >> drivers/usb/gadget/udc-core.c | 229 >> ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 230 >> insertions(+) create mode 100644 drivers/usb/gadget/udc-core.c >> >> diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile >> index 66becdc..74875a2 100644 >> --- a/drivers/usb/gadget/Makefile >> +++ b/drivers/usb/gadget/Makefile >> @@ -19,6 +19,7 @@ obj-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o >> obj-$(CONFIG_DFU_FUNCTION) += f_dfu.o >> obj-$(CONFIG_USB_GADGET_MASS_STORAGE) += f_mass_storage.o >> obj-$(CONFIG_CMD_FASTBOOT) += f_fastboot.o >> +obj-y += udc-core.o >> endif >> ifdef CONFIG_USB_ETHER >> obj-y += ether.o >> diff --git a/drivers/usb/gadget/udc-core.c >> b/drivers/usb/gadget/udc-core.c new file mode 100644 >> index 0000000..bbe919c >> --- /dev/null >> +++ b/drivers/usb/gadget/udc-core.c >> @@ -0,0 +1,229 @@ >> +/** >> + * udc-core.c - Core UDC Framework >> + * >> + * Copyright (C) 2014 Texas Instruments Incorporated - >> http://www.ti.com >> + * >> + * Author: Felipe Balbi <balbi@ti.com> >> + * >> + * Taken from Linux Kernel v3.16 (drivers/usb/gadget/udc-core.c) and >> ported >> + * to uboot. >> + * >> + * SPDX-License-Identifier: GPL-2.0+ > > It seems like the author is the same, but the GPL license is different: > > Original file ./drivers/usb/gadget/udc/udc-core.c > > > /** > * udc.c - Core UDCFramework > * > * Copyright (C) 2010 TexasInstruments > * Author: Felipe Balbi<balbi@ti.com> > * > * This program is free software: you can redistribute it and/or > modify > * it under the terms of the GNU General Public License version 2 > of > * the License as published by the Free Software Foundation. > > If Felipe don't mind then he should give you the permission to add + to > the GPL2. > >> + */ >> + >> +#include <linux/compat.h> >> +#include <malloc.h> >> +#include <asm/cache.h> >> +#include <common.h> >> + >> +#include <linux/usb/ch9.h> >> +#include <linux/usb/gadget.h> >> + >> +/** >> + * struct usb_udc - describes one usb device controller >> + * @driver - the gadget driver pointer. For use by the class code >> + * @dev - the child device to the actual controller >> + * @gadget - the gadget. For use by the class code >> + * @list - for use by the udc class driver >> + * >> + * This represents the internal data structure which is used by the >> UDC-class >> + * to hold information about udc driver and gadget together. >> + */ >> +struct usb_udc { >> + struct usb_gadget_driver *driver; >> + struct usb_gadget *gadget; >> + struct list_head list; >> +}; >> + >> +static LIST_HEAD(udc_list); >> + >> +void usb_gadget_set_state(struct usb_gadget *gadget, >> + enum usb_device_state state) >> +{ >> + gadget->state = state; >> +} >> + >> +/** >> + * usb_gadget_udc_start - tells usb device controller to start up >> + * @gadget: The gadget we want to get started >> + * @driver: The driver we want to bind to @gadget >> + * >> + * This call is issued by the UDC Class driver when it's about >> + * to register a gadget driver to the device controller, before >> + * calling gadget driver's bind() method. >> + * >> + * It allows the controller to be powered off until strictly >> + * necessary to have it powered on. >> + * >> + * Returns zero on success, else negative errno. >> + */ >> +static inline int usb_gadget_udc_start(struct usb_gadget *gadget, >> + struct usb_gadget_driver *driver) >> +{ >> + return gadget->ops->udc_start(gadget, driver); >> +} >> + >> +/** >> + * usb_gadget_udc_stop - tells usb device controller we don't need >> it anymore >> + * @gadget: The device we want to stop activity >> + * @driver: The driver to unbind from @gadget >> + * >> + * This call is issued by the UDC Class driver after calling >> + * gadget driver's unbind() method. >> + * >> + * The details are implementation specific, but it can go as >> + * far as powering off UDC completely and disable its data >> + * line pullups. >> + */ >> +static inline void usb_gadget_udc_stop(struct usb_gadget *gadget, >> + struct usb_gadget_driver *driver) >> +{ >> + gadget->ops->udc_stop(gadget, driver); >> +} >> + >> +/** >> + * usb_add_gadget_udc_release - adds a new gadget to the udc class >> driver list >> + * @parent: the parent device to this udc. Usually the controller >> driver's >> + * device. >> + * @gadget: the gadget to be added to the list. >> + * @release: a gadget release function. >> + * >> + * Returns zero on success, negative errno otherwise. >> + */ >> +int usb_add_gadget_udc_release(struct usb_gadget *gadget) >> +{ >> + struct usb_udc *udc; >> + int ret = -ENOMEM; >> + >> + udc = kzalloc(sizeof(*udc), GFP_KERNEL); >> + if (!udc) >> + return ret; >> + >> + udc->gadget = gadget; >> + list_add_tail(&udc->list, &udc_list); >> + usb_gadget_set_state(gadget, USB_STATE_NOTATTACHED); >> + return 0; >> +} >> + >> +/** >> + * usb_add_gadget_udc - adds a new gadget to the udc class driver >> list >> + * @parent: the parent device to this udc. Usually the controller >> + * driver's device. >> + * @gadget: the gadget to be added to the list >> + * >> + * Returns zero on success, negative errno otherwise. >> + */ >> +int usb_add_gadget_udc(struct usb_gadget *gadget) >> +{ >> + return usb_add_gadget_udc_release(gadget); >> +} >> + >> +static void usb_gadget_remove_driver(struct usb_udc *udc) >> +{ >> + dev_dbg(&udc->dev, "unregistering UDC driver [%s]\n", >> + udc->gadget->name); >> + usb_gadget_disconnect(udc->gadget); >> + udc->driver->disconnect(udc->gadget); >> + udc->driver->unbind(udc->gadget); >> + usb_gadget_udc_stop(udc->gadget, NULL); >> + >> + udc->driver = NULL; >> +} >> + >> +/** >> + * usb_del_gadget_udc - deletes @udc from udc_list >> + * @gadget: the gadget to be removed. >> + * >> + * This, will call usb_gadget_unregister_driver() if >> + * the @udc is still busy. >> + */ >> +void usb_del_gadget_udc(struct usb_gadget *gadget) >> +{ >> + struct usb_udc *udc = NULL; >> + list_for_each_entry(udc, &udc_list, list) >> + if (udc->gadget == gadget) >> + goto found; >> + >> + dev_err(gadget->dev.parent, "gadget not registered.\n"); >> + return; >> + >> +found: >> + dev_vdbg(gadget->dev.parent, "unregistering gadget\n"); >> + >> + list_del(&udc->list); >> + >> + if (udc->driver) >> + usb_gadget_remove_driver(udc); >> + >> + kfree(udc); >> +} >> + >> +static int udc_bind_to_driver(struct usb_udc *udc, struct >> usb_gadget_driver *driver) +{ >> + int ret; >> + >> + dev_dbg(&udc->dev, "registering UDC driver [%s]\n", >> + driver->function); >> + >> + udc->driver = driver; >> + >> + ret = driver->bind(udc->gadget); >> + if (ret) >> + goto err1; >> + >> + ret = usb_gadget_udc_start(udc->gadget, driver); >> + if (ret) { >> + driver->unbind(udc->gadget); >> + goto err1; >> + } >> + usb_gadget_connect(udc->gadget); >> + >> + return 0; >> +err1: >> + if (ret != -EISNAM) >> + dev_err(&udc->dev, "failed to start %s: %d\n", >> + udc->driver->function, ret); >> + udc->driver = NULL; >> + return ret; >> +} >> + >> +int usb_gadget_register_driver(struct usb_gadget_driver *driver) >> +{ >> + struct usb_udc *udc = NULL; >> + int ret; >> + >> + if (!driver || !driver->bind || !driver->setup) >> + return -EINVAL; >> + >> + list_for_each_entry(udc, &udc_list, list) { >> + /* For now we take the first one */ >> + if (!udc->driver) >> + goto found; >> + } >> + >> + debug("couldn't find an available UDC\n"); >> + return -ENODEV; >> +found: >> + ret = udc_bind_to_driver(udc, driver); >> + return ret; >> +} >> + >> +int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) >> +{ >> + struct usb_udc *udc = NULL; >> + int ret = -ENODEV; >> + >> + if (!driver || !driver->unbind) >> + return -EINVAL; >> + >> + list_for_each_entry(udc, &udc_list, list) >> + if (udc->driver == driver) { >> + usb_gadget_remove_driver(udc); >> + usb_gadget_set_state(udc->gadget, >> + USB_STATE_NOTATTACHED); >> + ret = 0; >> + break; >> + } >> + >> + return ret; >> +} > > > ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-19 15:18 ` Kishon Vijay Abraham I @ 2014-08-19 15:28 ` Felipe Balbi 2014-08-19 15:38 ` Lukasz Majewski 2014-08-19 16:06 ` Kishon Vijay Abraham I 0 siblings, 2 replies; 57+ messages in thread From: Felipe Balbi @ 2014-08-19 15:28 UTC (permalink / raw) To: u-boot On Tue, Aug 19, 2014 at 08:48:36PM +0530, Kishon Vijay Abraham I wrote: > Hi Lukasz, > > On Tuesday 19 August 2014 02:22 PM, Lukasz Majewski wrote: > > Hi Kishon, > > > >> In order to support multiple USB device controllers in uboot, > >> udc-core is needed. > > > > Is it? In u-boot at best only one UDC is operational at a time. > > I didn't mean operational at the same time. dra7xx has 4 USB > controllers and we should allow the user to use any USB port for DFU. but from u-boot's perspective, that can (should?) be a build-time choice. That user, certainly, won't need more than one port active for booting, right ? > >> udc-core also helps to cleanly link the USB > >> peripheral driver with the gadget driver. Hence Ported minimal > >> udc-core from linux kernel. > > > > I'd appreciate the exact SHA for this udc-core.c code. And the SHA > > should be from some already released mainline code (like final 3.16), > > not any private branch nor linux-next. > > We can't have the exact udc-core.c from linux kernel as it deals with > kernel driver model stuff and vfs which is not needed for kernel. > Trying to have the exact same code from kernel complicates it. what he means is to point to the SHA1 when you originally forked the code from kernel. Sure udc-core can't be the same, but you based off of a known commit ID frmo the kernel. -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140819/93e1387e/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-19 15:28 ` Felipe Balbi @ 2014-08-19 15:38 ` Lukasz Majewski 2014-08-19 16:06 ` Kishon Vijay Abraham I 1 sibling, 0 replies; 57+ messages in thread From: Lukasz Majewski @ 2014-08-19 15:38 UTC (permalink / raw) To: u-boot Hi Felipe, Kishon > On Tue, Aug 19, 2014 at 08:48:36PM +0530, Kishon Vijay Abraham I > wrote: > > Hi Lukasz, > > > > On Tuesday 19 August 2014 02:22 PM, Lukasz Majewski wrote: > > > Hi Kishon, > > > > > >> In order to support multiple USB device controllers in uboot, > > >> udc-core is needed. > > > > > > Is it? In u-boot at best only one UDC is operational at a time. > > > > I didn't mean operational at the same time. dra7xx has 4 USB > > controllers and we should allow the user to use any USB port for > > DFU. > > but from u-boot's perspective, that can (should?) be a build-time > choice. That user, certainly, won't need more than one port active for > booting, right ? This is my point. We are working with the bootloader. Some things here are set at board configuration and aren't changed afterwards (like only UDC 0 output is wired out). The dfu/ums commands give you the ability to specify controller if you need such option. > > > >> udc-core also helps to cleanly link the USB > > >> peripheral driver with the gadget driver. Hence Ported minimal > > >> udc-core from linux kernel. > > > > > > I'd appreciate the exact SHA for this udc-core.c code. And the SHA > > > should be from some already released mainline code (like final > > > 3.16), not any private branch nor linux-next. > > > > We can't have the exact udc-core.c from linux kernel as it deals > > with kernel driver model stuff and vfs which is not needed for > > kernel. Trying to have the exact same code from kernel complicates > > it. > > what he means is to point to the SHA1 when you originally forked the > code from kernel. Sure udc-core can't be the same, but you based off > of a known commit ID frmo the kernel. > +1 The best way is to grab original source from mailine kernel, and then provide patch which adjust it. In this way we have clean trace from where the code comes. -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-19 15:28 ` Felipe Balbi 2014-08-19 15:38 ` Lukasz Majewski @ 2014-08-19 16:06 ` Kishon Vijay Abraham I 2014-08-20 7:02 ` Lukasz Majewski 1 sibling, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 16:06 UTC (permalink / raw) To: u-boot On Tuesday 19 August 2014 08:58 PM, Felipe Balbi wrote: > On Tue, Aug 19, 2014 at 08:48:36PM +0530, Kishon Vijay Abraham I wrote: >> Hi Lukasz, >> >> On Tuesday 19 August 2014 02:22 PM, Lukasz Majewski wrote: >>> Hi Kishon, >>> >>>> In order to support multiple USB device controllers in uboot, >>>> udc-core is needed. >>> >>> Is it? In u-boot at best only one UDC is operational at a time. >> >> I didn't mean operational at the same time. dra7xx has 4 USB >> controllers and we should allow the user to use any USB port for DFU. > > but from u-boot's perspective, that can (should?) be a build-time > choice. That user, certainly, won't need more than one port active for > booting, right ? hmm.. right now I don't think any one needs more than one port. But then without udc core, we have to maintain global variable in gadget.c. Maybe slightly cleaner way is to use udc.. > >>>> udc-core also helps to cleanly link the USB >>>> peripheral driver with the gadget driver. Hence Ported minimal >>>> udc-core from linux kernel. >>> >>> I'd appreciate the exact SHA for this udc-core.c code. And the SHA >>> should be from some already released mainline code (like final 3.16), >>> not any private branch nor linux-next. >> >> We can't have the exact udc-core.c from linux kernel as it deals with >> kernel driver model stuff and vfs which is not needed for kernel. >> Trying to have the exact same code from kernel complicates it. > > what he means is to point to the SHA1 when you originally forked the > code from kernel. Sure udc-core can't be the same, but you based off of > a known commit ID frmo the kernel. Ah ok. The header of the file gives the gives the kernel tag it is forked from. Maybe add that in commit log to? -Kishon > ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core from linux kernel 2014-08-19 16:06 ` Kishon Vijay Abraham I @ 2014-08-20 7:02 ` Lukasz Majewski 0 siblings, 0 replies; 57+ messages in thread From: Lukasz Majewski @ 2014-08-20 7:02 UTC (permalink / raw) To: u-boot Hi Kishon, > > > On Tuesday 19 August 2014 08:58 PM, Felipe Balbi wrote: > > On Tue, Aug 19, 2014 at 08:48:36PM +0530, Kishon Vijay Abraham I > > wrote: > >> Hi Lukasz, > >> > >> On Tuesday 19 August 2014 02:22 PM, Lukasz Majewski wrote: > >>> Hi Kishon, > >>> > >>>> In order to support multiple USB device controllers in uboot, > >>>> udc-core is needed. > >>> > >>> Is it? In u-boot at best only one UDC is operational at a time. > >> > >> I didn't mean operational at the same time. dra7xx has 4 USB > >> controllers and we should allow the user to use any USB port for > >> DFU. > > > > but from u-boot's perspective, that can (should?) be a build-time > > choice. That user, certainly, won't need more than one port active > > for booting, right ? > > hmm.. right now I don't think any one needs more than one port. Please look into the dfu/ums commands interface. There is a possibility to set the controller for transmission. > But then without udc core, we have to maintain global variable in > gadget.c. Maybe slightly cleaner way is to use udc.. I don't mind taking code from linux kernel, but I'm concerned about the complexity and accepting the dead code. The composite.c was taken from 2.6.36 on purpose - it was the smallest working code in the linux kernel. > > > >>>> udc-core also helps to cleanly link the USB > >>>> peripheral driver with the gadget driver. Hence Ported minimal > >>>> udc-core from linux kernel. > >>> > >>> I'd appreciate the exact SHA for this udc-core.c code. And the SHA > >>> should be from some already released mainline code (like final > >>> 3.16), not any private branch nor linux-next. > >> > >> We can't have the exact udc-core.c from linux kernel as it deals > >> with kernel driver model stuff and vfs which is not needed for > >> kernel. Trying to have the exact same code from kernel complicates > >> it. > > > > what he means is to point to the SHA1 when you originally forked the > > code from kernel. Sure udc-core can't be the same, but you based > > off of a known commit ID frmo the kernel. > > Ah ok. The header of the file gives the gives the kernel tag it is > forked from. Maybe add that in commit log to? Please for example refer to: SHA1: dee1d99973 and b4d36f6 > > -Kishon > > > -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 03/13] ARM: DRA7: Enable clocks for USB OTGSS and USB PHY 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 01/13] include: linux: preparation for porting dwc3 from linux kernel Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core " Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 04/13] usb: dwc3: Add dwc3 driver Kishon Vijay Abraham I ` (11 subsequent siblings) 14 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Enabled clocks for dwc3 controller and USB PHY present in DRA7. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/cpu/armv7/omap5/hw_data.c | 14 ++++++++++++++ arch/arm/cpu/armv7/omap5/prcm-regs.c | 6 ++++-- arch/arm/include/asm/omap_common.h | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c b/arch/arm/cpu/armv7/omap5/hw_data.c index 4baca11..c7d5343 100644 --- a/arch/arm/cpu/armv7/omap5/hw_data.c +++ b/arch/arm/cpu/armv7/omap5/hw_data.c @@ -434,6 +434,10 @@ void enable_basic_clocks(void) (*prcm)->cm_l4per_gpio6_clkctrl, (*prcm)->cm_l4per_gpio7_clkctrl, (*prcm)->cm_l4per_gpio8_clkctrl, +#ifdef CONFIG_USB_DWC3 + (*prcm)->cm_l3init_ocp2scp1_clkctrl, + (*prcm)->cm_l3init_usb_otg_ss1_clkctrl, +#endif 0 }; @@ -465,6 +469,16 @@ void enable_basic_clocks(void) setbits_le32((*prcm)->cm_l3init_hsmmc2_clkctrl, HSMMC_CLKCTRL_CLKSEL_MASK); +#ifdef CONFIG_USB_DWC3 + /* Enable 960 MHz clock for dwc3 */ + setbits_le32((*prcm)->cm_l3init_usb_otg_ss1_clkctrl, + OPTFCLKEN_REFCLK960M); + + /* Enable 32 KHz clock for dwc3 */ + setbits_le32((*prcm)->cm_coreaon_usb_phy1_core_clkctrl, + USBPHY_CORE_CLKCTRL_OPTFCLKEN_CLK32K); +#endif + /* Set the correct clock dividers for mmc */ setbits_le32((*prcm)->cm_l3init_hsmmc1_clkctrl, HSMMC_CLKCTRL_CLKSEL_DIV_MASK); diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c b/arch/arm/cpu/armv7/omap5/prcm-regs.c index ff08ef4..74d99de 100644 --- a/arch/arm/cpu/armv7/omap5/prcm-regs.c +++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c @@ -574,7 +574,7 @@ struct prcm_regs const omap5_es2_prcm = { .cm_div_m2_dpll_unipro = 0x4a0081d0, .cm_ssc_deltamstep_dpll_unipro = 0x4a0081e8, .cm_ssc_modfreqdiv_dpll_unipro = 0x4a0081ec, - .cm_coreaon_usb_phy_core_clkctrl = 0x4A008640, + .cm_coreaon_usb_phy1_core_clkctrl = 0x4A008640, .cm_coreaon_bandgap_clkctrl = 0x4a008648, .cm_coreaon_io_srcomp_clkctrl = 0x4a008650, @@ -708,7 +708,7 @@ struct prcm_regs const omap5_es2_prcm = { .cm_l3init_fsusb_clkctrl = 0x4a0096d0, .cm_l3init_ocp2scp1_clkctrl = 0x4a0096e0, .cm_l3init_ocp2scp3_clkctrl = 0x4a0096e8, - .cm_l3init_usb_otg_ss_clkctrl = 0x4a0096f0, + .cm_l3init_usb_otg_ss1_clkctrl = 0x4a0096f0, /* prm irqstatus regs */ .prm_irqstatus_mpu_2 = 0x4ae06014, @@ -800,6 +800,7 @@ struct prcm_regs const dra7xx_prcm = { .cm_clkmode_dpll_dsp = 0x4a005234, .cm_shadow_freq_config1 = 0x4a005260, .cm_clkmode_dpll_gmac = 0x4a0052a8, + .cm_coreaon_usb_phy1_core_clkctrl = 0x4a008640, .cm_coreaon_usb_phy2_core_clkctrl = 0x4a008688, /* cm1.mpu */ @@ -906,6 +907,7 @@ struct prcm_regs const dra7xx_prcm = { .cm_gmac_gmac_clkctrl = 0x4a0093d0, .cm_l3init_ocp2scp1_clkctrl = 0x4a0093e0, .cm_l3init_ocp2scp3_clkctrl = 0x4a0093e8, + .cm_l3init_usb_otg_ss1_clkctrl = 0x4a0093f0, /* cm2.l4per */ .cm_l4per_clkstctrl = 0x4a009700, diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index d1344ee..f010af3 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -143,7 +143,7 @@ struct prcm_regs { u32 cm_div_m2_dpll_unipro; u32 cm_ssc_deltamstep_dpll_unipro; u32 cm_ssc_modfreqdiv_dpll_unipro; - u32 cm_coreaon_usb_phy_core_clkctrl; + u32 cm_coreaon_usb_phy1_core_clkctrl; u32 cm_coreaon_usb_phy2_core_clkctrl; /* cm2.core */ @@ -230,7 +230,7 @@ struct prcm_regs { u32 cm_l3init_fsusb_clkctrl; u32 cm_l3init_ocp2scp1_clkctrl; u32 cm_l3init_ocp2scp3_clkctrl; - u32 cm_l3init_usb_otg_ss_clkctrl; + u32 cm_l3init_usb_otg_ss1_clkctrl; u32 prm_irqstatus_mpu_2; -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 04/13] usb: dwc3: Add dwc3 driver 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (2 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 03/13] ARM: DRA7: Enable clocks for USB OTGSS and USB PHY Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:37 ` Felipe Balbi 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 05/13] usb: dwc3-omap: Add dwc3 glue driver for OMAP Kishon Vijay Abraham I ` (10 subsequent siblings) 14 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Ported dwc3 driver from linux kernel to uboot. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- Makefile | 1 + drivers/usb/dwc3/Makefile | 7 + drivers/usb/dwc3/core.c | 640 +++++++++ drivers/usb/dwc3/core.h | 961 +++++++++++++ drivers/usb/dwc3/ep0.c | 1045 ++++++++++++++ drivers/usb/dwc3/gadget.c | 2841 +++++++++++++++++++++++++++++++++++++++ drivers/usb/dwc3/gadget.h | 163 +++ drivers/usb/dwc3/io.h | 52 + drivers/usb/dwc3/linux-compat.h | 132 ++ include/dwc3-uboot.h | 26 + 10 files changed, 5868 insertions(+) create mode 100644 drivers/usb/dwc3/Makefile create mode 100644 drivers/usb/dwc3/core.c create mode 100644 drivers/usb/dwc3/core.h create mode 100644 drivers/usb/dwc3/ep0.c create mode 100644 drivers/usb/dwc3/gadget.c create mode 100644 drivers/usb/dwc3/gadget.h create mode 100644 drivers/usb/dwc3/io.h create mode 100644 drivers/usb/dwc3/linux-compat.h create mode 100644 include/dwc3-uboot.h diff --git a/Makefile b/Makefile index cf810a9..c9a18d3 100644 --- a/Makefile +++ b/Makefile @@ -645,6 +645,7 @@ libs-y += drivers/spi/ libs-$(CONFIG_FMAN_ENET) += drivers/net/fm/ libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/ libs-y += drivers/serial/ +libs-y += drivers/usb/dwc3/ libs-y += drivers/usb/eth/ libs-y += drivers/usb/gadget/ libs-y += drivers/usb/host/ diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile new file mode 100644 index 0000000..fbfa0df --- /dev/null +++ b/drivers/usb/dwc3/Makefile @@ -0,0 +1,7 @@ +ccflags-$(CONFIG_USB_DWC3_DEBUG) := -DDEBUG +ccflags-$(CONFIG_USB_DWC3_VERBOSE) += -DVERBOSE_DEBUG + +obj-$(CONFIG_USB_DWC3) += dwc3.o + +dwc3-y := core.o +dwc3-$(CONFIG_USB_DWC3_GADGET) += gadget.o ep0.o diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c new file mode 100644 index 0000000..66bbe92 --- /dev/null +++ b/drivers/usb/dwc3/core.c @@ -0,0 +1,640 @@ +/** + * core.c - DesignWare USB3 DRD Controller Core file + * + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Authors: Felipe Balbi <balbi@ti.com>, + * Sebastian Andrzej Siewior <bigeasy@linutronix.de> + * + * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported + * to uboot. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <linux/compat.h> +#include "linux-compat.h" + +#include <malloc.h> +#include <asm/cache.h> +#include <common.h> +#include <dwc3-uboot.h> +#include <linux/usb/ch9.h> +#include <linux/usb/gadget.h> +#include <linux/ioport.h> + +#include "core.h" +#include "gadget.h" +#include "io.h" + +static LIST_HEAD(dwc3_list); + +/* -------------------------------------------------------------------------- */ + +void dwc3_set_mode(struct dwc3 *dwc, u32 mode) +{ + u32 reg; + + reg = dwc3_readl(dwc->regs, DWC3_GCTL); + reg &= ~(DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG)); + reg |= DWC3_GCTL_PRTCAPDIR(mode); + dwc3_writel(dwc->regs, DWC3_GCTL, reg); +} + +/** + * dwc3_core_soft_reset - Issues core soft reset and PHY reset + * @dwc: pointer to our context structure + */ +static int dwc3_core_soft_reset(struct dwc3 *dwc) +{ + u32 reg; + + /* Before Resetting PHY, put Core in Reset */ + reg = dwc3_readl(dwc->regs, DWC3_GCTL); + reg |= DWC3_GCTL_CORESOFTRESET; + dwc3_writel(dwc->regs, DWC3_GCTL, reg); + + /* Assert USB3 PHY reset */ + reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)); + reg |= DWC3_GUSB3PIPECTL_PHYSOFTRST; + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); + + /* Assert USB2 PHY reset */ + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg |= DWC3_GUSB2PHYCFG_PHYSOFTRST; + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + + mdelay(100); + + /* Clear USB3 PHY reset */ + reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)); + reg &= ~DWC3_GUSB3PIPECTL_PHYSOFTRST; + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg); + + /* Clear USB2 PHY reset */ + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg &= ~DWC3_GUSB2PHYCFG_PHYSOFTRST; + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + + mdelay(100); + + /* After PHYs are stable we can take Core out of reset state */ + reg = dwc3_readl(dwc->regs, DWC3_GCTL); + reg &= ~DWC3_GCTL_CORESOFTRESET; + dwc3_writel(dwc->regs, DWC3_GCTL, reg); + + return 0; +} + +/** + * dwc3_free_one_event_buffer - Frees one event buffer + * @dwc: Pointer to our controller context structure + * @evt: Pointer to event buffer to be freed + */ +static void dwc3_free_one_event_buffer(struct dwc3 *dwc, + struct dwc3_event_buffer *evt) +{ + dma_free_coherent(dwc->dev, evt->length, evt->buf, evt->dma); +} + +/** + * dwc3_alloc_one_event_buffer - Allocates one event buffer structure + * @dwc: Pointer to our controller context structure + * @length: size of the event buffer + * + * Returns a pointer to the allocated event buffer structure on success + * otherwise ERR_PTR(errno). + */ +static struct dwc3_event_buffer *dwc3_alloc_one_event_buffer(struct dwc3 *dwc, + unsigned length) +{ + struct dwc3_event_buffer *evt; + + evt = devm_kzalloc(dwc->dev, sizeof(*evt), GFP_KERNEL); + if (!evt) + return ERR_PTR(-ENOMEM); + + evt->dwc = dwc; + evt->length = length; + evt->buf = dma_alloc_coherent(dwc->dev, length, + &evt->dma, GFP_KERNEL); + if (!evt->buf) + return ERR_PTR(-ENOMEM); + + return evt; +} + +/** + * dwc3_free_event_buffers - frees all allocated event buffers + * @dwc: Pointer to our controller context structure + */ +static void dwc3_free_event_buffers(struct dwc3 *dwc) +{ + struct dwc3_event_buffer *evt; + int i; + + for (i = 0; i < dwc->num_event_buffers; i++) { + evt = dwc->ev_buffs[i]; + if (evt) + dwc3_free_one_event_buffer(dwc, evt); + } +} + +/** + * dwc3_alloc_event_buffers - Allocates @num event buffers of size @length + * @dwc: pointer to our controller context structure + * @length: size of event buffer + * + * Returns 0 on success otherwise negative errno. In the error case, dwc + * may contain some buffers allocated but not all which were requested. + */ +static int dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned length) +{ + int num; + int i; + + num = DWC3_NUM_INT(dwc->hwparams.hwparams1); + dwc->num_event_buffers = num; + + dwc->ev_buffs = devm_kzalloc(dwc->dev, sizeof(*dwc->ev_buffs) * num, + GFP_KERNEL); + if (!dwc->ev_buffs) { + dev_err(dwc->dev, "can't allocate event buffers array\n"); + return -ENOMEM; + } + + for (i = 0; i < num; i++) { + struct dwc3_event_buffer *evt; + + evt = dwc3_alloc_one_event_buffer(dwc, length); + if (IS_ERR(evt)) { + dev_err(dwc->dev, "can't allocate event buffer\n"); + return PTR_ERR(evt); + } + dwc->ev_buffs[i] = evt; + } + + return 0; +} + +/** + * dwc3_event_buffers_setup - setup our allocated event buffers + * @dwc: pointer to our controller context structure + * + * Returns 0 on success otherwise negative errno. + */ +static int dwc3_event_buffers_setup(struct dwc3 *dwc) +{ + struct dwc3_event_buffer *evt; + int n; + + for (n = 0; n < dwc->num_event_buffers; n++) { + evt = dwc->ev_buffs[n]; + dev_dbg(dwc->dev, "Event buf %p dma %08llx length %d\n", + evt->buf, (unsigned long long) evt->dma, + evt->length); + + evt->lpos = 0; + + dwc3_writel(dwc->regs, DWC3_GEVNTADRLO(n), + lower_32_bits(evt->dma)); + dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(n), + upper_32_bits(evt->dma)); + dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(n), + DWC3_GEVNTSIZ_SIZE(evt->length)); + dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(n), 0); + } + + return 0; +} + +static void dwc3_event_buffers_cleanup(struct dwc3 *dwc) +{ + struct dwc3_event_buffer *evt; + int n; + + for (n = 0; n < dwc->num_event_buffers; n++) { + evt = dwc->ev_buffs[n]; + + evt->lpos = 0; + + dwc3_writel(dwc->regs, DWC3_GEVNTADRLO(n), 0); + dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(n), 0); + dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(n), DWC3_GEVNTSIZ_INTMASK + | DWC3_GEVNTSIZ_SIZE(0)); + dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(n), 0); + } +} + +static int dwc3_alloc_scratch_buffers(struct dwc3 *dwc) +{ + if (!dwc->has_hibernation) + return 0; + + if (!dwc->nr_scratch) + return 0; + + dwc->scratchbuf = kmalloc_array(dwc->nr_scratch, + DWC3_SCRATCHBUF_SIZE, GFP_KERNEL); + if (!dwc->scratchbuf) + return -ENOMEM; + + return 0; +} + +static int dwc3_setup_scratch_buffers(struct dwc3 *dwc) +{ + dma_addr_t scratch_addr; + u32 param; + int ret; + + if (!dwc->has_hibernation) + return 0; + + if (!dwc->nr_scratch) + return 0; + + /* should never fall here */ + if (!WARN_ON(dwc->scratchbuf)) + return 0; + + scratch_addr = dma_map_single(dwc->dev, dwc->scratchbuf, + dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE, + DMA_BIDIRECTIONAL); + if (dma_mapping_error(dwc->dev, scratch_addr)) { + dev_err(dwc->dev, "failed to map scratch buffer\n"); + ret = -EFAULT; + goto err0; + } + + dwc->scratch_addr = scratch_addr; + + param = lower_32_bits(scratch_addr); + + ret = dwc3_send_gadget_generic_command(dwc, + DWC3_DGCMD_SET_SCRATCHPAD_ADDR_LO, param); + if (ret < 0) + goto err1; + + param = upper_32_bits(scratch_addr); + + ret = dwc3_send_gadget_generic_command(dwc, + DWC3_DGCMD_SET_SCRATCHPAD_ADDR_HI, param); + if (ret < 0) + goto err1; + + return 0; + +err1: + dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch * + DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL); + +err0: + return ret; +} + +static void dwc3_free_scratch_buffers(struct dwc3 *dwc) +{ + if (!dwc->has_hibernation) + return; + + if (!dwc->nr_scratch) + return; + + /* should never fall here */ + if (!WARN_ON(dwc->scratchbuf)) + return; + + dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch * + DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL); + kfree(dwc->scratchbuf); +} + +static void dwc3_core_num_eps(struct dwc3 *dwc) +{ + struct dwc3_hwparams *parms = &dwc->hwparams; + + dwc->num_in_eps = DWC3_NUM_IN_EPS(parms); + dwc->num_out_eps = DWC3_NUM_EPS(parms) - dwc->num_in_eps; + + dev_vdbg(dwc->dev, "found %d IN and %d OUT endpoints\n", + dwc->num_in_eps, dwc->num_out_eps); +} + +static void dwc3_cache_hwparams(struct dwc3 *dwc) +{ + struct dwc3_hwparams *parms = &dwc->hwparams; + + parms->hwparams0 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS0); + parms->hwparams1 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS1); + parms->hwparams2 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS2); + parms->hwparams3 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS3); + parms->hwparams4 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS4); + parms->hwparams5 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS5); + parms->hwparams6 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS6); + parms->hwparams7 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS7); + parms->hwparams8 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS8); +} + +/** + * dwc3_core_init - Low-level initialization of DWC3 Core + * @dwc: Pointer to our controller context structure + * + * Returns 0 on success otherwise negative errno. + */ +static int dwc3_core_init(struct dwc3 *dwc) +{ + unsigned long timeout; + u32 hwparams4 = dwc->hwparams.hwparams4; + u32 reg; + int ret; + + reg = dwc3_readl(dwc->regs, DWC3_GSNPSID); + /* This should read as U3 followed by revision number */ + if ((reg & DWC3_GSNPSID_MASK) != 0x55330000) { + dev_err(dwc->dev, "this is not a DesignWare USB3 DRD Core\n"); + ret = -ENODEV; + goto err0; + } + dwc->revision = reg; + + /* issue device SoftReset too */ + timeout = jiffies + msecs_to_jiffies(500); + dwc3_writel(dwc->regs, DWC3_DCTL, DWC3_DCTL_CSFTRST); + do { + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + if (!(reg & DWC3_DCTL_CSFTRST)) + break; + + if (time_after(jiffies, timeout)) { + dev_err(dwc->dev, "Reset Timed Out\n"); + ret = -ETIMEDOUT; + goto err0; + } + + cpu_relax(); + } while (true); + + ret = dwc3_core_soft_reset(dwc); + if (ret) + goto err0; + + reg = dwc3_readl(dwc->regs, DWC3_GCTL); + reg &= ~DWC3_GCTL_SCALEDOWN_MASK; + reg &= ~DWC3_GCTL_DISSCRAMBLE; + + switch (DWC3_GHWPARAMS1_EN_PWROPT(dwc->hwparams.hwparams1)) { + case DWC3_GHWPARAMS1_EN_PWROPT_CLK: + /** + * WORKAROUND: DWC3 revisions between 2.10a and 2.50a have an + * issue which would cause xHCI compliance tests to fail. + * + * Because of that we cannot enable clock gating on such + * configurations. + * + * Refers to: + * + * STAR#9000588375: Clock Gating, SOF Issues when ref_clk-Based + * SOF/ITP Mode Used + */ + if ((dwc->dr_mode == USB_DR_MODE_HOST || + dwc->dr_mode == USB_DR_MODE_OTG) && + (dwc->revision >= DWC3_REVISION_210A && + dwc->revision <= DWC3_REVISION_250A)) + reg |= DWC3_GCTL_DSBLCLKGTNG | DWC3_GCTL_SOFITPSYNC; + else + reg &= ~DWC3_GCTL_DSBLCLKGTNG; + break; + case DWC3_GHWPARAMS1_EN_PWROPT_HIB: + /* enable hibernation here */ + dwc->nr_scratch = DWC3_GHWPARAMS4_HIBER_SCRATCHBUFS(hwparams4); + break; + default: + dev_dbg(dwc->dev, "No power optimization available\n"); + } + + /* + * WORKAROUND: DWC3 revisions <1.90a have a bug + * where the device can fail to connect@SuperSpeed + * and falls back to high-speed mode which causes + * the device to enter a Connect/Disconnect loop + */ + if (dwc->revision < DWC3_REVISION_190A) + reg |= DWC3_GCTL_U2RSTECN; + + dwc3_core_num_eps(dwc); + + dwc3_writel(dwc->regs, DWC3_GCTL, reg); + + ret = dwc3_alloc_scratch_buffers(dwc); + if (ret) + goto err0; + + ret = dwc3_setup_scratch_buffers(dwc); + if (ret) + goto err2; + + return 0; + +err2: + dwc3_free_scratch_buffers(dwc); + +err0: + return ret; +} + +static void dwc3_core_exit(struct dwc3 *dwc) +{ + dwc3_free_scratch_buffers(dwc); +} + +static int dwc3_core_init_mode(struct dwc3 *dwc) +{ + int ret; + + switch (dwc->dr_mode) { + case USB_DR_MODE_PERIPHERAL: + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); + ret = dwc3_gadget_init(dwc); + if (ret) { + dev_err(dwc->dev, "failed to initialize gadget\n"); + return ret; + } + break; + case USB_DR_MODE_HOST: + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_HOST); + ret = dwc3_host_init(dwc); + if (ret) { + dev_err(dwc->dev, "failed to initialize host\n"); + return ret; + } + break; + case USB_DR_MODE_OTG: + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); + ret = dwc3_host_init(dwc); + if (ret) { + dev_err(dwc->dev, "failed to initialize host\n"); + return ret; + } + + ret = dwc3_gadget_init(dwc); + if (ret) { + dev_err(dwc->dev, "failed to initialize gadget\n"); + return ret; + } + break; + default: + dev_err(dwc->dev, "Unsupported mode of operation %d\n", dwc->dr_mode); + return -EINVAL; + } + + return 0; +} + +static void dwc3_core_exit_mode(struct dwc3 *dwc) +{ + switch (dwc->dr_mode) { + case USB_DR_MODE_PERIPHERAL: + dwc3_gadget_exit(dwc); + break; + case USB_DR_MODE_HOST: + dwc3_host_exit(dwc); + break; + case USB_DR_MODE_OTG: + dwc3_host_exit(dwc); + dwc3_gadget_exit(dwc); + break; + default: + /* do nothing */ + break; + } +} + +#define DWC3_ALIGN_MASK (16 - 1) + +/** + * dwc3_uboot_init - dwc3 core uboot initialization code + * @dwc3_dev: struct dwc3_device containing initialization data + * + * Entry point for dwc3 driver (equivalent to dwc3_probe in linux + * kernel driver). Pointer to dwc3_device should be passed containing + * base address and other initialization data. Returns '0' on success and + * a negative value on failure. + * + * Generally called from board_usb_init() implemented in board file. + */ +int dwc3_uboot_init(struct dwc3_device *dwc3_dev) +{ + struct dwc3 *dwc; + void *dev; + int ret; + void *mem; + + mem = devm_kzalloc(dev, sizeof(*dwc) + DWC3_ALIGN_MASK, GFP_KERNEL); + if (!mem) { + dev_err(dev, "not enough memory\n"); + return -ENOMEM; + } + dwc = PTR_ALIGN(mem, DWC3_ALIGN_MASK + 1); + dwc->mem = mem; + dwc->maximum_speed = dwc3_dev->maximum_speed; + + /* default to superspeed if no maximum_speed passed */ + if (dwc->maximum_speed == USB_SPEED_UNKNOWN) + dwc->maximum_speed = USB_SPEED_SUPER; + + dwc->regs = (int *)(dwc3_dev->base + DWC3_GLOBALS_REGS_START); + dwc->needs_fifo_resize = dwc3_dev->needs_fifo_resize; + dwc->dr_mode = dwc3_dev->dr_mode; + dwc->index = dwc3_dev->index; + + dwc3_cache_hwparams(dwc); + + ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE); + if (ret) { + dev_err(dwc->dev, "failed to allocate event buffers\n"); + ret = -ENOMEM; + goto err0; + } + + ret = dwc3_core_init(dwc); + if (ret) { + dev_err(dev, "failed to initialize core\n"); + goto err0; + } + + ret = dwc3_event_buffers_setup(dwc); + if (ret) { + dev_err(dwc->dev, "failed to setup event buffers\n"); + goto err1; + } + + ret = dwc3_core_init_mode(dwc); + if (ret) + goto err2; + + list_add_tail(&dwc->list, &dwc3_list); + + return 0; + +err2: + dwc3_event_buffers_cleanup(dwc); + +err1: + dwc3_core_exit(dwc); + +err0: + dwc3_free_event_buffers(dwc); + + return ret; +} + +/** + * dwc3_uboot_exit - dwc3 core uboot cleanup code + * @index: index of this controller + * + * Performs cleanup of memory allocated in dwc3_uboot_init and other misc + * cleanups (equivalent to dwc3_remove in linux). index of _this_ controller + * should be passed and should match with the index passed in + * dwc3_device during init. + * + * Generally called from board file. + */ +void dwc3_uboot_exit(int index) +{ + struct dwc3 *dwc = NULL; + + list_for_each_entry(dwc, &dwc3_list, list) { + if (dwc->index != index) + continue; + + dwc3_core_exit_mode(dwc); + dwc3_event_buffers_cleanup(dwc); + dwc3_free_event_buffers(dwc); + dwc3_core_exit(dwc); + list_del(&dwc->list); + kfree(dwc->mem); + break; + } +} + +/** + * dwc3_uboot_handle_interrupt - handle dwc3 core interrupt + * @index: index of this controller + * + * Invokes dwc3 gadget interrupts. + * + * Generally called from board file. + */ +void dwc3_uboot_handle_interrupt(int index) +{ + struct dwc3 *dwc = NULL; + + list_for_each_entry(dwc, &dwc3_list, list) { + if (dwc->index != index) + continue; + + dwc3_gadget_uboot_handle_interrupt(dwc); + break; + } +} diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h new file mode 100644 index 0000000..e9ea7ca --- /dev/null +++ b/drivers/usb/dwc3/core.h @@ -0,0 +1,961 @@ +/** + * core.h - DesignWare USB3 DRD Core Header + * + * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com + * + * Authors: Felipe Balbi <balbi@ti.com>, + * Sebastian Andrzej Siewior <bigeasy@linutronix.de> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 of + * the License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __DRIVERS_USB_DWC3_CORE_H +#define __DRIVERS_USB_DWC3_CORE_H + +#include <linux/ioport.h> +#include <linux/usb/ch9.h> +#include <linux/usb/otg.h> + +/* Global constants */ +#define DWC3_EP0_BOUNCE_SIZE 512 +#define DWC3_ENDPOINTS_NUM 32 +#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_TYPE_MASK 0xfe + +#define DWC3_EVENT_TYPE_DEV 0 +#define DWC3_EVENT_TYPE_CARKIT 3 +#define DWC3_EVENT_TYPE_I2C 4 + +#define DWC3_DEVICE_EVENT_DISCONNECT 0 +#define DWC3_DEVICE_EVENT_RESET 1 +#define DWC3_DEVICE_EVENT_CONNECT_DONE 2 +#define DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE 3 +#define DWC3_DEVICE_EVENT_WAKEUP 4 +#define DWC3_DEVICE_EVENT_HIBER_REQ 5 +#define DWC3_DEVICE_EVENT_EOPF 6 +#define DWC3_DEVICE_EVENT_SOF 7 +#define DWC3_DEVICE_EVENT_ERRATIC_ERROR 9 +#define DWC3_DEVICE_EVENT_CMD_CMPL 10 +#define DWC3_DEVICE_EVENT_OVERFLOW 11 + +#define DWC3_GEVNTCOUNT_MASK 0xfffc +#define DWC3_GSNPSID_MASK 0xffff0000 +#define DWC3_GSNPSREV_MASK 0xffff + +/* DWC3 registers memory space boundries */ +#define DWC3_XHCI_REGS_START 0x0 +#define DWC3_XHCI_REGS_END 0x7fff +#define DWC3_GLOBALS_REGS_START 0xc100 +#define DWC3_GLOBALS_REGS_END 0xc6ff +#define DWC3_DEVICE_REGS_START 0xc700 +#define DWC3_DEVICE_REGS_END 0xcbff +#define DWC3_OTG_REGS_START 0xcc00 +#define DWC3_OTG_REGS_END 0xccff + +/* Global Registers */ +#define DWC3_GSBUSCFG0 0xc100 +#define DWC3_GSBUSCFG1 0xc104 +#define DWC3_GTXTHRCFG 0xc108 +#define DWC3_GRXTHRCFG 0xc10c +#define DWC3_GCTL 0xc110 +#define DWC3_GEVTEN 0xc114 +#define DWC3_GSTS 0xc118 +#define DWC3_GSNPSID 0xc120 +#define DWC3_GGPIO 0xc124 +#define DWC3_GUID 0xc128 +#define DWC3_GUCTL 0xc12c +#define DWC3_GBUSERRADDR0 0xc130 +#define DWC3_GBUSERRADDR1 0xc134 +#define DWC3_GPRTBIMAP0 0xc138 +#define DWC3_GPRTBIMAP1 0xc13c +#define DWC3_GHWPARAMS0 0xc140 +#define DWC3_GHWPARAMS1 0xc144 +#define DWC3_GHWPARAMS2 0xc148 +#define DWC3_GHWPARAMS3 0xc14c +#define DWC3_GHWPARAMS4 0xc150 +#define DWC3_GHWPARAMS5 0xc154 +#define DWC3_GHWPARAMS6 0xc158 +#define DWC3_GHWPARAMS7 0xc15c +#define DWC3_GDBGFIFOSPACE 0xc160 +#define DWC3_GDBGLTSSM 0xc164 +#define DWC3_GPRTBIMAP_HS0 0xc180 +#define DWC3_GPRTBIMAP_HS1 0xc184 +#define DWC3_GPRTBIMAP_FS0 0xc188 +#define DWC3_GPRTBIMAP_FS1 0xc18c + +#define DWC3_GUSB2PHYCFG(n) (0xc200 + (n * 0x04)) +#define DWC3_GUSB2I2CCTL(n) (0xc240 + (n * 0x04)) + +#define DWC3_GUSB2PHYACC(n) (0xc280 + (n * 0x04)) + +#define DWC3_GUSB3PIPECTL(n) (0xc2c0 + (n * 0x04)) + +#define DWC3_GTXFIFOSIZ(n) (0xc300 + (n * 0x04)) +#define DWC3_GRXFIFOSIZ(n) (0xc380 + (n * 0x04)) + +#define DWC3_GEVNTADRLO(n) (0xc400 + (n * 0x10)) +#define DWC3_GEVNTADRHI(n) (0xc404 + (n * 0x10)) +#define DWC3_GEVNTSIZ(n) (0xc408 + (n * 0x10)) +#define DWC3_GEVNTCOUNT(n) (0xc40c + (n * 0x10)) + +#define DWC3_GHWPARAMS8 0xc600 + +/* Device Registers */ +#define DWC3_DCFG 0xc700 +#define DWC3_DCTL 0xc704 +#define DWC3_DEVTEN 0xc708 +#define DWC3_DSTS 0xc70c +#define DWC3_DGCMDPAR 0xc710 +#define DWC3_DGCMD 0xc714 +#define DWC3_DALEPENA 0xc720 +#define DWC3_DEPCMDPAR2(n) (0xc800 + (n * 0x10)) +#define DWC3_DEPCMDPAR1(n) (0xc804 + (n * 0x10)) +#define DWC3_DEPCMDPAR0(n) (0xc808 + (n * 0x10)) +#define DWC3_DEPCMD(n) (0xc80c + (n * 0x10)) + +/* OTG Registers */ +#define DWC3_OCFG 0xcc00 +#define DWC3_OCTL 0xcc04 +#define DWC3_OEVT 0xcc08 +#define DWC3_OEVTEN 0xcc0C +#define DWC3_OSTS 0xcc10 + +/* Bit fields */ + +/* Global Configuration Register */ +#define DWC3_GCTL_PWRDNSCALE(n) ((n) << 19) +#define DWC3_GCTL_U2RSTECN (1 << 16) +#define DWC3_GCTL_RAMCLKSEL(x) (((x) & DWC3_GCTL_CLK_MASK) << 6) +#define DWC3_GCTL_CLK_BUS (0) +#define DWC3_GCTL_CLK_PIPE (1) +#define DWC3_GCTL_CLK_PIPEHALF (2) +#define DWC3_GCTL_CLK_MASK (3) + +#define DWC3_GCTL_PRTCAP(n) (((n) & (3 << 12)) >> 12) +#define DWC3_GCTL_PRTCAPDIR(n) ((n) << 12) +#define DWC3_GCTL_PRTCAP_HOST 1 +#define DWC3_GCTL_PRTCAP_DEVICE 2 +#define DWC3_GCTL_PRTCAP_OTG 3 + +#define DWC3_GCTL_CORESOFTRESET (1 << 11) +#define DWC3_GCTL_SOFITPSYNC (1 << 10) +#define DWC3_GCTL_SCALEDOWN(n) ((n) << 4) +#define DWC3_GCTL_SCALEDOWN_MASK DWC3_GCTL_SCALEDOWN(3) +#define DWC3_GCTL_DISSCRAMBLE (1 << 3) +#define DWC3_GCTL_GBLHIBERNATIONEN (1 << 1) +#define DWC3_GCTL_DSBLCLKGTNG (1 << 0) + +/* Global USB2 PHY Configuration Register */ +#define DWC3_GUSB2PHYCFG_PHYSOFTRST (1 << 31) +#define DWC3_GUSB2PHYCFG_SUSPHY (1 << 6) + +/* Global USB3 PIPE Control Register */ +#define DWC3_GUSB3PIPECTL_PHYSOFTRST (1 << 31) +#define DWC3_GUSB3PIPECTL_SUSPHY (1 << 17) + +/* Global TX Fifo Size Register */ +#define DWC3_GTXFIFOSIZ_TXFDEF(n) ((n) & 0xffff) +#define DWC3_GTXFIFOSIZ_TXFSTADDR(n) ((n) & 0xffff0000) + +/* Global Event Size Registers */ +#define DWC3_GEVNTSIZ_INTMASK (1 << 31) +#define DWC3_GEVNTSIZ_SIZE(n) ((n) & 0xffff) + +/* Global HWPARAMS1 Register */ +#define DWC3_GHWPARAMS1_EN_PWROPT(n) (((n) & (3 << 24)) >> 24) +#define DWC3_GHWPARAMS1_EN_PWROPT_NO 0 +#define DWC3_GHWPARAMS1_EN_PWROPT_CLK 1 +#define DWC3_GHWPARAMS1_EN_PWROPT_HIB 2 +#define DWC3_GHWPARAMS1_PWROPT(n) ((n) << 24) +#define DWC3_GHWPARAMS1_PWROPT_MASK DWC3_GHWPARAMS1_PWROPT(3) + +/* Global HWPARAMS4 Register */ +#define DWC3_GHWPARAMS4_HIBER_SCRATCHBUFS(n) (((n) & (0x0f << 13)) >> 13) +#define DWC3_MAX_HIBER_SCRATCHBUFS 15 + +/* Device Configuration Register */ +#define DWC3_DCFG_DEVADDR(addr) ((addr) << 3) +#define DWC3_DCFG_DEVADDR_MASK DWC3_DCFG_DEVADDR(0x7f) + +#define DWC3_DCFG_SPEED_MASK (7 << 0) +#define DWC3_DCFG_SUPERSPEED (4 << 0) +#define DWC3_DCFG_HIGHSPEED (0 << 0) +#define DWC3_DCFG_FULLSPEED2 (1 << 0) +#define DWC3_DCFG_LOWSPEED (2 << 0) +#define DWC3_DCFG_FULLSPEED1 (3 << 0) + +#define DWC3_DCFG_LPM_CAP (1 << 22) + +/* Device Control Register */ +#define DWC3_DCTL_RUN_STOP (1 << 31) +#define DWC3_DCTL_CSFTRST (1 << 30) +#define DWC3_DCTL_LSFTRST (1 << 29) + +#define DWC3_DCTL_HIRD_THRES_MASK (0x1f << 24) +#define DWC3_DCTL_HIRD_THRES(n) ((n) << 24) + +#define DWC3_DCTL_APPL1RES (1 << 23) + +/* These apply for core versions 1.87a and earlier */ +#define DWC3_DCTL_TRGTULST_MASK (0x0f << 17) +#define DWC3_DCTL_TRGTULST(n) ((n) << 17) +#define DWC3_DCTL_TRGTULST_U2 (DWC3_DCTL_TRGTULST(2)) +#define DWC3_DCTL_TRGTULST_U3 (DWC3_DCTL_TRGTULST(3)) +#define DWC3_DCTL_TRGTULST_SS_DIS (DWC3_DCTL_TRGTULST(4)) +#define DWC3_DCTL_TRGTULST_RX_DET (DWC3_DCTL_TRGTULST(5)) +#define DWC3_DCTL_TRGTULST_SS_INACT (DWC3_DCTL_TRGTULST(6)) + +/* These apply for core versions 1.94a and later */ +#define DWC3_DCTL_KEEP_CONNECT (1 << 19) +#define DWC3_DCTL_L1_HIBER_EN (1 << 18) +#define DWC3_DCTL_CRS (1 << 17) +#define DWC3_DCTL_CSS (1 << 16) + +#define DWC3_DCTL_INITU2ENA (1 << 12) +#define DWC3_DCTL_ACCEPTU2ENA (1 << 11) +#define DWC3_DCTL_INITU1ENA (1 << 10) +#define DWC3_DCTL_ACCEPTU1ENA (1 << 9) +#define DWC3_DCTL_TSTCTRL_MASK (0xf << 1) + +#define DWC3_DCTL_ULSTCHNGREQ_MASK (0x0f << 5) +#define DWC3_DCTL_ULSTCHNGREQ(n) (((n) << 5) & DWC3_DCTL_ULSTCHNGREQ_MASK) + +#define DWC3_DCTL_ULSTCHNG_NO_ACTION (DWC3_DCTL_ULSTCHNGREQ(0)) +#define DWC3_DCTL_ULSTCHNG_SS_DISABLED (DWC3_DCTL_ULSTCHNGREQ(4)) +#define DWC3_DCTL_ULSTCHNG_RX_DETECT (DWC3_DCTL_ULSTCHNGREQ(5)) +#define DWC3_DCTL_ULSTCHNG_SS_INACTIVE (DWC3_DCTL_ULSTCHNGREQ(6)) +#define DWC3_DCTL_ULSTCHNG_RECOVERY (DWC3_DCTL_ULSTCHNGREQ(8)) +#define DWC3_DCTL_ULSTCHNG_COMPLIANCE (DWC3_DCTL_ULSTCHNGREQ(10)) +#define DWC3_DCTL_ULSTCHNG_LOOPBACK (DWC3_DCTL_ULSTCHNGREQ(11)) + +/* Device Event Enable Register */ +#define DWC3_DEVTEN_VNDRDEVTSTRCVEDEN (1 << 12) +#define DWC3_DEVTEN_EVNTOVERFLOWEN (1 << 11) +#define DWC3_DEVTEN_CMDCMPLTEN (1 << 10) +#define DWC3_DEVTEN_ERRTICERREN (1 << 9) +#define DWC3_DEVTEN_SOFEN (1 << 7) +#define DWC3_DEVTEN_EOPFEN (1 << 6) +#define DWC3_DEVTEN_HIBERNATIONREQEVTEN (1 << 5) +#define DWC3_DEVTEN_WKUPEVTEN (1 << 4) +#define DWC3_DEVTEN_ULSTCNGEN (1 << 3) +#define DWC3_DEVTEN_CONNECTDONEEN (1 << 2) +#define DWC3_DEVTEN_USBRSTEN (1 << 1) +#define DWC3_DEVTEN_DISCONNEVTEN (1 << 0) + +/* Device Status Register */ +#define DWC3_DSTS_DCNRD (1 << 29) + +/* This applies for core versions 1.87a and earlier */ +#define DWC3_DSTS_PWRUPREQ (1 << 24) + +/* These apply for core versions 1.94a and later */ +#define DWC3_DSTS_RSS (1 << 25) +#define DWC3_DSTS_SSS (1 << 24) + +#define DWC3_DSTS_COREIDLE (1 << 23) +#define DWC3_DSTS_DEVCTRLHLT (1 << 22) + +#define DWC3_DSTS_USBLNKST_MASK (0x0f << 18) +#define DWC3_DSTS_USBLNKST(n) (((n) & DWC3_DSTS_USBLNKST_MASK) >> 18) + +#define DWC3_DSTS_RXFIFOEMPTY (1 << 17) + +#define DWC3_DSTS_SOFFN_MASK (0x3fff << 3) +#define DWC3_DSTS_SOFFN(n) (((n) & DWC3_DSTS_SOFFN_MASK) >> 3) + +#define DWC3_DSTS_CONNECTSPD (7 << 0) + +#define DWC3_DSTS_SUPERSPEED (4 << 0) +#define DWC3_DSTS_HIGHSPEED (0 << 0) +#define DWC3_DSTS_FULLSPEED2 (1 << 0) +#define DWC3_DSTS_LOWSPEED (2 << 0) +#define DWC3_DSTS_FULLSPEED1 (3 << 0) + +/* Device Generic Command Register */ +#define DWC3_DGCMD_SET_LMP 0x01 +#define DWC3_DGCMD_SET_PERIODIC_PAR 0x02 +#define DWC3_DGCMD_XMIT_FUNCTION 0x03 + +/* These apply for core versions 1.94a and later */ +#define DWC3_DGCMD_SET_SCRATCHPAD_ADDR_LO 0x04 +#define DWC3_DGCMD_SET_SCRATCHPAD_ADDR_HI 0x05 + +#define DWC3_DGCMD_SELECTED_FIFO_FLUSH 0x09 +#define DWC3_DGCMD_ALL_FIFO_FLUSH 0x0a +#define DWC3_DGCMD_SET_ENDPOINT_NRDY 0x0c +#define DWC3_DGCMD_RUN_SOC_BUS_LOOPBACK 0x10 + +#define DWC3_DGCMD_STATUS(n) (((n) >> 15) & 1) +#define DWC3_DGCMD_CMDACT (1 << 10) +#define DWC3_DGCMD_CMDIOC (1 << 8) + +/* Device Generic Command Parameter Register */ +#define DWC3_DGCMDPAR_FORCE_LINKPM_ACCEPT (1 << 0) +#define DWC3_DGCMDPAR_FIFO_NUM(n) ((n) << 0) +#define DWC3_DGCMDPAR_RX_FIFO (0 << 5) +#define DWC3_DGCMDPAR_TX_FIFO (1 << 5) +#define DWC3_DGCMDPAR_LOOPBACK_DIS (0 << 0) +#define DWC3_DGCMDPAR_LOOPBACK_ENA (1 << 0) + +/* Device Endpoint Command Register */ +#define DWC3_DEPCMD_PARAM_SHIFT 16 +#define DWC3_DEPCMD_PARAM(x) ((x) << DWC3_DEPCMD_PARAM_SHIFT) +#define DWC3_DEPCMD_GET_RSC_IDX(x) (((x) >> DWC3_DEPCMD_PARAM_SHIFT) & 0x7f) +#define DWC3_DEPCMD_STATUS(x) (((x) >> 15) & 1) +#define DWC3_DEPCMD_HIPRI_FORCERM (1 << 11) +#define DWC3_DEPCMD_CMDACT (1 << 10) +#define DWC3_DEPCMD_CMDIOC (1 << 8) + +#define DWC3_DEPCMD_DEPSTARTCFG (0x09 << 0) +#define DWC3_DEPCMD_ENDTRANSFER (0x08 << 0) +#define DWC3_DEPCMD_UPDATETRANSFER (0x07 << 0) +#define DWC3_DEPCMD_STARTTRANSFER (0x06 << 0) +#define DWC3_DEPCMD_CLEARSTALL (0x05 << 0) +#define DWC3_DEPCMD_SETSTALL (0x04 << 0) +/* This applies for core versions 1.90a and earlier */ +#define DWC3_DEPCMD_GETSEQNUMBER (0x03 << 0) +/* This applies for core versions 1.94a and later */ +#define DWC3_DEPCMD_GETEPSTATE (0x03 << 0) +#define DWC3_DEPCMD_SETTRANSFRESOURCE (0x02 << 0) +#define DWC3_DEPCMD_SETEPCONFIG (0x01 << 0) + +/* The EP number goes 0..31 so ep0 is always out and ep1 is always in */ +#define DWC3_DALEPENA_EP(n) (1 << n) + +#define DWC3_DEPCMD_TYPE_CONTROL 0 +#define DWC3_DEPCMD_TYPE_ISOC 1 +#define DWC3_DEPCMD_TYPE_BULK 2 +#define DWC3_DEPCMD_TYPE_INTR 3 + +/* Structures */ + +struct dwc3_trb; + +/** + * struct dwc3_event_buffer - Software event buffer representation + * @buf: _THE_ buffer + * @length: size of this buffer + * @lpos: event offset + * @count: cache of last read event count register + * @flags: flags related to this event buffer + * @dma: dma_addr_t + * @dwc: pointer to DWC controller + */ +struct dwc3_event_buffer { + void *buf; + unsigned length; + unsigned int lpos; + unsigned int count; + unsigned int flags; + +#define DWC3_EVENT_PENDING BIT(0) + + dma_addr_t dma; + + struct dwc3 *dwc; +}; + +#define DWC3_EP_FLAG_STALLED (1 << 0) +#define DWC3_EP_FLAG_WEDGED (1 << 1) + +#define DWC3_EP_DIRECTION_TX true +#define DWC3_EP_DIRECTION_RX false + +#define DWC3_TRB_NUM 32 +#define DWC3_TRB_MASK (DWC3_TRB_NUM - 1) + +/** + * struct dwc3_ep - device side endpoint representation + * @endpoint: usb endpoint + * @request_list: list of requests for this endpoint + * @req_queued: list of requests on this ep which have TRBs setup + * @trb_pool: array of transaction buffers + * @trb_pool_dma: dma address of @trb_pool + * @free_slot: next slot which is going to be used + * @busy_slot: first slot which is owned by HW + * @desc: usb_endpoint_descriptor pointer + * @dwc: pointer to DWC controller + * @saved_state: ep state saved during hibernation + * @flags: endpoint flags (wedged, stalled, ...) + * @current_trb: index of current used trb + * @number: endpoint number (1 - 15) + * @type: set to bmAttributes & USB_ENDPOINT_XFERTYPE_MASK + * @resource_index: Resource transfer index + * @interval: the interval on which the ISOC transfer is started + * @name: a human readable name e.g. ep1out-bulk + * @direction: true for TX, false for RX + * @stream_capable: true when streams are enabled + */ +struct dwc3_ep { + struct usb_ep endpoint; + struct list_head request_list; + struct list_head req_queued; + + struct dwc3_trb *trb_pool; + dma_addr_t trb_pool_dma; + u32 free_slot; + u32 busy_slot; + const struct usb_ss_ep_comp_descriptor *comp_desc; + struct dwc3 *dwc; + + u32 saved_state; + unsigned flags; +#define DWC3_EP_ENABLED (1 << 0) +#define DWC3_EP_STALL (1 << 1) +#define DWC3_EP_WEDGE (1 << 2) +#define DWC3_EP_BUSY (1 << 4) +#define DWC3_EP_PENDING_REQUEST (1 << 5) +#define DWC3_EP_MISSED_ISOC (1 << 6) + + /* This last one is specific to EP0 */ +#define DWC3_EP0_DIR_IN (1 << 31) + + unsigned current_trb; + + u8 number; + u8 type; + u8 resource_index; + u32 interval; + + char name[20]; + + unsigned direction:1; + unsigned stream_capable:1; +}; + +enum dwc3_phy { + DWC3_PHY_UNKNOWN = 0, + DWC3_PHY_USB3, + DWC3_PHY_USB2, +}; + +enum dwc3_ep0_next { + DWC3_EP0_UNKNOWN = 0, + DWC3_EP0_COMPLETE, + DWC3_EP0_NRDY_DATA, + DWC3_EP0_NRDY_STATUS, +}; + +enum dwc3_ep0_state { + EP0_UNCONNECTED = 0, + EP0_SETUP_PHASE, + EP0_DATA_PHASE, + EP0_STATUS_PHASE, +}; + +enum dwc3_link_state { + /* In SuperSpeed */ + DWC3_LINK_STATE_U0 = 0x00, /* in HS, means ON */ + DWC3_LINK_STATE_U1 = 0x01, + DWC3_LINK_STATE_U2 = 0x02, /* in HS, means SLEEP */ + DWC3_LINK_STATE_U3 = 0x03, /* in HS, means SUSPEND */ + DWC3_LINK_STATE_SS_DIS = 0x04, + DWC3_LINK_STATE_RX_DET = 0x05, /* in HS, means Early Suspend */ + DWC3_LINK_STATE_SS_INACT = 0x06, + DWC3_LINK_STATE_POLL = 0x07, + DWC3_LINK_STATE_RECOV = 0x08, + DWC3_LINK_STATE_HRESET = 0x09, + DWC3_LINK_STATE_CMPLY = 0x0a, + DWC3_LINK_STATE_LPBK = 0x0b, + DWC3_LINK_STATE_RESET = 0x0e, + DWC3_LINK_STATE_RESUME = 0x0f, + DWC3_LINK_STATE_MASK = 0x0f, +}; + +/* TRB Length, PCM and Status */ +#define DWC3_TRB_SIZE_MASK (0x00ffffff) +#define DWC3_TRB_SIZE_LENGTH(n) ((n) & DWC3_TRB_SIZE_MASK) +#define DWC3_TRB_SIZE_PCM1(n) (((n) & 0x03) << 24) +#define DWC3_TRB_SIZE_TRBSTS(n) (((n) & (0x0f << 28)) >> 28) + +#define DWC3_TRBSTS_OK 0 +#define DWC3_TRBSTS_MISSED_ISOC 1 +#define DWC3_TRBSTS_SETUP_PENDING 2 +#define DWC3_TRB_STS_XFER_IN_PROG 4 + +/* TRB Control */ +#define DWC3_TRB_CTRL_HWO (1 << 0) +#define DWC3_TRB_CTRL_LST (1 << 1) +#define DWC3_TRB_CTRL_CHN (1 << 2) +#define DWC3_TRB_CTRL_CSP (1 << 3) +#define DWC3_TRB_CTRL_TRBCTL(n) (((n) & 0x3f) << 4) +#define DWC3_TRB_CTRL_ISP_IMI (1 << 10) +#define DWC3_TRB_CTRL_IOC (1 << 11) +#define DWC3_TRB_CTRL_SID_SOFN(n) (((n) & 0xffff) << 14) + +#define DWC3_TRBCTL_NORMAL DWC3_TRB_CTRL_TRBCTL(1) +#define DWC3_TRBCTL_CONTROL_SETUP DWC3_TRB_CTRL_TRBCTL(2) +#define DWC3_TRBCTL_CONTROL_STATUS2 DWC3_TRB_CTRL_TRBCTL(3) +#define DWC3_TRBCTL_CONTROL_STATUS3 DWC3_TRB_CTRL_TRBCTL(4) +#define DWC3_TRBCTL_CONTROL_DATA DWC3_TRB_CTRL_TRBCTL(5) +#define DWC3_TRBCTL_ISOCHRONOUS_FIRST DWC3_TRB_CTRL_TRBCTL(6) +#define DWC3_TRBCTL_ISOCHRONOUS DWC3_TRB_CTRL_TRBCTL(7) +#define DWC3_TRBCTL_LINK_TRB DWC3_TRB_CTRL_TRBCTL(8) + +/** + * struct dwc3_trb - transfer request block (hw format) + * @bpl: DW0-3 + * @bph: DW4-7 + * @size: DW8-B + * @trl: DWC-F + */ +struct dwc3_trb { + u32 bpl; + u32 bph; + u32 size; + u32 ctrl; +} __packed; + +/** + * dwc3_hwparams - copy of HWPARAMS registers + * @hwparams0 - GHWPARAMS0 + * @hwparams1 - GHWPARAMS1 + * @hwparams2 - GHWPARAMS2 + * @hwparams3 - GHWPARAMS3 + * @hwparams4 - GHWPARAMS4 + * @hwparams5 - GHWPARAMS5 + * @hwparams6 - GHWPARAMS6 + * @hwparams7 - GHWPARAMS7 + * @hwparams8 - GHWPARAMS8 + */ +struct dwc3_hwparams { + u32 hwparams0; + u32 hwparams1; + u32 hwparams2; + u32 hwparams3; + u32 hwparams4; + u32 hwparams5; + u32 hwparams6; + u32 hwparams7; + u32 hwparams8; +}; + +/* HWPARAMS0 */ +#define DWC3_MODE(n) ((n) & 0x7) + +#define DWC3_MDWIDTH(n) (((n) & 0xff00) >> 8) + +/* HWPARAMS1 */ +#define DWC3_NUM_INT(n) (((n) & (0x3f << 15)) >> 15) + +/* HWPARAMS3 */ +#define DWC3_NUM_IN_EPS_MASK (0x1f << 18) +#define DWC3_NUM_EPS_MASK (0x3f << 12) +#define DWC3_NUM_EPS(p) (((p)->hwparams3 & \ + (DWC3_NUM_EPS_MASK)) >> 12) +#define DWC3_NUM_IN_EPS(p) (((p)->hwparams3 & \ + (DWC3_NUM_IN_EPS_MASK)) >> 18) + +/* HWPARAMS7 */ +#define DWC3_RAM1_DEPTH(n) ((n) & 0xffff) + +struct dwc3_request { + struct usb_request request; + struct list_head list; + struct dwc3_ep *dep; + u32 start_slot; + + u8 epnum; + struct dwc3_trb *trb; + dma_addr_t trb_dma; + + unsigned direction:1; + unsigned mapped:1; + unsigned queued:1; +}; + +/* + * struct dwc3_scratchpad_array - hibernation scratchpad array + * (format defined by hw) + */ +struct dwc3_scratchpad_array { + __le64 dma_adr[DWC3_MAX_HIBER_SCRATCHBUFS]; +}; + +/** + * struct dwc3 - representation of our controller + * @ctrl_req: usb control request which is used for ep0 + * @ep0_trb: trb which is used for the ctrl_req + * @ep0_bounce: bounce buffer for ep0 + * @setup_buf: used while precessing STD USB requests + * @ctrl_req_addr: dma address of ctrl_req + * @ep0_trb: dma address of ep0_trb + * @ep0_usb_req: dummy req used while handling STD USB requests + * @ep0_bounce_addr: dma address of ep0_bounce + * @scratch_addr: dma address of scratchbuf + * @lock: for synchronizing + * @dev: pointer to our struct device + * @xhci: pointer to our xHCI child + * @event_buffer_list: a list of event buffers + * @gadget: device side representation of the peripheral controller + * @gadget_driver: pointer to the gadget driver + * @regs: base address for our registers + * @regs_size: address space size + * @nr_scratch: number of scratch buffers + * @num_event_buffers: calculated number of event buffers + * @u1u2: only used on revisions <1.83a for workaround + * @maximum_speed: maximum speed requested (mainly for testing purposes) + * @revision: revision register contents + * @dr_mode: requested mode of operation + * @dcfg: saved contents of DCFG register + * @gctl: saved contents of GCTL register + * @isoch_delay: wValue from Set Isochronous Delay request; + * @u2sel: parameter from Set SEL request. + * @u2pel: parameter from Set SEL request. + * @u1sel: parameter from Set SEL request. + * @u1pel: parameter from Set SEL request. + * @num_out_eps: number of out endpoints + * @num_in_eps: number of in endpoints + * @ep0_next_event: hold the next expected event + * @ep0state: state of endpoint zero + * @link_state: link state + * @speed: device speed (super, high, full, low) + * @mem: points to start of memory which is used for this struct. + * @hwparams: copy of hwparams registers + * @root: debugfs root folder pointer + * @regset: debugfs pointer to regdump file + * @test_mode: true when we're entering a USB test mode + * @test_mode_nr: test feature selector + * @delayed_status: true when gadget driver asks for delayed status + * @ep0_bounced: true when we used bounce buffer + * @ep0_expect_in: true when we expect a DATA IN transfer + * @has_hibernation: true when dwc3 was configured with Hibernation + * @is_selfpowered: true when we are selfpowered + * @needs_fifo_resize: not all users might want fifo resizing, flag it + * @pullups_connected: true when Run/Stop bit is set + * @resize_fifos: tells us it's ok to reconfigure our TxFIFO sizes. + * @setup_packet_pending: true when there's a Setup Packet in FIFO. Workaround + * @start_config_issued: true when StartConfig command has been issued + * @three_stage_setup: set if we perform a three phase setup + * @index: index of _this_ controller + * @list: to maintain the list of dwc3 controllers + */ +struct dwc3 { + struct usb_ctrlrequest *ctrl_req; + struct dwc3_trb *ep0_trb; + void *ep0_bounce; + void *scratchbuf; + u8 *setup_buf; + dma_addr_t ctrl_req_addr; + dma_addr_t ep0_trb_addr; + dma_addr_t ep0_bounce_addr; + dma_addr_t scratch_addr; + struct dwc3_request ep0_usb_req; + + /* device lock */ + spinlock_t lock; + + struct device *dev; + + struct platform_device *xhci; + struct resource xhci_resources[DWC3_XHCI_RESOURCES_NUM]; + + struct dwc3_event_buffer **ev_buffs; + struct dwc3_ep *eps[DWC3_ENDPOINTS_NUM]; + + struct usb_gadget gadget; + struct usb_gadget_driver *gadget_driver; + + void __iomem *regs; + size_t regs_size; + + enum usb_dr_mode dr_mode; + + /* used for suspend/resume */ + u32 dcfg; + u32 gctl; + + u32 nr_scratch; + u32 num_event_buffers; + u32 u1u2; + u32 maximum_speed; + u32 revision; + +#define DWC3_REVISION_173A 0x5533173a +#define DWC3_REVISION_175A 0x5533175a +#define DWC3_REVISION_180A 0x5533180a +#define DWC3_REVISION_183A 0x5533183a +#define DWC3_REVISION_185A 0x5533185a +#define DWC3_REVISION_187A 0x5533187a +#define DWC3_REVISION_188A 0x5533188a +#define DWC3_REVISION_190A 0x5533190a +#define DWC3_REVISION_194A 0x5533194a +#define DWC3_REVISION_200A 0x5533200a +#define DWC3_REVISION_202A 0x5533202a +#define DWC3_REVISION_210A 0x5533210a +#define DWC3_REVISION_220A 0x5533220a +#define DWC3_REVISION_230A 0x5533230a +#define DWC3_REVISION_240A 0x5533240a +#define DWC3_REVISION_250A 0x5533250a +#define DWC3_REVISION_260A 0x5533260a +#define DWC3_REVISION_270A 0x5533270a +#define DWC3_REVISION_280A 0x5533280a + + enum dwc3_ep0_next ep0_next_event; + enum dwc3_ep0_state ep0state; + enum dwc3_link_state link_state; + + u16 isoch_delay; + u16 u2sel; + u16 u2pel; + u8 u1sel; + u8 u1pel; + + u8 speed; + + u8 num_out_eps; + u8 num_in_eps; + + void *mem; + + struct dwc3_hwparams hwparams; + struct dentry *root; + struct debugfs_regset32 *regset; + + u8 test_mode; + u8 test_mode_nr; + + unsigned delayed_status:1; + unsigned ep0_bounced:1; + unsigned ep0_expect_in:1; + unsigned has_hibernation:1; + unsigned is_selfpowered:1; + unsigned needs_fifo_resize:1; + unsigned pullups_connected:1; + unsigned resize_fifos:1; + unsigned setup_packet_pending:1; + unsigned start_config_issued:1; + unsigned three_stage_setup:1; + int index; + struct list_head list; +}; + +/* -------------------------------------------------------------------------- */ + +/* -------------------------------------------------------------------------- */ + +struct dwc3_event_type { + u32 is_devspec:1; + u32 type:7; + u32 reserved8_31:24; +} __packed; + +#define DWC3_DEPEVT_XFERCOMPLETE 0x01 +#define DWC3_DEPEVT_XFERINPROGRESS 0x02 +#define DWC3_DEPEVT_XFERNOTREADY 0x03 +#define DWC3_DEPEVT_RXTXFIFOEVT 0x04 +#define DWC3_DEPEVT_STREAMEVT 0x06 +#define DWC3_DEPEVT_EPCMDCMPLT 0x07 + +/** + * struct dwc3_event_depvt - Device Endpoint Events + * @one_bit: indicates this is an endpoint event (not used) + * @endpoint_number: number of the endpoint + * @endpoint_event: The event we have: + * 0x00 - Reserved + * 0x01 - XferComplete + * 0x02 - XferInProgress + * 0x03 - XferNotReady + * 0x04 - RxTxFifoEvt (IN->Underrun, OUT->Overrun) + * 0x05 - Reserved + * 0x06 - StreamEvt + * 0x07 - EPCmdCmplt + * @reserved11_10: Reserved, don't use. + * @status: Indicates the status of the event. Refer to databook for + * more information. + * @parameters: Parameters of the current event. Refer to databook for + * more information. + */ +struct dwc3_event_depevt { + u32 one_bit:1; + u32 endpoint_number:5; + u32 endpoint_event:4; + u32 reserved11_10:2; + u32 status:4; + +/* Within XferNotReady */ +#define DEPEVT_STATUS_TRANSFER_ACTIVE (1 << 3) + +/* Within XferComplete */ +#define DEPEVT_STATUS_BUSERR (1 << 0) +#define DEPEVT_STATUS_SHORT (1 << 1) +#define DEPEVT_STATUS_IOC (1 << 2) +#define DEPEVT_STATUS_LST (1 << 3) + +/* Stream event only */ +#define DEPEVT_STREAMEVT_FOUND 1 +#define DEPEVT_STREAMEVT_NOTFOUND 2 + +/* Control-only Status */ +#define DEPEVT_STATUS_CONTROL_DATA 1 +#define DEPEVT_STATUS_CONTROL_STATUS 2 + + u32 parameters:16; +} __packed; + +/** + * struct dwc3_event_devt - Device Events + * @one_bit: indicates this is a non-endpoint event (not used) + * @device_event: indicates it's a device event. Should read as 0x00 + * @type: indicates the type of device event. + * 0 - DisconnEvt + * 1 - USBRst + * 2 - ConnectDone + * 3 - ULStChng + * 4 - WkUpEvt + * 5 - Reserved + * 6 - EOPF + * 7 - SOF + * 8 - Reserved + * 9 - ErrticErr + * 10 - CmdCmplt + * 11 - EvntOverflow + * 12 - VndrDevTstRcved + * @reserved15_12: Reserved, not used + * @event_info: Information about this event + * @reserved31_25: Reserved, not used + */ +struct dwc3_event_devt { + u32 one_bit:1; + u32 device_event:7; + u32 type:4; + u32 reserved15_12:4; + u32 event_info:9; + u32 reserved31_25:7; +} __packed; + +/** + * struct dwc3_event_gevt - Other Core Events + * @one_bit: indicates this is a non-endpoint event (not used) + * @device_event: indicates it's (0x03) Carkit or (0x04) I2C event. + * @phy_port_number: self-explanatory + * @reserved31_12: Reserved, not used. + */ +struct dwc3_event_gevt { + u32 one_bit:1; + u32 device_event:7; + u32 phy_port_number:4; + u32 reserved31_12:20; +} __packed; + +/** + * union dwc3_event - representation of Event Buffer contents + * @raw: raw 32-bit event + * @type: the type of the event + * @depevt: Device Endpoint Event + * @devt: Device Event + * @gevt: Global Event + */ +union dwc3_event { + u32 raw; + struct dwc3_event_type type; + struct dwc3_event_depevt depevt; + struct dwc3_event_devt devt; + struct dwc3_event_gevt gevt; +}; + +/** + * struct dwc3_gadget_ep_cmd_params - representation of endpoint command + * parameters + * @param2: third parameter + * @param1: second parameter + * @param0: first parameter + */ +struct dwc3_gadget_ep_cmd_params { + u32 param2; + u32 param1; + u32 param0; +}; + +/* + * DWC3 Features to be used as Driver Data + */ + +#define DWC3_HAS_PERIPHERAL BIT(0) +#define DWC3_HAS_XHCI BIT(1) +#define DWC3_HAS_OTG BIT(3) + +/* prototypes */ +void dwc3_set_mode(struct dwc3 *dwc, u32 mode); +int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc); + +#if CONFIG_USB_DWC3_HOST +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 + +#ifdef CONFIG_USB_DWC3_GADGET +int dwc3_gadget_init(struct dwc3 *dwc); +void dwc3_gadget_exit(struct dwc3 *dwc); +int dwc3_gadget_set_test_mode(struct dwc3 *dwc, int mode); +int dwc3_gadget_get_link_state(struct dwc3 *dwc); +int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state); +int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep, + unsigned cmd, struct dwc3_gadget_ep_cmd_params *params); +int dwc3_send_gadget_generic_command(struct dwc3 *dwc, int cmd, u32 param); +#else +static inline int dwc3_gadget_init(struct dwc3 *dwc) +{ return 0; } +static inline void dwc3_gadget_exit(struct dwc3 *dwc) +{ } +static inline int dwc3_gadget_set_test_mode(struct dwc3 *dwc, int mode) +{ return 0; } +static inline int dwc3_gadget_get_link_state(struct dwc3 *dwc) +{ return 0; } +static inline int dwc3_gadget_set_link_state(struct dwc3 *dwc, + enum dwc3_link_state state) +{ return 0; } + +static inline int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep, + unsigned cmd, struct dwc3_gadget_ep_cmd_params *params) +{ return 0; } +static inline int dwc3_send_gadget_generic_command(struct dwc3 *dwc, + int cmd, u32 param) +{ return 0; } +#endif + +/* power management interface */ +#if !CONFIG_USB_DWC3_HOST +int dwc3_gadget_prepare(struct dwc3 *dwc); +void dwc3_gadget_complete(struct dwc3 *dwc); +int dwc3_gadget_suspend(struct dwc3 *dwc); +int dwc3_gadget_resume(struct dwc3 *dwc); +#else +static inline int dwc3_gadget_prepare(struct dwc3 *dwc) +{ + return 0; +} + +static inline void dwc3_gadget_complete(struct dwc3 *dwc) +{ +} + +static inline int dwc3_gadget_suspend(struct dwc3 *dwc) +{ + return 0; +} + +static inline int dwc3_gadget_resume(struct dwc3 *dwc) +{ + return 0; +} +#endif /* !IS_ENABLED(CONFIG_USB_DWC3_HOST) */ + +#endif /* __DRIVERS_USB_DWC3_CORE_H */ diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c new file mode 100644 index 0000000..ce24428 --- /dev/null +++ b/drivers/usb/dwc3/ep0.c @@ -0,0 +1,1045 @@ +/** + * ep0.c - DesignWare USB3 DRD Controller Endpoint 0 Handling + * + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Authors: Felipe Balbi <balbi@ti.com>, + * Sebastian Andrzej Siewior <bigeasy@linutronix.de> + * + * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/ep0.c) and ported + * to uboot. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <usb/lin_gadget_compat.h> +#include <linux/list.h> + +#include <linux/usb/ch9.h> +#include <linux/usb/gadget.h> +#include <linux/usb/composite.h> + +#include "linux-compat.h" +#include "core.h" +#include "gadget.h" +#include "io.h" + +static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep); +static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, + struct dwc3_ep *dep, struct dwc3_request *req); + +static const char *dwc3_ep0_state_string(enum dwc3_ep0_state state) +{ + switch (state) { + case EP0_UNCONNECTED: + return "Unconnected"; + case EP0_SETUP_PHASE: + return "Setup Phase"; + case EP0_DATA_PHASE: + return "Data Phase"; + case EP0_STATUS_PHASE: + return "Status Phase"; + default: + return "UNKNOWN"; + } +} + +static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma, + u32 len, u32 type) +{ + struct dwc3_gadget_ep_cmd_params params; + struct dwc3_trb *trb; + struct dwc3_ep *dep; + + int ret; + + dep = dwc->eps[epnum]; + if (dep->flags & DWC3_EP_BUSY) { + dev_vdbg(dwc->dev, "%s: still busy\n", dep->name); + return 0; + } + + trb = dwc->ep0_trb; + + trb->bpl = lower_32_bits(buf_dma); + trb->bph = upper_32_bits(buf_dma); + trb->size = len; + trb->ctrl = type; + + trb->ctrl |= (DWC3_TRB_CTRL_HWO + | DWC3_TRB_CTRL_LST + | DWC3_TRB_CTRL_IOC + | DWC3_TRB_CTRL_ISP_IMI); + + memset(¶ms, 0, sizeof(params)); + params.param0 = upper_32_bits(dwc->ep0_trb_addr); + params.param1 = lower_32_bits(dwc->ep0_trb_addr); + + ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, + DWC3_DEPCMD_STARTTRANSFER, ¶ms); + if (ret < 0) { + dev_dbg(dwc->dev, "failed to send STARTTRANSFER command\n"); + return ret; + } + + dep->flags |= DWC3_EP_BUSY; + dep->resource_index = dwc3_gadget_ep_get_transfer_index(dwc, + dep->number); + + dwc->ep0_next_event = DWC3_EP0_COMPLETE; + + return 0; +} + +static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep, + struct dwc3_request *req) +{ + struct dwc3 *dwc = dep->dwc; + + req->request.actual = 0; + req->request.status = -EINPROGRESS; + req->epnum = dep->number; + + list_add_tail(&req->list, &dep->request_list); + + /* + * Gadget driver might not be quick enough to queue a request + * before we get a Transfer Not Ready event on this endpoint. + * + * In that case, we will set DWC3_EP_PENDING_REQUEST. When that + * flag is set, it's telling us that as soon as Gadget queues the + * required request, we should kick the transfer here because the + * IRQ we were waiting for is long gone. + */ + if (dep->flags & DWC3_EP_PENDING_REQUEST) { + unsigned direction; + + direction = !!(dep->flags & DWC3_EP0_DIR_IN); + + if (dwc->ep0state != EP0_DATA_PHASE) { + dev_WARN(dwc->dev, "Unexpected pending request\n"); + return 0; + } + + __dwc3_ep0_do_control_data(dwc, dwc->eps[direction], req); + + dep->flags &= ~(DWC3_EP_PENDING_REQUEST | + DWC3_EP0_DIR_IN); + + return 0; + } + + /* + * In case gadget driver asked us to delay the STATUS phase, + * handle it here. + */ + if (dwc->delayed_status) { + unsigned direction; + + direction = !dwc->ep0_expect_in; + dwc->delayed_status = false; + usb_gadget_set_state(&dwc->gadget, USB_STATE_CONFIGURED); + + if (dwc->ep0state == EP0_STATUS_PHASE) + __dwc3_ep0_do_control_status(dwc, dwc->eps[direction]); + else + dev_dbg(dwc->dev, "too early for delayed status\n"); + + return 0; + } + + /* + * Unfortunately we have uncovered a limitation wrt the Data Phase. + * + * Section 9.4 says we can wait for the XferNotReady(DATA) event to + * come before issueing Start Transfer command, but if we do, we will + * miss situations where the host starts another SETUP phase instead of + * the DATA phase. Such cases happen at least on TD.7.6 of the Link + * Layer Compliance Suite. + * + * The problem surfaces due to the fact that in case of back-to-back + * SETUP packets there will be no XferNotReady(DATA) generated and we + * will be stuck waiting for XferNotReady(DATA) forever. + * + * By looking at tables 9-13 and 9-14 of the Databook, we can see that + * it tells us to start Data Phase right away. It also mentions that if + * we receive a SETUP phase instead of the DATA phase, core will issue + * XferComplete for the DATA phase, before actually initiating it in + * the wire, with the TRB's status set to "SETUP_PENDING". Such status + * can only be used to print some debugging logs, as the core expects + * us to go through to the STATUS phase and start a CONTROL_STATUS TRB, + * just so it completes right away, without transferring anything and, + * only then, we can go back to the SETUP phase. + * + * Because of this scenario, SNPS decided to change the programming + * model of control transfers and support on-demand transfers only for + * the STATUS phase. To fix the issue we have now, we will always wait + * for gadget driver to queue the DATA phase's struct usb_request, then + * start it right away. + * + * If we're actually in a 2-stage transfer, we will wait for + * XferNotReady(STATUS). + */ + if (dwc->three_stage_setup) { + unsigned direction; + + direction = dwc->ep0_expect_in; + dwc->ep0state = EP0_DATA_PHASE; + + __dwc3_ep0_do_control_data(dwc, dwc->eps[direction], req); + + dep->flags &= ~DWC3_EP0_DIR_IN; + } + + return 0; +} + +int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request, + gfp_t gfp_flags) +{ + struct dwc3_request *req = to_dwc3_request(request); + struct dwc3_ep *dep = to_dwc3_ep(ep); + struct dwc3 *dwc = dep->dwc; + + unsigned long flags; + + int ret; + + spin_lock_irqsave(&dwc->lock, flags); + if (!dep->endpoint.desc) { + dev_dbg(dwc->dev, "trying to queue request %p to disabled %s\n", + request, dep->name); + ret = -ESHUTDOWN; + goto out; + } + + /* we share one TRB for ep0/1 */ + if (!list_empty(&dep->request_list)) { + ret = -EBUSY; + goto out; + } + + dev_vdbg(dwc->dev, "queueing request %p to %s length %d, state '%s'\n", + request, dep->name, request->length, + dwc3_ep0_state_string(dwc->ep0state)); + + ret = __dwc3_gadget_ep0_queue(dep, req); + +out: + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +static void dwc3_ep0_stall_and_restart(struct dwc3 *dwc) +{ + struct dwc3_ep *dep; + + /* reinitialize physical ep1 */ + dep = dwc->eps[1]; + dep->flags = DWC3_EP_ENABLED; + + /* stall is always issued on EP0 */ + dep = dwc->eps[0]; + __dwc3_gadget_ep_set_halt(dep, 1); + dep->flags = DWC3_EP_ENABLED; + dwc->delayed_status = false; + + if (!list_empty(&dep->request_list)) { + struct dwc3_request *req; + + req = next_request(&dep->request_list); + dwc3_gadget_giveback(dep, req, -ECONNRESET); + } + + dwc->ep0state = EP0_SETUP_PHASE; + dwc3_ep0_out_start(dwc); +} + +int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value) +{ + struct dwc3_ep *dep = to_dwc3_ep(ep); + struct dwc3 *dwc = dep->dwc; + + dwc3_ep0_stall_and_restart(dwc); + + return 0; +} + +void dwc3_ep0_out_start(struct dwc3 *dwc) +{ + int ret; + + ret = dwc3_ep0_start_trans(dwc, 0, dwc->ctrl_req_addr, 8, + DWC3_TRBCTL_CONTROL_SETUP); + WARN_ON(ret < 0); +} + +static struct dwc3_ep *dwc3_wIndex_to_dep(struct dwc3 *dwc, __le16 wIndex_le) +{ + struct dwc3_ep *dep; + u32 windex = le16_to_cpu(wIndex_le); + u32 epnum; + + epnum = (windex & USB_ENDPOINT_NUMBER_MASK) << 1; + if ((windex & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) + epnum |= 1; + + dep = dwc->eps[epnum]; + if (dep->flags & DWC3_EP_ENABLED) + return dep; + + return NULL; +} + +static void dwc3_ep0_status_cmpl(struct usb_ep *ep, struct usb_request *req) +{ +} +/* + * ch 9.4.5 + */ +static int dwc3_ep0_handle_status(struct dwc3 *dwc, + struct usb_ctrlrequest *ctrl) +{ + struct dwc3_ep *dep; + u32 recip; + u32 reg; + u16 usb_status = 0; + __le16 *response_pkt; + + recip = ctrl->bRequestType & USB_RECIP_MASK; + switch (recip) { + case USB_RECIP_DEVICE: + /* + * LTM will be set once we know how to set this in HW. + */ + usb_status |= dwc->is_selfpowered << USB_DEVICE_SELF_POWERED; + + if (dwc->speed == DWC3_DSTS_SUPERSPEED) { + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + if (reg & DWC3_DCTL_INITU1ENA) + usb_status |= 1 << USB_DEV_STAT_U1_ENABLED; + if (reg & DWC3_DCTL_INITU2ENA) + usb_status |= 1 << USB_DEV_STAT_U2_ENABLED; + } + + break; + + case USB_RECIP_INTERFACE: + /* + * Function Remote Wake Capable D0 + * Function Remote Wakeup D1 + */ + break; + + case USB_RECIP_ENDPOINT: + dep = dwc3_wIndex_to_dep(dwc, ctrl->wIndex); + if (!dep) + return -EINVAL; + + if (dep->flags & DWC3_EP_STALL) + usb_status = 1 << USB_ENDPOINT_HALT; + break; + default: + return -EINVAL; + } + + response_pkt = (__le16 *) dwc->setup_buf; + *response_pkt = cpu_to_le16(usb_status); + + dep = dwc->eps[0]; + dwc->ep0_usb_req.dep = dep; + dwc->ep0_usb_req.request.length = sizeof(*response_pkt); + dwc->ep0_usb_req.request.buf = dwc->setup_buf; + dwc->ep0_usb_req.request.complete = dwc3_ep0_status_cmpl; + + return __dwc3_gadget_ep0_queue(dep, &dwc->ep0_usb_req); +} + +static int dwc3_ep0_handle_feature(struct dwc3 *dwc, + struct usb_ctrlrequest *ctrl, int set) +{ + struct dwc3_ep *dep; + u32 recip; + u32 wValue; + u32 wIndex; + u32 reg; + int ret; + enum usb_device_state state; + + wValue = le16_to_cpu(ctrl->wValue); + wIndex = le16_to_cpu(ctrl->wIndex); + recip = ctrl->bRequestType & USB_RECIP_MASK; + state = dwc->gadget.state; + + switch (recip) { + case USB_RECIP_DEVICE: + + switch (wValue) { + case USB_DEVICE_REMOTE_WAKEUP: + break; + /* + * 9.4.1 says only only for SS, in AddressState only for + * default control pipe + */ + case USB_DEVICE_U1_ENABLE: + if (state != USB_STATE_CONFIGURED) + return -EINVAL; + if (dwc->speed != DWC3_DSTS_SUPERSPEED) + return -EINVAL; + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + if (set) + reg |= DWC3_DCTL_INITU1ENA; + else + reg &= ~DWC3_DCTL_INITU1ENA; + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + break; + + case USB_DEVICE_U2_ENABLE: + if (state != USB_STATE_CONFIGURED) + return -EINVAL; + if (dwc->speed != DWC3_DSTS_SUPERSPEED) + return -EINVAL; + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + if (set) + reg |= DWC3_DCTL_INITU2ENA; + else + reg &= ~DWC3_DCTL_INITU2ENA; + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + break; + + case USB_DEVICE_LTM_ENABLE: + return -EINVAL; + break; + + case USB_DEVICE_TEST_MODE: + if ((wIndex & 0xff) != 0) + return -EINVAL; + if (!set) + return -EINVAL; + + dwc->test_mode_nr = wIndex >> 8; + dwc->test_mode = true; + break; + default: + return -EINVAL; + } + break; + + case USB_RECIP_INTERFACE: + switch (wValue) { + case USB_INTRF_FUNC_SUSPEND: + if (wIndex & USB_INTRF_FUNC_SUSPEND_LP) + /* XXX enable Low power suspend */ + ; + if (wIndex & USB_INTRF_FUNC_SUSPEND_RW) + /* XXX enable remote wakeup */ + ; + break; + default: + return -EINVAL; + } + break; + + case USB_RECIP_ENDPOINT: + switch (wValue) { + case USB_ENDPOINT_HALT: + dep = dwc3_wIndex_to_dep(dwc, wIndex); + if (!dep) + return -EINVAL; + if (set == 0 && (dep->flags & DWC3_EP_WEDGE)) + break; + ret = __dwc3_gadget_ep_set_halt(dep, set); + if (ret) + return -EINVAL; + break; + default: + return -EINVAL; + } + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int dwc3_ep0_set_address(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) +{ + enum usb_device_state state = dwc->gadget.state; + u32 addr; + u32 reg; + + addr = le16_to_cpu(ctrl->wValue); + if (addr > 127) { + dev_dbg(dwc->dev, "invalid device address %d\n", addr); + return -EINVAL; + } + + if (state == USB_STATE_CONFIGURED) { + dev_dbg(dwc->dev, "trying to set address when configured\n"); + return -EINVAL; + } + + reg = dwc3_readl(dwc->regs, DWC3_DCFG); + reg &= ~(DWC3_DCFG_DEVADDR_MASK); + reg |= DWC3_DCFG_DEVADDR(addr); + dwc3_writel(dwc->regs, DWC3_DCFG, reg); + + if (addr) + usb_gadget_set_state(&dwc->gadget, USB_STATE_ADDRESS); + else + usb_gadget_set_state(&dwc->gadget, USB_STATE_DEFAULT); + + return 0; +} + +static int dwc3_ep0_delegate_req(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) +{ + int ret; + + spin_unlock(&dwc->lock); + ret = dwc->gadget_driver->setup(&dwc->gadget, ctrl); + spin_lock(&dwc->lock); + return ret; +} + +static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) +{ + enum usb_device_state state = dwc->gadget.state; + u32 cfg; + int ret; + u32 reg; + + dwc->start_config_issued = false; + cfg = le16_to_cpu(ctrl->wValue); + + switch (state) { + case USB_STATE_DEFAULT: + return -EINVAL; + break; + + case USB_STATE_ADDRESS: + ret = dwc3_ep0_delegate_req(dwc, ctrl); + /* if the cfg matches and the cfg is non zero */ + if (cfg && (!ret || (ret == USB_GADGET_DELAYED_STATUS))) { + + /* + * only change state if set_config has already + * been processed. If gadget driver returns + * USB_GADGET_DELAYED_STATUS, we will wait + * to change the state on the next usb_ep_queue() + */ + if (ret == 0) + usb_gadget_set_state(&dwc->gadget, + USB_STATE_CONFIGURED); + + /* + * Enable transition to U1/U2 state when + * nothing is pending from application. + */ + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + reg |= (DWC3_DCTL_ACCEPTU1ENA | DWC3_DCTL_ACCEPTU2ENA); + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + + dwc->resize_fifos = true; + dev_dbg(dwc->dev, "resize fifos flag SET\n"); + } + break; + + case USB_STATE_CONFIGURED: + ret = dwc3_ep0_delegate_req(dwc, ctrl); + if (!cfg && !ret) + usb_gadget_set_state(&dwc->gadget, + USB_STATE_ADDRESS); + + break; + default: + ret = -EINVAL; + } + return ret; +} + +static void dwc3_ep0_set_sel_cmpl(struct usb_ep *ep, struct usb_request *req) +{ + struct dwc3_ep *dep = to_dwc3_ep(ep); + struct dwc3 *dwc = dep->dwc; + + u32 param = 0; + u32 reg; + + struct timing { + u8 u1sel; + u8 u1pel; + u16 u2sel; + u16 u2pel; + } __packed timing; + + int ret; + + memcpy(&timing, req->buf, sizeof(timing)); + + dwc->u1sel = timing.u1sel; + dwc->u1pel = timing.u1pel; + dwc->u2sel = le16_to_cpu(timing.u2sel); + dwc->u2pel = le16_to_cpu(timing.u2pel); + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + if (reg & DWC3_DCTL_INITU2ENA) + param = dwc->u2pel; + if (reg & DWC3_DCTL_INITU1ENA) + param = dwc->u1pel; + + /* + * According to Synopsys Databook, if parameter is + * greater than 125, a value of zero should be + * programmed in the register. + */ + if (param > 125) + param = 0; + + /* now that we have the time, issue DGCMD Set Sel */ + ret = dwc3_send_gadget_generic_command(dwc, + DWC3_DGCMD_SET_PERIODIC_PAR, param); + WARN_ON(ret < 0); +} + +static int dwc3_ep0_set_sel(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) +{ + struct dwc3_ep *dep; + enum usb_device_state state = dwc->gadget.state; + u16 wLength; + + if (state == USB_STATE_DEFAULT) + return -EINVAL; + + wLength = le16_to_cpu(ctrl->wLength); + + if (wLength != 6) { + dev_err(dwc->dev, "Set SEL should be 6 bytes, got %d\n", + wLength); + return -EINVAL; + } + + /* + * To handle Set SEL we need to receive 6 bytes from Host. So let's + * queue a usb_request for 6 bytes. + * + * Remember, though, this controller can't handle non-wMaxPacketSize + * aligned transfers on the OUT direction, so we queue a request for + * wMaxPacketSize instead. + */ + dep = dwc->eps[0]; + dwc->ep0_usb_req.dep = dep; + dwc->ep0_usb_req.request.length = dep->endpoint.maxpacket; + dwc->ep0_usb_req.request.buf = dwc->setup_buf; + dwc->ep0_usb_req.request.complete = dwc3_ep0_set_sel_cmpl; + + return __dwc3_gadget_ep0_queue(dep, &dwc->ep0_usb_req); +} + +static int dwc3_ep0_set_isoch_delay(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) +{ + u16 wLength; + u16 wValue; + u16 wIndex; + + wValue = le16_to_cpu(ctrl->wValue); + wLength = le16_to_cpu(ctrl->wLength); + wIndex = le16_to_cpu(ctrl->wIndex); + + if (wIndex || wLength) + return -EINVAL; + + /* + * REVISIT It's unclear from Databook what to do with this + * value. For now, just cache it. + */ + dwc->isoch_delay = wValue; + + return 0; +} + +static int dwc3_ep0_std_request(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) +{ + int ret; + + switch (ctrl->bRequest) { + case USB_REQ_GET_STATUS: + dev_vdbg(dwc->dev, "USB_REQ_GET_STATUS\n"); + ret = dwc3_ep0_handle_status(dwc, ctrl); + break; + case USB_REQ_CLEAR_FEATURE: + dev_vdbg(dwc->dev, "USB_REQ_CLEAR_FEATURE\n"); + ret = dwc3_ep0_handle_feature(dwc, ctrl, 0); + break; + case USB_REQ_SET_FEATURE: + dev_vdbg(dwc->dev, "USB_REQ_SET_FEATURE\n"); + ret = dwc3_ep0_handle_feature(dwc, ctrl, 1); + break; + case USB_REQ_SET_ADDRESS: + dev_vdbg(dwc->dev, "USB_REQ_SET_ADDRESS\n"); + ret = dwc3_ep0_set_address(dwc, ctrl); + break; + case USB_REQ_SET_CONFIGURATION: + dev_vdbg(dwc->dev, "USB_REQ_SET_CONFIGURATION\n"); + ret = dwc3_ep0_set_config(dwc, ctrl); + break; + case USB_REQ_SET_SEL: + dev_vdbg(dwc->dev, "USB_REQ_SET_SEL\n"); + ret = dwc3_ep0_set_sel(dwc, ctrl); + break; + case USB_REQ_SET_ISOCH_DELAY: + dev_vdbg(dwc->dev, "USB_REQ_SET_ISOCH_DELAY\n"); + ret = dwc3_ep0_set_isoch_delay(dwc, ctrl); + break; + default: + dev_vdbg(dwc->dev, "Forwarding to gadget driver\n"); + ret = dwc3_ep0_delegate_req(dwc, ctrl); + break; + } + + return ret; +} + +static void dwc3_ep0_inspect_setup(struct dwc3 *dwc, + const struct dwc3_event_depevt *event) +{ + struct usb_ctrlrequest *ctrl = dwc->ctrl_req; + int ret = -EINVAL; + u32 len; + + if (!dwc->gadget_driver) + goto out; + + len = le16_to_cpu(ctrl->wLength); + if (!len) { + dwc->three_stage_setup = false; + dwc->ep0_expect_in = false; + dwc->ep0_next_event = DWC3_EP0_NRDY_STATUS; + } else { + dwc->three_stage_setup = true; + dwc->ep0_expect_in = !!(ctrl->bRequestType & USB_DIR_IN); + dwc->ep0_next_event = DWC3_EP0_NRDY_DATA; + } + + if ((ctrl->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD) + ret = dwc3_ep0_std_request(dwc, ctrl); + else + ret = dwc3_ep0_delegate_req(dwc, ctrl); + + if (ret == USB_GADGET_DELAYED_STATUS) + dwc->delayed_status = true; + +out: + if (ret < 0) + dwc3_ep0_stall_and_restart(dwc); +} + +static void dwc3_ep0_complete_data(struct dwc3 *dwc, + const struct dwc3_event_depevt *event) +{ + struct dwc3_request *r = NULL; + struct usb_request *ur; + struct dwc3_trb *trb; + struct dwc3_ep *ep0; + u32 transferred; + u32 status; + u32 length; + u8 epnum; + + epnum = event->endpoint_number; + ep0 = dwc->eps[0]; + + dwc->ep0_next_event = DWC3_EP0_NRDY_STATUS; + + r = next_request(&ep0->request_list); + ur = &r->request; + + trb = dwc->ep0_trb; + + status = DWC3_TRB_SIZE_TRBSTS(trb->size); + if (status == DWC3_TRBSTS_SETUP_PENDING) { + dev_dbg(dwc->dev, "Setup Pending received\n"); + + if (r) + dwc3_gadget_giveback(ep0, r, -ECONNRESET); + + return; + } + + length = trb->size & DWC3_TRB_SIZE_MASK; + + if (dwc->ep0_bounced) { + unsigned transfer_size = ur->length; + unsigned maxp = ep0->endpoint.maxpacket; + + transfer_size += (maxp - (transfer_size % maxp)); + transferred = min_t(u32, ur->length, + transfer_size - length); + memcpy(ur->buf, dwc->ep0_bounce, transferred); + } else { + transferred = ur->length - length; + } + + ur->actual += transferred; + + if ((epnum & 1) && ur->actual < ur->length) { + /* for some reason we did not get everything out */ + + dwc3_ep0_stall_and_restart(dwc); + } else { + /* + * handle the case where we have to send a zero packet. This + * seems to be case when req.length > maxpacket. Could it be? + */ + if (r) + dwc3_gadget_giveback(ep0, r, 0); + } +} + +static void dwc3_ep0_complete_status(struct dwc3 *dwc, + const struct dwc3_event_depevt *event) +{ + struct dwc3_request *r; + struct dwc3_ep *dep; + struct dwc3_trb *trb; + u32 status; + + dep = dwc->eps[0]; + trb = dwc->ep0_trb; + + if (!list_empty(&dep->request_list)) { + r = next_request(&dep->request_list); + + dwc3_gadget_giveback(dep, r, 0); + } + + if (dwc->test_mode) { + int ret; + + ret = dwc3_gadget_set_test_mode(dwc, dwc->test_mode_nr); + if (ret < 0) { + dev_dbg(dwc->dev, "Invalid Test #%d\n", + dwc->test_mode_nr); + dwc3_ep0_stall_and_restart(dwc); + return; + } + } + + status = DWC3_TRB_SIZE_TRBSTS(trb->size); + if (status == DWC3_TRBSTS_SETUP_PENDING) + dev_dbg(dwc->dev, "Setup Pending received\n"); + + dwc->ep0state = EP0_SETUP_PHASE; + dwc3_ep0_out_start(dwc); +} + +static void dwc3_ep0_xfer_complete(struct dwc3 *dwc, + const struct dwc3_event_depevt *event) +{ + struct dwc3_ep *dep = dwc->eps[event->endpoint_number]; + + dep->flags &= ~DWC3_EP_BUSY; + dep->resource_index = 0; + dwc->setup_packet_pending = false; + + switch (dwc->ep0state) { + case EP0_SETUP_PHASE: + dev_vdbg(dwc->dev, "Inspecting Setup Bytes\n"); + dwc3_ep0_inspect_setup(dwc, event); + break; + + case EP0_DATA_PHASE: + dev_vdbg(dwc->dev, "Data Phase\n"); + dwc3_ep0_complete_data(dwc, event); + break; + + case EP0_STATUS_PHASE: + dev_vdbg(dwc->dev, "Status Phase\n"); + dwc3_ep0_complete_status(dwc, event); + break; + default: + WARN(true, "UNKNOWN ep0state %d\n", dwc->ep0state); + } +} + +static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, + struct dwc3_ep *dep, struct dwc3_request *req) +{ + int ret; + + req->direction = !!dep->number; + + if (req->request.length == 0) { + ret = dwc3_ep0_start_trans(dwc, dep->number, + dwc->ctrl_req_addr, 0, + DWC3_TRBCTL_CONTROL_DATA); + } else if (!IS_ALIGNED(req->request.length, dep->endpoint.maxpacket) + && (dep->number == 0)) { + u32 transfer_size; + u32 maxpacket; + + ret = usb_gadget_map_request(&dwc->gadget, &req->request, + dep->number); + if (ret) { + dev_dbg(dwc->dev, "failed to map request\n"); + return; + } + + WARN_ON(req->request.length > DWC3_EP0_BOUNCE_SIZE); + + maxpacket = dep->endpoint.maxpacket; + transfer_size = roundup(req->request.length, maxpacket); + + dwc->ep0_bounced = true; + + /* + * REVISIT in case request length is bigger than + * DWC3_EP0_BOUNCE_SIZE we will need two chained + * TRBs to handle the transfer. + */ + ret = dwc3_ep0_start_trans(dwc, dep->number, + dwc->ep0_bounce_addr, transfer_size, + DWC3_TRBCTL_CONTROL_DATA); + } else { + ret = usb_gadget_map_request(&dwc->gadget, &req->request, + dep->number); + if (ret) { + dev_dbg(dwc->dev, "failed to map request\n"); + return; + } + + ret = dwc3_ep0_start_trans(dwc, dep->number, req->request.dma, + req->request.length, DWC3_TRBCTL_CONTROL_DATA); + } + + WARN_ON(ret < 0); +} + +static int dwc3_ep0_start_control_status(struct dwc3_ep *dep) +{ + struct dwc3 *dwc = dep->dwc; + u32 type; + + type = dwc->three_stage_setup ? DWC3_TRBCTL_CONTROL_STATUS3 + : DWC3_TRBCTL_CONTROL_STATUS2; + + return dwc3_ep0_start_trans(dwc, dep->number, + dwc->ctrl_req_addr, 0, type); +} + +static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep) +{ + if (dwc->resize_fifos) { + dev_dbg(dwc->dev, "starting to resize fifos\n"); + dwc3_gadget_resize_tx_fifos(dwc); + dwc->resize_fifos = 0; + } + + WARN_ON(dwc3_ep0_start_control_status(dep)); +} + +static void dwc3_ep0_do_control_status(struct dwc3 *dwc, + const struct dwc3_event_depevt *event) +{ + struct dwc3_ep *dep = dwc->eps[event->endpoint_number]; + + __dwc3_ep0_do_control_status(dwc, dep); +} + +static void dwc3_ep0_end_control_data(struct dwc3 *dwc, struct dwc3_ep *dep) +{ + struct dwc3_gadget_ep_cmd_params params; + u32 cmd; + int ret; + + if (!dep->resource_index) + return; + + cmd = DWC3_DEPCMD_ENDTRANSFER; + cmd |= DWC3_DEPCMD_CMDIOC; + cmd |= DWC3_DEPCMD_PARAM(dep->resource_index); + memset(¶ms, 0, sizeof(params)); + ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, ¶ms); + WARN_ON_ONCE(ret); + dep->resource_index = 0; +} + +static void dwc3_ep0_xfernotready(struct dwc3 *dwc, + const struct dwc3_event_depevt *event) +{ + dwc->setup_packet_pending = true; + + switch (event->status) { + case DEPEVT_STATUS_CONTROL_DATA: + dev_vdbg(dwc->dev, "Control Data\n"); + + /* + * We already have a DATA transfer in the controller's cache, + * if we receive a XferNotReady(DATA) we will ignore it, unless + * it's for the wrong direction. + * + * In that case, we must issue END_TRANSFER command to the Data + * Phase we already have started and issue SetStall on the + * control endpoint. + */ + if (dwc->ep0_expect_in != event->endpoint_number) { + struct dwc3_ep *dep = dwc->eps[dwc->ep0_expect_in]; + + dev_vdbg(dwc->dev, "Wrong direction for Data phase\n"); + dwc3_ep0_end_control_data(dwc, dep); + dwc3_ep0_stall_and_restart(dwc); + return; + } + + break; + + case DEPEVT_STATUS_CONTROL_STATUS: + if (dwc->ep0_next_event != DWC3_EP0_NRDY_STATUS) + return; + + dev_vdbg(dwc->dev, "Control Status\n"); + + dwc->ep0state = EP0_STATUS_PHASE; + + if (dwc->delayed_status) { + WARN_ON_ONCE(event->endpoint_number != 1); + dev_vdbg(dwc->dev, "Mass Storage delayed status\n"); + return; + } + + dwc3_ep0_do_control_status(dwc, event); + } +} + +void dwc3_ep0_interrupt(struct dwc3 *dwc, + const struct dwc3_event_depevt *event) +{ + u8 epnum = event->endpoint_number; + + dev_dbg(dwc->dev, "%s while ep%d%s in state '%s'\n", + dwc3_ep_event_string(event->endpoint_event), + epnum >> 1, (epnum & 1) ? "in" : "out", + dwc3_ep0_state_string(dwc->ep0state)); + + switch (event->endpoint_event) { + case DWC3_DEPEVT_XFERCOMPLETE: + dwc3_ep0_xfer_complete(dwc, event); + break; + + case DWC3_DEPEVT_XFERNOTREADY: + dwc3_ep0_xfernotready(dwc, event); + break; + + case DWC3_DEPEVT_XFERINPROGRESS: + case DWC3_DEPEVT_RXTXFIFOEVT: + case DWC3_DEPEVT_STREAMEVT: + case DWC3_DEPEVT_EPCMDCMPLT: + break; + } +} diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c new file mode 100644 index 0000000..b8eeacf --- /dev/null +++ b/drivers/usb/dwc3/gadget.c @@ -0,0 +1,2841 @@ +/** + * gadget.c - DesignWare USB3 DRD Controller Gadget Framework Link + * + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Authors: Felipe Balbi <balbi@ti.com>, + * Sebastian Andrzej Siewior <bigeasy@linutronix.de> + * + * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/gadget.c) and ported + * to uboot. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <usb/lin_gadget_compat.h> +#include <linux/compat.h> +#include <linux/list.h> + +#include <linux/usb/ch9.h> +#include <linux/usb/gadget.h> + +#include "linux-compat.h" +#include "core.h" +#include "gadget.h" +#include "io.h" + +static int dev_WARN_ONCE(struct device *dev, int val, char *format, ...) +{ + va_list args; + char printbuffer[CONFIG_SYS_PBSIZE]; + + if (!val) + return val; + va_start(args, format); + + vscnprintf(printbuffer, sizeof(printbuffer), format, args); + va_end(args); + + puts(printbuffer); + return val; +} + +/** + * dwc3_gadget_set_test_mode - Enables USB2 Test Modes + * @dwc: pointer to our context structure + * @mode: the mode to set (J, K SE0 NAK, Force Enable) + * + * Caller should take care of locking. This function will + * return 0 on success or -EINVAL if wrong Test Selector + * is passed + */ +int dwc3_gadget_set_test_mode(struct dwc3 *dwc, int mode) +{ + u32 reg; + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + reg &= ~DWC3_DCTL_TSTCTRL_MASK; + + switch (mode) { + case TEST_J: + case TEST_K: + case TEST_SE0_NAK: + case TEST_PACKET: + case TEST_FORCE_EN: + reg |= mode << 1; + break; + default: + return -EINVAL; + } + + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + + return 0; +} + +/** + * dwc3_gadget_get_link_state - Gets current state of USB Link + * @dwc: pointer to our context structure + * + * Caller should take care of locking. This function will + * return the link state on success (>= 0) or -ETIMEDOUT. + */ +int dwc3_gadget_get_link_state(struct dwc3 *dwc) +{ + u32 reg; + + reg = dwc3_readl(dwc->regs, DWC3_DSTS); + + return DWC3_DSTS_USBLNKST(reg); +} + +/** + * dwc3_gadget_set_link_state - Sets USB Link to a particular State + * @dwc: pointer to our context structure + * @state: the state to put link into + * + * Caller should take care of locking. This function will + * return 0 on success or -ETIMEDOUT. + */ +int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state) +{ + int retries = 10000; + u32 reg; + + /* + * Wait until device controller is ready. Only applies to 1.94a and + * later RTL. + */ + if (dwc->revision >= DWC3_REVISION_194A) { + while (--retries) { + reg = dwc3_readl(dwc->regs, DWC3_DSTS); + if (reg & DWC3_DSTS_DCNRD) + udelay(5); + else + break; + } + + if (retries <= 0) + return -ETIMEDOUT; + } + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + reg &= ~DWC3_DCTL_ULSTCHNGREQ_MASK; + + /* set requested state */ + reg |= DWC3_DCTL_ULSTCHNGREQ(state); + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + + /* + * The following code is racy when called from dwc3_gadget_wakeup, + * and is not needed, at least on newer versions + */ + if (dwc->revision >= DWC3_REVISION_194A) + return 0; + + /* wait for a change in DSTS */ + retries = 10000; + while (--retries) { + reg = dwc3_readl(dwc->regs, DWC3_DSTS); + + if (DWC3_DSTS_USBLNKST(reg) == state) + return 0; + + udelay(5); + } + + dev_vdbg(dwc->dev, "link state change request timed out\n"); + + return -ETIMEDOUT; +} + +/** + * dwc3_gadget_resize_tx_fifos - reallocate fifo spaces for current use-case + * @dwc: pointer to our context structure + * + * This function will a best effort FIFO allocation in order + * to improve FIFO usage and throughput, while still allowing + * us to enable as many endpoints as possible. + * + * Keep in mind that this operation will be highly dependent + * on the configured size for RAM1 - which contains TxFifo -, + * the amount of endpoints enabled on coreConsultant tool, and + * the width of the Master Bus. + * + * In the ideal world, we would always be able to satisfy the + * following equation: + * + * ((512 + 2 * MDWIDTH-Bytes) + (Number of IN Endpoints - 1) * \ + * (3 * (1024 + MDWIDTH-Bytes) + MDWIDTH-Bytes)) / MDWIDTH-Bytes + * + * Unfortunately, due to many variables that's not always the case. + */ +int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc) +{ + int last_fifo_depth = 0; + int fifo_size; + int mdwidth; + int num; + + if (!dwc->needs_fifo_resize) + return 0; + + mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0); + + /* MDWIDTH is represented in bits, we need it in bytes */ + mdwidth >>= 3; + + /* + * FIXME For now we will only allocate 1 wMaxPacketSize space + * for each enabled endpoint, later patches will come to + * improve this algorithm so that we better use the internal + * FIFO space + */ + for (num = 0; num < dwc->num_in_eps; num++) { + /* bit0 indicates direction; 1 means IN ep */ + struct dwc3_ep *dep = dwc->eps[(num << 1) | 1]; + int mult = 1; + int tmp; + + if (!(dep->flags & DWC3_EP_ENABLED)) + continue; + + if (usb_endpoint_xfer_bulk(dep->endpoint.desc) + || usb_endpoint_xfer_isoc(dep->endpoint.desc)) + mult = 3; + + /* + * REVISIT: the following assumes we will always have enough + * space available on the FIFO RAM for all possible use cases. + * Make sure that's true somehow and change FIFO allocation + * accordingly. + * + * If we have Bulk or Isochronous endpoints, we want + * them to be able to be very, very fast. So we're giving + * those endpoints a fifo_size which is enough for 3 full + * packets + */ + tmp = mult * (dep->endpoint.maxpacket + mdwidth); + tmp += mdwidth; + + fifo_size = DIV_ROUND_UP(tmp, mdwidth); + + fifo_size |= (last_fifo_depth << 16); + + dev_vdbg(dwc->dev, "%s: Fifo Addr %04x Size %d\n", + dep->name, last_fifo_depth, fifo_size & 0xffff); + + dwc3_writel(dwc->regs, DWC3_GTXFIFOSIZ(num), fifo_size); + + last_fifo_depth += (fifo_size & 0xffff); + } + + return 0; +} + +void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, + int status) +{ + struct dwc3 *dwc = dep->dwc; + int i; + + if (req->queued) { + i = 0; + do { + dep->busy_slot++; + /* + * Skip LINK TRB. We can't use req->trb and check for + * DWC3_TRBCTL_LINK_TRB because it points the TRB we + * just completed (not the LINK TRB). + */ + if (((dep->busy_slot & DWC3_TRB_MASK) == + DWC3_TRB_NUM - 1) && + usb_endpoint_xfer_isoc(dep->endpoint.desc)) + dep->busy_slot++; + } while (++i < req->request.num_mapped_sgs); + req->queued = false; + } + list_del(&req->list); + req->trb = NULL; + + if (req->request.status == -EINPROGRESS) + req->request.status = status; + + if (dwc->ep0_bounced && dep->number == 0) + dwc->ep0_bounced = false; + else + usb_gadget_unmap_request(&dwc->gadget, &req->request, + req->direction); + + dev_dbg(dwc->dev, "request %p from %s completed %d/%d ===> %d\n", + req, dep->name, req->request.actual, + req->request.length, status); + + spin_unlock(&dwc->lock); + req->request.complete(&dep->endpoint, &req->request); + spin_lock(&dwc->lock); +} + +static const char *dwc3_gadget_ep_cmd_string(u8 cmd) +{ + switch (cmd) { + case DWC3_DEPCMD_DEPSTARTCFG: + return "Start New Configuration"; + case DWC3_DEPCMD_ENDTRANSFER: + return "End Transfer"; + case DWC3_DEPCMD_UPDATETRANSFER: + return "Update Transfer"; + case DWC3_DEPCMD_STARTTRANSFER: + return "Start Transfer"; + case DWC3_DEPCMD_CLEARSTALL: + return "Clear Stall"; + case DWC3_DEPCMD_SETSTALL: + return "Set Stall"; + case DWC3_DEPCMD_GETEPSTATE: + return "Get Endpoint State"; + case DWC3_DEPCMD_SETTRANSFRESOURCE: + return "Set Endpoint Transfer Resource"; + case DWC3_DEPCMD_SETEPCONFIG: + return "Set Endpoint Configuration"; + default: + return "UNKNOWN command"; + } +} + +static const char *dwc3_gadget_generic_cmd_string(u8 cmd) +{ + switch (cmd) { + case DWC3_DGCMD_SET_LMP: + return "Set LMP"; + case DWC3_DGCMD_SET_PERIODIC_PAR: + return "Set Periodic Parameters"; + case DWC3_DGCMD_XMIT_FUNCTION: + return "Transmit Function Wake Device Notification"; + case DWC3_DGCMD_SET_SCRATCHPAD_ADDR_LO: + return "Set Scratchpad Buffer Array Address Lo"; + case DWC3_DGCMD_SET_SCRATCHPAD_ADDR_HI: + return "Set Scratchpad Buffer Array Address Hi"; + case DWC3_DGCMD_SELECTED_FIFO_FLUSH: + return "Selected FIFO Flush"; + case DWC3_DGCMD_ALL_FIFO_FLUSH: + return "All FIFO Flush"; + case DWC3_DGCMD_SET_ENDPOINT_NRDY: + return "Set Endpoint NRDY"; + case DWC3_DGCMD_RUN_SOC_BUS_LOOPBACK: + return "Run SoC Bus Loopback Test"; + default: + return "UNKNOWN"; + } +} + +static const char *dwc3_gadget_link_string(enum dwc3_link_state link_state) +{ + switch (link_state) { + case DWC3_LINK_STATE_U0: + return "U0"; + case DWC3_LINK_STATE_U1: + return "U1"; + case DWC3_LINK_STATE_U2: + return "U2"; + case DWC3_LINK_STATE_U3: + return "U3"; + case DWC3_LINK_STATE_SS_DIS: + return "SS.Disabled"; + case DWC3_LINK_STATE_RX_DET: + return "RX.Detect"; + case DWC3_LINK_STATE_SS_INACT: + return "SS.Inactive"; + case DWC3_LINK_STATE_POLL: + return "Polling"; + case DWC3_LINK_STATE_RECOV: + return "Recovery"; + case DWC3_LINK_STATE_HRESET: + return "Hot Reset"; + case DWC3_LINK_STATE_CMPLY: + return "Compliance"; + case DWC3_LINK_STATE_LPBK: + return "Loopback"; + case DWC3_LINK_STATE_RESET: + return "Reset"; + case DWC3_LINK_STATE_RESUME: + return "Resume"; + default: + return "UNKNOWN link state\n"; + } +} + +int dwc3_send_gadget_generic_command(struct dwc3 *dwc, int cmd, u32 param) +{ + u32 timeout = 500; + u32 reg; + + dev_vdbg(dwc->dev, "generic cmd '%s' [%d] param %08x\n", + dwc3_gadget_generic_cmd_string(cmd), cmd, param); + + dwc3_writel(dwc->regs, DWC3_DGCMDPAR, param); + dwc3_writel(dwc->regs, DWC3_DGCMD, cmd | DWC3_DGCMD_CMDACT); + + do { + reg = dwc3_readl(dwc->regs, DWC3_DGCMD); + if (!(reg & DWC3_DGCMD_CMDACT)) { + dev_vdbg(dwc->dev, "Command Complete --> %d\n", + DWC3_DGCMD_STATUS(reg)); + return 0; + } + + /* + * We can't sleep here, because it's also called from + * interrupt context. + */ + timeout--; + if (!timeout) + return -ETIMEDOUT; + udelay(1); + } while (1); +} + +int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep, + unsigned cmd, struct dwc3_gadget_ep_cmd_params *params) +{ + struct dwc3_ep *dep = dwc->eps[ep]; + u32 timeout = 500; + u32 reg; + + dev_vdbg(dwc->dev, "%s: cmd '%s' [%d] params %08x %08x %08x\n", + dep->name, + dwc3_gadget_ep_cmd_string(cmd), cmd, params->param0, + params->param1, params->param2); + + dwc3_writel(dwc->regs, DWC3_DEPCMDPAR0(ep), params->param0); + dwc3_writel(dwc->regs, DWC3_DEPCMDPAR1(ep), params->param1); + dwc3_writel(dwc->regs, DWC3_DEPCMDPAR2(ep), params->param2); + + dwc3_writel(dwc->regs, DWC3_DEPCMD(ep), cmd | DWC3_DEPCMD_CMDACT); + do { + reg = dwc3_readl(dwc->regs, DWC3_DEPCMD(ep)); + if (!(reg & DWC3_DEPCMD_CMDACT)) { + dev_vdbg(dwc->dev, "Command Complete --> %d\n", + DWC3_DEPCMD_STATUS(reg)); + return 0; + } + + /* + * We can't sleep here, because it is also called from + * interrupt context. + */ + timeout--; + if (!timeout) + return -ETIMEDOUT; + + udelay(1); + } while (1); +} + +static dma_addr_t dwc3_trb_dma_offset(struct dwc3_ep *dep, + struct dwc3_trb *trb) +{ + u32 offset = (char *) trb - (char *) dep->trb_pool; + + return dep->trb_pool_dma + offset; +} + +static int dwc3_alloc_trb_pool(struct dwc3_ep *dep) +{ + struct dwc3 *dwc = dep->dwc; + + if (dep->trb_pool) + return 0; + + if (dep->number == 0 || dep->number == 1) + return 0; + + dep->trb_pool = dma_alloc_coherent(dwc->dev, + sizeof(struct dwc3_trb) * DWC3_TRB_NUM, + &dep->trb_pool_dma, GFP_KERNEL); + if (!dep->trb_pool) { + dev_err(dep->dwc->dev, "failed to allocate trb pool for %s\n", + dep->name); + return -ENOMEM; + } + + return 0; +} + +static void dwc3_free_trb_pool(struct dwc3_ep *dep) +{ + struct dwc3 *dwc = dep->dwc; + + dma_free_coherent(dwc->dev, sizeof(struct dwc3_trb) * DWC3_TRB_NUM, + dep->trb_pool, dep->trb_pool_dma); + + dep->trb_pool = NULL; + dep->trb_pool_dma = 0; +} + +static int dwc3_gadget_start_config(struct dwc3 *dwc, struct dwc3_ep *dep) +{ + struct dwc3_gadget_ep_cmd_params params; + u32 cmd; + + memset(¶ms, 0x00, sizeof(params)); + + if (dep->number != 1) { + cmd = DWC3_DEPCMD_DEPSTARTCFG; + /* XferRscIdx == 0 for ep0 and 2 for the remaining */ + if (dep->number > 1) { + if (dwc->start_config_issued) + return 0; + dwc->start_config_issued = true; + cmd |= DWC3_DEPCMD_PARAM(2); + } + + return dwc3_send_gadget_ep_cmd(dwc, 0, cmd, ¶ms); + } + + return 0; +} + +static int dwc3_gadget_set_ep_config(struct dwc3 *dwc, struct dwc3_ep *dep, + const struct usb_endpoint_descriptor *desc, + const struct usb_ss_ep_comp_descriptor *comp_desc, + bool ignore, bool restore) +{ + struct dwc3_gadget_ep_cmd_params params; + + memset(¶ms, 0x00, sizeof(params)); + + params.param0 = DWC3_DEPCFG_EP_TYPE(usb_endpoint_type(desc)) + | DWC3_DEPCFG_MAX_PACKET_SIZE(usb_endpoint_maxp(desc)); + + /* Burst size is only needed in SuperSpeed mode */ + if (dwc->gadget.speed == USB_SPEED_SUPER) { + u32 burst = dep->endpoint.maxburst - 1; + + params.param0 |= DWC3_DEPCFG_BURST_SIZE(burst); + } + + if (ignore) + params.param0 |= DWC3_DEPCFG_IGN_SEQ_NUM; + + if (restore) { + params.param0 |= DWC3_DEPCFG_ACTION_RESTORE; + params.param2 |= dep->saved_state; + } + + params.param1 = DWC3_DEPCFG_XFER_COMPLETE_EN + | DWC3_DEPCFG_XFER_NOT_READY_EN; + + if (usb_ss_max_streams(comp_desc) && usb_endpoint_xfer_bulk(desc)) { + params.param1 |= DWC3_DEPCFG_STREAM_CAPABLE + | DWC3_DEPCFG_STREAM_EVENT_EN; + dep->stream_capable = true; + } + + if (usb_endpoint_xfer_isoc(desc)) + params.param1 |= DWC3_DEPCFG_XFER_IN_PROGRESS_EN; + + /* + * We are doing 1:1 mapping for endpoints, meaning + * Physical Endpoints 2 maps to Logical Endpoint 2 and + * so on. We consider the direction bit as part of the physical + * endpoint number. So USB endpoint 0x81 is 0x03. + */ + params.param1 |= DWC3_DEPCFG_EP_NUMBER(dep->number); + + /* + * We must use the lower 16 TX FIFOs even though + * HW might have more + */ + if (dep->direction) + params.param0 |= DWC3_DEPCFG_FIFO_NUMBER(dep->number >> 1); + + if (desc->bInterval) { + params.param1 |= DWC3_DEPCFG_BINTERVAL_M1(desc->bInterval - 1); + dep->interval = 1 << (desc->bInterval - 1); + } + + return dwc3_send_gadget_ep_cmd(dwc, dep->number, + DWC3_DEPCMD_SETEPCONFIG, ¶ms); +} + +static int dwc3_gadget_set_xfer_resource(struct dwc3 *dwc, struct dwc3_ep *dep) +{ + struct dwc3_gadget_ep_cmd_params params; + + memset(¶ms, 0x00, sizeof(params)); + + params.param0 = DWC3_DEPXFERCFG_NUM_XFER_RES(1); + + return dwc3_send_gadget_ep_cmd(dwc, dep->number, + DWC3_DEPCMD_SETTRANSFRESOURCE, ¶ms); +} + +/** + * __dwc3_gadget_ep_enable - Initializes a HW endpoint + * @dep: endpoint to be initialized + * @desc: USB Endpoint Descriptor + * + * Caller should take care of locking + */ +static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep, + const struct usb_endpoint_descriptor *desc, + const struct usb_ss_ep_comp_descriptor *comp_desc, + bool ignore, bool restore) +{ + struct dwc3 *dwc = dep->dwc; + u32 reg; + int ret; + + dev_vdbg(dwc->dev, "Enabling %s\n", dep->name); + + if (!(dep->flags & DWC3_EP_ENABLED)) { + ret = dwc3_gadget_start_config(dwc, dep); + if (ret) + return ret; + } + + ret = dwc3_gadget_set_ep_config(dwc, dep, desc, comp_desc, ignore, + restore); + if (ret) + return ret; + + if (!(dep->flags & DWC3_EP_ENABLED)) { + struct dwc3_trb *trb_st_hw; + struct dwc3_trb *trb_link; + + ret = dwc3_gadget_set_xfer_resource(dwc, dep); + if (ret) + return ret; + + dep->endpoint.desc = desc; + dep->comp_desc = comp_desc; + dep->type = usb_endpoint_type(desc); + dep->flags |= DWC3_EP_ENABLED; + + reg = dwc3_readl(dwc->regs, DWC3_DALEPENA); + reg |= DWC3_DALEPENA_EP(dep->number); + dwc3_writel(dwc->regs, DWC3_DALEPENA, reg); + + if (!usb_endpoint_xfer_isoc(desc)) + return 0; + + memset(&trb_link, 0, sizeof(trb_link)); + + /* Link TRB for ISOC. The HWO bit is never reset */ + trb_st_hw = &dep->trb_pool[0]; + + trb_link = &dep->trb_pool[DWC3_TRB_NUM - 1]; + + trb_link->bpl = lower_32_bits(dwc3_trb_dma_offset(dep, trb_st_hw)); + trb_link->bph = upper_32_bits(dwc3_trb_dma_offset(dep, trb_st_hw)); + trb_link->ctrl |= DWC3_TRBCTL_LINK_TRB; + trb_link->ctrl |= DWC3_TRB_CTRL_HWO; + } + + return 0; +} + +static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum, bool force); +static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep) +{ + struct dwc3_request *req; + + if (!list_empty(&dep->req_queued)) { + dwc3_stop_active_transfer(dwc, dep->number, true); + + /* - giveback all requests to gadget driver */ + while (!list_empty(&dep->req_queued)) { + req = next_request(&dep->req_queued); + + dwc3_gadget_giveback(dep, req, -ESHUTDOWN); + } + } + + while (!list_empty(&dep->request_list)) { + req = next_request(&dep->request_list); + + dwc3_gadget_giveback(dep, req, -ESHUTDOWN); + } +} + +/** + * __dwc3_gadget_ep_disable - Disables a HW endpoint + * @dep: the endpoint to disable + * + * This function also removes requests which are currently processed ny the + * hardware and those which are not yet scheduled. + * Caller should take care of locking. + */ +static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep) +{ + struct dwc3 *dwc = dep->dwc; + u32 reg; + + dwc3_remove_requests(dwc, dep); + + /* make sure HW endpoint isn't stalled */ + if (dep->flags & DWC3_EP_STALL) + __dwc3_gadget_ep_set_halt(dep, 0); + + reg = dwc3_readl(dwc->regs, DWC3_DALEPENA); + reg &= ~DWC3_DALEPENA_EP(dep->number); + dwc3_writel(dwc->regs, DWC3_DALEPENA, reg); + + dep->stream_capable = false; + dep->endpoint.desc = NULL; + dep->comp_desc = NULL; + dep->type = 0; + dep->flags = 0; + + return 0; +} + +/* -------------------------------------------------------------------------- */ + +static int dwc3_gadget_ep0_enable(struct usb_ep *ep, + const struct usb_endpoint_descriptor *desc) +{ + return -EINVAL; +} + +static int dwc3_gadget_ep0_disable(struct usb_ep *ep) +{ + return -EINVAL; +} + +/* -------------------------------------------------------------------------- */ + +static int dwc3_gadget_ep_enable(struct usb_ep *ep, + const struct usb_endpoint_descriptor *desc) +{ + struct dwc3_ep *dep; + struct dwc3 *dwc; + unsigned long flags; + int ret; + + if (!ep || !desc || desc->bDescriptorType != USB_DT_ENDPOINT) { + pr_debug("dwc3: invalid parameters\n"); + return -EINVAL; + } + + if (!desc->wMaxPacketSize) { + pr_debug("dwc3: missing wMaxPacketSize\n"); + return -EINVAL; + } + + dep = to_dwc3_ep(ep); + dwc = dep->dwc; + + if (dep->flags & DWC3_EP_ENABLED) { + dev_WARN_ONCE(dwc->dev, true, "%s is already enabled\n", + dep->name); + return 0; + } + + switch (usb_endpoint_type(desc)) { + case USB_ENDPOINT_XFER_CONTROL: + strlcat(dep->name, "-control", sizeof(dep->name)); + break; + case USB_ENDPOINT_XFER_ISOC: + strlcat(dep->name, "-isoc", sizeof(dep->name)); + break; + case USB_ENDPOINT_XFER_BULK: + strlcat(dep->name, "-bulk", sizeof(dep->name)); + break; + case USB_ENDPOINT_XFER_INT: + strlcat(dep->name, "-int", sizeof(dep->name)); + break; + default: + dev_err(dwc->dev, "invalid endpoint transfer type\n"); + } + + spin_lock_irqsave(&dwc->lock, flags); + ret = __dwc3_gadget_ep_enable(dep, desc, ep->comp_desc, false, false); + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +static int dwc3_gadget_ep_disable(struct usb_ep *ep) +{ + struct dwc3_ep *dep; + struct dwc3 *dwc; + unsigned long flags; + int ret; + + if (!ep) { + pr_debug("dwc3: invalid parameters\n"); + return -EINVAL; + } + + dep = to_dwc3_ep(ep); + dwc = dep->dwc; + + if (!(dep->flags & DWC3_EP_ENABLED)) { + dev_WARN_ONCE(dwc->dev, true, "%s is already disabled\n", + dep->name); + return 0; + } + + snprintf(dep->name, sizeof(dep->name), "ep%d%s", + dep->number >> 1, + (dep->number & 1) ? "in" : "out"); + + spin_lock_irqsave(&dwc->lock, flags); + ret = __dwc3_gadget_ep_disable(dep); + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +static struct usb_request *dwc3_gadget_ep_alloc_request(struct usb_ep *ep, + gfp_t gfp_flags) +{ + struct dwc3_request *req; + struct dwc3_ep *dep = to_dwc3_ep(ep); + + req = kzalloc(sizeof(*req), gfp_flags); + if (!req) { + dev_err(NULL, "not enough memory\n"); + return NULL; + } + + req->epnum = dep->number; + req->dep = dep; + + return &req->request; +} + +static void dwc3_gadget_ep_free_request(struct usb_ep *ep, + struct usb_request *request) +{ + struct dwc3_request *req = to_dwc3_request(request); + + kfree(req); +} + +/** + * dwc3_prepare_one_trb - setup one TRB from one request + * @dep: endpoint for which this request is prepared + * @req: dwc3_request pointer + */ +static void dwc3_prepare_one_trb(struct dwc3_ep *dep, + struct dwc3_request *req, dma_addr_t dma, + unsigned length, unsigned last, unsigned chain, unsigned node) +{ + struct dwc3_trb *trb; + + dev_vdbg(NULL, "%s: req %p dma %08llx length %d%s%s\n", + dep->name, req, (unsigned long long) dma, + length, last ? " last" : "", + chain ? " chain" : ""); + + trb = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK]; + + if (!req->trb) { + dwc3_gadget_move_request_queued(req); + req->trb = trb; + req->trb_dma = dwc3_trb_dma_offset(dep, trb); + req->start_slot = dep->free_slot & DWC3_TRB_MASK; + } + + dep->free_slot++; + /* Skip the LINK-TRB on ISOC */ + if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) && + usb_endpoint_xfer_isoc(dep->endpoint.desc)) + dep->free_slot++; + + trb->size = DWC3_TRB_SIZE_LENGTH(length); + trb->bpl = lower_32_bits(dma); + trb->bph = upper_32_bits(dma); + + switch (usb_endpoint_type(dep->endpoint.desc)) { + case USB_ENDPOINT_XFER_CONTROL: + trb->ctrl = DWC3_TRBCTL_CONTROL_SETUP; + break; + + case USB_ENDPOINT_XFER_ISOC: + if (!node) + trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS_FIRST; + else + trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS; + break; + + case USB_ENDPOINT_XFER_BULK: + case USB_ENDPOINT_XFER_INT: + trb->ctrl = DWC3_TRBCTL_NORMAL; + break; + default: + /* + * This is only possible with faulty memory because we + * checked it already :) + */ + BUG(); + } + + if (!req->request.no_interrupt && !chain) + trb->ctrl |= DWC3_TRB_CTRL_IOC; + + if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) { + trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI; + trb->ctrl |= DWC3_TRB_CTRL_CSP; + } else if (last) { + trb->ctrl |= DWC3_TRB_CTRL_LST; + } + + if (chain) + trb->ctrl |= DWC3_TRB_CTRL_CHN; + + if (usb_endpoint_xfer_bulk(dep->endpoint.desc) && dep->stream_capable) + trb->ctrl |= DWC3_TRB_CTRL_SID_SOFN(req->request.stream_id); + + trb->ctrl |= DWC3_TRB_CTRL_HWO; +} + +/* + * dwc3_prepare_trbs - setup TRBs from requests + * @dep: endpoint for which requests are being prepared + * @starting: true if the endpoint is idle and no requests are queued. + * + * The function goes through the requests list and sets up TRBs for the + * transfers. The function returns once there are no more TRBs available or + * it runs out of requests. + */ +static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting) +{ + struct dwc3_request *req, *n; + u32 trbs_left; + u32 max; + unsigned int last_one = 0; + + BUILD_BUG_ON_NOT_POWER_OF_2(DWC3_TRB_NUM); + + /* the first request must not be queued */ + trbs_left = (dep->busy_slot - dep->free_slot) & DWC3_TRB_MASK; + + /* Can't wrap around on a non-isoc EP since there's no link TRB */ + if (!usb_endpoint_xfer_isoc(dep->endpoint.desc)) { + max = DWC3_TRB_NUM - (dep->free_slot & DWC3_TRB_MASK); + if (trbs_left > max) + trbs_left = max; + } + + /* + * If busy & slot are equal than it is either full or empty. If we are + * starting to process requests then we are empty. Otherwise we are + * full and don't do anything + */ + if (!trbs_left) { + if (!starting) + return; + trbs_left = DWC3_TRB_NUM; + /* + * In case we start from scratch, we queue the ISOC requests + * starting from slot 1. This is done because we use ring + * buffer and have no LST bit to stop us. Instead, we place + * IOC bit every TRB_NUM/4. We try to avoid having an interrupt + * after the first request so we start at slot 1 and have + * 7 requests proceed before we hit the first IOC. + * Other transfer types don't use the ring buffer and are + * processed from the first TRB until the last one. Since we + * don't wrap around we have to start at the beginning. + */ + if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) { + dep->busy_slot = 1; + dep->free_slot = 1; + } else { + dep->busy_slot = 0; + dep->free_slot = 0; + } + } + + /* The last TRB is a link TRB, not used for xfer */ + if ((trbs_left <= 1) && usb_endpoint_xfer_isoc(dep->endpoint.desc)) + return; + + list_for_each_entry_safe(req, n, &dep->request_list, list) { + unsigned length; + dma_addr_t dma; + last_one = false; + +#if 0 + if (req->request.num_mapped_sgs > 0) { + struct usb_request *request = &req->request; + struct scatterlist *sg = request->sg; + struct scatterlist *s; + int i; + + for_each_sg(sg, s, request->num_mapped_sgs, i) { + unsigned chain = true; + + length = sg_dma_len(s); + dma = sg_dma_address(s); + + if (i == (request->num_mapped_sgs - 1) || + sg_is_last(s)) { + if (list_is_last(&req->list, + &dep->request_list)) + last_one = true; + chain = false; + } + + trbs_left--; + if (!trbs_left) + last_one = true; + + if (last_one) + chain = false; + + dwc3_prepare_one_trb(dep, req, dma, length, + last_one, chain, i); + + if (last_one) + break; + } + } else +#endif + { + dma = req->request.dma; + length = req->request.length; + trbs_left--; + + if (!trbs_left) + last_one = 1; + + /* Is this the last request? */ + if (list_is_last(&req->list, &dep->request_list)) + last_one = 1; + + dwc3_prepare_one_trb(dep, req, dma, length, + last_one, false, 0); + + if (last_one) + break; + } + } +} + +static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param, + int start_new) +{ + struct dwc3_gadget_ep_cmd_params params; + struct dwc3_request *req; + struct dwc3 *dwc = dep->dwc; + int ret; + u32 cmd; + + if (start_new && (dep->flags & DWC3_EP_BUSY)) { + dev_vdbg(dwc->dev, "%s: endpoint busy\n", dep->name); + return -EBUSY; + } + dep->flags &= ~DWC3_EP_PENDING_REQUEST; + + /* + * If we are getting here after a short-out-packet we don't enqueue any + * new requests as we try to set the IOC bit only on the last request. + */ + if (start_new) { + if (list_empty(&dep->req_queued)) + dwc3_prepare_trbs(dep, start_new); + + /* req points to the first request which will be sent */ + req = next_request(&dep->req_queued); + } else { + dwc3_prepare_trbs(dep, start_new); + + /* + * req points to the first request where HWO changed from 0 to 1 + */ + req = next_request(&dep->req_queued); + } + if (!req) { + dep->flags |= DWC3_EP_PENDING_REQUEST; + return 0; + } + + memset(¶ms, 0, sizeof(params)); + + if (start_new) { + params.param0 = upper_32_bits(req->trb_dma); + params.param1 = lower_32_bits(req->trb_dma); + cmd = DWC3_DEPCMD_STARTTRANSFER; + } else { + cmd = DWC3_DEPCMD_UPDATETRANSFER; + } + + cmd |= DWC3_DEPCMD_PARAM(cmd_param); + ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, ¶ms); + if (ret < 0) { + dev_dbg(dwc->dev, "failed to send STARTTRANSFER command\n"); + + /* + * FIXME we need to iterate over the list of requests + * here and stop, unmap, free and del each of the linked + * requests instead of what we do now. + */ + usb_gadget_unmap_request(&dwc->gadget, &req->request, + req->direction); + list_del(&req->list); + return ret; + } + + dep->flags |= DWC3_EP_BUSY; + + if (start_new) { + dep->resource_index = dwc3_gadget_ep_get_transfer_index(dwc, + dep->number); + WARN_ON_ONCE(!dep->resource_index); + } + + return 0; +} + +static void __dwc3_gadget_start_isoc(struct dwc3 *dwc, + struct dwc3_ep *dep, u32 cur_uf) +{ + u32 uf; + + if (list_empty(&dep->request_list)) { + dev_vdbg(dwc->dev, "ISOC ep %s run out for requests.\n", + dep->name); + dep->flags |= DWC3_EP_PENDING_REQUEST; + return; + } + + /* 4 micro frames in the future */ + uf = cur_uf + dep->interval * 4; + + __dwc3_gadget_kick_transfer(dep, uf, 1); +} + +static void dwc3_gadget_start_isoc(struct dwc3 *dwc, + struct dwc3_ep *dep, const struct dwc3_event_depevt *event) +{ + u32 cur_uf, mask; + + mask = ~(dep->interval - 1); + cur_uf = event->parameters & mask; + + __dwc3_gadget_start_isoc(dwc, dep, cur_uf); +} + +static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req) +{ + struct dwc3 *dwc = dep->dwc; + int ret; + + req->request.actual = 0; + req->request.status = -EINPROGRESS; + req->direction = dep->direction; + req->epnum = dep->number; + + /* + * We only add to our list of requests now and + * start consuming the list once we get XferNotReady + * IRQ. + * + * That way, we avoid doing anything that we don't need + * to do now and defer it until the point we receive a + * particular token from the Host side. + * + * This will also avoid Host cancelling URBs due to too + * many NAKs. + */ + ret = usb_gadget_map_request(&dwc->gadget, &req->request, + dep->direction); + if (ret) + return ret; + + list_add_tail(&req->list, &dep->request_list); + + /* + * There are a few special cases: + * + * 1. XferNotReady with empty list of requests. We need to kick the + * transfer here in that situation, otherwise we will be NAKing + * forever. If we get XferNotReady before gadget driver has a + * chance to queue a request, we will ACK the IRQ but won't be + * able to receive the data until the next request is queued. + * The following code is handling exactly that. + * + */ + if (dep->flags & DWC3_EP_PENDING_REQUEST) { + /* + * If xfernotready is already elapsed and it is a case + * of isoc transfer, then issue END TRANSFER, so that + * you can receive xfernotready again and can have + * notion of current microframe. + */ + if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) { + if (list_empty(&dep->req_queued)) { + dwc3_stop_active_transfer(dwc, dep->number, true); + dep->flags = DWC3_EP_ENABLED; + } + return 0; + } + + ret = __dwc3_gadget_kick_transfer(dep, 0, true); + if (ret && ret != -EBUSY) + dev_dbg(dwc->dev, "%s: failed to kick transfers\n", + dep->name); + return ret; + } + + /* + * 2. XferInProgress on Isoc EP with an active transfer. We need to + * kick the transfer here after queuing a request, otherwise the + * core may not see the modified TRB(s). + */ + if (usb_endpoint_xfer_isoc(dep->endpoint.desc) && + (dep->flags & DWC3_EP_BUSY) && + !(dep->flags & DWC3_EP_MISSED_ISOC)) { + WARN_ON_ONCE(!dep->resource_index); + ret = __dwc3_gadget_kick_transfer(dep, dep->resource_index, + false); + if (ret && ret != -EBUSY) + dev_dbg(dwc->dev, "%s: failed to kick transfers\n", + dep->name); + return ret; + } + + /* + * 4. Stream Capable Bulk Endpoints. We need to start the transfer + * right away, otherwise host will not know we have streams to be + * handled. + */ + if (dep->stream_capable) { + int ret; + + ret = __dwc3_gadget_kick_transfer(dep, 0, true); + if (ret && ret != -EBUSY) { + dev_dbg(dwc->dev, "%s: failed to kick transfers\n", + dep->name); + } + } + + return 0; +} + +static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request, + gfp_t gfp_flags) +{ + struct dwc3_request *req = to_dwc3_request(request); + struct dwc3_ep *dep = to_dwc3_ep(ep); + + unsigned long flags; + + int ret; + + if (!dep->endpoint.desc) { + dev_dbg(NULL, "trying to queue request %p to disabled %s\n", + request, ep->name); + return -ESHUTDOWN; + } + + dev_vdbg(NULL, "queing request %p to %s length %d\n", + request, ep->name, request->length); + + spin_lock_irqsave(&dwc->lock, flags); + ret = __dwc3_gadget_ep_queue(dep, req); + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, + struct usb_request *request) +{ + struct dwc3_request *req = to_dwc3_request(request); + struct dwc3_request *r = NULL; + + struct dwc3_ep *dep = to_dwc3_ep(ep); + struct dwc3 *dwc = dep->dwc; + + unsigned long flags; + int ret = 0; + + spin_lock_irqsave(&dwc->lock, flags); + + list_for_each_entry(r, &dep->request_list, list) { + if (r == req) + break; + } + + if (r != req) { + list_for_each_entry(r, &dep->req_queued, list) { + if (r == req) + break; + } + if (r == req) { + /* wait until it is processed */ + dwc3_stop_active_transfer(dwc, dep->number, true); + goto out1; + } + dev_err(dwc->dev, "request %p was not queued to %s\n", + request, ep->name); + ret = -EINVAL; + goto out0; + } + +out1: + /* giveback the request */ + dwc3_gadget_giveback(dep, req, -ECONNRESET); + +out0: + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) +{ + struct dwc3_gadget_ep_cmd_params params; + struct dwc3 *dwc = dep->dwc; + int ret; + + memset(¶ms, 0x00, sizeof(params)); + + if (value) { + ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, + DWC3_DEPCMD_SETSTALL, ¶ms); + if (ret) + dev_err(dwc->dev, "failed to set STALL on %s\n", + dep->name); + else + dep->flags |= DWC3_EP_STALL; + } else { + ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, + DWC3_DEPCMD_CLEARSTALL, ¶ms); + if (ret) + dev_err(dwc->dev, "failed to clear STALL on %s\n", + dep->name); + else + dep->flags &= ~(DWC3_EP_STALL | DWC3_EP_WEDGE); + } + + return ret; +} + +static int dwc3_gadget_ep_set_halt(struct usb_ep *ep, int value) +{ + struct dwc3_ep *dep = to_dwc3_ep(ep); + + unsigned long flags; + + int ret; + + spin_lock_irqsave(&dwc->lock, flags); + + if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) { + dev_err(NULL, "%s is of Isochronous type\n", dep->name); + ret = -EINVAL; + goto out; + } + + ret = __dwc3_gadget_ep_set_halt(dep, value); +out: + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +static int dwc3_gadget_ep_set_wedge(struct usb_ep *ep) +{ + struct dwc3_ep *dep = to_dwc3_ep(ep); + unsigned long flags; + + spin_lock_irqsave(NULL, flags); + dep->flags |= DWC3_EP_WEDGE; + spin_unlock_irqrestore(&dwc->lock, flags); + + if (dep->number == 0 || dep->number == 1) + return dwc3_gadget_ep0_set_halt(ep, 1); + else + return dwc3_gadget_ep_set_halt(ep, 1); +} + +/* -------------------------------------------------------------------------- */ + +static struct usb_endpoint_descriptor dwc3_gadget_ep0_desc = { + .bLength = USB_DT_ENDPOINT_SIZE, + .bDescriptorType = USB_DT_ENDPOINT, + .bmAttributes = USB_ENDPOINT_XFER_CONTROL, +}; + +static const struct usb_ep_ops dwc3_gadget_ep0_ops = { + .enable = dwc3_gadget_ep0_enable, + .disable = dwc3_gadget_ep0_disable, + .alloc_request = dwc3_gadget_ep_alloc_request, + .free_request = dwc3_gadget_ep_free_request, + .queue = dwc3_gadget_ep0_queue, + .dequeue = dwc3_gadget_ep_dequeue, + .set_halt = dwc3_gadget_ep0_set_halt, + .set_wedge = dwc3_gadget_ep_set_wedge, +}; + +static const struct usb_ep_ops dwc3_gadget_ep_ops = { + .enable = dwc3_gadget_ep_enable, + .disable = dwc3_gadget_ep_disable, + .alloc_request = dwc3_gadget_ep_alloc_request, + .free_request = dwc3_gadget_ep_free_request, + .queue = dwc3_gadget_ep_queue, + .dequeue = dwc3_gadget_ep_dequeue, + .set_halt = dwc3_gadget_ep_set_halt, + .set_wedge = dwc3_gadget_ep_set_wedge, +}; + +/* -------------------------------------------------------------------------- */ + +static int dwc3_gadget_get_frame(struct usb_gadget *g) +{ + struct dwc3 *dwc = gadget_to_dwc(g); + u32 reg; + + reg = dwc3_readl(dwc->regs, DWC3_DSTS); + return DWC3_DSTS_SOFFN(reg); +} + +static int dwc3_gadget_wakeup(struct usb_gadget *g) +{ + struct dwc3 *dwc = gadget_to_dwc(g); + + unsigned long timeout; + unsigned long flags; + + u32 reg; + + int ret = 0; + + u8 link_state; + u8 speed; + + spin_lock_irqsave(&dwc->lock, flags); + + /* + * According to the Databook Remote wakeup request should + * be issued only when the device is in early suspend state. + * + * We can check that via USB Link State bits in DSTS register. + */ + reg = dwc3_readl(dwc->regs, DWC3_DSTS); + + speed = reg & DWC3_DSTS_CONNECTSPD; + if (speed == DWC3_DSTS_SUPERSPEED) { + dev_dbg(dwc->dev, "no wakeup on SuperSpeed\n"); + ret = -EINVAL; + goto out; + } + + link_state = DWC3_DSTS_USBLNKST(reg); + + switch (link_state) { + case DWC3_LINK_STATE_RX_DET: /* in HS, means Early Suspend */ + case DWC3_LINK_STATE_U3: /* in HS, means SUSPEND */ + break; + default: + dev_dbg(dwc->dev, "can't wakeup from link state %d\n", + link_state); + ret = -EINVAL; + goto out; + } + + ret = dwc3_gadget_set_link_state(dwc, DWC3_LINK_STATE_RECOV); + if (ret < 0) { + dev_err(dwc->dev, "failed to put link in Recovery\n"); + goto out; + } + + /* Recent versions do this automatically */ + if (dwc->revision < DWC3_REVISION_194A) { + /* write zeroes to Link Change Request */ + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + reg &= ~DWC3_DCTL_ULSTCHNGREQ_MASK; + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + } + + /* poll until Link State changes to ON */ + timeout = jiffies + msecs_to_jiffies(100); + + while (!time_after(jiffies, timeout)) { + reg = dwc3_readl(dwc->regs, DWC3_DSTS); + + /* in HS, means ON */ + if (DWC3_DSTS_USBLNKST(reg) == DWC3_LINK_STATE_U0) + break; + } + + if (DWC3_DSTS_USBLNKST(reg) != DWC3_LINK_STATE_U0) { + dev_err(dwc->dev, "failed to send remote wakeup\n"); + ret = -EINVAL; + } + +out: + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +static int dwc3_gadget_set_selfpowered(struct usb_gadget *g, + int is_selfpowered) +{ + struct dwc3 *dwc = gadget_to_dwc(g); + unsigned long flags; + + spin_lock_irqsave(&dwc->lock, flags); + dwc->is_selfpowered = !!is_selfpowered; + spin_unlock_irqrestore(&dwc->lock, flags); + + return 0; +} + +static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) +{ + u32 reg; + u32 timeout = 500; + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + if (is_on) { + if (dwc->revision <= DWC3_REVISION_187A) { + reg &= ~DWC3_DCTL_TRGTULST_MASK; + reg |= DWC3_DCTL_TRGTULST_RX_DET; + } + + if (dwc->revision >= DWC3_REVISION_194A) + reg &= ~DWC3_DCTL_KEEP_CONNECT; + reg |= DWC3_DCTL_RUN_STOP; + + if (dwc->has_hibernation) + reg |= DWC3_DCTL_KEEP_CONNECT; + + dwc->pullups_connected = true; + } else { + reg &= ~DWC3_DCTL_RUN_STOP; + + if (dwc->has_hibernation && !suspend) + reg &= ~DWC3_DCTL_KEEP_CONNECT; + + dwc->pullups_connected = false; + } + + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + + do { + reg = dwc3_readl(dwc->regs, DWC3_DSTS); + if (is_on) { + if (!(reg & DWC3_DSTS_DEVCTRLHLT)) + break; + } else { + if (reg & DWC3_DSTS_DEVCTRLHLT) + break; + } + timeout--; + if (!timeout) + return -ETIMEDOUT; + udelay(1); + } while (1); + + dev_vdbg(dwc->dev, "gadget %s data soft-%s\n", + dwc->gadget_driver + ? dwc->gadget_driver->function : "no-function", + is_on ? "connect" : "disconnect"); + + return 0; +} + +static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) +{ + struct dwc3 *dwc = gadget_to_dwc(g); + unsigned long flags; + int ret; + + is_on = !!is_on; + + spin_lock_irqsave(&dwc->lock, flags); + ret = dwc3_gadget_run_stop(dwc, is_on, false); + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +static void dwc3_gadget_enable_irq(struct dwc3 *dwc) +{ + u32 reg; + + /* Enable all but Start and End of Frame IRQs */ + reg = (DWC3_DEVTEN_VNDRDEVTSTRCVEDEN | + DWC3_DEVTEN_EVNTOVERFLOWEN | + DWC3_DEVTEN_CMDCMPLTEN | + DWC3_DEVTEN_ERRTICERREN | + DWC3_DEVTEN_WKUPEVTEN | + DWC3_DEVTEN_ULSTCNGEN | + DWC3_DEVTEN_CONNECTDONEEN | + DWC3_DEVTEN_USBRSTEN | + DWC3_DEVTEN_DISCONNEVTEN); + + dwc3_writel(dwc->regs, DWC3_DEVTEN, reg); +} + +static void dwc3_gadget_disable_irq(struct dwc3 *dwc) +{ + /* mask all interrupts */ + dwc3_writel(dwc->regs, DWC3_DEVTEN, 0x00); +} + +static irqreturn_t dwc3_interrupt(int irq, void *_dwc); +static irqreturn_t dwc3_thread_interrupt(int irq, void *_dwc); + +static int dwc3_gadget_start(struct usb_gadget *g, + struct usb_gadget_driver *driver) +{ + struct dwc3 *dwc = gadget_to_dwc(g); + struct dwc3_ep *dep; + unsigned long flags; + int ret = 0; + u32 reg; + + spin_lock_irqsave(&dwc->lock, flags); + + if (dwc->gadget_driver) { + dev_err(dwc->dev, "%s is already bound to %s\n", + dwc->gadget.name, + dwc->gadget_driver->function); + ret = -EBUSY; + goto err1; + } + + dwc->gadget_driver = driver; + + reg = dwc3_readl(dwc->regs, DWC3_DCFG); + reg &= ~(DWC3_DCFG_SPEED_MASK); + + /** + * WORKAROUND: DWC3 revision < 2.20a have an issue + * which would cause metastability state on Run/Stop + * bit if we try to force the IP to USB2-only mode. + * + * Because of that, we cannot configure the IP to any + * speed other than the SuperSpeed + * + * Refers to: + * + * STAR#9000525659: Clock Domain Crossing on DCTL in + * USB 2.0 Mode + */ + if (dwc->revision < DWC3_REVISION_220A) { + reg |= DWC3_DCFG_SUPERSPEED; + } else { + switch (dwc->maximum_speed) { + case USB_SPEED_LOW: + reg |= DWC3_DSTS_LOWSPEED; + break; + case USB_SPEED_FULL: + reg |= DWC3_DSTS_FULLSPEED1; + break; + case USB_SPEED_HIGH: + reg |= DWC3_DSTS_HIGHSPEED; + break; + case USB_SPEED_SUPER: /* FALLTHROUGH */ + case USB_SPEED_UNKNOWN: /* FALTHROUGH */ + default: + reg |= DWC3_DSTS_SUPERSPEED; + } + } + dwc3_writel(dwc->regs, DWC3_DCFG, reg); + + dwc->start_config_issued = false; + + /* Start with SuperSpeed Default */ + dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512); + + dep = dwc->eps[0]; + ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, false, + false); + if (ret) { + dev_err(dwc->dev, "failed to enable %s\n", dep->name); + goto err2; + } + + dep = dwc->eps[1]; + ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, false, + false); + if (ret) { + dev_err(dwc->dev, "failed to enable %s\n", dep->name); + goto err3; + } + + /* begin to receive SETUP packets */ + dwc->ep0state = EP0_SETUP_PHASE; + dwc3_ep0_out_start(dwc); + + dwc3_gadget_enable_irq(dwc); + + spin_unlock_irqrestore(&dwc->lock, flags); + + return 0; + +err3: + __dwc3_gadget_ep_disable(dwc->eps[0]); + +err2: + dwc->gadget_driver = NULL; + +err1: + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +static int dwc3_gadget_stop(struct usb_gadget *g, + struct usb_gadget_driver *driver) +{ + struct dwc3 *dwc = gadget_to_dwc(g); + unsigned long flags; + + spin_lock_irqsave(&dwc->lock, flags); + + dwc3_gadget_disable_irq(dwc); + __dwc3_gadget_ep_disable(dwc->eps[0]); + __dwc3_gadget_ep_disable(dwc->eps[1]); + + dwc->gadget_driver = NULL; + + spin_unlock_irqrestore(&dwc->lock, flags); + + return 0; +} + +static const struct usb_gadget_ops dwc3_gadget_ops = { + .get_frame = dwc3_gadget_get_frame, + .wakeup = dwc3_gadget_wakeup, + .set_selfpowered = dwc3_gadget_set_selfpowered, + .pullup = dwc3_gadget_pullup, + .udc_start = dwc3_gadget_start, + .udc_stop = dwc3_gadget_stop, +}; + +/* -------------------------------------------------------------------------- */ + +static int dwc3_gadget_init_hw_endpoints(struct dwc3 *dwc, + u8 num, u32 direction) +{ + struct dwc3_ep *dep; + u8 i; + + for (i = 0; i < num; i++) { + u8 epnum = (i << 1) | (!!direction); + + dep = kzalloc(sizeof(*dep), GFP_KERNEL); + if (!dep) { + dev_err(dwc->dev, "can't allocate endpoint %d\n", + epnum); + return -ENOMEM; + } + + dep->dwc = dwc; + dep->number = epnum; + dep->direction = !!direction; + dwc->eps[epnum] = dep; + + snprintf(dep->name, sizeof(dep->name), "ep%d%s", epnum >> 1, + (epnum & 1) ? "in" : "out"); + + dep->endpoint.name = dep->name; + + dev_vdbg(dwc->dev, "initializing %s\n", dep->name); + + if (epnum == 0 || epnum == 1) { + usb_ep_set_maxpacket_limit(&dep->endpoint, 512); + dep->endpoint.maxburst = 1; + dep->endpoint.ops = &dwc3_gadget_ep0_ops; + if (!epnum) + dwc->gadget.ep0 = &dep->endpoint; + } else { + int ret; + + usb_ep_set_maxpacket_limit(&dep->endpoint, 1024); + dep->endpoint.max_streams = 15; + dep->endpoint.ops = &dwc3_gadget_ep_ops; + list_add_tail(&dep->endpoint.ep_list, + &dwc->gadget.ep_list); + + ret = dwc3_alloc_trb_pool(dep); + if (ret) + return ret; + } + + INIT_LIST_HEAD(&dep->request_list); + INIT_LIST_HEAD(&dep->req_queued); + } + + return 0; +} + +static int dwc3_gadget_init_endpoints(struct dwc3 *dwc) +{ + int ret; + + INIT_LIST_HEAD(&dwc->gadget.ep_list); + + ret = dwc3_gadget_init_hw_endpoints(dwc, dwc->num_out_eps, 0); + if (ret < 0) { + dev_vdbg(dwc->dev, "failed to allocate OUT endpoints\n"); + return ret; + } + + ret = dwc3_gadget_init_hw_endpoints(dwc, dwc->num_in_eps, 1); + if (ret < 0) { + dev_vdbg(dwc->dev, "failed to allocate IN endpoints\n"); + return ret; + } + + return 0; +} + +static void dwc3_gadget_free_endpoints(struct dwc3 *dwc) +{ + struct dwc3_ep *dep; + u8 epnum; + + for (epnum = 0; epnum < DWC3_ENDPOINTS_NUM; epnum++) { + dep = dwc->eps[epnum]; + if (!dep) + continue; + /* + * Physical endpoints 0 and 1 are special; they form the + * bi-directional USB endpoint 0. + * + * For those two physical endpoints, we don't allocate a TRB + * pool nor do we add them the endpoints list. Due to that, we + * shouldn't do these two operations otherwise we would end up + * with all sorts of bugs when removing dwc3.ko. + */ + if (epnum != 0 && epnum != 1) { + dwc3_free_trb_pool(dep); + list_del(&dep->endpoint.ep_list); + } + + kfree(dep); + } +} + +/* -------------------------------------------------------------------------- */ + +static int __dwc3_cleanup_done_trbs(struct dwc3 *dwc, struct dwc3_ep *dep, + struct dwc3_request *req, struct dwc3_trb *trb, + const struct dwc3_event_depevt *event, int status) +{ + unsigned int count; + unsigned int s_pkt = 0; + unsigned int trb_status; + + if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN) + /* + * We continue despite the error. There is not much we + * can do. If we don't clean it up we loop forever. If + * we skip the TRB then it gets overwritten after a + * while since we use them in a ring buffer. A BUG() + * would help. Lets hope that if this occurs, someone + * fixes the root cause instead of looking away :) + */ + dev_err(dwc->dev, "%s's TRB (%p) still owned by HW\n", + dep->name, trb); + count = trb->size & DWC3_TRB_SIZE_MASK; + + if (dep->direction) { + if (count) { + trb_status = DWC3_TRB_SIZE_TRBSTS(trb->size); + if (trb_status == DWC3_TRBSTS_MISSED_ISOC) { + dev_dbg(dwc->dev, "incomplete IN transfer %s\n", + dep->name); + /* + * If missed isoc occurred and there is + * no request queued then issue END + * TRANSFER, so that core generates + * next xfernotready and we will issue + * a fresh START TRANSFER. + * If there are still queued request + * then wait, do not issue either END + * or UPDATE TRANSFER, just attach next + * request in request_list during + * giveback.If any future queued request + * is successfully transferred then we + * will issue UPDATE TRANSFER for all + * request in the request_list. + */ + dep->flags |= DWC3_EP_MISSED_ISOC; + } else { + dev_err(dwc->dev, "incomplete IN transfer %s\n", + dep->name); + status = -ECONNRESET; + } + } else { + dep->flags &= ~DWC3_EP_MISSED_ISOC; + } + } else { + if (count && (event->status & DEPEVT_STATUS_SHORT)) + s_pkt = 1; + } + + /* + * We assume here we will always receive the entire data block + * which we should receive. Meaning, if we program RX to + * receive 4K but we receive only 2K, we assume that's all we + * should receive and we simply bounce the request back to the + * gadget driver for further processing. + */ + req->request.actual += req->request.length - count; + if (s_pkt) + return 1; + if ((event->status & DEPEVT_STATUS_LST) && + (trb->ctrl & (DWC3_TRB_CTRL_LST | + DWC3_TRB_CTRL_HWO))) + return 1; + if ((event->status & DEPEVT_STATUS_IOC) && + (trb->ctrl & DWC3_TRB_CTRL_IOC)) + return 1; + return 0; +} + +static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep, + const struct dwc3_event_depevt *event, int status) +{ + struct dwc3_request *req; + struct dwc3_trb *trb; + unsigned int slot; + unsigned int i; + int ret; + + do { + req = next_request(&dep->req_queued); + if (!req) { + WARN_ON_ONCE(1); + return 1; + } + i = 0; + do { + slot = req->start_slot + i; + if ((slot == DWC3_TRB_NUM - 1) && + usb_endpoint_xfer_isoc(dep->endpoint.desc)) + slot++; + slot %= DWC3_TRB_NUM; + trb = &dep->trb_pool[slot]; + + ret = __dwc3_cleanup_done_trbs(dwc, dep, req, trb, + event, status); + if (ret) + break; + } while (++i < req->request.num_mapped_sgs); + + dwc3_gadget_giveback(dep, req, status); + + if (ret) + break; + } while (1); + + if (usb_endpoint_xfer_isoc(dep->endpoint.desc) && + list_empty(&dep->req_queued)) { + if (list_empty(&dep->request_list)) { + /* + * If there is no entry in request list then do + * not issue END TRANSFER now. Just set PENDING + * flag, so that END TRANSFER is issued when an + * entry is added into request list. + */ + dep->flags = DWC3_EP_PENDING_REQUEST; + } else { + dwc3_stop_active_transfer(dwc, dep->number, true); + dep->flags = DWC3_EP_ENABLED; + } + return 1; + } + + return 1; +} + +static void dwc3_endpoint_transfer_complete(struct dwc3 *dwc, + struct dwc3_ep *dep, const struct dwc3_event_depevt *event, + int start_new) +{ + unsigned status = 0; + int clean_busy; + + if (event->status & DEPEVT_STATUS_BUSERR) + status = -ECONNRESET; + + clean_busy = dwc3_cleanup_done_reqs(dwc, dep, event, status); + if (clean_busy) + dep->flags &= ~DWC3_EP_BUSY; + + /* + * WORKAROUND: This is the 2nd half of U1/U2 -> U0 workaround. + * See dwc3_gadget_linksts_change_interrupt() for 1st half. + */ + if (dwc->revision < DWC3_REVISION_183A) { + u32 reg; + int i; + + for (i = 0; i < DWC3_ENDPOINTS_NUM; i++) { + dep = dwc->eps[i]; + + if (!(dep->flags & DWC3_EP_ENABLED)) + continue; + + if (!list_empty(&dep->req_queued)) + return; + } + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + reg |= dwc->u1u2; + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + + dwc->u1u2 = 0; + } +} + +static void dwc3_endpoint_interrupt(struct dwc3 *dwc, + const struct dwc3_event_depevt *event) +{ + struct dwc3_ep *dep; + u8 epnum = event->endpoint_number; + + dep = dwc->eps[epnum]; + + if (!(dep->flags & DWC3_EP_ENABLED)) + return; + + dev_vdbg(dwc->dev, "%s: %s\n", dep->name, + dwc3_ep_event_string(event->endpoint_event)); + + if (epnum == 0 || epnum == 1) { + dwc3_ep0_interrupt(dwc, event); + return; + } + + switch (event->endpoint_event) { + case DWC3_DEPEVT_XFERCOMPLETE: + dep->resource_index = 0; + + if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) { + dev_dbg(dwc->dev, "%s is an Isochronous endpoint\n", + dep->name); + return; + } + + dwc3_endpoint_transfer_complete(dwc, dep, event, 1); + break; + case DWC3_DEPEVT_XFERINPROGRESS: + if (!usb_endpoint_xfer_isoc(dep->endpoint.desc)) { + dev_dbg(dwc->dev, "%s is not an Isochronous endpoint\n", + dep->name); + return; + } + + dwc3_endpoint_transfer_complete(dwc, dep, event, 0); + break; + case DWC3_DEPEVT_XFERNOTREADY: + if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) { + dwc3_gadget_start_isoc(dwc, dep, event); + } else { + int ret; + + dev_vdbg(dwc->dev, "%s: reason %s\n", + dep->name, event->status & + DEPEVT_STATUS_TRANSFER_ACTIVE + ? "Transfer Active" + : "Transfer Not Active"); + + ret = __dwc3_gadget_kick_transfer(dep, 0, 1); + if (!ret || ret == -EBUSY) + return; + + dev_dbg(dwc->dev, "%s: failed to kick transfers\n", + dep->name); + } + + break; + case DWC3_DEPEVT_STREAMEVT: + if (!usb_endpoint_xfer_bulk(dep->endpoint.desc)) { + dev_err(dwc->dev, "Stream event for non-Bulk %s\n", + dep->name); + return; + } + + switch (event->status) { + case DEPEVT_STREAMEVT_FOUND: + dev_vdbg(dwc->dev, "Stream %d found and started\n", + event->parameters); + + break; + case DEPEVT_STREAMEVT_NOTFOUND: + /* FALLTHROUGH */ + default: + dev_dbg(dwc->dev, "Couldn't find suitable stream\n"); + } + break; + case DWC3_DEPEVT_RXTXFIFOEVT: + dev_dbg(dwc->dev, "%s FIFO Overrun\n", dep->name); + break; + case DWC3_DEPEVT_EPCMDCMPLT: + dev_vdbg(dwc->dev, "Endpoint Command Complete\n"); + break; + } +} + +static void dwc3_disconnect_gadget(struct dwc3 *dwc) +{ + if (dwc->gadget_driver && dwc->gadget_driver->disconnect) { + spin_unlock(&dwc->lock); + dwc->gadget_driver->disconnect(&dwc->gadget); + spin_lock(&dwc->lock); + } +} + +static void dwc3_suspend_gadget(struct dwc3 *dwc) +{ + if (dwc->gadget_driver && dwc->gadget_driver->suspend) { + spin_unlock(&dwc->lock); + dwc->gadget_driver->suspend(&dwc->gadget); + spin_lock(&dwc->lock); + } +} + +static void dwc3_resume_gadget(struct dwc3 *dwc) +{ + if (dwc->gadget_driver && dwc->gadget_driver->resume) { + spin_unlock(&dwc->lock); + dwc->gadget_driver->resume(&dwc->gadget); + spin_lock(&dwc->lock); + } +} + +static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum, bool force) +{ + struct dwc3_ep *dep; + struct dwc3_gadget_ep_cmd_params params; + u32 cmd; + int ret; + + dep = dwc->eps[epnum]; + + if (!dep->resource_index) + return; + + /* + * NOTICE: We are violating what the Databook says about the + * EndTransfer command. Ideally we would _always_ wait for the + * EndTransfer Command Completion IRQ, but that's causing too + * much trouble synchronizing between us and gadget driver. + * + * We have discussed this with the IP Provider and it was + * suggested to giveback all requests here, but give HW some + * extra time to synchronize with the interconnect. We're using + * an arbitraty 100us delay for that. + * + * Note also that a similar handling was tested by Synopsys + * (thanks a lot Paul) and nothing bad has come out of it. + * In short, what we're doing is: + * + * - Issue EndTransfer WITH CMDIOC bit set + * - Wait 100us + */ + + cmd = DWC3_DEPCMD_ENDTRANSFER; + cmd |= force ? DWC3_DEPCMD_HIPRI_FORCERM : 0; + cmd |= DWC3_DEPCMD_CMDIOC; + cmd |= DWC3_DEPCMD_PARAM(dep->resource_index); + memset(¶ms, 0, sizeof(params)); + ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, ¶ms); + WARN_ON_ONCE(ret); + dep->resource_index = 0; + dep->flags &= ~DWC3_EP_BUSY; + udelay(100); +} + +static void dwc3_stop_active_transfers(struct dwc3 *dwc) +{ + u32 epnum; + + for (epnum = 2; epnum < DWC3_ENDPOINTS_NUM; epnum++) { + struct dwc3_ep *dep; + + dep = dwc->eps[epnum]; + if (!dep) + continue; + + if (!(dep->flags & DWC3_EP_ENABLED)) + continue; + + dwc3_remove_requests(dwc, dep); + } +} + +static void dwc3_clear_stall_all_ep(struct dwc3 *dwc) +{ + u32 epnum; + + for (epnum = 1; epnum < DWC3_ENDPOINTS_NUM; epnum++) { + struct dwc3_ep *dep; + struct dwc3_gadget_ep_cmd_params params; + int ret; + + dep = dwc->eps[epnum]; + if (!dep) + continue; + + if (!(dep->flags & DWC3_EP_STALL)) + continue; + + dep->flags &= ~DWC3_EP_STALL; + + memset(¶ms, 0, sizeof(params)); + ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, + DWC3_DEPCMD_CLEARSTALL, ¶ms); + WARN_ON_ONCE(ret); + } +} + +static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc) +{ + int reg; + + dev_vdbg(dwc->dev, "%s\n", __func__); + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + reg &= ~DWC3_DCTL_INITU1ENA; + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + + reg &= ~DWC3_DCTL_INITU2ENA; + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + + dwc3_disconnect_gadget(dwc); + dwc->start_config_issued = false; + + dwc->gadget.speed = USB_SPEED_UNKNOWN; + dwc->setup_packet_pending = false; +} + +static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc) +{ + u32 reg; + + dev_vdbg(dwc->dev, "%s\n", __func__); + + /* + * WORKAROUND: DWC3 revisions <1.88a have an issue which + * would cause a missing Disconnect Event if there's a + * pending Setup Packet in the FIFO. + * + * There's no suggested workaround on the official Bug + * report, which states that "unless the driver/application + * is doing any special handling of a disconnect event, + * there is no functional issue". + * + * Unfortunately, it turns out that we _do_ some special + * handling of a disconnect event, namely complete all + * pending transfers, notify gadget driver of the + * disconnection, and so on. + * + * Our suggested workaround is to follow the Disconnect + * Event steps here, instead, based on a setup_packet_pending + * flag. Such flag gets set whenever we have a XferNotReady + * event on EP0 and gets cleared on XferComplete for the + * same endpoint. + * + * Refers to: + * + * STAR#9000466709: RTL: Device : Disconnect event not + * generated if setup packet pending in FIFO + */ + if (dwc->revision < DWC3_REVISION_188A) { + if (dwc->setup_packet_pending) + dwc3_gadget_disconnect_interrupt(dwc); + } + + /* after reset -> Default State */ + usb_gadget_set_state(&dwc->gadget, USB_STATE_DEFAULT); + + if (dwc->gadget.speed != USB_SPEED_UNKNOWN) + dwc3_disconnect_gadget(dwc); + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + reg &= ~DWC3_DCTL_TSTCTRL_MASK; + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + dwc->test_mode = false; + + dwc3_stop_active_transfers(dwc); + dwc3_clear_stall_all_ep(dwc); + dwc->start_config_issued = false; + + /* Reset device address to zero */ + reg = dwc3_readl(dwc->regs, DWC3_DCFG); + reg &= ~(DWC3_DCFG_DEVADDR_MASK); + dwc3_writel(dwc->regs, DWC3_DCFG, reg); +} + +static void dwc3_update_ram_clk_sel(struct dwc3 *dwc, u32 speed) +{ + u32 reg; + u32 usb30_clock = DWC3_GCTL_CLK_BUS; + + /* + * We change the clock only at SS but I dunno why I would want to do + * this. Maybe it becomes part of the power saving plan. + */ + + if (speed != DWC3_DSTS_SUPERSPEED) + return; + + /* + * RAMClkSel is reset to 0 after USB reset, so it must be reprogrammed + * each time on Connect Done. + */ + if (!usb30_clock) + return; + + reg = dwc3_readl(dwc->regs, DWC3_GCTL); + reg |= DWC3_GCTL_RAMCLKSEL(usb30_clock); + dwc3_writel(dwc->regs, DWC3_GCTL, reg); +} + +static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) +{ + struct dwc3_ep *dep; + int ret; + u32 reg; + u8 speed; + + dev_vdbg(dwc->dev, "%s\n", __func__); + + reg = dwc3_readl(dwc->regs, DWC3_DSTS); + speed = reg & DWC3_DSTS_CONNECTSPD; + dwc->speed = speed; + + dwc3_update_ram_clk_sel(dwc, speed); + + switch (speed) { + case DWC3_DCFG_SUPERSPEED: + /* + * WORKAROUND: DWC3 revisions <1.90a have an issue which + * would cause a missing USB3 Reset event. + * + * In such situations, we should force a USB3 Reset + * event by calling our dwc3_gadget_reset_interrupt() + * routine. + * + * Refers to: + * + * STAR#9000483510: RTL: SS : USB3 reset event may + * not be generated always when the link enters poll + */ + if (dwc->revision < DWC3_REVISION_190A) + dwc3_gadget_reset_interrupt(dwc); + + dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512); + dwc->gadget.ep0->maxpacket = 512; + dwc->gadget.speed = USB_SPEED_SUPER; + break; + case DWC3_DCFG_HIGHSPEED: + dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64); + dwc->gadget.ep0->maxpacket = 64; + dwc->gadget.speed = USB_SPEED_HIGH; + break; + case DWC3_DCFG_FULLSPEED2: + case DWC3_DCFG_FULLSPEED1: + dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64); + dwc->gadget.ep0->maxpacket = 64; + dwc->gadget.speed = USB_SPEED_FULL; + break; + case DWC3_DCFG_LOWSPEED: + dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(8); + dwc->gadget.ep0->maxpacket = 8; + dwc->gadget.speed = USB_SPEED_LOW; + break; + } + + /* Enable USB2 LPM Capability */ + + if ((dwc->revision > DWC3_REVISION_194A) + && (speed != DWC3_DCFG_SUPERSPEED)) { + reg = dwc3_readl(dwc->regs, DWC3_DCFG); + reg |= DWC3_DCFG_LPM_CAP; + dwc3_writel(dwc->regs, DWC3_DCFG, reg); + + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + reg &= ~(DWC3_DCTL_HIRD_THRES_MASK | DWC3_DCTL_L1_HIBER_EN); + + /* + * TODO: This should be configurable. For now using + * maximum allowed HIRD threshold value of 0b1100 + */ + reg |= DWC3_DCTL_HIRD_THRES(12); + + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + } else { + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + reg &= ~DWC3_DCTL_HIRD_THRES_MASK; + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + } + + dep = dwc->eps[0]; + ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, true, + false); + if (ret) { + dev_err(dwc->dev, "failed to enable %s\n", dep->name); + return; + } + + dep = dwc->eps[1]; + ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL, true, + false); + if (ret) { + dev_err(dwc->dev, "failed to enable %s\n", dep->name); + return; + } + + /* + * Configure PHY via GUSB3PIPECTLn if required. + * + * Update GTXFIFOSIZn + * + * In both cases reset values should be sufficient. + */ +} + +static void dwc3_gadget_wakeup_interrupt(struct dwc3 *dwc) +{ + dev_vdbg(dwc->dev, "%s\n", __func__); + + /* + * TODO take core out of low power mode when that's + * implemented. + */ + + dwc->gadget_driver->resume(&dwc->gadget); +} + +static void dwc3_gadget_linksts_change_interrupt(struct dwc3 *dwc, + unsigned int evtinfo) +{ + enum dwc3_link_state next = evtinfo & DWC3_LINK_STATE_MASK; + unsigned int pwropt; + + /* + * WORKAROUND: DWC3 < 2.50a have an issue when configured without + * Hibernation mode enabled which would show up when device detects + * host-initiated U3 exit. + * + * In that case, device will generate a Link State Change Interrupt + * from U3 to RESUME which is only necessary if Hibernation is + * configured in. + * + * There are no functional changes due to such spurious event and we + * just need to ignore it. + * + * Refers to: + * + * STAR#9000570034 RTL: SS Resume event generated in non-Hibernation + * operational mode + */ + pwropt = DWC3_GHWPARAMS1_EN_PWROPT(dwc->hwparams.hwparams1); + if ((dwc->revision < DWC3_REVISION_250A) && + (pwropt != DWC3_GHWPARAMS1_EN_PWROPT_HIB)) { + if ((dwc->link_state == DWC3_LINK_STATE_U3) && + (next == DWC3_LINK_STATE_RESUME)) { + dev_vdbg(dwc->dev, "ignoring transition U3 -> Resume\n"); + return; + } + } + + /* + * WORKAROUND: DWC3 Revisions <1.83a have an issue which, depending + * on the link partner, the USB session might do multiple entry/exit + * of low power states before a transfer takes place. + * + * Due to this problem, we might experience lower throughput. The + * suggested workaround is to disable DCTL[12:9] bits if we're + * transitioning from U1/U2 to U0 and enable those bits again + * after a transfer completes and there are no pending transfers + * on any of the enabled endpoints. + * + * This is the first half of that workaround. + * + * Refers to: + * + * STAR#9000446952: RTL: Device SS : if U1/U2 ->U0 takes >128us + * core send LGO_Ux entering U0 + */ + if (dwc->revision < DWC3_REVISION_183A) { + if (next == DWC3_LINK_STATE_U0) { + u32 u1u2; + u32 reg; + + switch (dwc->link_state) { + case DWC3_LINK_STATE_U1: + case DWC3_LINK_STATE_U2: + reg = dwc3_readl(dwc->regs, DWC3_DCTL); + u1u2 = reg & (DWC3_DCTL_INITU2ENA + | DWC3_DCTL_ACCEPTU2ENA + | DWC3_DCTL_INITU1ENA + | DWC3_DCTL_ACCEPTU1ENA); + + if (!dwc->u1u2) + dwc->u1u2 = reg & u1u2; + + reg &= ~u1u2; + + dwc3_writel(dwc->regs, DWC3_DCTL, reg); + break; + default: + /* do nothing */ + break; + } + } + } + + switch (next) { + case DWC3_LINK_STATE_U1: + if (dwc->speed == USB_SPEED_SUPER) + dwc3_suspend_gadget(dwc); + break; + case DWC3_LINK_STATE_U2: + case DWC3_LINK_STATE_U3: + dwc3_suspend_gadget(dwc); + break; + case DWC3_LINK_STATE_RESUME: + dwc3_resume_gadget(dwc); + break; + default: + /* do nothing */ + break; + } + + dev_vdbg(dwc->dev, "link change: %s [%d] -> %s [%d]\n", + dwc3_gadget_link_string(dwc->link_state), + dwc->link_state, dwc3_gadget_link_string(next), next); + + dwc->link_state = next; +} + +static void dwc3_gadget_hibernation_interrupt(struct dwc3 *dwc, + unsigned int evtinfo) +{ + unsigned int is_ss = evtinfo & BIT(4); + + /** + * WORKAROUND: DWC3 revison 2.20a with hibernation support + * have a known issue which can cause USB CV TD.9.23 to fail + * randomly. + * + * Because of this issue, core could generate bogus hibernation + * events which SW needs to ignore. + * + * Refers to: + * + * STAR#9000546576: Device Mode Hibernation: Issue in USB 2.0 + * Device Fallback from SuperSpeed + */ + if (is_ss ^ (dwc->speed == USB_SPEED_SUPER)) + return; + + /* enter hibernation here */ +} + +static void dwc3_gadget_interrupt(struct dwc3 *dwc, + const struct dwc3_event_devt *event) +{ + switch (event->type) { + case DWC3_DEVICE_EVENT_DISCONNECT: + dwc3_gadget_disconnect_interrupt(dwc); + break; + case DWC3_DEVICE_EVENT_RESET: + dwc3_gadget_reset_interrupt(dwc); + break; + case DWC3_DEVICE_EVENT_CONNECT_DONE: + dwc3_gadget_conndone_interrupt(dwc); + break; + case DWC3_DEVICE_EVENT_WAKEUP: + dwc3_gadget_wakeup_interrupt(dwc); + break; + case DWC3_DEVICE_EVENT_HIBER_REQ: + if (dev_WARN_ONCE(dwc->dev, !dwc->has_hibernation, + "unexpected hibernation event\n")) + break; + + dwc3_gadget_hibernation_interrupt(dwc, event->event_info); + break; + case DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE: + dwc3_gadget_linksts_change_interrupt(dwc, event->event_info); + break; + case DWC3_DEVICE_EVENT_EOPF: + dev_vdbg(dwc->dev, "End of Periodic Frame\n"); + break; + case DWC3_DEVICE_EVENT_SOF: + dev_vdbg(dwc->dev, "Start of Periodic Frame\n"); + break; + case DWC3_DEVICE_EVENT_ERRATIC_ERROR: + dev_vdbg(dwc->dev, "Erratic Error\n"); + break; + case DWC3_DEVICE_EVENT_CMD_CMPL: + dev_vdbg(dwc->dev, "Command Complete\n"); + break; + case DWC3_DEVICE_EVENT_OVERFLOW: + dev_vdbg(dwc->dev, "Overflow\n"); + break; + default: + dev_dbg(dwc->dev, "UNKNOWN IRQ %d\n", event->type); + } +} + +static void dwc3_process_event_entry(struct dwc3 *dwc, + const union dwc3_event *event) +{ + /* Endpoint IRQ, handle it and return early */ + if (event->type.is_devspec == 0) { + /* depevt */ + return dwc3_endpoint_interrupt(dwc, &event->depevt); + } + + switch (event->type.type) { + case DWC3_EVENT_TYPE_DEV: + dwc3_gadget_interrupt(dwc, &event->devt); + break; + /* REVISIT what to do with Carkit and I2C events ? */ + default: + dev_err(dwc->dev, "UNKNOWN IRQ type %d\n", event->raw); + } +} + +static irqreturn_t dwc3_process_event_buf(struct dwc3 *dwc, u32 buf) +{ + struct dwc3_event_buffer *evt; + irqreturn_t ret = IRQ_NONE; + int left; + u32 reg; + + evt = dwc->ev_buffs[buf]; + left = evt->count; + + if (!(evt->flags & DWC3_EVENT_PENDING)) + return IRQ_NONE; + + while (left > 0) { + union dwc3_event event; + + event.raw = *(u32 *) (evt->buf + evt->lpos); + + dwc3_process_event_entry(dwc, &event); + + /* + * FIXME we wrap around correctly to the next entry as + * almost all entries are 4 bytes in size. There is one + * entry which has 12 bytes which is a regular entry + * followed by 8 bytes data. ATM I don't know how + * things are organized if we get next to the a + * boundary so I worry about that once we try to handle + * that. + */ + evt->lpos = (evt->lpos + 4) % DWC3_EVENT_BUFFERS_SIZE; + left -= 4; + + dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(buf), 4); + } + + evt->count = 0; + evt->flags &= ~DWC3_EVENT_PENDING; + ret = IRQ_HANDLED; + + /* Unmask interrupt */ + reg = dwc3_readl(dwc->regs, DWC3_GEVNTSIZ(buf)); + reg &= ~DWC3_GEVNTSIZ_INTMASK; + dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(buf), reg); + + return ret; +} + +static irqreturn_t dwc3_thread_interrupt(int irq, void *_dwc) +{ + struct dwc3 *dwc = _dwc; + unsigned long flags; + irqreturn_t ret = IRQ_NONE; + int i; + + spin_lock_irqsave(&dwc->lock, flags); + + for (i = 0; i < dwc->num_event_buffers; i++) + ret |= dwc3_process_event_buf(dwc, i); + + spin_unlock_irqrestore(&dwc->lock, flags); + + return ret; +} + +static irqreturn_t dwc3_check_event_buf(struct dwc3 *dwc, u32 buf) +{ + struct dwc3_event_buffer *evt; + u32 count; + u32 reg; + + evt = dwc->ev_buffs[buf]; + + count = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(buf)); + count &= DWC3_GEVNTCOUNT_MASK; + if (!count) + return IRQ_NONE; + + evt->count = count; + evt->flags |= DWC3_EVENT_PENDING; + + /* Mask interrupt */ + reg = dwc3_readl(dwc->regs, DWC3_GEVNTSIZ(buf)); + reg |= DWC3_GEVNTSIZ_INTMASK; + dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(buf), reg); + + return IRQ_WAKE_THREAD; +} + +static irqreturn_t dwc3_interrupt(int irq, void *_dwc) +{ + struct dwc3 *dwc = _dwc; + int i; + irqreturn_t ret = IRQ_NONE; + + spin_lock(&dwc->lock); + + for (i = 0; i < dwc->num_event_buffers; i++) { + irqreturn_t status; + + status = dwc3_check_event_buf(dwc, i); + if (status == IRQ_WAKE_THREAD) + ret = status; + } + + spin_unlock(&dwc->lock); + + return ret; +} + +/** + * dwc3_gadget_init - Initializes gadget related registers + * @dwc: pointer to our controller context structure + * + * Returns 0 on success otherwise negative errno. + */ +int dwc3_gadget_init(struct dwc3 *dwc) +{ + int ret; + + dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req), + &dwc->ctrl_req_addr, GFP_KERNEL); + if (!dwc->ctrl_req) { + dev_err(dwc->dev, "failed to allocate ctrl request\n"); + ret = -ENOMEM; + goto err0; + } + + dwc->ep0_trb = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ep0_trb), + &dwc->ep0_trb_addr, GFP_KERNEL); + if (!dwc->ep0_trb) { + dev_err(dwc->dev, "failed to allocate ep0 trb\n"); + ret = -ENOMEM; + goto err1; + } + + dwc->setup_buf = kzalloc(DWC3_EP0_BOUNCE_SIZE, GFP_KERNEL); + if (!dwc->setup_buf) { + dev_err(dwc->dev, "failed to allocate setup buffer\n"); + ret = -ENOMEM; + goto err2; + } + + dwc->ep0_bounce = dma_alloc_coherent(dwc->dev, + DWC3_EP0_BOUNCE_SIZE, &dwc->ep0_bounce_addr, + GFP_KERNEL); + if (!dwc->ep0_bounce) { + dev_err(dwc->dev, "failed to allocate ep0 bounce buffer\n"); + ret = -ENOMEM; + goto err3; + } + + 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"; + + /* + * Per databook, DWC3 needs buffer size to be aligned to MaxPacketSize + * on ep out. + */ + dwc->gadget.quirk_ep_out_aligned_size = true; + + /* + * REVISIT: Here we should clear all pending IRQs to be + * sure we're starting from a well known location. + */ + + ret = dwc3_gadget_init_endpoints(dwc); + if (ret) + goto err4; + + ret = usb_add_gadget_udc(&dwc->gadget); + if (ret) { + dev_err(dwc->dev, "failed to register udc\n"); + goto err4; + } + + return 0; + +err4: + dwc3_gadget_free_endpoints(dwc); + dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE, + dwc->ep0_bounce, dwc->ep0_bounce_addr); + +err3: + kfree(dwc->setup_buf); + +err2: + dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb), + dwc->ep0_trb, dwc->ep0_trb_addr); + +err1: + dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req), + dwc->ctrl_req, dwc->ctrl_req_addr); + +err0: + return ret; +} + +/* -------------------------------------------------------------------------- */ + +void dwc3_gadget_exit(struct dwc3 *dwc) +{ + usb_del_gadget_udc(&dwc->gadget); + + dwc3_gadget_free_endpoints(dwc); + + dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE, + dwc->ep0_bounce, dwc->ep0_bounce_addr); + + kfree(dwc->setup_buf); + + dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb), + dwc->ep0_trb, dwc->ep0_trb_addr); + + dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req), + dwc->ctrl_req, dwc->ctrl_req_addr); +} + +/** + * dwc3_gadget_uboot_handle_interrupt - handle dwc3 gadget interrupt + * @dwc: struct dwce * + * + * Handles ep0 and gadget interrupt + * + * Should be called from dwc3 core. + */ +void dwc3_gadget_uboot_handle_interrupt(struct dwc3 *dwc) +{ + dwc3_interrupt(0, dwc); + dwc3_thread_interrupt(0, dwc); +} diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h new file mode 100644 index 0000000..7d0cb2d --- /dev/null +++ b/drivers/usb/dwc3/gadget.h @@ -0,0 +1,163 @@ +/** + * gadget.h - DesignWare USB3 DRD Gadget Header + * + * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com + * + * Authors: Felipe Balbi <balbi@ti.com>, + * Sebastian Andrzej Siewior <bigeasy@linutronix.de> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 of + * the License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __DRIVERS_USB_DWC3_GADGET_H +#define __DRIVERS_USB_DWC3_GADGET_H + +#include <linux/list.h> +#include <linux/usb/gadget.h> +#include "io.h" + +struct dwc3; +#define to_dwc3_ep(ep) (container_of(ep, struct dwc3_ep, endpoint)) +#define gadget_to_dwc(g) (container_of(g, struct dwc3, gadget)) + +/* DEPCFG parameter 1 */ +#define DWC3_DEPCFG_INT_NUM(n) ((n) << 0) +#define DWC3_DEPCFG_XFER_COMPLETE_EN (1 << 8) +#define DWC3_DEPCFG_XFER_IN_PROGRESS_EN (1 << 9) +#define DWC3_DEPCFG_XFER_NOT_READY_EN (1 << 10) +#define DWC3_DEPCFG_FIFO_ERROR_EN (1 << 11) +#define DWC3_DEPCFG_STREAM_EVENT_EN (1 << 13) +#define DWC3_DEPCFG_BINTERVAL_M1(n) ((n) << 16) +#define DWC3_DEPCFG_STREAM_CAPABLE (1 << 24) +#define DWC3_DEPCFG_EP_NUMBER(n) ((n) << 25) +#define DWC3_DEPCFG_BULK_BASED (1 << 30) +#define DWC3_DEPCFG_FIFO_BASED (1 << 31) + +/* DEPCFG parameter 0 */ +#define DWC3_DEPCFG_EP_TYPE(n) ((n) << 1) +#define DWC3_DEPCFG_MAX_PACKET_SIZE(n) ((n) << 3) +#define DWC3_DEPCFG_FIFO_NUMBER(n) ((n) << 17) +#define DWC3_DEPCFG_BURST_SIZE(n) ((n) << 22) +#define DWC3_DEPCFG_DATA_SEQ_NUM(n) ((n) << 26) +/* This applies for core versions earlier than 1.94a */ +#define DWC3_DEPCFG_IGN_SEQ_NUM (1 << 31) +/* These apply for core versions 1.94a and later */ +#define DWC3_DEPCFG_ACTION_INIT (0 << 30) +#define DWC3_DEPCFG_ACTION_RESTORE (1 << 30) +#define DWC3_DEPCFG_ACTION_MODIFY (2 << 30) + +/* DEPXFERCFG parameter 0 */ +#define DWC3_DEPXFERCFG_NUM_XFER_RES(n) ((n) & 0xffff) + +/* -------------------------------------------------------------------------- */ + +#define to_dwc3_request(r) (container_of(r, struct dwc3_request, request)) + +static inline struct dwc3_request *next_request(struct list_head *list) +{ + if (list_empty(list)) + return NULL; + + return list_first_entry(list, struct dwc3_request, list); +} + +static inline void dwc3_gadget_move_request_queued(struct dwc3_request *req) +{ + struct dwc3_ep *dep = req->dep; + + req->queued = true; + list_move_tail(&req->list, &dep->req_queued); +} + +void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, + int status); + +void dwc3_ep0_interrupt(struct dwc3 *dwc, + const struct dwc3_event_depevt *event); +void dwc3_ep0_out_start(struct dwc3 *dwc); +int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value); +int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request, + gfp_t gfp_flags); +int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value); +void dwc3_gadget_uboot_handle_interrupt(struct dwc3 *dwc); + +/** + * dwc3_gadget_ep_get_transfer_index - Gets transfer index from HW + * @dwc: DesignWare USB3 Pointer + * @number: DWC endpoint number + * + * Caller should take care of locking + */ +static inline u32 dwc3_gadget_ep_get_transfer_index(struct dwc3 *dwc, u8 number) +{ + u32 res_id; + + res_id = dwc3_readl(dwc->regs, DWC3_DEPCMD(number)); + + return DWC3_DEPCMD_GET_RSC_IDX(res_id); +} + +/** + * dwc3_gadget_event_string - returns event name + * @event: the event code + */ +static inline const char *dwc3_gadget_event_string(u8 event) +{ + switch (event) { + case DWC3_DEVICE_EVENT_DISCONNECT: + return "Disconnect"; + case DWC3_DEVICE_EVENT_RESET: + return "Reset"; + case DWC3_DEVICE_EVENT_CONNECT_DONE: + return "Connection Done"; + case DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE: + return "Link Status Change"; + case DWC3_DEVICE_EVENT_WAKEUP: + return "WakeUp"; + case DWC3_DEVICE_EVENT_EOPF: + return "End-Of-Frame"; + case DWC3_DEVICE_EVENT_SOF: + return "Start-Of-Frame"; + case DWC3_DEVICE_EVENT_ERRATIC_ERROR: + return "Erratic Error"; + case DWC3_DEVICE_EVENT_CMD_CMPL: + return "Command Complete"; + case DWC3_DEVICE_EVENT_OVERFLOW: + return "Overflow"; + } + + return "UNKNOWN"; +} + +/** + * dwc3_ep_event_string - returns event name + * @event: then event code + */ +static inline const char *dwc3_ep_event_string(u8 event) +{ + switch (event) { + case DWC3_DEPEVT_XFERCOMPLETE: + return "Transfer Complete"; + case DWC3_DEPEVT_XFERINPROGRESS: + return "Transfer In-Progress"; + case DWC3_DEPEVT_XFERNOTREADY: + return "Transfer Not Ready"; + case DWC3_DEPEVT_RXTXFIFOEVT: + return "FIFO"; + case DWC3_DEPEVT_STREAMEVT: + return "Stream"; + case DWC3_DEPEVT_EPCMDCMPLT: + return "Endpoint Command Complete"; + } + + return "UNKNOWN"; +} + +#endif /* __DRIVERS_USB_DWC3_GADGET_H */ diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h new file mode 100644 index 0000000..129a2e8 --- /dev/null +++ b/drivers/usb/dwc3/io.h @@ -0,0 +1,52 @@ +/** + * io.h - DesignWare USB3 DRD IO Header + * + * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com + * + * Authors: Felipe Balbi <balbi@ti.com>, + * Sebastian Andrzej Siewior <bigeasy@linutronix.de> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 of + * the License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __DRIVERS_USB_DWC3_IO_H +#define __DRIVERS_USB_DWC3_IO_H + +#define __UBOOT__ +#ifndef __UBOOT__ +#include <linux/io.h> +#endif + +#include <asm/io.h> +#include "core.h" + +static inline u32 dwc3_readl(void __iomem *base, u32 offset) +{ + u32 temp; + /* + * We requested the mem region starting from the Globals address + * space, see dwc3_probe in core.c. + * However, the offsets are given starting from xHCI address space. + */ + temp = readl(base + (offset - DWC3_GLOBALS_REGS_START)); + return temp; +} + +static inline void dwc3_writel(void __iomem *base, u32 offset, u32 value) +{ + /* + * We requested the mem region starting from the Globals address + * space, see dwc3_probe in core.c. + * However, the offsets are given starting from xHCI address space. + */ + writel(value, base + (offset - DWC3_GLOBALS_REGS_START)); +} + +#endif /* __DRIVERS_USB_DWC3_IO_H */ diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h new file mode 100644 index 0000000..aa8c94d --- /dev/null +++ b/drivers/usb/dwc3/linux-compat.h @@ -0,0 +1,132 @@ + +#ifndef __DWC3_LINUX_COMPAT__ +#define __DWC3_LINUX_COMPAT__ +#include <linux/usb/ch9.h> +#include <linux/usb/otg.h> +#include <linux/string.h> +#include <common.h> +#include <malloc.h> +#include <asm/errno.h> +#include <stdarg.h> + +typedef int spinlock_t; +typedef u32 resource_size_t; + +#include <linux/ioport.h> +#include <linux/usb/ch9.h> +#include <linux/usb/gadget.h> + +struct device { +}; + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define BUILD_BUG_ON_NOT_POWER_OF_2(n) + +static inline size_t strlcat(char *dest, const char *src, size_t n) +{ + strcat(dest, src); + return strlen(dest) + strlen(src); +} + +enum dma_data_direction { + DMA_BIDIRECTIONAL = 0, + DMA_TO_DEVICE = 1, + DMA_FROM_DEVICE = 2, + DMA_NONE = 3, +}; + +static inline void *devm_kzalloc(struct device *dev, unsigned int size, + unsigned int flags) +{ + return kzalloc(size, flags); +} + +static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags) +{ + return kzalloc(n * size, flags); +} + +static inline dma_addr_t dma_map_single(struct device *dev, void *ptr, + size_t size, enum dma_data_direction dir) +{ + return (unsigned long)ptr; +} + +static inline void *dma_alloc_coherent(void *dev, size_t size, + dma_addr_t *dma_handle, gfp_t gfp) +{ + void *p; + + p = malloc(size); + *dma_handle = (unsigned long)p; + return p; +} + +static inline void dma_free_coherent(struct device *dev, size_t size, + void *vaddr, dma_addr_t bus) +{ + free(vaddr); +} + +static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) +{ + return 0; +} + +static inline void dma_unmap_single(struct device *dev, dma_addr_t addr, + size_t size, enum dma_data_direction dir) +{ +} + +#define GFP_KERNEL 0 +#define MAX_ERRNO 4095 +#define IS_ERR_VALUE(x) ((x) >= (unsigned long)-MAX_ERRNO && (x) < 0) + +static inline void *ERR_PTR(long error) +{ + return (void *)error; +} + +static inline long PTR_ERR(const void *ptr) +{ + return (long)ptr; +} + +static inline long IS_ERR(const void *ptr) +{ + return IS_ERR_VALUE((unsigned long)ptr); +} + +#define pr_debug(format) debug(format) +#define dev_WARN(dev, format, arg...) debug(format, ##arg) +#define WARN(val, format, arg...) debug(format, ##arg) +#define WARN_ON_ONCE(val) debug("Error %d\n", val) + +#define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) +#define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) + +#define upper_32_bits(n) ((u32)(((n) >> 16) >> 16)) +#define lower_32_bits(n) ((u32)(n)) + +static unsigned long volatile jiffies; +static inline unsigned long msecs_to_jiffies(const unsigned int m) +{ + jiffies = 0; + return m; +} +#define time_after(a, b) ((long)((b) - (a)) < 0) +#define cpu_relax() do {jiffies++; } while (0) + +static inline int usb_gadget_map_request(struct usb_gadget *gadget, + struct usb_request *req, int is_in) { + req->dma = dma_map_single((struct device *)&gadget->dev, req->buf, + req->length, + is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE); + return 0; +} + +static inline void usb_gadget_unmap_request(struct usb_gadget *gadget, + struct usb_request *req, int is_in) +{ +} +#endif diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h new file mode 100644 index 0000000..275fb7a --- /dev/null +++ b/include/dwc3-uboot.h @@ -0,0 +1,26 @@ +/* include/dwc3-uboot.h + * + * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Designware SuperSpeed USB uboot init + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __DWC3_UBOOT_H_ +#define __DWC3_UBOOT_H_ + +#include <linux/usb/otg.h> + +struct dwc3_device { + u32 maximum_speed; + int base; + unsigned needs_fifo_resize:1; + enum usb_dr_mode dr_mode; + int index; +}; + +int dwc3_uboot_init(struct dwc3_device *dev); +void dwc3_uboot_exit(int index); +void dwc3_uboot_handle_interrupt(int index); +#endif /* __DWC3_UBOOT_H_ */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 04/13] usb: dwc3: Add dwc3 driver 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 04/13] usb: dwc3: Add dwc3 driver Kishon Vijay Abraham I @ 2014-08-18 14:37 ` Felipe Balbi 2014-08-19 15:19 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-18 14:37 UTC (permalink / raw) To: u-boot On Mon, Aug 18, 2014 at 07:58:26PM +0530, Kishon Vijay Abraham I wrote: > Ported dwc3 driver from linux kernel to uboot. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > Makefile | 1 + > drivers/usb/dwc3/Makefile | 7 + > drivers/usb/dwc3/core.c | 640 +++++++++ > drivers/usb/dwc3/core.h | 961 +++++++++++++ > drivers/usb/dwc3/ep0.c | 1045 ++++++++++++++ > drivers/usb/dwc3/gadget.c | 2841 +++++++++++++++++++++++++++++++++++++++ > drivers/usb/dwc3/gadget.h | 163 +++ > drivers/usb/dwc3/io.h | 52 + > drivers/usb/dwc3/linux-compat.h | 132 ++ > include/dwc3-uboot.h | 26 + > 10 files changed, 5868 insertions(+) > create mode 100644 drivers/usb/dwc3/Makefile > create mode 100644 drivers/usb/dwc3/core.c > create mode 100644 drivers/usb/dwc3/core.h > create mode 100644 drivers/usb/dwc3/ep0.c > create mode 100644 drivers/usb/dwc3/gadget.c > create mode 100644 drivers/usb/dwc3/gadget.h > create mode 100644 drivers/usb/dwc3/io.h > create mode 100644 drivers/usb/dwc3/linux-compat.h > create mode 100644 include/dwc3-uboot.h > > diff --git a/Makefile b/Makefile > index cf810a9..c9a18d3 100644 > --- a/Makefile > +++ b/Makefile > @@ -645,6 +645,7 @@ libs-y += drivers/spi/ > libs-$(CONFIG_FMAN_ENET) += drivers/net/fm/ > libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/ > libs-y += drivers/serial/ > +libs-y += drivers/usb/dwc3/ > libs-y += drivers/usb/eth/ > libs-y += drivers/usb/gadget/ > libs-y += drivers/usb/host/ > diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile > new file mode 100644 > index 0000000..fbfa0df > --- /dev/null > +++ b/drivers/usb/dwc3/Makefile > @@ -0,0 +1,7 @@ > +ccflags-$(CONFIG_USB_DWC3_DEBUG) := -DDEBUG > +ccflags-$(CONFIG_USB_DWC3_VERBOSE) += -DVERBOSE_DEBUG > + > +obj-$(CONFIG_USB_DWC3) += dwc3.o > + > +dwc3-y := core.o > +dwc3-$(CONFIG_USB_DWC3_GADGET) += gadget.o ep0.o > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > new file mode 100644 > index 0000000..66bbe92 > --- /dev/null > +++ b/drivers/usb/dwc3/core.c > @@ -0,0 +1,640 @@ > +/** > + * core.c - DesignWare USB3 DRD Controller Core file > + * > + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com > + * > + * Authors: Felipe Balbi <balbi@ti.com>, > + * Sebastian Andrzej Siewior <bigeasy@linutronix.de> > + * > + * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported > + * to uboot. > + * > + * SPDX-License-Identifier: GPL-2.0+ same here. Please review all patches to make sure license is correct. -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140818/b72ef901/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 04/13] usb: dwc3: Add dwc3 driver 2014-08-18 14:37 ` Felipe Balbi @ 2014-08-19 15:19 ` Kishon Vijay Abraham I 0 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 15:19 UTC (permalink / raw) To: u-boot On Monday 18 August 2014 08:07 PM, Felipe Balbi wrote: > On Mon, Aug 18, 2014 at 07:58:26PM +0530, Kishon Vijay Abraham I wrote: >> Ported dwc3 driver from linux kernel to uboot. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> Makefile | 1 + >> drivers/usb/dwc3/Makefile | 7 + >> drivers/usb/dwc3/core.c | 640 +++++++++ >> drivers/usb/dwc3/core.h | 961 +++++++++++++ >> drivers/usb/dwc3/ep0.c | 1045 ++++++++++++++ >> drivers/usb/dwc3/gadget.c | 2841 +++++++++++++++++++++++++++++++++++++++ >> drivers/usb/dwc3/gadget.h | 163 +++ >> drivers/usb/dwc3/io.h | 52 + >> drivers/usb/dwc3/linux-compat.h | 132 ++ >> include/dwc3-uboot.h | 26 + >> 10 files changed, 5868 insertions(+) >> create mode 100644 drivers/usb/dwc3/Makefile >> create mode 100644 drivers/usb/dwc3/core.c >> create mode 100644 drivers/usb/dwc3/core.h >> create mode 100644 drivers/usb/dwc3/ep0.c >> create mode 100644 drivers/usb/dwc3/gadget.c >> create mode 100644 drivers/usb/dwc3/gadget.h >> create mode 100644 drivers/usb/dwc3/io.h >> create mode 100644 drivers/usb/dwc3/linux-compat.h >> create mode 100644 include/dwc3-uboot.h >> >> diff --git a/Makefile b/Makefile >> index cf810a9..c9a18d3 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -645,6 +645,7 @@ libs-y += drivers/spi/ >> libs-$(CONFIG_FMAN_ENET) += drivers/net/fm/ >> libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/ >> libs-y += drivers/serial/ >> +libs-y += drivers/usb/dwc3/ >> libs-y += drivers/usb/eth/ >> libs-y += drivers/usb/gadget/ >> libs-y += drivers/usb/host/ >> diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile >> new file mode 100644 >> index 0000000..fbfa0df >> --- /dev/null >> +++ b/drivers/usb/dwc3/Makefile >> @@ -0,0 +1,7 @@ >> +ccflags-$(CONFIG_USB_DWC3_DEBUG) := -DDEBUG >> +ccflags-$(CONFIG_USB_DWC3_VERBOSE) += -DVERBOSE_DEBUG >> + >> +obj-$(CONFIG_USB_DWC3) += dwc3.o >> + >> +dwc3-y := core.o >> +dwc3-$(CONFIG_USB_DWC3_GADGET) += gadget.o ep0.o >> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >> new file mode 100644 >> index 0000000..66bbe92 >> --- /dev/null >> +++ b/drivers/usb/dwc3/core.c >> @@ -0,0 +1,640 @@ >> +/** >> + * core.c - DesignWare USB3 DRD Controller Core file >> + * >> + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com >> + * >> + * Authors: Felipe Balbi <balbi@ti.com>, >> + * Sebastian Andrzej Siewior <bigeasy@linutronix.de> >> + * >> + * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/core.c) and ported >> + * to uboot. >> + * >> + * SPDX-License-Identifier: GPL-2.0+ > > same here. Please review all patches to make sure license is correct. sure. Thanks Kishon > ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 05/13] usb: dwc3-omap: Add dwc3 glue driver for OMAP 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (3 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 04/13] usb: dwc3: Add dwc3 driver Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 06/13] usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms Kishon Vijay Abraham I ` (9 subsequent siblings) 14 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Ported dwc3-omap driver from linux kernel to uboot. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/usb/dwc3/Makefile | 2 + drivers/usb/dwc3/dwc3-omap.c | 447 ++++++++++++++++++++++++++++++++++++++++++ include/dwc3-omap-uboot.h | 32 +++ include/linux/usb/dwc3-omap.h | 19 ++ 4 files changed, 500 insertions(+) create mode 100644 drivers/usb/dwc3/dwc3-omap.c create mode 100644 include/dwc3-omap-uboot.h create mode 100644 include/linux/usb/dwc3-omap.h diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index fbfa0df..5533546 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -5,3 +5,5 @@ obj-$(CONFIG_USB_DWC3) += dwc3.o dwc3-y := core.o dwc3-$(CONFIG_USB_DWC3_GADGET) += gadget.o ep0.o + +obj-$(CONFIG_USB_DWC3_OMAP) += dwc3-omap.o diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c new file mode 100644 index 0000000..ed92eec --- /dev/null +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -0,0 +1,447 @@ +/** + * dwc3-omap.c - OMAP Specific Glue layer + * + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Authors: Felipe Balbi <balbi@ti.com>, + * Sebastian Andrzej Siewior <bigeasy@linutronix.de> + * + * Taken from Linux Kernel v3.16 (drivers/usb/dwc3/dwc3-omap.c) and ported + * to uboot. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <asm/io.h> +#include <common.h> +#include <errno.h> +#include <dwc3-omap-uboot.h> +#include <linux/usb/dwc3-omap.h> +#include <malloc.h> +#include <linux/compat.h> +#include "linux-compat.h" + +/* + * All these registers belong to OMAP's Wrapper around the + * DesignWare USB3 Core. + */ + +#define USBOTGSS_REVISION 0x0000 +#define USBOTGSS_SYSCONFIG 0x0010 +#define USBOTGSS_IRQ_EOI 0x0020 +#define USBOTGSS_EOI_OFFSET 0x0008 +#define USBOTGSS_IRQSTATUS_RAW_0 0x0024 +#define USBOTGSS_IRQSTATUS_0 0x0028 +#define USBOTGSS_IRQENABLE_SET_0 0x002c +#define USBOTGSS_IRQENABLE_CLR_0 0x0030 +#define USBOTGSS_IRQ0_OFFSET 0x0004 +#define USBOTGSS_IRQSTATUS_RAW_1 0x0030 +#define USBOTGSS_IRQSTATUS_1 0x0034 +#define USBOTGSS_IRQENABLE_SET_1 0x0038 +#define USBOTGSS_IRQENABLE_CLR_1 0x003c +#define USBOTGSS_IRQSTATUS_RAW_2 0x0040 +#define USBOTGSS_IRQSTATUS_2 0x0044 +#define USBOTGSS_IRQENABLE_SET_2 0x0048 +#define USBOTGSS_IRQENABLE_CLR_2 0x004c +#define USBOTGSS_IRQSTATUS_RAW_3 0x0050 +#define USBOTGSS_IRQSTATUS_3 0x0054 +#define USBOTGSS_IRQENABLE_SET_3 0x0058 +#define USBOTGSS_IRQENABLE_CLR_3 0x005c +#define USBOTGSS_IRQSTATUS_EOI_MISC 0x0030 +#define USBOTGSS_IRQSTATUS_RAW_MISC 0x0034 +#define USBOTGSS_IRQSTATUS_MISC 0x0038 +#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_OFFSET 0x0480 +#define USBOTGSS_TXFIFO_DEPTH 0x0508 +#define USBOTGSS_RXFIFO_DEPTH 0x050c +#define USBOTGSS_MMRAM_OFFSET 0x0100 +#define USBOTGSS_FLADJ 0x0104 +#define USBOTGSS_DEBUG_CFG 0x0108 +#define USBOTGSS_DEBUG_DATA 0x010c +#define USBOTGSS_DEV_EBC_EN 0x0110 +#define USBOTGSS_DEBUG_OFFSET 0x0600 + +/* REVISION REGISTER */ +#define USBOTGSS_REVISION_XMAJOR(reg) ((reg >> 8) & 0x7) +#define USBOTGSS_REVISION_XMAJOR1 1 +#define USBOTGSS_REVISION_XMAJOR2 2 +/* SYSCONFIG REGISTER */ +#define USBOTGSS_SYSCONFIG_DMADISABLE (1 << 16) + +/* IRQ_EOI REGISTER */ +#define USBOTGSS_IRQ_EOI_LINE_NUMBER (1 << 0) + +/* IRQS0 BITS */ +#define USBOTGSS_IRQO_COREIRQ_ST (1 << 0) + +/* IRQMISC BITS */ +#define USBOTGSS_IRQMISC_DMADISABLECLR (1 << 17) +#define USBOTGSS_IRQMISC_OEVT (1 << 16) +#define USBOTGSS_IRQMISC_DRVVBUS_RISE (1 << 13) +#define USBOTGSS_IRQMISC_CHRGVBUS_RISE (1 << 12) +#define USBOTGSS_IRQMISC_DISCHRGVBUS_RISE (1 << 11) +#define USBOTGSS_IRQMISC_IDPULLUP_RISE (1 << 8) +#define USBOTGSS_IRQMISC_DRVVBUS_FALL (1 << 5) +#define USBOTGSS_IRQMISC_CHRGVBUS_FALL (1 << 4) +#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) + +static LIST_HEAD(dwc3_omap_list); + +struct dwc3_omap { + void *dev; + void *base; + + u32 utmi_otg_status; + u32 utmi_otg_offset; + u32 irqmisc_offset; + u32 irq_eoi_offset; + u32 debug_offset; + u32 irq0_offset; + u32 revision; + + u32 dma_status:1; + struct list_head list; + u32 index; +}; + +static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset) +{ + return readl(base + offset); +} + +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) +{ + return dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS + + omap->utmi_otg_offset); +} + +static void dwc3_omap_write_utmi_status(struct dwc3_omap *omap, u32 value) +{ + dwc3_omap_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS + + omap->utmi_otg_offset, value); +} + +static u32 dwc3_omap_read_irq0_status(struct dwc3_omap *omap) +{ + return dwc3_omap_readl(omap->base, USBOTGSS_IRQSTATUS_0 - + omap->irq0_offset); +} + +static void dwc3_omap_write_irq0_status(struct dwc3_omap *omap, u32 value) +{ + dwc3_omap_writel(omap->base, USBOTGSS_IRQSTATUS_0 - + omap->irq0_offset, value); +} + +static u32 dwc3_omap_read_irqmisc_status(struct dwc3_omap *omap) +{ + return dwc3_omap_readl(omap->base, USBOTGSS_IRQSTATUS_MISC + + omap->irqmisc_offset); +} + +static void dwc3_omap_write_irqmisc_status(struct dwc3_omap *omap, u32 value) +{ + dwc3_omap_writel(omap->base, USBOTGSS_IRQSTATUS_MISC + + omap->irqmisc_offset, value); +} + +static void dwc3_omap_write_irqmisc_set(struct dwc3_omap *omap, u32 value) +{ + dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_MISC + + omap->irqmisc_offset, value); +} + +static void dwc3_omap_write_irq0_set(struct dwc3_omap *omap, u32 value) +{ + dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_0 - + omap->irq0_offset, value); +} + +static void dwc3_omap_set_mailbox(struct dwc3_omap *omap, + enum omap_dwc3_vbus_id_status status) +{ + u32 val; + + switch (status) { + case OMAP_DWC3_ID_GROUND: + dev_dbg(omap->dev, "ID GND\n"); + + 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); + 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); + break; + + case OMAP_DWC3_ID_FLOAT: + 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); + break; + + default: + dev_dbg(omap->dev, "invalid state\n"); + } +} + +static int dwc3_omap_interrupt(int irq, void *_omap) +{ + struct dwc3_omap *omap = _omap; + u32 reg; + + reg = dwc3_omap_read_irqmisc_status(omap); + + if (reg & USBOTGSS_IRQMISC_DMADISABLECLR) { + dev_dbg(omap->dev, "DMA Disable was Cleared\n"); + omap->dma_status = false; + } + + if (reg & USBOTGSS_IRQMISC_OEVT) + dev_dbg(omap->dev, "OTG Event\n"); + + if (reg & USBOTGSS_IRQMISC_DRVVBUS_RISE) + dev_dbg(omap->dev, "DRVVBUS Rise\n"); + + if (reg & USBOTGSS_IRQMISC_CHRGVBUS_RISE) + dev_dbg(omap->dev, "CHRGVBUS Rise\n"); + + if (reg & USBOTGSS_IRQMISC_DISCHRGVBUS_RISE) + dev_dbg(omap->dev, "DISCHRGVBUS Rise\n"); + + if (reg & USBOTGSS_IRQMISC_IDPULLUP_RISE) + dev_dbg(omap->dev, "IDPULLUP Rise\n"); + + if (reg & USBOTGSS_IRQMISC_DRVVBUS_FALL) + dev_dbg(omap->dev, "DRVVBUS Fall\n"); + + if (reg & USBOTGSS_IRQMISC_CHRGVBUS_FALL) + dev_dbg(omap->dev, "CHRGVBUS Fall\n"); + + if (reg & USBOTGSS_IRQMISC_DISCHRGVBUS_FALL) + dev_dbg(omap->dev, "DISCHRGVBUS Fall\n"); + + if (reg & USBOTGSS_IRQMISC_IDPULLUP_FALL) + dev_dbg(omap->dev, "IDPULLUP Fall\n"); + + dwc3_omap_write_irqmisc_status(omap, reg); + + reg = dwc3_omap_read_irq0_status(omap); + + dwc3_omap_write_irq0_status(omap, reg); + + return !!reg; +} + +static void dwc3_omap_enable_irqs(struct dwc3_omap *omap) +{ + u32 reg; + + /* enable all IRQs */ + reg = USBOTGSS_IRQO_COREIRQ_ST; + dwc3_omap_write_irq0_set(omap, reg); + + reg = (USBOTGSS_IRQMISC_OEVT | + USBOTGSS_IRQMISC_DRVVBUS_RISE | + USBOTGSS_IRQMISC_CHRGVBUS_RISE | + USBOTGSS_IRQMISC_DISCHRGVBUS_RISE | + USBOTGSS_IRQMISC_IDPULLUP_RISE | + USBOTGSS_IRQMISC_DRVVBUS_FALL | + USBOTGSS_IRQMISC_CHRGVBUS_FALL | + USBOTGSS_IRQMISC_DISCHRGVBUS_FALL | + USBOTGSS_IRQMISC_IDPULLUP_FALL); + + dwc3_omap_write_irqmisc_set(omap, reg); +} + +static void dwc3_omap_disable_irqs(struct dwc3_omap *omap) +{ + /* disable all IRQs */ + dwc3_omap_write_irqmisc_set(omap, 0x00); + dwc3_omap_write_irq0_set(omap, 0x00); +} + +/** + * dwc3_omap_uboot_init - dwc3 omap uboot initialization code + * @dev: struct dwc3_omap_device containing initialization data + * + * Entry point for dwc3 omap driver (equivalent to dwc3_omap_probe in linux + * kernel driver). Pointer to dwc3_omap_device should be passed containing + * base address and other initialization data. Returns '0' on success and + * a negative value on failure. + * + * Generally called from board_usb_init() implemented in board file. + */ +int dwc3_omap_uboot_init(struct dwc3_omap_device *dev) +{ + struct dwc3_omap *omap; + + int utmi_mode; + int x_major; + + u32 reg; + + omap = devm_kzalloc(NULL, sizeof(*omap), GFP_KERNEL); + if (!omap) { + dev_err(NULL, "not enough memory\n"); + return -ENOMEM; + } + + omap->base = dev->base; + omap->index = dev->index; + + reg = dwc3_omap_readl(omap->base, USBOTGSS_REVISION); + omap->revision = reg; + x_major = USBOTGSS_REVISION_XMAJOR(reg); + + /* Differentiate between OMAP5 and AM437x */ + switch (x_major) { + case USBOTGSS_REVISION_XMAJOR1: + case USBOTGSS_REVISION_XMAJOR2: + omap->irq_eoi_offset = 0; + omap->irq0_offset = 0; + omap->irqmisc_offset = 0; + omap->utmi_otg_offset = 0; + omap->debug_offset = 0; + break; + default: + /* Default to the latest revision */ + omap->irq_eoi_offset = USBOTGSS_EOI_OFFSET; + omap->irq0_offset = USBOTGSS_IRQ0_OFFSET; + omap->irqmisc_offset = USBOTGSS_IRQMISC_OFFSET; + omap->utmi_otg_offset = USBOTGSS_UTMI_OTG_OFFSET; + omap->debug_offset = USBOTGSS_DEBUG_OFFSET; + break; + } + + /* For OMAP5(ES2.0) and AM437x x_major is 2 even though there are + * changes in wrapper registers, Using dt compatible for aegis + */ + +#ifdef CONFIG_AM43XX + omap->irq_eoi_offset = USBOTGSS_EOI_OFFSET; + omap->irq0_offset = USBOTGSS_IRQ0_OFFSET; + omap->irqmisc_offset = USBOTGSS_IRQMISC_OFFSET; + omap->utmi_otg_offset = USBOTGSS_UTMI_OTG_OFFSET; + omap->debug_offset = USBOTGSS_DEBUG_OFFSET; +#endif + + reg = dwc3_omap_read_utmi_status(omap); + + utmi_mode = dev->utmi_mode; + + switch (utmi_mode) { + case DWC3_OMAP_UTMI_MODE_SW: + reg |= USBOTGSS_UTMI_OTG_STATUS_SW_MODE; + break; + case DWC3_OMAP_UTMI_MODE_HW: + reg &= ~USBOTGSS_UTMI_OTG_STATUS_SW_MODE; + break; + default: + dev_dbg(omap->dev, "UNKNOWN utmi mode %d\n", utmi_mode); + } + + dwc3_omap_write_utmi_status(omap, reg); + + /* check the DMA Status */ + reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG); + omap->dma_status = !!(reg & USBOTGSS_SYSCONFIG_DMADISABLE); + + dwc3_omap_enable_irqs(omap); + + dwc3_omap_set_mailbox(omap, dev->vbus_id_status); + list_add_tail(&omap->list, &dwc3_omap_list); + + return 0; +} + +/** + * dwc3_omap_uboot_exit - dwc3 omap uboot cleanup code + * @index: index of this controller + * + * Performs cleanup of memory allocated in dwc3_omap_uboot_init + * (equivalent to dwc3_omap_remove in linux). index of _this_ controller + * should be passed and should match with the index passed in + * dwc3_omap_device during init. + * + * Generally called from board file. + */ +void dwc3_omap_uboot_exit(int index) +{ + struct dwc3_omap *omap = NULL; + + list_for_each_entry(omap, &dwc3_omap_list, list) { + if (omap->index != index) + continue; + + dwc3_omap_disable_irqs(omap); + list_del(&omap->list); + kfree(omap); + break; + } +} + +/** + * dwc3_omap_uboot_interrupt_status - check the status of interrupt + * @index: index of this controller + * + * Checks the status of interrupts and returns true if an interrupt + * is detected or false otherwise. + * + * Generally called from board file. + */ +int dwc3_omap_uboot_interrupt_status(int index) +{ + struct dwc3_omap *omap = NULL; + + list_for_each_entry(omap, &dwc3_omap_list, list) + if (omap->index == index) + return dwc3_omap_interrupt(-1, omap); + + return 0; +} diff --git a/include/dwc3-omap-uboot.h b/include/dwc3-omap-uboot.h new file mode 100644 index 0000000..92038fb --- /dev/null +++ b/include/dwc3-omap-uboot.h @@ -0,0 +1,32 @@ +/* include/dwc3_omap_uboot.h + * + * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Designware SuperSpeed OMAP Glue uboot init + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __DWC3_OMAP_UBOOT_H_ +#define __DWC3_OMAP_UBOOT_H_ + +#include <linux/usb/dwc3-omap.h> + +enum omap_dwc3_vbus_id_status { + OMAP_DWC3_ID_FLOAT, + OMAP_DWC3_ID_GROUND, + OMAP_DWC3_VBUS_OFF, + OMAP_DWC3_VBUS_VALID, +}; + +struct dwc3_omap_device { + void *base; + int index; + enum dwc3_omap_utmi_mode utmi_mode; + enum omap_dwc3_vbus_id_status vbus_id_status; +}; + +int dwc3_omap_uboot_init(struct dwc3_omap_device *dev); +void dwc3_omap_uboot_exit(int index); +int dwc3_omap_uboot_interrupt_status(int index); +#endif /* __DWC3_OMAP_UBOOT_H_ */ diff --git a/include/linux/usb/dwc3-omap.h b/include/linux/usb/dwc3-omap.h new file mode 100644 index 0000000..8bf7b55 --- /dev/null +++ b/include/linux/usb/dwc3-omap.h @@ -0,0 +1,19 @@ +/* include/linux/usb/dwc3-omap.h + * + * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Designware SuperSpeed Glue + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __DWC3_OMAP_H_ +#define __DWC3_OMAP_H_ + +enum dwc3_omap_utmi_mode { + DWC3_OMAP_UTMI_MODE_UNKNOWN = 0, + DWC3_OMAP_UTMI_MODE_HW, + DWC3_OMAP_UTMI_MODE_SW, +}; + +#endif /* __DWC3_OMAP_H_ */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 06/13] usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (4 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 05/13] usb: dwc3-omap: Add dwc3 glue driver for OMAP Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor Kishon Vijay Abraham I ` (8 subsequent siblings) 14 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Added a single driver for both USB2 PHY programming and USB3 PHY programming. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/usb/dwc3/Makefile | 1 + drivers/usb/dwc3/ti_usb_phy.c | 269 ++++++++++++++++++++++++++++++++++++++++++ include/ti-usb-phy-uboot.h | 22 ++++ 3 files changed, 292 insertions(+) create mode 100644 drivers/usb/dwc3/ti_usb_phy.c create mode 100644 include/ti-usb-phy-uboot.h diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index 5533546..6b55b9f 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -7,3 +7,4 @@ dwc3-y := core.o dwc3-$(CONFIG_USB_DWC3_GADGET) += gadget.o ep0.o obj-$(CONFIG_USB_DWC3_OMAP) += dwc3-omap.o +obj-$(CONFIG_USB_DWC3_PHY_OMAP) += ti_usb_phy.o diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c new file mode 100644 index 0000000..05052c3 --- /dev/null +++ b/drivers/usb/dwc3/ti_usb_phy.c @@ -0,0 +1,269 @@ +/** + * ti_usb_phy.c - USB3 and USB3 PHY programming for dwc3 + * + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Author: Kishon Vijay Abraham I <kishon@ti.com> + * + * Taken from Linux Kernel v3.16 (drivers/phy/phy-ti-pipe3.c and + * drivers/phy/phy-omap-usb2.c) and ported to uboot. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <linux/compat.h> +#include "linux-compat.h" +#include <ti-usb-phy-uboot.h> +#include <linux/ioport.h> +#include <asm/io.h> +#include <asm/arch/sys_proto.h> + +#define PLL_STATUS 0x00000004 +#define PLL_GO 0x00000008 +#define PLL_CONFIGURATION1 0x0000000C +#define PLL_CONFIGURATION2 0x00000010 +#define PLL_CONFIGURATION3 0x00000014 +#define PLL_CONFIGURATION4 0x00000020 + +#define PLL_REGM_MASK 0x001FFE00 +#define PLL_REGM_SHIFT 0x9 +#define PLL_REGM_F_MASK 0x0003FFFF +#define PLL_REGM_F_SHIFT 0x0 +#define PLL_REGN_MASK 0x000001FE +#define PLL_REGN_SHIFT 0x1 +#define PLL_SELFREQDCO_MASK 0x0000000E +#define PLL_SELFREQDCO_SHIFT 0x1 +#define PLL_SD_MASK 0x0003FC00 +#define PLL_SD_SHIFT 10 +#define SET_PLL_GO 0x1 +#define PLL_LDOPWDN BIT(15) +#define PLL_TICOPWDN BIT(16) +#define PLL_LOCK 0x2 +#define PLL_IDLE 0x1 + +#define OMAP_CTRL_DEV_PHY_PD BIT(0) +#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_MASK 0x003FC000 +#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_SHIFT 0xE + +#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_MASK 0xFFC00000 +#define OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_SHIFT 0x16 + +#define OMAP_CTRL_USB3_PHY_TX_RX_POWERON 0x3 +#define OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF 0x0 + +static LIST_HEAD(ti_usb_phy_list); +typedef unsigned int u32; + +struct usb3_dpll_params { + u16 m; + u8 n; + u8 freq:3; + u8 sd; + u32 mf; +}; + +struct usb3_dpll_map { + unsigned long rate; + struct usb3_dpll_params params; + struct usb3_dpll_map *dpll_map; +}; + +struct ti_usb_phy { + void __iomem *pll_ctrl_base; + void __iomem *usb2_phy_power; + void __iomem *usb3_phy_power; + struct usb3_dpll_map *dpll_map; + struct list_head list; + int index; +}; + +static struct usb3_dpll_map dpll_map_usb[] = { + {12000000, {1250, 5, 4, 20, 0} }, /* 12 MHz */ + {16800000, {3125, 20, 4, 20, 0} }, /* 16.8 MHz */ + {19200000, {1172, 8, 4, 20, 65537} }, /* 19.2 MHz */ + {20000000, {1000, 7, 4, 10, 0} }, /* 20 MHz */ + {26000000, {1250, 12, 4, 20, 0} }, /* 26 MHz */ + {38400000, {3125, 47, 4, 20, 92843} }, /* 38.4 MHz */ + { }, /* Terminator */ +}; + +static inline unsigned int ti_usb3_readl(void __iomem *base, u32 offset) +{ + return readl(base + offset); +} + +static inline void ti_usb3_writel(void __iomem *base, u32 offset, u32 value) +{ + writel(value, base + offset); +} + +static struct usb3_dpll_params *ti_usb3_get_dpll_params(struct ti_usb_phy *phy) +{ + unsigned long rate; + struct usb3_dpll_map *dpll_map = phy->dpll_map; + + rate = get_sys_clk_freq(); + + for (; dpll_map->rate; dpll_map++) { + if (rate == dpll_map->rate) + return &dpll_map->params; + } + + dev_err(phy->dev, "No DPLL configuration for %lu Hz SYS CLK\n", rate); + + return NULL; +} + +static int ti_usb3_dpll_wait_lock(struct ti_usb_phy *phy) +{ + u32 val; + do { + val = ti_usb3_readl(phy->pll_ctrl_base, PLL_STATUS); + if (val & PLL_LOCK) + break; + } while (1); + + return 0; +} + +static int ti_usb3_dpll_program(struct ti_usb_phy *phy) +{ + u32 val; + struct usb3_dpll_params *dpll_params; + + if (!phy->pll_ctrl_base) + return -EINVAL; + + dpll_params = ti_usb3_get_dpll_params(phy); + if (!dpll_params) + return -EINVAL; + + val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1); + val &= ~PLL_REGN_MASK; + val |= dpll_params->n << PLL_REGN_SHIFT; + ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val); + + val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2); + val &= ~PLL_SELFREQDCO_MASK; + val |= dpll_params->freq << PLL_SELFREQDCO_SHIFT; + ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION2, val); + + val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1); + val &= ~PLL_REGM_MASK; + val |= dpll_params->m << PLL_REGM_SHIFT; + ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val); + + val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION4); + val &= ~PLL_REGM_F_MASK; + val |= dpll_params->mf << PLL_REGM_F_SHIFT; + ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION4, val); + + val = ti_usb3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION3); + val &= ~PLL_SD_MASK; + val |= dpll_params->sd << PLL_SD_SHIFT; + ti_usb3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION3, val); + + ti_usb3_writel(phy->pll_ctrl_base, PLL_GO, SET_PLL_GO); + + return ti_usb3_dpll_wait_lock(phy); +} + +void ti_usb2_phy_power(struct ti_usb_phy *phy, int on) +{ + u32 val; + + val = readl(phy->usb2_phy_power); + if (on) + val &= ~OMAP_CTRL_DEV_PHY_PD; + else + val |= OMAP_CTRL_DEV_PHY_PD; + writel(val, phy->usb2_phy_power); +} + +void ti_usb3_phy_power(struct ti_usb_phy *phy, int on) +{ + u32 val; + u32 rate; + rate = get_sys_clk_freq(); + rate = rate/1000000; + + if (!phy->usb3_phy_power) + return; + + val = readl(phy->usb3_phy_power); + if (on) { + val &= ~(OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_MASK | + OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_MASK); + val |= (OMAP_CTRL_USB3_PHY_TX_RX_POWERON) << + OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_SHIFT; + val |= rate << + OMAP_CTRL_USB3_PHY_PWRCTL_CLK_FREQ_SHIFT; + } else { + val &= ~OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_MASK; + val |= OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF << + OMAP_CTRL_USB3_PHY_PWRCTL_CLK_CMD_SHIFT; + } + writel(val, phy->usb3_phy_power); +} + +/** + * ti_usb_phy_uboot_init - usb phy uboot initialization code + * @dev: struct ti_usb_phy_device containing initialization data + * + * Entry point for ti usb phy driver. This driver handles initialization + * of both usb2 phy and usb3 phy. Pointer to ti_usb_phy_device should be + * passed containing base address and other initialization data. + * Returns '0' on success and a negative value on failure. + * + * Generally called from board_usb_init() implemented in board file. + */ +int ti_usb_phy_uboot_init(struct ti_usb_phy_device *dev) +{ + struct ti_usb_phy *phy; + + phy = devm_kzalloc(NULL, sizeof(*phy), GFP_KERNEL); + if (!phy) { + dev_err(NULL, "unable to alloc mem for TI USB3 PHY\n"); + return -ENOMEM; + } + + phy->dpll_map = dpll_map_usb; + phy->index = dev->index; + phy->pll_ctrl_base = dev->pll_ctrl_base; + phy->usb2_phy_power = dev->usb2_phy_power; + phy->usb3_phy_power = dev->usb3_phy_power; + + ti_usb3_dpll_program(phy); + ti_usb2_phy_power(phy, 1); + ti_usb3_phy_power(phy, 1); + mdelay(150); + list_add_tail(&phy->list, &ti_usb_phy_list); + + return 0; +} + +/** + * ti_usb_phy_uboot_exit - usb phy uboot cleanup code + * @index: index of this controller + * + * Performs cleanup of memory allocated in ti_usb_phy_uboot_init. + * index of _this_ controller should be passed and should match with + * the index passed in ti_usb_phy_device during init. + * + * Generally called from board file. + */ +void ti_usb_phy_uboot_exit(int index) +{ + struct ti_usb_phy *phy = NULL; + + list_for_each_entry(phy, &ti_usb_phy_list, list) { + if (phy->index != index) + continue; + + ti_usb2_phy_power(phy, 0); + ti_usb3_phy_power(phy, 0); + list_del(&phy->list); + kfree(phy); + break; + } +} diff --git a/include/ti-usb-phy-uboot.h b/include/ti-usb-phy-uboot.h new file mode 100644 index 0000000..93f7101 --- /dev/null +++ b/include/ti-usb-phy-uboot.h @@ -0,0 +1,22 @@ +/* include/ti_usb_phy_uboot.h + * + * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * USB2 and USB3 PHY uboot init + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __TI_USB_PHY_UBOOT_H_ +#define __TI_USB_PHY_UBOOT_H_ + +struct ti_usb_phy_device { + void *pll_ctrl_base; + void *usb2_phy_power; + void *usb3_phy_power; + int index; +}; + +int ti_usb_phy_uboot_init(struct ti_usb_phy_device *dev); +void ti_usb_phy_uboot_exit(int index); +#endif /* __TI_USB_PHY_UBOOT_H_ */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (5 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 06/13] usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:38 ` Felipe Balbi 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 08/13] common: cmd_dfu: invoke board_usb_cleanup() for cleaning up Kishon Vijay Abraham I ` (7 subsequent siblings) 14 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Explicity set the max packet size in the device descriptor to 0x40 as specified in the device class specification for device firmware upgrade. Also changed debug to printf to explicitly notify the user if the device has been enumerated. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/usb/gadget/composite.c | 3 +-- drivers/usb/gadget/g_dnl.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 7bd2562..60ca9a5 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -331,7 +331,7 @@ static int set_config(struct usb_composite_dev *cdev, } else result = 0; - debug("%s: %s speed config #%d: %s\n", __func__, + printf("%s: %s speed config #%d: %s\n", __func__, ({ char *speed; switch (gadget->speed) { case USB_SPEED_LOW: @@ -987,7 +987,6 @@ static int composite_bind(struct usb_gadget *gadget) memcpy(&cdev->desc, composite->dev, sizeof(struct usb_device_descriptor)); - cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket; debug("%s: ready\n", composite->name); return 0; diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 25611ac..8128b86 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -59,6 +59,7 @@ static struct usb_device_descriptor device_desc = { .bcdUSB = __constant_cpu_to_le16(0x0200), .bDeviceClass = USB_CLASS_COMM, .bDeviceSubClass = 0x02, /*0x02:CDC-modem , 0x00:CDC-serial*/ + .bMaxPacketSize0 = 0x40, .idVendor = __constant_cpu_to_le16(CONFIG_G_DNL_VENDOR_NUM), .idProduct = __constant_cpu_to_le16(CONFIG_G_DNL_PRODUCT_NUM), -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor Kishon Vijay Abraham I @ 2014-08-18 14:38 ` Felipe Balbi 2014-08-18 14:49 ` Lukasz Majewski ` (2 more replies) 0 siblings, 3 replies; 57+ messages in thread From: Felipe Balbi @ 2014-08-18 14:38 UTC (permalink / raw) To: u-boot On Mon, Aug 18, 2014 at 07:58:29PM +0530, Kishon Vijay Abraham I wrote: > Explicity set the max packet size in the device descriptor to 0x40 > as specified in the device class specification for device firmware upgrade. > Also changed debug to printf to explicitly notify the user if the > device has been enumerated. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > drivers/usb/gadget/composite.c | 3 +-- > drivers/usb/gadget/g_dnl.c | 1 + > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c > index 7bd2562..60ca9a5 100644 > --- a/drivers/usb/gadget/composite.c > +++ b/drivers/usb/gadget/composite.c > @@ -331,7 +331,7 @@ static int set_config(struct usb_composite_dev *cdev, > } else > result = 0; > > - debug("%s: %s speed config #%d: %s\n", __func__, > + printf("%s: %s speed config #%d: %s\n", __func__, this looks like it's only needed for debugging. No strong feelings though > @@ -987,7 +987,6 @@ static int composite_bind(struct usb_gadget *gadget) > > memcpy(&cdev->desc, composite->dev, > sizeof(struct usb_device_descriptor)); > - cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket; why are you dropping this line ? -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140818/e9b17520/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-18 14:38 ` Felipe Balbi @ 2014-08-18 14:49 ` Lukasz Majewski 2014-08-18 14:56 ` Lukasz Majewski 2014-08-19 15:34 ` Kishon Vijay Abraham I 2 siblings, 0 replies; 57+ messages in thread From: Lukasz Majewski @ 2014-08-18 14:49 UTC (permalink / raw) To: u-boot Hi Kishon, > On Mon, Aug 18, 2014 at 07:58:29PM +0530, Kishon Vijay Abraham I > wrote: > > Explicity set the max packet size in the device descriptor to 0x40 > > as specified in the device class specification for device firmware > > upgrade. Also changed debug to printf to explicitly notify the user > > if the device has been enumerated. It seems like this patch has slipped without my attention. Hence I'd like to ask why do you need to hardcode the 0x40 value? > > > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > > --- > > drivers/usb/gadget/composite.c | 3 +-- > > drivers/usb/gadget/g_dnl.c | 1 + > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/usb/gadget/composite.c > > b/drivers/usb/gadget/composite.c index 7bd2562..60ca9a5 100644 > > --- a/drivers/usb/gadget/composite.c > > +++ b/drivers/usb/gadget/composite.c > > @@ -331,7 +331,7 @@ static int set_config(struct usb_composite_dev > > *cdev, } else > > result = 0; > > > > - debug("%s: %s speed config #%d: %s\n", __func__, > > + printf("%s: %s speed config #%d: %s\n", __func__, > > this looks like it's only needed for debugging. No strong feelings > though > > > @@ -987,7 +987,6 @@ static int composite_bind(struct usb_gadget > > *gadget) > > memcpy(&cdev->desc, composite->dev, > > sizeof(struct usb_device_descriptor)); > > - cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket; > > why are you dropping this line ? > -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-18 14:38 ` Felipe Balbi 2014-08-18 14:49 ` Lukasz Majewski @ 2014-08-18 14:56 ` Lukasz Majewski 2014-08-19 15:38 ` Kishon Vijay Abraham I 2014-08-19 15:34 ` Kishon Vijay Abraham I 2 siblings, 1 reply; 57+ messages in thread From: Lukasz Majewski @ 2014-08-18 14:56 UTC (permalink / raw) To: u-boot Hi Kishon, > > Explicity set the max packet size in the device descriptor to 0x40 > > as specified in the device class specification for device firmware > > upgrade. Also changed debug to printf to explicitly notify the user > > if the device has been enumerated. It seems like this patch slipped without my attention ... Hence, I'd like to ask why you must hardcode the packet size here? -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-18 14:56 ` Lukasz Majewski @ 2014-08-19 15:38 ` Kishon Vijay Abraham I 2014-08-19 15:44 ` Felipe Balbi 2014-08-20 7:23 ` Lukasz Majewski 0 siblings, 2 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 15:38 UTC (permalink / raw) To: u-boot On Monday 18 August 2014 08:26 PM, Lukasz Majewski wrote: > Hi Kishon, > >>> Explicity set the max packet size in the device descriptor to 0x40 >>> as specified in the device class specification for device firmware >>> upgrade. Also changed debug to printf to explicitly notify the user >>> if the device has been enumerated. > > It seems like this patch slipped without my attention ... > > Hence, I'd like to ask why you must hardcode the packet size here? http://www.usb.org/developers/devclass_docs/usbdfu10.pdf (in section 4.2.1 DFU Mode Device Descriptor), specifies the bMaxPacketSize0 can be 8,16,32,64. And the value we get from gadget is 512. So hard coded it. Thanks Kishon ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-19 15:38 ` Kishon Vijay Abraham I @ 2014-08-19 15:44 ` Felipe Balbi 2014-08-20 7:34 ` Lukasz Majewski 2014-08-20 7:23 ` Lukasz Majewski 1 sibling, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-19 15:44 UTC (permalink / raw) To: u-boot On Tue, Aug 19, 2014 at 09:08:00PM +0530, Kishon Vijay Abraham I wrote: > > > On Monday 18 August 2014 08:26 PM, Lukasz Majewski wrote: > > Hi Kishon, > > > >>> Explicity set the max packet size in the device descriptor to 0x40 > >>> as specified in the device class specification for device firmware > >>> upgrade. Also changed debug to printf to explicitly notify the user > >>> if the device has been enumerated. > > > > It seems like this patch slipped without my attention ... > > > > Hence, I'd like to ask why you must hardcode the packet size here? > > http://www.usb.org/developers/devclass_docs/usbdfu10.pdf (in section 4.2.1 DFU > Mode Device Descriptor), specifies the bMaxPacketSize0 can be 8,16,32,64. And > the value we get from gadget is 512. So hard coded it. as I mentioned, this should be changed on connection done interrupt. DFU has one of the poorest documentations for a USB Class and has some moronic definitions. What happens if you want ot run DFU with a superspeed controller (such as dwc3) when connected to a superspeed port. We cannot use ep0 packet size as 64, right ? That's why hardcoding is bad ;-) -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140819/743e097b/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-19 15:44 ` Felipe Balbi @ 2014-08-20 7:34 ` Lukasz Majewski 2014-08-20 16:11 ` Felipe Balbi 0 siblings, 1 reply; 57+ messages in thread From: Lukasz Majewski @ 2014-08-20 7:34 UTC (permalink / raw) To: u-boot Hi Felipe, > On Tue, Aug 19, 2014 at 09:08:00PM +0530, Kishon Vijay Abraham I > wrote: > > > > > > On Monday 18 August 2014 08:26 PM, Lukasz Majewski wrote: > > > Hi Kishon, > > > > > >>> Explicity set the max packet size in the device descriptor to > > >>> 0x40 as specified in the device class specification for device > > >>> firmware upgrade. Also changed debug to printf to explicitly > > >>> notify the user if the device has been enumerated. > > > > > > It seems like this patch slipped without my attention ... > > > > > > Hence, I'd like to ask why you must hardcode the packet size here? > > > > http://www.usb.org/developers/devclass_docs/usbdfu10.pdf (in > > section 4.2.1 DFU Mode Device Descriptor), specifies the > > bMaxPacketSize0 can be 8,16,32,64. And the value we get from > > gadget is 512. So hard coded it. > > as I mentioned, this should be changed on connection done interrupt. In the u-boot it is set up during binding the composite. > DFU has one of the poorest documentations for a USB Class and has some > moronic definitions. Frankly speaking I prefer to have the worst standard than some "brilliant" in house developed protocols. > What happens if you want ot run DFU with a > superspeed controller (such as dwc3) when connected to a superspeed > port. We cannot use ep0 packet size as 64, right ? Correct me if I'm wrong, but MaxPacket for SS ep0 is 2^9 = 512B. I'm curious if dfu-util will manage to handle ep0 MaxPacket size up to 512B. It not, then we shall be able to fallback to 64B. > That's why > hardcoding is bad ;-) > -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-20 7:34 ` Lukasz Majewski @ 2014-08-20 16:11 ` Felipe Balbi 2014-08-21 8:00 ` Lukasz Majewski 0 siblings, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-20 16:11 UTC (permalink / raw) To: u-boot On Wed, Aug 20, 2014 at 09:34:13AM +0200, Lukasz Majewski wrote: > Hi Felipe, > > > On Tue, Aug 19, 2014 at 09:08:00PM +0530, Kishon Vijay Abraham I > > wrote: > > > > > > > > > On Monday 18 August 2014 08:26 PM, Lukasz Majewski wrote: > > > > Hi Kishon, > > > > > > > >>> Explicity set the max packet size in the device descriptor to > > > >>> 0x40 as specified in the device class specification for device > > > >>> firmware upgrade. Also changed debug to printf to explicitly > > > >>> notify the user if the device has been enumerated. > > > > > > > > It seems like this patch slipped without my attention ... > > > > > > > > Hence, I'd like to ask why you must hardcode the packet size here? > > > > > > http://www.usb.org/developers/devclass_docs/usbdfu10.pdf (in > > > section 4.2.1 DFU Mode Device Descriptor), specifies the > > > bMaxPacketSize0 can be 8,16,32,64. And the value we get from > > > gadget is 512. So hard coded it. > > > > as I mentioned, this should be changed on connection done interrupt. > > In the u-boot it is set up during binding the composite. look at dwc3. dwc3 has a connection done IRQ which also tells me the negotiated link speed. > > DFU has one of the poorest documentations for a USB Class and has some > > moronic definitions. > > Frankly speaking I prefer to have the worst standard than some > "brilliant" in house developed protocols. nobody is talking about changing the protocol. DFU was written back when Full speed was the fastest USB on earth. > > What happens if you want ot run DFU with a > > superspeed controller (such as dwc3) when connected to a superspeed > > port. We cannot use ep0 packet size as 64, right ? > > Correct me if I'm wrong, but MaxPacket for SS ep0 is 2^9 = 512B. > I'm curious if dfu-util will manage to handle ep0 MaxPacket size up to > 512B. > It not, then we shall be able to fallback to 64B. should be a test away. -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140820/a9cdf997/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-20 16:11 ` Felipe Balbi @ 2014-08-21 8:00 ` Lukasz Majewski 2014-08-21 13:50 ` Felipe Balbi 0 siblings, 1 reply; 57+ messages in thread From: Lukasz Majewski @ 2014-08-21 8:00 UTC (permalink / raw) To: u-boot Hi Felipe, > On Wed, Aug 20, 2014 at 09:34:13AM +0200, Lukasz Majewski wrote: > > Hi Felipe, > > > > > On Tue, Aug 19, 2014 at 09:08:00PM +0530, Kishon Vijay Abraham I > > > wrote: > > > > > > > > > > > > On Monday 18 August 2014 08:26 PM, Lukasz Majewski wrote: > > > > > Hi Kishon, > > > > > > > > > >>> Explicity set the max packet size in the device descriptor > > > > >>> to 0x40 as specified in the device class specification for > > > > >>> device firmware upgrade. Also changed debug to printf to > > > > >>> explicitly notify the user if the device has been > > > > >>> enumerated. > > > > > > > > > > It seems like this patch slipped without my attention ... > > > > > > > > > > Hence, I'd like to ask why you must hardcode the packet size > > > > > here? > > > > > > > > http://www.usb.org/developers/devclass_docs/usbdfu10.pdf (in > > > > section 4.2.1 DFU Mode Device Descriptor), specifies the > > > > bMaxPacketSize0 can be 8,16,32,64. And the value we get from > > > > gadget is 512. So hard coded it. > > > > > > as I mentioned, this should be changed on connection done > > > interrupt. > > > > In the u-boot it is set up during binding the composite. > > look at dwc3. dwc3 has a connection done IRQ which also tells me the > negotiated link speed. My point is that you will need to pool in u-boot to emulate this IRQ. > > > > DFU has one of the poorest documentations for a USB Class and has > > > some moronic definitions. > > > > Frankly speaking I prefer to have the worst standard than some > > "brilliant" in house developed protocols. > > nobody is talking about changing the protocol. DFU was written back > when Full speed was the fastest USB on earth. As you can see the standard is a bit old now... and should be revised. > > > > What happens if you want ot run DFU with a > > > superspeed controller (such as dwc3) when connected to a > > > superspeed port. We cannot use ep0 packet size as 64, right ? > > > > Correct me if I'm wrong, but MaxPacket for SS ep0 is 2^9 = 512B. > > I'm curious if dfu-util will manage to handle ep0 MaxPacket size up > > to 512B. > > It not, then we shall be able to fallback to 64B. > > should be a test away. > Ok. -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-21 8:00 ` Lukasz Majewski @ 2014-08-21 13:50 ` Felipe Balbi 0 siblings, 0 replies; 57+ messages in thread From: Felipe Balbi @ 2014-08-21 13:50 UTC (permalink / raw) To: u-boot On Thu, Aug 21, 2014 at 10:00:46AM +0200, Lukasz Majewski wrote: > Hi Felipe, > > > On Wed, Aug 20, 2014 at 09:34:13AM +0200, Lukasz Majewski wrote: > > > Hi Felipe, > > > > > > > On Tue, Aug 19, 2014 at 09:08:00PM +0530, Kishon Vijay Abraham I > > > > wrote: > > > > > > > > > > > > > > > On Monday 18 August 2014 08:26 PM, Lukasz Majewski wrote: > > > > > > Hi Kishon, > > > > > > > > > > > >>> Explicity set the max packet size in the device descriptor > > > > > >>> to 0x40 as specified in the device class specification for > > > > > >>> device firmware upgrade. Also changed debug to printf to > > > > > >>> explicitly notify the user if the device has been > > > > > >>> enumerated. > > > > > > > > > > > > It seems like this patch slipped without my attention ... > > > > > > > > > > > > Hence, I'd like to ask why you must hardcode the packet size > > > > > > here? > > > > > > > > > > http://www.usb.org/developers/devclass_docs/usbdfu10.pdf (in > > > > > section 4.2.1 DFU Mode Device Descriptor), specifies the > > > > > bMaxPacketSize0 can be 8,16,32,64. And the value we get from > > > > > gadget is 512. So hard coded it. > > > > > > > > as I mentioned, this should be changed on connection done > > > > interrupt. > > > > > > In the u-boot it is set up during binding the composite. > > > > look at dwc3. dwc3 has a connection done IRQ which also tells me the > > negotiated link speed. > > My point is that you will need to pool in u-boot to emulate this IRQ. you will need to poll anyways for a bunch of other things. There are some details in DWC3 which are mandated that you wait for event X before doing Y. For example control transfers, it's mandatory that you wait for a XferNotReady event before trying to start a Status Phase. > > > > DFU has one of the poorest documentations for a USB Class and has > > > > some moronic definitions. > > > > > > Frankly speaking I prefer to have the worst standard than some > > > "brilliant" in house developed protocols. > > > > nobody is talking about changing the protocol. DFU was written back > > when Full speed was the fastest USB on earth. > > As you can see the standard is a bit old now... and should be revised. right, once USB-IF does that, I hope they switch to bulk endpoints :-p -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140821/29fe9f39/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-19 15:38 ` Kishon Vijay Abraham I 2014-08-19 15:44 ` Felipe Balbi @ 2014-08-20 7:23 ` Lukasz Majewski 1 sibling, 0 replies; 57+ messages in thread From: Lukasz Majewski @ 2014-08-20 7:23 UTC (permalink / raw) To: u-boot Hi Kishon, > > > On Monday 18 August 2014 08:26 PM, Lukasz Majewski wrote: > > Hi Kishon, > > > >>> Explicity set the max packet size in the device descriptor to 0x40 > >>> as specified in the device class specification for device firmware > >>> upgrade. Also changed debug to printf to explicitly notify the > >>> user if the device has been enumerated. > > > > It seems like this patch slipped without my attention ... > > > > Hence, I'd like to ask why you must hardcode the packet size here? > > http://www.usb.org/developers/devclass_docs/usbdfu10.pdf (in section > 4.2.1 DFU Mode Device Descriptor), specifies the bMaxPacketSize0 can > be 8,16,32,64. And the value we get from gadget is 512. So hard > coded it. As fair as I know ep0 MaxPacket for USB 2.0 is up to 64 bytes. This value here is set in a following way: ./drivers/usb/gadget/composite.c:990: cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket; And in my UDC driver .maxpacket = EP0_FIFO_SIZE, for ep0 the max packet is set to 64B: s3c_udc_otg.c:782 .maxpacket = EP0_FIFO_SIZE, So you don't need to hardcode it. Another issue is how DFU works. It uses ONLY ep0 for transmission (as it was the requirement for very tiny microcontrollers). According to USB 2.0 spec the ep0 MaxPacket size is up to 64B. Considering above, DFU shall work with USB 3.0 using compliance mode with USB 2.0. For other gadgets - like USB Mass Storage - which use other EPs you should notice benefit from using USB 3.0. > > Thanks > Kishon -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-18 14:38 ` Felipe Balbi 2014-08-18 14:49 ` Lukasz Majewski 2014-08-18 14:56 ` Lukasz Majewski @ 2014-08-19 15:34 ` Kishon Vijay Abraham I 2014-08-19 15:39 ` Felipe Balbi 2 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 15:34 UTC (permalink / raw) To: u-boot Hi, On Monday 18 August 2014 08:08 PM, Felipe Balbi wrote: > On Mon, Aug 18, 2014 at 07:58:29PM +0530, Kishon Vijay Abraham I wrote: >> Explicity set the max packet size in the device descriptor to 0x40 >> as specified in the device class specification for device firmware upgrade. >> Also changed debug to printf to explicitly notify the user if the >> device has been enumerated. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> drivers/usb/gadget/composite.c | 3 +-- >> drivers/usb/gadget/g_dnl.c | 1 + >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c >> index 7bd2562..60ca9a5 100644 >> --- a/drivers/usb/gadget/composite.c >> +++ b/drivers/usb/gadget/composite.c >> @@ -331,7 +331,7 @@ static int set_config(struct usb_composite_dev *cdev, >> } else >> result = 0; >> >> - debug("%s: %s speed config #%d: %s\n", __func__, >> + printf("%s: %s speed config #%d: %s\n", __func__, > > this looks like it's only needed for debugging. No strong feelings > though yeah.. it helps to know if the device has been enumerated. > >> @@ -987,7 +987,6 @@ static int composite_bind(struct usb_gadget *gadget) >> >> memcpy(&cdev->desc, composite->dev, >> sizeof(struct usb_device_descriptor)); >> - cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket; > > why are you dropping this line ? Actually faced an issue with this. DWC3 gadget sets ep0 maxpacket size to 512 and if the device is operating at hight speed, the bMaxPacketSize0 field should be 64? If the maxpacket size is set to 512, the host reports Invalid EP0 Maxpacket. Thanks Kishon ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-19 15:34 ` Kishon Vijay Abraham I @ 2014-08-19 15:39 ` Felipe Balbi 2014-08-19 15:42 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-19 15:39 UTC (permalink / raw) To: u-boot Hi, On Tue, Aug 19, 2014 at 09:04:06PM +0530, Kishon Vijay Abraham I wrote: > On Monday 18 August 2014 08:08 PM, Felipe Balbi wrote: > > On Mon, Aug 18, 2014 at 07:58:29PM +0530, Kishon Vijay Abraham I wrote: > >> Explicity set the max packet size in the device descriptor to 0x40 > >> as specified in the device class specification for device firmware upgrade. > >> Also changed debug to printf to explicitly notify the user if the > >> device has been enumerated. > >> > >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > >> --- > >> drivers/usb/gadget/composite.c | 3 +-- > >> drivers/usb/gadget/g_dnl.c | 1 + > >> 2 files changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c > >> index 7bd2562..60ca9a5 100644 > >> --- a/drivers/usb/gadget/composite.c > >> +++ b/drivers/usb/gadget/composite.c > >> @@ -331,7 +331,7 @@ static int set_config(struct usb_composite_dev *cdev, > >> } else > >> result = 0; > >> > >> - debug("%s: %s speed config #%d: %s\n", __func__, > >> + printf("%s: %s speed config #%d: %s\n", __func__, > > > > this looks like it's only needed for debugging. No strong feelings > > though > > yeah.. it helps to know if the device has been enumerated. > > > >> @@ -987,7 +987,6 @@ static int composite_bind(struct usb_gadget *gadget) > >> > >> memcpy(&cdev->desc, composite->dev, > >> sizeof(struct usb_device_descriptor)); > >> - cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket; > > > > why are you dropping this line ? > > Actually faced an issue with this. DWC3 gadget sets ep0 maxpacket size > to 512 and if the device is operating at hight speed, the > bMaxPacketSize0 field should be 64? right, but that's changed on connection done IRQ. > If the maxpacket size is set to 512, the host reports Invalid EP0 > Maxpacket. huh ? who broke dwc3 ? connection done happens before we receive the first setup packet, how can host complain about anything ? -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140819/eb825288/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-19 15:39 ` Felipe Balbi @ 2014-08-19 15:42 ` Kishon Vijay Abraham I 2014-08-19 15:48 ` Felipe Balbi 0 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 15:42 UTC (permalink / raw) To: u-boot On Tuesday 19 August 2014 09:09 PM, Felipe Balbi wrote: > Hi, > > On Tue, Aug 19, 2014 at 09:04:06PM +0530, Kishon Vijay Abraham I wrote: >> On Monday 18 August 2014 08:08 PM, Felipe Balbi wrote: >>> On Mon, Aug 18, 2014 at 07:58:29PM +0530, Kishon Vijay Abraham I wrote: >>>> Explicity set the max packet size in the device descriptor to 0x40 >>>> as specified in the device class specification for device firmware upgrade. >>>> Also changed debug to printf to explicitly notify the user if the >>>> device has been enumerated. >>>> >>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >>>> --- >>>> drivers/usb/gadget/composite.c | 3 +-- >>>> drivers/usb/gadget/g_dnl.c | 1 + >>>> 2 files changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c >>>> index 7bd2562..60ca9a5 100644 >>>> --- a/drivers/usb/gadget/composite.c >>>> +++ b/drivers/usb/gadget/composite.c >>>> @@ -331,7 +331,7 @@ static int set_config(struct usb_composite_dev *cdev, >>>> } else >>>> result = 0; >>>> >>>> - debug("%s: %s speed config #%d: %s\n", __func__, >>>> + printf("%s: %s speed config #%d: %s\n", __func__, >>> >>> this looks like it's only needed for debugging. No strong feelings >>> though >> >> yeah.. it helps to know if the device has been enumerated. >>> >>>> @@ -987,7 +987,6 @@ static int composite_bind(struct usb_gadget *gadget) >>>> >>>> memcpy(&cdev->desc, composite->dev, >>>> sizeof(struct usb_device_descriptor)); >>>> - cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket; >>> >>> why are you dropping this line ? >> >> Actually faced an issue with this. DWC3 gadget sets ep0 maxpacket size >> to 512 and if the device is operating at hight speed, the >> bMaxPacketSize0 field should be 64? > > right, but that's changed on connection done IRQ. > >> If the maxpacket size is set to 512, the host reports Invalid EP0 >> Maxpacket. > > huh ? who broke dwc3 ? connection done happens before we receive the > first setup packet, how can host complain about anything ? > composite_bind() (where maxpacket is being set) happens much before connection done interrupt. So it's not dwc3's fault. Thanks Kishon ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-19 15:42 ` Kishon Vijay Abraham I @ 2014-08-19 15:48 ` Felipe Balbi 2014-08-19 15:53 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-19 15:48 UTC (permalink / raw) To: u-boot Hi, On Tue, Aug 19, 2014 at 09:12:29PM +0530, Kishon Vijay Abraham I wrote: > >>>> @@ -987,7 +987,6 @@ static int composite_bind(struct usb_gadget *gadget) > >>>> > >>>> memcpy(&cdev->desc, composite->dev, > >>>> sizeof(struct usb_device_descriptor)); > >>>> - cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket; > >>> > >>> why are you dropping this line ? > >> > >> Actually faced an issue with this. DWC3 gadget sets ep0 maxpacket size > >> to 512 and if the device is operating at hight speed, the > >> bMaxPacketSize0 field should be 64? > > > > right, but that's changed on connection done IRQ. > > > >> If the maxpacket size is set to 512, the host reports Invalid EP0 > >> Maxpacket. > > > > huh ? who broke dwc3 ? connection done happens before we receive the > > first setup packet, how can host complain about anything ? > > > composite_bind() (where maxpacket is being set) happens much before connection > done interrupt. So it's not dwc3's fault. seems like you're just missing a few fixes to composite.c, such as commit 765f5b830e547229bb752e7b232ee83e2b3d49d5 -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140819/1ec75e6e/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor 2014-08-19 15:48 ` Felipe Balbi @ 2014-08-19 15:53 ` Kishon Vijay Abraham I 0 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 15:53 UTC (permalink / raw) To: u-boot On Tuesday 19 August 2014 09:18 PM, Felipe Balbi wrote: > Hi, > > On Tue, Aug 19, 2014 at 09:12:29PM +0530, Kishon Vijay Abraham I wrote: >>>>>> @@ -987,7 +987,6 @@ static int composite_bind(struct usb_gadget *gadget) >>>>>> >>>>>> memcpy(&cdev->desc, composite->dev, >>>>>> sizeof(struct usb_device_descriptor)); >>>>>> - cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket; >>>>> >>>>> why are you dropping this line ? >>>> >>>> Actually faced an issue with this. DWC3 gadget sets ep0 maxpacket size >>>> to 512 and if the device is operating at hight speed, the >>>> bMaxPacketSize0 field should be 64? >>> >>> right, but that's changed on connection done IRQ. >>> >>>> If the maxpacket size is set to 512, the host reports Invalid EP0 >>>> Maxpacket. >>> >>> huh ? who broke dwc3 ? connection done happens before we receive the >>> first setup packet, how can host complain about anything ? >>> >> composite_bind() (where maxpacket is being set) happens much before connection >> done interrupt. So it's not dwc3's fault. > > seems like you're just missing a few fixes to composite.c, such as > commit 765f5b830e547229bb752e7b232ee83e2b3d49d5 hmm.. yeah. -Kishon > ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 08/13] common: cmd_dfu: invoke board_usb_cleanup() for cleaning up 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (6 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 09/13] common: cmd_dfu: add an API that takes controller index for handling interrupts Kishon Vijay Abraham I ` (6 subsequent siblings) 14 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Invoked board_usb_cleanup for cleaning up initialized USB. It will be invoked if the user enterts ctrl-C. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- common/cmd_dfu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c index a03538d..1e7d50c 100644 --- a/common/cmd_dfu.c +++ b/common/cmd_dfu.c @@ -55,6 +55,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } exit: g_dnl_unregister(); + board_usb_cleanup(controller_index, USB_INIT_DEVICE); done: dfu_free_entities(); -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 09/13] common: cmd_dfu: add an API that takes controller index for handling interrupts 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (7 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 08/13] common: cmd_dfu: invoke board_usb_cleanup() for cleaning up Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-19 8:53 ` Lukasz Majewski 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 10/13] board: ti: DRA7: added USB initializtion code Kishon Vijay Abraham I ` (5 subsequent siblings) 14 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Since there can be multiple USB controllers in the system, usb_gadget_handle_interrupts should take controller index as arguments. However such an API can only be added in board file so added board_usb_gadget_handle_interrupts(). usb_gadget_handle_interrupts() should be deprecated. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- common/cmd_dfu.c | 1 + include/usb.h | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c index 1e7d50c..f27ba52 100644 --- a/common/cmd_dfu.c +++ b/common/cmd_dfu.c @@ -52,6 +52,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) goto exit; usb_gadget_handle_interrupts(); + board_usb_gadget_handle_interrupts(controller_index); } exit: g_dnl_unregister(); diff --git a/include/usb.h b/include/usb.h index d9fedee..26c6462 100644 --- a/include/usb.h +++ b/include/usb.h @@ -197,6 +197,13 @@ int board_usb_init(int index, enum usb_init_type init); */ int board_usb_cleanup(int index, enum usb_init_type init); +/* + * Can be use to handle interrupts from a specific controller. + * + * @index index of the USB controller + */ +int board_usb_gadget_handle_interrupts(int index); + #ifdef CONFIG_USB_STORAGE #define USB_MAX_STOR_DEV 5 -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 09/13] common: cmd_dfu: add an API that takes controller index for handling interrupts 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 09/13] common: cmd_dfu: add an API that takes controller index for handling interrupts Kishon Vijay Abraham I @ 2014-08-19 8:53 ` Lukasz Majewski 2014-08-19 16:09 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 57+ messages in thread From: Lukasz Majewski @ 2014-08-19 8:53 UTC (permalink / raw) To: u-boot Hi Kishon, > Since there can be multiple USB controllers in the system, > usb_gadget_handle_interrupts should take controller index as > arguments. The controller index is passed in the ums/dfu/thor command. Then PHY subsystem is properly configured. Since we only handle one USB controller transmission at a time (u-boot doesn't use interrupts - we only pool) the usb_gadget_handle_interrupts() was enough for our purpose. To start transmission from other usb controller you need to end current transmission and then invoke modified command with different controller number. It would be enough to extend usb_gadget_handle_interrupts() to accept controller index argument (only six boards use it - it shall be easy to modify them all). > However such an API can only be added in board file so > added board_usb_gadget_handle_interrupts(). > usb_gadget_handle_interrupts() should be deprecated. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > common/cmd_dfu.c | 1 + > include/usb.h | 7 +++++++ > 2 files changed, 8 insertions(+) > > diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c > index 1e7d50c..f27ba52 100644 > --- a/common/cmd_dfu.c > +++ b/common/cmd_dfu.c > @@ -52,6 +52,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int > argc, char * const argv[]) goto exit; > > usb_gadget_handle_interrupts(); > + board_usb_gadget_handle_interrupts(controller_index); NAK, for the reason stated above. > } > exit: > g_dnl_unregister(); > diff --git a/include/usb.h b/include/usb.h > index d9fedee..26c6462 100644 > --- a/include/usb.h > +++ b/include/usb.h > @@ -197,6 +197,13 @@ int board_usb_init(int index, enum usb_init_type > init); */ > int board_usb_cleanup(int index, enum usb_init_type init); > > +/* > + * Can be use to handle interrupts from a specific controller. > + * > + * @index index of the USB controller > + */ > +int board_usb_gadget_handle_interrupts(int index); > + > #ifdef CONFIG_USB_STORAGE > > #define USB_MAX_STOR_DEV 5 -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 09/13] common: cmd_dfu: add an API that takes controller index for handling interrupts 2014-08-19 8:53 ` Lukasz Majewski @ 2014-08-19 16:09 ` Kishon Vijay Abraham I 2014-08-20 7:37 ` Lukasz Majewski 0 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 16:09 UTC (permalink / raw) To: u-boot Hi, On Tuesday 19 August 2014 02:23 PM, Lukasz Majewski wrote: > Hi Kishon, > >> Since there can be multiple USB controllers in the system, >> usb_gadget_handle_interrupts should take controller index as >> arguments. > > The controller index is passed in the ums/dfu/thor command. Then PHY > subsystem is properly configured. > Since we only handle one USB controller transmission at a time (u-boot > doesn't use interrupts - we only pool) the > usb_gadget_handle_interrupts() was enough for our purpose. yeah, if we have only one USB controller in the system, controller index is not needed. -Kishon > > To start transmission from other usb controller you need to end current > transmission and then invoke modified command with different controller > number. > > It would be enough to extend > usb_gadget_handle_interrupts() to accept controller index argument > (only six boards use it - it shall be easy to modify them all). > >> However such an API can only be added in board file so >> added board_usb_gadget_handle_interrupts(). >> usb_gadget_handle_interrupts() should be deprecated. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> common/cmd_dfu.c | 1 + >> include/usb.h | 7 +++++++ >> 2 files changed, 8 insertions(+) >> >> diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c >> index 1e7d50c..f27ba52 100644 >> --- a/common/cmd_dfu.c >> +++ b/common/cmd_dfu.c >> @@ -52,6 +52,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int >> argc, char * const argv[]) goto exit; >> >> usb_gadget_handle_interrupts(); >> + board_usb_gadget_handle_interrupts(controller_index); > > NAK, for the reason stated above. > >> } >> exit: >> g_dnl_unregister(); >> diff --git a/include/usb.h b/include/usb.h >> index d9fedee..26c6462 100644 >> --- a/include/usb.h >> +++ b/include/usb.h >> @@ -197,6 +197,13 @@ int board_usb_init(int index, enum usb_init_type >> init); */ >> int board_usb_cleanup(int index, enum usb_init_type init); >> >> +/* >> + * Can be use to handle interrupts from a specific controller. >> + * >> + * @index index of the USB controller >> + */ >> +int board_usb_gadget_handle_interrupts(int index); >> + >> #ifdef CONFIG_USB_STORAGE >> >> #define USB_MAX_STOR_DEV 5 > > > ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 09/13] common: cmd_dfu: add an API that takes controller index for handling interrupts 2014-08-19 16:09 ` Kishon Vijay Abraham I @ 2014-08-20 7:37 ` Lukasz Majewski 0 siblings, 0 replies; 57+ messages in thread From: Lukasz Majewski @ 2014-08-20 7:37 UTC (permalink / raw) To: u-boot Hi Kishon, > Hi, > > On Tuesday 19 August 2014 02:23 PM, Lukasz Majewski wrote: > > Hi Kishon, > > > >> Since there can be multiple USB controllers in the system, > >> usb_gadget_handle_interrupts should take controller index as > >> arguments. > > > > The controller index is passed in the ums/dfu/thor command. Then PHY > > subsystem is properly configured. > > Since we only handle one USB controller transmission at a time > > (u-boot doesn't use interrupts - we only pool) the > > usb_gadget_handle_interrupts() was enough for our purpose. > > yeah, if we have only one USB controller in the system, controller > index is not needed. To sum up: 1. You should be able to specify the USB controller when calling dfu or ums commands (as it is now). 2. If this is not enough for some reason (and good justification is welcome here), then usb_gadget_handle_interrupts() should be extended to accept the controller index argument. > > -Kishon > > > > To start transmission from other usb controller you need to end > > current transmission and then invoke modified command with > > different controller number. > > > > It would be enough to extend > > usb_gadget_handle_interrupts() to accept controller index argument > > (only six boards use it - it shall be easy to modify them all). > > > >> However such an API can only be added in board file so > >> added board_usb_gadget_handle_interrupts(). > >> usb_gadget_handle_interrupts() should be deprecated. > >> > >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > >> --- > >> common/cmd_dfu.c | 1 + > >> include/usb.h | 7 +++++++ > >> 2 files changed, 8 insertions(+) > >> > >> diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c > >> index 1e7d50c..f27ba52 100644 > >> --- a/common/cmd_dfu.c > >> +++ b/common/cmd_dfu.c > >> @@ -52,6 +52,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int > >> argc, char * const argv[]) goto exit; > >> > >> usb_gadget_handle_interrupts(); > >> + > >> board_usb_gadget_handle_interrupts(controller_index); > > > > NAK, for the reason stated above. > > > >> } > >> exit: > >> g_dnl_unregister(); > >> diff --git a/include/usb.h b/include/usb.h > >> index d9fedee..26c6462 100644 > >> --- a/include/usb.h > >> +++ b/include/usb.h > >> @@ -197,6 +197,13 @@ int board_usb_init(int index, enum > >> usb_init_type init); */ > >> int board_usb_cleanup(int index, enum usb_init_type init); > >> > >> +/* > >> + * Can be use to handle interrupts from a specific controller. > >> + * > >> + * @index index of the USB controller > >> + */ > >> +int board_usb_gadget_handle_interrupts(int index); > >> + > >> #ifdef CONFIG_USB_STORAGE > >> > >> #define USB_MAX_STOR_DEV 5 > > > > > > -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 10/13] board: ti: DRA7: added USB initializtion code 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (8 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 09/13] common: cmd_dfu: add an API that takes controller index for handling interrupts Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:40 ` Felipe Balbi 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 11/13] commom: usb: implement "__weak" functions to make compiler happy Kishon Vijay Abraham I ` (4 subsequent siblings) 14 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Implemented board_usb_init(), board_usb_cleanup() and board_usb_gadget_handle_interrupts() in dra7xx board file that can be invoked by various gadget drivers. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/include/asm/arch-omap5/omap.h | 12 ++++ board/ti/dra7xx/evm.c | 106 +++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h index b9600cf..a2348a2 100644 --- a/arch/arm/include/asm/arch-omap5/omap.h +++ b/arch/arm/include/asm/arch-omap5/omap.h @@ -33,6 +33,18 @@ #define CONTROL_ID_CODE CONTROL_CORE_ID_CODE #endif +#ifdef CONFIG_DRA7XX +#define DRA7_USB_OTG_SS1_BASE 0x48890000 +#define DRA7_USB_OTG_SS1_GLUE_BASE 0x48880000 +#define DRA7_USB3_PHY1_PLL_CTRL 0x4A084C00 +#define DRA7_USB3_PHY1_POWER 0x4A002370 +#define DRA7_USB2_PHY1_POWER 0x4A002300 + +#define DRA7_USB_OTG_SS2_BASE 0x488D0000 +#define DRA7_USB_OTG_SS2_GLUE_BASE 0x488C0000 +#define DRA7_USB2_PHY2_POWER 0x4A002E74 +#endif + /* To be verified */ #define OMAP5430_CONTROL_ID_CODE_ES1_0 0x0B94202F #define OMAP5430_CONTROL_ID_CODE_ES2_0 0x1B94202F diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 073d151..0d1b93f 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -13,10 +13,14 @@ #include <common.h> #include <palmas.h> #include <sata.h> +#include <usb.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mmc_host_def.h> #include <asm/arch/sata.h> #include <environment.h> +#include <dwc3-uboot.h> +#include <dwc3-omap-uboot.h> +#include <ti-usb-phy-uboot.h> #include "mux_data.h" @@ -125,6 +129,108 @@ int board_mmc_init(bd_t *bis) } #endif +static struct dwc3_device usb_otg_ss1 = { + .maximum_speed = USB_SPEED_SUPER, + .base = DRA7_USB_OTG_SS1_BASE, + .needs_fifo_resize = true, +}; + +static struct dwc3_omap_device usb_otg_ss1_glue = { + .base = (void *)DRA7_USB_OTG_SS1_GLUE_BASE, + .utmi_mode = DWC3_OMAP_UTMI_MODE_SW, + .vbus_id_status = OMAP_DWC3_VBUS_VALID, +}; + +static struct ti_usb_phy_device usb_phy1_device = { + .pll_ctrl_base = (void *)DRA7_USB3_PHY1_PLL_CTRL, + .usb2_phy_power = (void *)DRA7_USB2_PHY1_POWER, + .usb3_phy_power = (void *)DRA7_USB3_PHY1_POWER, +}; + +static struct dwc3_device usb_otg_ss2 = { + .maximum_speed = USB_SPEED_SUPER, + .base = DRA7_USB_OTG_SS2_BASE, + .needs_fifo_resize = true, +}; + +static struct dwc3_omap_device usb_otg_ss2_glue = { + .base = (void *) DRA7_USB_OTG_SS2_GLUE_BASE, + .utmi_mode = DWC3_OMAP_UTMI_MODE_SW, + .vbus_id_status = OMAP_DWC3_VBUS_VALID, +}; + +static struct ti_usb_phy_device usb_phy2_device = { + .usb2_phy_power = (void *) DRA7_USB2_PHY2_POWER, +}; + +int board_usb_init(int index, enum usb_init_type init) +{ + switch (index) { + case 0: + if (init == USB_INIT_DEVICE) { + usb_otg_ss1.dr_mode = USB_DR_MODE_PERIPHERAL; + usb_otg_ss1_glue.vbus_id_status = OMAP_DWC3_VBUS_VALID; + } else { + usb_otg_ss1.dr_mode = USB_DR_MODE_HOST; + usb_otg_ss1_glue.vbus_id_status = OMAP_DWC3_ID_GROUND; + } + + ti_usb_phy_uboot_init(&usb_phy1_device); + dwc3_omap_uboot_init(&usb_otg_ss1_glue); + dwc3_uboot_init(&usb_otg_ss1); + break; + case 1: + if (init == USB_INIT_DEVICE) { + usb_otg_ss2.dr_mode = USB_DR_MODE_PERIPHERAL; + usb_otg_ss2_glue.vbus_id_status = OMAP_DWC3_VBUS_VALID; + } else { + usb_otg_ss2.dr_mode = USB_DR_MODE_HOST; + usb_otg_ss2_glue.vbus_id_status = OMAP_DWC3_ID_GROUND; + } + + ti_usb_phy_uboot_init(&usb_phy2_device); + dwc3_omap_uboot_init(&usb_otg_ss2_glue); + dwc3_uboot_init(&usb_otg_ss2); + break; + default: + printf("Invalid Controller Index\n"); + } + + return 0; +} + +int board_usb_cleanup(int index, enum usb_init_type init) +{ + switch (index) { + case 0: + case 1: + ti_usb_phy_uboot_exit(index); + dwc3_uboot_exit(index); + dwc3_omap_uboot_exit(index); + break; + default: + printf("Invalid Controller Index\n"); + } + return 0; +} + +int board_usb_gadget_handle_interrupts(int index) +{ + u32 status; + switch (index) { + case 0: + case 1: + status = dwc3_omap_uboot_interrupt_status(index); + if (status) + dwc3_uboot_handle_interrupt(index); + break; + default: + printf("Invalid Controller Index\n"); + } + + return 0; +} + #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_OS_BOOT) int spl_start_uboot(void) { -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 10/13] board: ti: DRA7: added USB initializtion code 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 10/13] board: ti: DRA7: added USB initializtion code Kishon Vijay Abraham I @ 2014-08-18 14:40 ` Felipe Balbi 2014-08-19 16:13 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-18 14:40 UTC (permalink / raw) To: u-boot On Mon, Aug 18, 2014 at 07:58:32PM +0530, Kishon Vijay Abraham I wrote: > Implemented board_usb_init(), board_usb_cleanup() and > board_usb_gadget_handle_interrupts() in dra7xx board file that > can be invoked by various gadget drivers. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > arch/arm/include/asm/arch-omap5/omap.h | 12 ++++ > board/ti/dra7xx/evm.c | 106 +++++++++++++++++++++++++++++++++ > 2 files changed, 118 insertions(+) > > diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h > index b9600cf..a2348a2 100644 > --- a/arch/arm/include/asm/arch-omap5/omap.h > +++ b/arch/arm/include/asm/arch-omap5/omap.h > @@ -33,6 +33,18 @@ > #define CONTROL_ID_CODE CONTROL_CORE_ID_CODE > #endif > > +#ifdef CONFIG_DRA7XX > +#define DRA7_USB_OTG_SS1_BASE 0x48890000 > +#define DRA7_USB_OTG_SS1_GLUE_BASE 0x48880000 > +#define DRA7_USB3_PHY1_PLL_CTRL 0x4A084C00 > +#define DRA7_USB3_PHY1_POWER 0x4A002370 > +#define DRA7_USB2_PHY1_POWER 0x4A002300 > + > +#define DRA7_USB_OTG_SS2_BASE 0x488D0000 > +#define DRA7_USB_OTG_SS2_GLUE_BASE 0x488C0000 > +#define DRA7_USB2_PHY2_POWER 0x4A002E74 > +#endif > + > /* To be verified */ > #define OMAP5430_CONTROL_ID_CODE_ES1_0 0x0B94202F > #define OMAP5430_CONTROL_ID_CODE_ES2_0 0x1B94202F > diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c > index 073d151..0d1b93f 100644 > --- a/board/ti/dra7xx/evm.c > +++ b/board/ti/dra7xx/evm.c > @@ -13,10 +13,14 @@ > #include <common.h> > #include <palmas.h> > #include <sata.h> > +#include <usb.h> > #include <asm/arch/sys_proto.h> > #include <asm/arch/mmc_host_def.h> > #include <asm/arch/sata.h> > #include <environment.h> > +#include <dwc3-uboot.h> > +#include <dwc3-omap-uboot.h> > +#include <ti-usb-phy-uboot.h> > > #include "mux_data.h" > > @@ -125,6 +129,108 @@ int board_mmc_init(bd_t *bis) > } > #endif > > +static struct dwc3_device usb_otg_ss1 = { > + .maximum_speed = USB_SPEED_SUPER, > + .base = DRA7_USB_OTG_SS1_BASE, > + .needs_fifo_resize = true, make sure this is *really* needed. The only SoC which has needed this was OMAP5 ES1 due to a nice little "feature" IP folks left in there :-) -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140818/ab09eb41/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 10/13] board: ti: DRA7: added USB initializtion code 2014-08-18 14:40 ` Felipe Balbi @ 2014-08-19 16:13 ` Kishon Vijay Abraham I 2014-08-19 16:26 ` Felipe Balbi 0 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 16:13 UTC (permalink / raw) To: u-boot Hi Felipe, On Monday 18 August 2014 08:10 PM, Felipe Balbi wrote: > On Mon, Aug 18, 2014 at 07:58:32PM +0530, Kishon Vijay Abraham I wrote: >> Implemented board_usb_init(), board_usb_cleanup() and >> board_usb_gadget_handle_interrupts() in dra7xx board file that >> can be invoked by various gadget drivers. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> arch/arm/include/asm/arch-omap5/omap.h | 12 ++++ >> board/ti/dra7xx/evm.c | 106 +++++++++++++++++++++++++++++++++ >> 2 files changed, 118 insertions(+) >> >> diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h >> index b9600cf..a2348a2 100644 >> --- a/arch/arm/include/asm/arch-omap5/omap.h >> +++ b/arch/arm/include/asm/arch-omap5/omap.h >> @@ -33,6 +33,18 @@ >> #define CONTROL_ID_CODE CONTROL_CORE_ID_CODE >> #endif >> >> +#ifdef CONFIG_DRA7XX >> +#define DRA7_USB_OTG_SS1_BASE 0x48890000 >> +#define DRA7_USB_OTG_SS1_GLUE_BASE 0x48880000 >> +#define DRA7_USB3_PHY1_PLL_CTRL 0x4A084C00 >> +#define DRA7_USB3_PHY1_POWER 0x4A002370 >> +#define DRA7_USB2_PHY1_POWER 0x4A002300 >> + >> +#define DRA7_USB_OTG_SS2_BASE 0x488D0000 >> +#define DRA7_USB_OTG_SS2_GLUE_BASE 0x488C0000 >> +#define DRA7_USB2_PHY2_POWER 0x4A002E74 >> +#endif >> + >> /* To be verified */ >> #define OMAP5430_CONTROL_ID_CODE_ES1_0 0x0B94202F >> #define OMAP5430_CONTROL_ID_CODE_ES2_0 0x1B94202F >> diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c >> index 073d151..0d1b93f 100644 >> --- a/board/ti/dra7xx/evm.c >> +++ b/board/ti/dra7xx/evm.c >> @@ -13,10 +13,14 @@ >> #include <common.h> >> #include <palmas.h> >> #include <sata.h> >> +#include <usb.h> >> #include <asm/arch/sys_proto.h> >> #include <asm/arch/mmc_host_def.h> >> #include <asm/arch/sata.h> >> #include <environment.h> >> +#include <dwc3-uboot.h> >> +#include <dwc3-omap-uboot.h> >> +#include <ti-usb-phy-uboot.h> >> >> #include "mux_data.h" >> >> @@ -125,6 +129,108 @@ int board_mmc_init(bd_t *bis) >> } >> #endif >> >> +static struct dwc3_device usb_otg_ss1 = { >> + .maximum_speed = USB_SPEED_SUPER, >> + .base = DRA7_USB_OTG_SS1_BASE, >> + .needs_fifo_resize = true, > > make sure this is *really* needed. The only SoC which has needed this > was OMAP5 ES1 due to a nice little "feature" IP folks left in there :-) ah.. "tx-fifo-resize" is set in dra7.dtsi. Thanks Kishon ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 10/13] board: ti: DRA7: added USB initializtion code 2014-08-19 16:13 ` Kishon Vijay Abraham I @ 2014-08-19 16:26 ` Felipe Balbi 2014-08-22 10:47 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-19 16:26 UTC (permalink / raw) To: u-boot On Tue, Aug 19, 2014 at 09:43:48PM +0530, Kishon Vijay Abraham I wrote: > Hi Felipe, > > On Monday 18 August 2014 08:10 PM, Felipe Balbi wrote: > > On Mon, Aug 18, 2014 at 07:58:32PM +0530, Kishon Vijay Abraham I wrote: > >> Implemented board_usb_init(), board_usb_cleanup() and > >> board_usb_gadget_handle_interrupts() in dra7xx board file that > >> can be invoked by various gadget drivers. > >> > >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > >> --- > >> arch/arm/include/asm/arch-omap5/omap.h | 12 ++++ > >> board/ti/dra7xx/evm.c | 106 +++++++++++++++++++++++++++++++++ > >> 2 files changed, 118 insertions(+) > >> > >> diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h > >> index b9600cf..a2348a2 100644 > >> --- a/arch/arm/include/asm/arch-omap5/omap.h > >> +++ b/arch/arm/include/asm/arch-omap5/omap.h > >> @@ -33,6 +33,18 @@ > >> #define CONTROL_ID_CODE CONTROL_CORE_ID_CODE > >> #endif > >> > >> +#ifdef CONFIG_DRA7XX > >> +#define DRA7_USB_OTG_SS1_BASE 0x48890000 > >> +#define DRA7_USB_OTG_SS1_GLUE_BASE 0x48880000 > >> +#define DRA7_USB3_PHY1_PLL_CTRL 0x4A084C00 > >> +#define DRA7_USB3_PHY1_POWER 0x4A002370 > >> +#define DRA7_USB2_PHY1_POWER 0x4A002300 > >> + > >> +#define DRA7_USB_OTG_SS2_BASE 0x488D0000 > >> +#define DRA7_USB_OTG_SS2_GLUE_BASE 0x488C0000 > >> +#define DRA7_USB2_PHY2_POWER 0x4A002E74 > >> +#endif > >> + > >> /* To be verified */ > >> #define OMAP5430_CONTROL_ID_CODE_ES1_0 0x0B94202F > >> #define OMAP5430_CONTROL_ID_CODE_ES2_0 0x1B94202F > >> diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c > >> index 073d151..0d1b93f 100644 > >> --- a/board/ti/dra7xx/evm.c > >> +++ b/board/ti/dra7xx/evm.c > >> @@ -13,10 +13,14 @@ > >> #include <common.h> > >> #include <palmas.h> > >> #include <sata.h> > >> +#include <usb.h> > >> #include <asm/arch/sys_proto.h> > >> #include <asm/arch/mmc_host_def.h> > >> #include <asm/arch/sata.h> > >> #include <environment.h> > >> +#include <dwc3-uboot.h> > >> +#include <dwc3-omap-uboot.h> > >> +#include <ti-usb-phy-uboot.h> > >> > >> #include "mux_data.h" > >> > >> @@ -125,6 +129,108 @@ int board_mmc_init(bd_t *bis) > >> } > >> #endif > >> > >> +static struct dwc3_device usb_otg_ss1 = { > >> + .maximum_speed = USB_SPEED_SUPER, > >> + .base = DRA7_USB_OTG_SS1_BASE, > >> + .needs_fifo_resize = true, > > > > make sure this is *really* needed. The only SoC which has needed this > > was OMAP5 ES1 due to a nice little "feature" IP folks left in there :-) > > ah.. "tx-fifo-resize" is set in dra7.dtsi. hmm, I don't think it needs to be :-) not sure if you remember but early OMAP5 samples had a default TX fifo configuration of less than one superspeed bulk packet (less than 1024 bytes) :-) -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140819/b5f07165/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 10/13] board: ti: DRA7: added USB initializtion code 2014-08-19 16:26 ` Felipe Balbi @ 2014-08-22 10:47 ` Kishon Vijay Abraham I 0 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-22 10:47 UTC (permalink / raw) To: u-boot On Tuesday 19 August 2014 09:56 PM, Felipe Balbi wrote: > On Tue, Aug 19, 2014 at 09:43:48PM +0530, Kishon Vijay Abraham I wrote: >> Hi Felipe, >> >> On Monday 18 August 2014 08:10 PM, Felipe Balbi wrote: >>> On Mon, Aug 18, 2014 at 07:58:32PM +0530, Kishon Vijay Abraham I wrote: >>>> Implemented board_usb_init(), board_usb_cleanup() and >>>> board_usb_gadget_handle_interrupts() in dra7xx board file that >>>> can be invoked by various gadget drivers. >>>> >>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >>>> --- >>>> arch/arm/include/asm/arch-omap5/omap.h | 12 ++++ >>>> board/ti/dra7xx/evm.c | 106 +++++++++++++++++++++++++++++++++ >>>> 2 files changed, 118 insertions(+) >>>> >>>> diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h >>>> index b9600cf..a2348a2 100644 >>>> --- a/arch/arm/include/asm/arch-omap5/omap.h >>>> +++ b/arch/arm/include/asm/arch-omap5/omap.h >>>> @@ -33,6 +33,18 @@ >>>> #define CONTROL_ID_CODE CONTROL_CORE_ID_CODE >>>> #endif >>>> >>>> +#ifdef CONFIG_DRA7XX >>>> +#define DRA7_USB_OTG_SS1_BASE 0x48890000 >>>> +#define DRA7_USB_OTG_SS1_GLUE_BASE 0x48880000 >>>> +#define DRA7_USB3_PHY1_PLL_CTRL 0x4A084C00 >>>> +#define DRA7_USB3_PHY1_POWER 0x4A002370 >>>> +#define DRA7_USB2_PHY1_POWER 0x4A002300 >>>> + >>>> +#define DRA7_USB_OTG_SS2_BASE 0x488D0000 >>>> +#define DRA7_USB_OTG_SS2_GLUE_BASE 0x488C0000 >>>> +#define DRA7_USB2_PHY2_POWER 0x4A002E74 >>>> +#endif >>>> + >>>> /* To be verified */ >>>> #define OMAP5430_CONTROL_ID_CODE_ES1_0 0x0B94202F >>>> #define OMAP5430_CONTROL_ID_CODE_ES2_0 0x1B94202F >>>> diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c >>>> index 073d151..0d1b93f 100644 >>>> --- a/board/ti/dra7xx/evm.c >>>> +++ b/board/ti/dra7xx/evm.c >>>> @@ -13,10 +13,14 @@ >>>> #include <common.h> >>>> #include <palmas.h> >>>> #include <sata.h> >>>> +#include <usb.h> >>>> #include <asm/arch/sys_proto.h> >>>> #include <asm/arch/mmc_host_def.h> >>>> #include <asm/arch/sata.h> >>>> #include <environment.h> >>>> +#include <dwc3-uboot.h> >>>> +#include <dwc3-omap-uboot.h> >>>> +#include <ti-usb-phy-uboot.h> >>>> >>>> #include "mux_data.h" >>>> >>>> @@ -125,6 +129,108 @@ int board_mmc_init(bd_t *bis) >>>> } >>>> #endif >>>> >>>> +static struct dwc3_device usb_otg_ss1 = { >>>> + .maximum_speed = USB_SPEED_SUPER, >>>> + .base = DRA7_USB_OTG_SS1_BASE, >>>> + .needs_fifo_resize = true, >>> >>> make sure this is *really* needed. The only SoC which has needed this >>> was OMAP5 ES1 due to a nice little "feature" IP folks left in there :-) >> >> ah.. "tx-fifo-resize" is set in dra7.dtsi. > > hmm, I don't think it needs to be :-) not sure if you remember but early > OMAP5 samples had a default TX fifo configuration of less than one > superspeed bulk packet (less than 1024 bytes) :-) ah.. I remember that one :-D Thankfully you solved it during wakeup ;-) -Kishon ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 11/13] commom: usb: implement "__weak" functions to make compiler happy 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (9 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 10/13] board: ti: DRA7: added USB initializtion code Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-19 8:28 ` Lukasz Majewski 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 12/13] include: configs: Enable DWC3 and DFU in DRA7xx Kishon Vijay Abraham I ` (3 subsequent siblings) 14 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Implemented __weak functions for board_usb_cleanup, board_usb_gadget_handle_interrupts and usb_gadget_handle_interrupts to get of compiler errors in platforms that haven't implemented these functions. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- common/usb.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/common/usb.c b/common/usb.c index 60daa10..892bf7c 100644 --- a/common/usb.c +++ b/common/usb.c @@ -1072,4 +1072,22 @@ int board_usb_init(int index, enum usb_init_type init) { return 0; } + +__weak +int board_usb_cleanup(int index, enum usb_init_type init) +{ + return 0; +} + +__weak +int board_usb_gadget_handle_interrupts(int index) +{ + return 0; +} + +__weak +int usb_gadget_handle_interrupts(void) +{ + return 0; +} /* EOF */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 11/13] commom: usb: implement "__weak" functions to make compiler happy 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 11/13] commom: usb: implement "__weak" functions to make compiler happy Kishon Vijay Abraham I @ 2014-08-19 8:28 ` Lukasz Majewski 2014-08-19 16:14 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 57+ messages in thread From: Lukasz Majewski @ 2014-08-19 8:28 UTC (permalink / raw) To: u-boot Hi Kishon, > Implemented __weak functions for board_usb_cleanup, > board_usb_gadget_handle_interrupts and usb_gadget_handle_interrupts > to get of compiler errors in platforms that haven't implemented > these functions. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > common/usb.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/common/usb.c b/common/usb.c > index 60daa10..892bf7c 100644 > --- a/common/usb.c > +++ b/common/usb.c > @@ -1072,4 +1072,22 @@ int board_usb_init(int index, enum > usb_init_type init) { > return 0; > } > + > +__weak > +int board_usb_cleanup(int index, enum usb_init_type init) > +{ > + return 0; > +} This needed before [PATCH 7/13]. Without it your code will cause u-boot repository to not be bisectable. > + > +__weak > +int board_usb_gadget_handle_interrupts(int index) > +{ > + return 0; > +} > + > +__weak > +int usb_gadget_handle_interrupts(void) > +{ > + return 0; > +} > /* EOF */ -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 11/13] commom: usb: implement "__weak" functions to make compiler happy 2014-08-19 8:28 ` Lukasz Majewski @ 2014-08-19 16:14 ` Kishon Vijay Abraham I 2014-08-21 17:32 ` Tom Rini 0 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 16:14 UTC (permalink / raw) To: u-boot On Tuesday 19 August 2014 01:58 PM, Lukasz Majewski wrote: > Hi Kishon, > >> Implemented __weak functions for board_usb_cleanup, >> board_usb_gadget_handle_interrupts and usb_gadget_handle_interrupts >> to get of compiler errors in platforms that haven't implemented >> these functions. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> common/usb.c | 18 ++++++++++++++++++ >> 1 file changed, 18 insertions(+) >> >> diff --git a/common/usb.c b/common/usb.c >> index 60daa10..892bf7c 100644 >> --- a/common/usb.c >> +++ b/common/usb.c >> @@ -1072,4 +1072,22 @@ int board_usb_init(int index, enum >> usb_init_type init) { >> return 0; >> } >> + >> +__weak >> +int board_usb_cleanup(int index, enum usb_init_type init) >> +{ >> + return 0; >> +} > > This needed before [PATCH 7/13]. Without it your code will cause u-boot > repository to not be bisectable. hmm. ok -Kishon > >> + >> +__weak >> +int board_usb_gadget_handle_interrupts(int index) >> +{ >> + return 0; >> +} >> + >> +__weak >> +int usb_gadget_handle_interrupts(void) >> +{ >> + return 0; >> +} >> /* EOF */ > > > ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 11/13] commom: usb: implement "__weak" functions to make compiler happy 2014-08-19 16:14 ` Kishon Vijay Abraham I @ 2014-08-21 17:32 ` Tom Rini 0 siblings, 0 replies; 57+ messages in thread From: Tom Rini @ 2014-08-21 17:32 UTC (permalink / raw) To: u-boot On Tue, Aug 19, 2014 at 09:44:20PM +0530, Kishon Vijay Abraham I wrote: > > > On Tuesday 19 August 2014 01:58 PM, Lukasz Majewski wrote: > > Hi Kishon, > > > >> Implemented __weak functions for board_usb_cleanup, > >> board_usb_gadget_handle_interrupts and usb_gadget_handle_interrupts > >> to get of compiler errors in platforms that haven't implemented > >> these functions. > >> > >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > >> --- > >> common/usb.c | 18 ++++++++++++++++++ > >> 1 file changed, 18 insertions(+) > >> > >> diff --git a/common/usb.c b/common/usb.c > >> index 60daa10..892bf7c 100644 > >> --- a/common/usb.c > >> +++ b/common/usb.c > >> @@ -1072,4 +1072,22 @@ int board_usb_init(int index, enum > >> usb_init_type init) { > >> return 0; > >> } > >> + > >> +__weak > >> +int board_usb_cleanup(int index, enum usb_init_type init) > >> +{ > >> + return 0; > >> +} > > > > This needed before [PATCH 7/13]. Without it your code will cause u-boot > > repository to not be bisectable. > > hmm. ok And note that you can use buildman to make sure that your branch is bisectable, in addition to the normal git rebase 'exec' keyword. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140821/bd4b4775/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 12/13] include: configs: Enable DWC3 and DFU in DRA7xx 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (10 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 11/13] commom: usb: implement "__weak" functions to make compiler happy Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 Kishon Vijay Abraham I ` (2 subsequent siblings) 14 siblings, 0 replies; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Enabled dwc3, dwc3-omap and PHY for dwc3 are enabled. Also enabled support for DFU. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- include/configs/dra7xx_evm.h | 59 +++++++++++++++++++++++++++++++++++++++ include/configs/ti_omap5_common.h | 1 + 2 files changed, 60 insertions(+) diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 8d0a0eb..629ecd5 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -132,6 +132,65 @@ #define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB2PHY2_HOST +/* USB GADGET */ +#define CONFIG_USB_DWC3_PHY_OMAP +#define CONFIG_USB_DWC3_OMAP +#define CONFIG_USB_DWC3 +#define CONFIG_USB_DWC3_GADGET +#define CONFIG_SYS_DCACHE_OFF 1 + +#define CONFIG_USB_GADGET +#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_VBUS_DRAW 2 +#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" +#define CONFIG_G_DNL_VENDOR_NUM 0x0403 +#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 +#define CONFIG_USB_GADGET_DUALSPEED + +/* USB Device Firmware Update support */ +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_RAM +#define CONFIG_CMD_DFU + +#define DFU_ALT_INFO_MMC \ + "dfu_alt_info_mmc=" \ + "boot part 0 1;" \ + "rootfs part 0 2;" \ + "MLO fat 0 1;" \ + "spl-os-args fat 0 1;" \ + "spl-os-image fat 0 1;" \ + "u-boot.img fat 0 1;" \ + "uEnv.txt fat 0 1\0" + +#ifdef CONFIG_NAND +#define CONFIG_DFU_NAND +#define DFU_ALT_INFO_NAND \ + "dfu_alt_info_nand=" \ + "SPL part 0 1;" \ + "SPL.backup1 part 0 2;" \ + "SPL.backup2 part 0 3;" \ + "SPL.backup3 part 0 4;" \ + "u-boot part 0 5;" \ + "u-boot-spl-os part 0 6;" \ + "kernel part 0 8;" \ + "rootfs part 0 9\0" +#else +#define DFU_ALT_INFO_NAND "" +#endif + +#define CONFIG_DFU_RAM +#define DFU_ALT_INFO_RAM \ + "dfu_alt_info_ram=" \ + "kernel ram 0x80200000 0x4000000;" \ + "fdt ram 0x80f80000 0x80000;" \ + "ramdisk ram 0x81000000 0x4000000\0" + +#define DFUARGS \ + "dfu_alt_info_emmc=rawemmc mmc 0 3751936\0" \ + DFU_ALT_INFO_MMC \ + DFU_ALT_INFO_RAM \ + DFU_ALT_INFO_NAND + /* SATA */ #define CONFIG_BOARD_LATE_INIT #define CONFIG_CMD_SCSI diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index a582fa4..de02f2e 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -119,6 +119,7 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \ + DFUARGS \ #define CONFIG_BOOTCOMMAND \ "run findfdt; " \ -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (11 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 12/13] include: configs: Enable DWC3 and DFU in DRA7xx Kishon Vijay Abraham I @ 2014-08-18 14:28 ` Kishon Vijay Abraham I 2014-08-18 14:41 ` Felipe Balbi 2014-08-18 15:29 ` [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Tom Rini 2014-08-19 8:56 ` Lukasz Majewski 14 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-18 14:28 UTC (permalink / raw) To: u-boot Bounce buffer is used for transferring requests which is not maxpacket aligned. In the case of DFU the requests can be upto 4096 bytes. While the actual fix for this should be using two chained TRBs to handle the transfer, this can be used as a temporary fix. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/usb/dwc3/core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index e9ea7ca..e9f43b4 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -24,7 +24,7 @@ #include <linux/usb/otg.h> /* Global constants */ -#define DWC3_EP0_BOUNCE_SIZE 512 +#define DWC3_EP0_BOUNCE_SIZE 4096 #define DWC3_ENDPOINTS_NUM 32 #define DWC3_XHCI_RESOURCES_NUM 2 -- 1.9.1 ^ permalink raw reply related [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 Kishon Vijay Abraham I @ 2014-08-18 14:41 ` Felipe Balbi 2014-08-19 16:15 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-18 14:41 UTC (permalink / raw) To: u-boot On Mon, Aug 18, 2014 at 07:58:35PM +0530, Kishon Vijay Abraham I wrote: > Bounce buffer is used for transferring requests which is not maxpacket > aligned. In the case of DFU the requests can be upto 4096 bytes. > > While the actual fix for this should be using two chained TRBs to handle > the transfer, this can be used as a temporary fix. Did you manage to trigger this fault ? Was the size larger than 512 ? I'm inclined into getting a real fix instead of just patching around. That way, the kernel benefits too as we can port the same patch there. -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140818/495e5c89/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 2014-08-18 14:41 ` Felipe Balbi @ 2014-08-19 16:15 ` Kishon Vijay Abraham I 2014-08-19 16:27 ` Felipe Balbi 0 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-19 16:15 UTC (permalink / raw) To: u-boot Hi, On Monday 18 August 2014 08:11 PM, Felipe Balbi wrote: > On Mon, Aug 18, 2014 at 07:58:35PM +0530, Kishon Vijay Abraham I wrote: >> Bounce buffer is used for transferring requests which is not maxpacket >> aligned. In the case of DFU the requests can be upto 4096 bytes. >> >> While the actual fix for this should be using two chained TRBs to handle >> the transfer, this can be used as a temporary fix. > > Did you manage to trigger this fault ? Was the size larger than 512 ? yeah.. transferring any kernel image resulted in a size larger than 512. > I'm inclined into getting a real fix instead of just patching around. > > That way, the kernel benefits too as we can port the same patch there. sure. Thanks Kishon ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 2014-08-19 16:15 ` Kishon Vijay Abraham I @ 2014-08-19 16:27 ` Felipe Balbi 2014-08-22 11:02 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 57+ messages in thread From: Felipe Balbi @ 2014-08-19 16:27 UTC (permalink / raw) To: u-boot On Tue, Aug 19, 2014 at 09:45:11PM +0530, Kishon Vijay Abraham I wrote: > Hi, > > On Monday 18 August 2014 08:11 PM, Felipe Balbi wrote: > > On Mon, Aug 18, 2014 at 07:58:35PM +0530, Kishon Vijay Abraham I wrote: > >> Bounce buffer is used for transferring requests which is not maxpacket > >> aligned. In the case of DFU the requests can be upto 4096 bytes. > >> > >> While the actual fix for this should be using two chained TRBs to handle > >> the transfer, this can be used as a temporary fix. > > > > Did you manage to trigger this fault ? Was the size larger than 512 ? > > yeah.. transferring any kernel image resulted in a size larger than 512. but it's also larger than 4KiB :-) -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140819/37f0ee92/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 2014-08-19 16:27 ` Felipe Balbi @ 2014-08-22 11:02 ` Kishon Vijay Abraham I 2014-08-22 13:54 ` Felipe Balbi 0 siblings, 1 reply; 57+ messages in thread From: Kishon Vijay Abraham I @ 2014-08-22 11:02 UTC (permalink / raw) To: u-boot Hi, On Tuesday 19 August 2014 09:57 PM, Felipe Balbi wrote: > On Tue, Aug 19, 2014 at 09:45:11PM +0530, Kishon Vijay Abraham I wrote: >> Hi, >> >> On Monday 18 August 2014 08:11 PM, Felipe Balbi wrote: >>> On Mon, Aug 18, 2014 at 07:58:35PM +0530, Kishon Vijay Abraham I wrote: >>>> Bounce buffer is used for transferring requests which is not maxpacket >>>> aligned. In the case of DFU the requests can be upto 4096 bytes. >>>> >>>> While the actual fix for this should be using two chained TRBs to handle >>>> the transfer, this can be used as a temporary fix. >>> >>> Did you manage to trigger this fault ? Was the size larger than 512 ? >> >> yeah.. transferring any kernel image resulted in a size larger than 512. > > but it's also larger than 4KiB :-) Yeah. But the DFU specifies the maximum transfer size in wTransferSize (DFU function descriptor) to the host which is 4096 bytes (DFU_USB_BUFSIZ). So the max size will be only 4KB. Thanks Kishon ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 2014-08-22 11:02 ` Kishon Vijay Abraham I @ 2014-08-22 13:54 ` Felipe Balbi 0 siblings, 0 replies; 57+ messages in thread From: Felipe Balbi @ 2014-08-22 13:54 UTC (permalink / raw) To: u-boot On Fri, Aug 22, 2014 at 04:32:10PM +0530, Kishon Vijay Abraham I wrote: > Hi, > > On Tuesday 19 August 2014 09:57 PM, Felipe Balbi wrote: > > On Tue, Aug 19, 2014 at 09:45:11PM +0530, Kishon Vijay Abraham I wrote: > >> Hi, > >> > >> On Monday 18 August 2014 08:11 PM, Felipe Balbi wrote: > >>> On Mon, Aug 18, 2014 at 07:58:35PM +0530, Kishon Vijay Abraham I wrote: > >>>> Bounce buffer is used for transferring requests which is not maxpacket > >>>> aligned. In the case of DFU the requests can be upto 4096 bytes. > >>>> > >>>> While the actual fix for this should be using two chained TRBs to handle > >>>> the transfer, this can be used as a temporary fix. > >>> > >>> Did you manage to trigger this fault ? Was the size larger than 512 ? > >> > >> yeah.. transferring any kernel image resulted in a size larger than 512. > > > > but it's also larger than 4KiB :-) > > Yeah. But the DFU specifies the maximum transfer size in wTransferSize (DFU > function descriptor) to the host which is 4096 bytes (DFU_USB_BUFSIZ). > > So the max size will be only 4KB. ah, ok. Thanks for that detail. -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140822/89e13ffb/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (12 preceding siblings ...) 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 Kishon Vijay Abraham I @ 2014-08-18 15:29 ` Tom Rini 2014-08-19 8:56 ` Lukasz Majewski 14 siblings, 0 replies; 57+ messages in thread From: Tom Rini @ 2014-08-18 15:29 UTC (permalink / raw) To: u-boot On Mon, Aug 18, 2014 at 07:58:22PM +0530, Kishon Vijay Abraham I wrote: > Ported DWC3 driver from linux kernel v3.16 to uboot and enabled DFU in DRA7xx. > Tested only with DFU ram. > > While I kept the dwc3 driver pretty much the same from linux kernel, I have > created a single driver for both USB2 and USB3 PHY programming. I have also > adapted udc-core from linux kernel so that we can cleanly link the gadet > driver with the controller driver. For the next round please CC Marek as he's the USB custodian. Also, enable DFU for writing to the eMMC as well, thanks. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140818/239d3244/attachment.pgp> ^ permalink raw reply [flat|nested] 57+ messages in thread
* [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I ` (13 preceding siblings ...) 2014-08-18 15:29 ` [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Tom Rini @ 2014-08-19 8:56 ` Lukasz Majewski 14 siblings, 0 replies; 57+ messages in thread From: Lukasz Majewski @ 2014-08-19 8:56 UTC (permalink / raw) To: u-boot Hi Kishon, > Ported DWC3 driver from linux kernel v3.16 to uboot and enabled DFU > in DRA7xx. Tested only with DFU ram. I'm afraid that only testing the code with DFU ram is not enough. I'd _appreciate_ if you had CCed other people involved in DFU/UDC/USB development to this RFC. I've CCed Marek Vasut - the USB custodian. The whole series seems like a huge improvement from the base code - which is 2.6.36 based one... > > While I kept the dwc3 driver pretty much the same from linux kernel, > I have created a single driver for both USB2 and USB3 PHY > programming. I concern about driver model compliance. Simon Glass has put a lot of effort to convert Exynos' UART and GPIO to it. Hence, I believe that potential UDC/PHY rework shall comply with Simon's device model work. Therefore, I've CC'ed Simon as well. > I have also adapted udc-core from linux kernel so that > we can cleanly link the gadet driver with the controller driver. > > This series was created on top of > commit 61e76f53708cf082ef9061a140b57df3513b8ba1 > Merge: 76b2102 3d83e67 > Author: Tom Rini <trini@ti.com> > Date: Tue Jun 10 20:37:00 2014 -0400 > > Merge branch 'master' of git://git.denx.de/u-boot-usb > > Let me know of any feedback and suggestions. > > Known Issues: > DWC3 is not enumerating consistently. > > Kishon Vijay Abraham I (13): > include: linux: preparation for porting dwc3 from linux kernel > usb: gadget: udc-core: Add minimal udc-core from linux kernel > ARM: DRA7: Enable clocks for USB OTGSS and USB PHY > usb: dwc3: Add dwc3 driver > usb: dwc3-omap: Add dwc3 glue driver for OMAP > usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms > usb: gadget: g_dnl: Explicitly set the max packet size in descriptor > common: cmd_dfu: invoke board_usb_cleanup() for cleaning up > common: cmd_dfu: add an API that takes controller index for handling > interrupts > board: ti: DRA7: added USB initializtion code > commom: usb: implement "__weak" functions to make compiler happy > include: configs: Enable DWC3 and DFU in DRA7xx > dwc3: core: Change the bounce buffer size to 4096 > > Makefile | 1 + > arch/arm/cpu/armv7/omap5/hw_data.c | 14 + > arch/arm/cpu/armv7/omap5/prcm-regs.c | 6 +- > arch/arm/include/asm/arch-omap5/omap.h | 12 + > arch/arm/include/asm/omap_common.h | 4 +- > board/ti/dra7xx/evm.c | 106 ++ > common/cmd_dfu.c | 2 + > common/usb.c | 18 + > drivers/usb/dwc3/Makefile | 10 + > drivers/usb/dwc3/core.c | 640 +++++++ > drivers/usb/dwc3/core.h | 961 +++++++++++ > drivers/usb/dwc3/dwc3-omap.c | 447 +++++ > drivers/usb/dwc3/ep0.c | 1045 ++++++++++++ > drivers/usb/dwc3/gadget.c | 2841 > ++++++++++++++++++++++++++++++++ > drivers/usb/dwc3/gadget.h | 163 ++ > drivers/usb/dwc3/io.h | 52 + > drivers/usb/dwc3/linux-compat.h | 132 ++ > drivers/usb/dwc3/ti_usb_phy.c | 269 +++ > drivers/usb/gadget/Makefile | 1 + > drivers/usb/gadget/composite.c | 3 +- > drivers/usb/gadget/g_dnl.c | 1 + > drivers/usb/gadget/udc-core.c | 229 +++ > include/configs/dra7xx_evm.h | 59 + > include/configs/ti_omap5_common.h | 1 + > include/dwc3-omap-uboot.h | 32 + > include/dwc3-uboot.h | 26 + > include/linux/compat.h | 12 +- > include/linux/usb/composite.h | 12 + > include/linux/usb/dwc3-omap.h | 19 + > include/linux/usb/gadget.h | 75 +- > include/linux/usb/otg.h | 20 + > include/ti-usb-phy-uboot.h | 22 + > include/usb.h | 7 + > include/usb/lin_gadget_compat.h | 8 +- 34 files changed, > 7236 insertions(+), 14 deletions(-) create mode 100644 > drivers/usb/dwc3/Makefile create mode 100644 drivers/usb/dwc3/core.c > create mode 100644 drivers/usb/dwc3/core.h > create mode 100644 drivers/usb/dwc3/dwc3-omap.c > create mode 100644 drivers/usb/dwc3/ep0.c > create mode 100644 drivers/usb/dwc3/gadget.c > create mode 100644 drivers/usb/dwc3/gadget.h > create mode 100644 drivers/usb/dwc3/io.h > create mode 100644 drivers/usb/dwc3/linux-compat.h > create mode 100644 drivers/usb/dwc3/ti_usb_phy.c > create mode 100644 drivers/usb/gadget/udc-core.c > create mode 100644 include/dwc3-omap-uboot.h > create mode 100644 include/dwc3-uboot.h > create mode 100644 include/linux/usb/dwc3-omap.h > create mode 100644 include/linux/usb/otg.h > create mode 100644 include/ti-usb-phy-uboot.h > -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 57+ messages in thread
end of thread, other threads:[~2014-08-22 13:54 UTC | newest] Thread overview: 57+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-08-18 14:28 [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 01/13] include: linux: preparation for porting dwc3 from linux kernel Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 02/13] usb: gadget: udc-core: Add minimal udc-core " Kishon Vijay Abraham I 2014-08-18 14:36 ` Felipe Balbi 2014-08-19 14:58 ` Kishon Vijay Abraham I 2014-08-19 8:52 ` Lukasz Majewski 2014-08-19 15:11 ` Felipe Balbi 2014-08-19 15:18 ` Kishon Vijay Abraham I 2014-08-19 15:28 ` Felipe Balbi 2014-08-19 15:38 ` Lukasz Majewski 2014-08-19 16:06 ` Kishon Vijay Abraham I 2014-08-20 7:02 ` Lukasz Majewski 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 03/13] ARM: DRA7: Enable clocks for USB OTGSS and USB PHY Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 04/13] usb: dwc3: Add dwc3 driver Kishon Vijay Abraham I 2014-08-18 14:37 ` Felipe Balbi 2014-08-19 15:19 ` Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 05/13] usb: dwc3-omap: Add dwc3 glue driver for OMAP Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 06/13] usb: dwc3: TI PHY: PHY driver for dwc3 in TI platforms Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 07/13] usb: gadget: g_dnl: Explicitly set the max packet size in descriptor Kishon Vijay Abraham I 2014-08-18 14:38 ` Felipe Balbi 2014-08-18 14:49 ` Lukasz Majewski 2014-08-18 14:56 ` Lukasz Majewski 2014-08-19 15:38 ` Kishon Vijay Abraham I 2014-08-19 15:44 ` Felipe Balbi 2014-08-20 7:34 ` Lukasz Majewski 2014-08-20 16:11 ` Felipe Balbi 2014-08-21 8:00 ` Lukasz Majewski 2014-08-21 13:50 ` Felipe Balbi 2014-08-20 7:23 ` Lukasz Majewski 2014-08-19 15:34 ` Kishon Vijay Abraham I 2014-08-19 15:39 ` Felipe Balbi 2014-08-19 15:42 ` Kishon Vijay Abraham I 2014-08-19 15:48 ` Felipe Balbi 2014-08-19 15:53 ` Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 08/13] common: cmd_dfu: invoke board_usb_cleanup() for cleaning up Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 09/13] common: cmd_dfu: add an API that takes controller index for handling interrupts Kishon Vijay Abraham I 2014-08-19 8:53 ` Lukasz Majewski 2014-08-19 16:09 ` Kishon Vijay Abraham I 2014-08-20 7:37 ` Lukasz Majewski 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 10/13] board: ti: DRA7: added USB initializtion code Kishon Vijay Abraham I 2014-08-18 14:40 ` Felipe Balbi 2014-08-19 16:13 ` Kishon Vijay Abraham I 2014-08-19 16:26 ` Felipe Balbi 2014-08-22 10:47 ` Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 11/13] commom: usb: implement "__weak" functions to make compiler happy Kishon Vijay Abraham I 2014-08-19 8:28 ` Lukasz Majewski 2014-08-19 16:14 ` Kishon Vijay Abraham I 2014-08-21 17:32 ` Tom Rini 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 12/13] include: configs: Enable DWC3 and DFU in DRA7xx Kishon Vijay Abraham I 2014-08-18 14:28 ` [U-Boot] [UBOOT RFC PATCH 13/13] dwc3: core: Change the bounce buffer size to 4096 Kishon Vijay Abraham I 2014-08-18 14:41 ` Felipe Balbi 2014-08-19 16:15 ` Kishon Vijay Abraham I 2014-08-19 16:27 ` Felipe Balbi 2014-08-22 11:02 ` Kishon Vijay Abraham I 2014-08-22 13:54 ` Felipe Balbi 2014-08-18 15:29 ` [U-Boot] [UBOOT RFC PATCH 00/13] DRA7xx: Add DWC3 USB driver and enable DFU Tom Rini 2014-08-19 8:56 ` Lukasz Majewski
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.