Merge a backport of the following 82 commits from the 3.2 kernel. commit10f1551c50Author: Yu Xu <yuxu@marvell.com> Date: Sat Dec 10 00:03:33 2011 +0800 usb: gadget: storage: release superspeed descriptors. Release superspeed mass storage descriptors memory when the function is unbind. Signed-off-by: Yu Xu <yuxu@marvell.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/f_mass_storage.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit1d6d304680Author: Felipe Balbi <balbi@ti.com> Date: Mon Oct 3 16:39:30 2011 +0300 usb: gadget: core: fix bug when removing gadget drivers usb_gadget_disconnect() is responsible of removing data pullups. Before doing that we must, first, tell gadget driver we're disconnecting (by calling disconnect method on gadget driver structure), unbind the gadget driver and stop the controller. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/udc-core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit145cbade27Author: Felipe Balbi <balbi@ti.com> Date: Wed Aug 3 13:33:27 2011 +0200 usb: gadget: storage: add superspeed support this patch adds superspeed descriptors for the storage gadgets. Acked-by: Michal Nazarewicz <mina86@mina86.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Felipe Balbi <balbi@ti.com> [idos@codeaurora.org: Conflicts: drivers/usb/gadget/storage_common.c] Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/f_mass_storage.c | 22 ++++++ drivers/usb/gadget/file_storage.c | 59 +++++++++++++--- drivers/usb/gadget/mass_storage.c | 2 +- drivers/usb/gadget/storage_common.c | 127 +++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+), 11 deletions(-) commitb0c3e7fb4dAuthor: Felipe Balbi <balbi@ti.com> Date: Mon Oct 10 09:43:44 2011 +0300 usb: gadget: fix typo for default U1/U2 exit latencies s/DEFULT/DEFAULT/, no functional changes. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/composite.c | 4 ++-- include/linux/usb/gadget.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit834e066cffAuthor: Paul Zimmerman <Paul.Zimmerman@synopsys.com> Date: Fri Sep 30 15:26:06 2011 -0700 usb: gadget: storage: fix mass storage gadgets to work with Synopsys UDC The Synopsys USB device controller requires all OUT transfer request lengths to be aligned to max packet size. The mass storage gadgets do not meet this requirement for Super Speed. The gadgets already have a function which performs this alignment for CBW packets, so use it for data packets too. The alternative would be to implement bounce buffers in the DWC3 driver, but that could have a significant impact on performance. This version is based upon a more-correct patch written by Alan Stern. Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/f_mass_storage.c | 18 +++++++++--------- drivers/usb/gadget/file_storage.c | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) commit7295baf179Author: Alan Stern <stern@rowland.harvard.edu> Date: Thu Aug 18 20:29:00 2011 +0200 USB: gadget: storage: remove alignment assumption This patch (as1481) fixes a problem affecting g_file_storage and g_mass_storage when running at SuperSpeed. The two drivers currently assume that the bulk-out maxpacket size can evenly divide the SCSI block size, which is 512 bytes. But SuperSpeed bulk endpoints have a maxpacket size of 1024, so the assumption is no longer true. This patch removes that assumption from the drivers, by getting rid of a small optimization (they try to align VFS reads and writes on page cache boundaries). If a command's starting logical block address is 512 bytes below the end of a page, it's not okay to issue a USB command for just those 512 bytes when the maxpacket size is 1024 -- it would result in either babble (for an OUT transfer) or a short packet (for an IN transfer). Also, for backward compatibility, the test for writes extending beyond the end of the backing storage has to be changed. If the host tries to do this, we should accept the data that fits in the backing storage and ignore the rest. Because the storage's end may not align with a USB packet boundary, this means we may have to accept a USB OUT transfer that extends beyond the end of the storage and then write out only the part of the data that fits. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com> [idos@codeaurora.org: Conflicts: drivers/usb/gadget/f_mass_storage.c Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/f_mass_storage.c | 64 ++++++++++++--------------------- drivers/usb/gadget/file_storage.c | 67 ++++++++++++++--------------------- 2 files changed, 50 insertions(+), 81 deletions(-) commit9e5eb17594Author: Peiyu Li <peiyu.li@csr.com> Date: Wed Aug 17 22:52:59 2011 -0700 usb: gadget: storage: adapt logic block size to bound block devices Now the mass storage driver has fixed logic block size of 512 bytes. The mass storage gadget read/write bound devices only through VFS, so the bottom level devices actually are just RAW devices to the driver and connected PC. As a RAW, hosts can always format, read and write it right in 512 bytes logic block and don't care about the actual logic block size of devices bound to the gadget. But if we want to share the bound block device partition between target board and PC, in case the logic block size of the bound block device is 4KB, we execute the following steps: 1. connect a board with mass storage gadget to PC(the board has set one partition of on-board block device as file name of the mass storage) 2. PC format the mass storage to VFAT by default logic block size and read/write it 3. disconnect boards from PC 4. target board mount the partition as VFAT Step 4 will fail since kernel on target thinks the logic block size of the bound partition as 4KB. A typical error is "FAT: logical sector size too small for device (logical sector size = 512)" If we execute opposite steps: 1. format the partition to VFAT on target board and read/write this partition 2. connect the board to Windows PC as usb mass storage gadget, windows will think the disk is not formatted So the conclusion is that only as a gadget, the mass storage driver has no any problem. But being shared VFAT or other filesystem on PC and target board, it will fail. This patch adapts logic block size to bound block devices and fix the issue. Cc: Michal Nazarewicz <mina86@mina86.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Peiyu Li <peiyu.li@csr.com> Signed-off-by: Xianglong Du <xianglong.du@csr.com> Signed-off-by: Huayi Li <huayi.li@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/f_mass_storage.c | 63 ++++++++++++++++++++-------------- drivers/usb/gadget/file_storage.c | 50 +++++++++++++-------------- drivers/usb/gadget/storage_common.c | 23 ++++++++++--- 3 files changed, 79 insertions(+), 57 deletions(-) commit26bba694a4Author: Felipe Balbi <balbi@ti.com> Date: Mon Dec 19 13:45:01 2011 +0200 usb: gadget: epautoconf: do not change number of streams We should not change gadget driver's descriptors just because we think it's right to do so. There are several of reasons which would support this statement but it suffices to say that this was probably never tested because it updates bmAttributes without asking the driver if it's ok to do so. This means that e.g. on UASP gadget it would enable stream support even for the command endpoint which must not have stream support enabled. In fact, this change is fixing the bug introduced by commit a59d6b9 (usb: gadget: add streams support to the gadget framework) which was caught when testing UASP gadget with dwc3 driver. Cc: Tatyana Brokhman <tlinder@codeaurora.org> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/epautoconf.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commitfb5591ebf5Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Thu Jun 23 14:26:15 2011 +0200 usb: gadget: udc-core: add "new-style" registration interface udc_start() should only trigger the internal state machine and make minimal house keeping. Before that call udc-core calls the bind() callback and after the callback the pullup(). udc_stop() is simillar, udc-core calls pullup(), unbind() and finally udc_stop(). Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/udc-core.c | 75 ++++++++++++++++++++++++++++++++++++++-- include/linux/usb/gadget.h | 6 +++ 2 files changed, 77 insertions(+), 4 deletions(-) commit0d0c240facAuthor: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Thu Jun 23 14:26:11 2011 +0200 usb: gadget: defer setting maxpacket till ->setup() maxpacket is set by the udc driver for ep0 very early. This value is copied by the function gadget used later for the USB_DT_DEVICE and USB_DT_DEVICE_QUALIFIER query. This seems to work fine so far. For USB3 we need set a different value here. In SS speed it is 2^x with x=9 and in HS we set something <= 64. If the UDC starts in SS and continues in HS after the cable has been plugged it will report a too small value. There setting of this value is defered and taken automaticly from the ep0 pointer where the UDC driver can update it according to the speed it detected _after_ a cable has been plugged. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/composite.c | 3 +-- drivers/usb/gadget/dbgp.c | 2 +- drivers/usb/gadget/file_storage.c | 10 ++++++---- drivers/usb/gadget/gmidi.c | 3 +-- drivers/usb/gadget/inode.c | 5 ++--- drivers/usb/gadget/printer.c | 14 +++++++++----- 6 files changed, 20 insertions(+), 17 deletions(-) commitbc2aa11468Author: Tatyana Brokhman <tlinder@codeaurora.org> Date: Wed Jun 29 16:41:50 2011 +0300 usb: gadget: add SuperSpeed support to the Gadget Framework SuperSpeed USB has defined a new descriptor, called the Binary Device Object Store (BOS) Descriptor. It has also changed a bit the definition of SET_FEATURE and GET_STATUS requests to add USB3-specific details. This patch implements both changes to the Composite Gadget Framework. [ balbi@ti.com : slight changes to commit log fixed a compile error on ARM ] Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/Kconfig | 6 + drivers/usb/gadget/composite.c | 257 ++++++++++++++++++++++++++++++++++++--- drivers/usb/gadget/epautoconf.c | 6 +- include/linux/usb/composite.h | 14 ++ include/linux/usb/gadget.h | 31 +++++ 5 files changed, 293 insertions(+), 21 deletions(-) commit3ba28906aeAuthor: Tatyana Brokhman <tlinder@codeaurora.org> Date: Wed Jun 29 16:41:49 2011 +0300 usb: gadget: add max_speed to usb_composite_driver This field is used by the Gadget drivers to specify the maximum speed they support, meaning: the maximum speed they can provide descriptors for. The driver speed will be set in consideration of this value. [ balbi@ti.com : dropped the ifdeffery ] Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> [idos@codeaurora.org: added max_speed also to android.c] Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/android.c | 1 + drivers/usb/gadget/audio.c | 1 + drivers/usb/gadget/cdc2.c | 1 + drivers/usb/gadget/composite.c | 2 ++ drivers/usb/gadget/ether.c | 1 + drivers/usb/gadget/g_ffs.c | 1 + drivers/usb/gadget/hid.c | 1 + drivers/usb/gadget/mass_storage.c | 1 + drivers/usb/gadget/multi.c | 1 + drivers/usb/gadget/ncm.c | 1 + drivers/usb/gadget/nokia.c | 1 + drivers/usb/gadget/serial.c | 1 + drivers/usb/gadget/webcam.c | 1 + drivers/usb/gadget/zero.c | 1 + include/linux/usb/composite.h | 2 ++ 15 files changed, 17 insertions(+), 0 deletions(-) commit081412dc44Author: Tatyana Brokhman <tlinder@codeaurora.org> Date: Tue Jun 28 16:33:53 2011 +0300 usb: gadget: add streams support to the gadget framework This patch defines necessary fields to support streaming for USB3.0. It implements a new function, called usb_ep_autoconfig_ss(), to be used instead of the existing usb_ep_autoconfig() when working in SuperSpeed mode and there is a need to search for an endpoint according to the number of required streams. [ balbi@ti.com : slight changes to commit log ] Signed-off-by: Maya Erez <merez@codeaurora.org> Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/epautoconf.c | 125 +++++++++++++++++++++++++++++++-------- include/linux/usb/gadget.h | 13 ++++ 2 files changed, 113 insertions(+), 25 deletions(-) commit5ef53d97a1Author: Tatyana Brokhman <tlinder@codeaurora.org> Date: Tue Jun 28 16:33:52 2011 +0300 usb: gadget: coding style fix fix the coding style of a few switches on the gadget framework. [ balbi@ti.com : add a commit log ] Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/composite.c | 16 ++++++++++--- drivers/usb/gadget/dummy_hcd.c | 48 ++++++++++++++++++++++++++++++---------- 2 files changed, 48 insertions(+), 16 deletions(-) commit31ac352192Author: Tatyana Brokhman <tlinder@codeaurora.org> Date: Tue Jun 28 15:33:50 2011 +0200 usb: gadget: use config_ep_by_speed() instead of ep_choose() Remove obsolete functions: 1. ep_choose() 2. usb_find_endpoint() Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> [idos@codeaurora.org: Changed also the following files to comply with this commit: f_accessory.c,f_adb.c,f_diag.c,f_mtp.c, f_rmnet.c,f_rmnet_sdio,f_rmnet_smd,f_rmnet_smd_sdio,f_serial.f_ccid.c. Also merged a patch in f_serial.c for checking return value of config_ep_by_speed, see "usb: gadget: fix g_serial regression". Also fix a bug in ci13xxx_udc. Since f_serial is now checking if the endpoint descriptors are null in the set_alt function, need to set them to null on ep_disable in case of cable disconnect. Since the ep descriptor was inserted to struct usb_ep in "usb: gadget: add usb_endpoint_descriptor to struct usb_ep", also set mEp->ep.desc to NULL. I have upstream this to the community, please see "usb: gadget: Clear usb_endpoint_descriptor inside the struct usb_ep" in the latest linux kernel.] Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/ci13xxx_udc.c | 1 + drivers/usb/gadget/config.c | 26 ------------- drivers/usb/gadget/f_accessory.c | 30 +++++++++++----- drivers/usb/gadget/f_acm.c | 46 +++++++----------------- drivers/usb/gadget/f_adb.c | 30 +++++++++++---- drivers/usb/gadget/f_ccid.c | 54 +++++++++++----------------- drivers/usb/gadget/f_diag.c | 13 ++++--- drivers/usb/gadget/f_ecm.c | 45 +++++++---------------- drivers/usb/gadget/f_eem.c | 32 +++++------------ drivers/usb/gadget/f_hid.c | 19 +++------- drivers/usb/gadget/f_loopback.c | 11 ++++-- drivers/usb/gadget/f_mass_storage.c | 46 ++++++++++-------------- drivers/usb/gadget/f_mtp.c | 30 +++++++++++---- drivers/usb/gadget/f_ncm.c | 49 ++++++++------------------ drivers/usb/gadget/f_obex.c | 32 +++++------------ drivers/usb/gadget/f_phonet.c | 12 +++--- drivers/usb/gadget/f_rmnet.c | 48 ++++++++----------------- drivers/usb/gadget/f_rmnet_sdio.c | 62 ++++++++++++++++++++++++++------ drivers/usb/gadget/f_rmnet_smd.c | 38 +++++++++++++++----- drivers/usb/gadget/f_rmnet_smd_sdio.c | 63 ++++++++++++++++++++++++++------ drivers/usb/gadget/f_rndis.c | 46 +++++++----------------- drivers/usb/gadget/f_serial.c | 53 +++++++++------------------- drivers/usb/gadget/f_sourcesink.c | 8 +++- drivers/usb/gadget/f_subset.c | 29 +++------------ drivers/usb/gadget/file_storage.c | 12 ++++++ drivers/usb/gadget/storage_common.c | 11 ------ include/linux/usb/composite.h | 15 -------- include/linux/usb/gadget.h | 6 --- 28 files changed, 392 insertions(+), 475 deletions(-) commitcf64ce4954Author: Tatyana Brokhman <tlinder@codeaurora.org> Date: Tue Jun 28 16:33:49 2011 +0300 usb: gadget: configure endpoint according to gadget speed Add config_ep_by_speed() to configure the endpoint according to the gadget speed. Using this function will spare the FDs from handling the endpoint chosen descriptor. Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/composite.c | 85 +++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/epautoconf.c | 1 + include/linux/usb/composite.h | 3 + include/linux/usb/gadget.h | 3 + 4 files changed, 92 insertions(+), 0 deletions(-) commitcf709c115cAuthor: Tatyana Brokhman <tlinder@codeaurora.org> Date: Tue Jun 28 16:33:48 2011 +0300 usb: gadget: add usb_endpoint_descriptor to struct usb_ep Change usb_ep_enable() prototype to use endpoint descriptor from usb_ep. This optimization spares the FDs from saving the endpoint chosen descriptor. This optimization is not full though. To fully exploit this change, one needs to update all the UDCs as well since in the current implementation each of them saves the endpoint descriptor in it's internal (and extended) endpoint structure. Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> [idos@codeaurora.org: Added more changes for the following files since API break with msm code tree: ci13xxx_udc.c,f_accessory,f_adb, f_diag,f_mtp,f_rmnet,f_rmnet_sdio,f_rmnet_smd, f_rmnet_smd_sdio,u_bam.c, u_sdio.c,u_rmnet.h,u_sdio.c,u_smd.c,f_ccid.c,u_data_hsic.c] Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/ci13xxx_udc.c | 6 ++++-- drivers/usb/gadget/dbgp.c | 8 +++++--- drivers/usb/gadget/f_accessory.c | 16 ++++++++++------ drivers/usb/gadget/f_acm.c | 9 ++++----- drivers/usb/gadget/f_adb.c | 14 ++++++++------ drivers/usb/gadget/f_audio.c | 5 ++--- drivers/usb/gadget/f_ccid.c | 15 ++++++--------- drivers/usb/gadget/f_diag.c | 12 +++++------- drivers/usb/gadget/f_ecm.c | 17 ++++++++--------- drivers/usb/gadget/f_eem.c | 10 +++++----- drivers/usb/gadget/f_fs.c | 3 ++- drivers/usb/gadget/f_hid.c | 5 ++--- drivers/usb/gadget/f_loopback.c | 14 ++++++-------- drivers/usb/gadget/f_mass_storage.c | 3 ++- drivers/usb/gadget/f_mtp.c | 17 ++++++++++------- drivers/usb/gadget/f_ncm.c | 17 ++++++++--------- drivers/usb/gadget/f_obex.c | 6 +++--- drivers/usb/gadget/f_phonet.c | 9 ++++----- drivers/usb/gadget/f_rmnet.c | 9 ++++----- drivers/usb/gadget/f_rmnet_sdio.c | 15 +++++++++------ drivers/usb/gadget/f_rmnet_smd.c | 15 +++++++++------ drivers/usb/gadget/f_rmnet_smd_sdio.c | 15 +++++++++------ drivers/usb/gadget/f_rndis.c | 15 +++++++-------- drivers/usb/gadget/f_serial.c | 9 ++++----- drivers/usb/gadget/f_sourcesink.c | 10 ++++------ drivers/usb/gadget/f_subset.c | 8 ++++---- drivers/usb/gadget/f_uvc.c | 6 ++++-- drivers/usb/gadget/file_storage.c | 3 ++- drivers/usb/gadget/gmidi.c | 6 ++++-- drivers/usb/gadget/inode.c | 6 ++++-- drivers/usb/gadget/printer.c | 26 ++++++++++++++------------ drivers/usb/gadget/u_bam.c | 8 ++++---- drivers/usb/gadget/u_data_hsic.c | 10 ++-------- drivers/usb/gadget/u_ether.c | 12 ++++++------ drivers/usb/gadget/u_ether.h | 4 ---- drivers/usb/gadget/u_rmnet.h | 2 -- drivers/usb/gadget/u_sdio.c | 4 ++-- drivers/usb/gadget/u_serial.c | 4 ++-- drivers/usb/gadget/u_serial.h | 2 -- drivers/usb/gadget/u_smd.c | 4 ++-- include/linux/usb/gadget.h | 16 +++++++--------- 41 files changed, 197 insertions(+), 198 deletions(-) commitd23607a2ebAuthor: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Tue Jun 28 16:33:47 2011 +0300 usb: gadget: convert all users to the new udc infrastructure peripheral drivers are using usb_add_gadget()/usb_del_gadget() to register/unregister to the udc-core. The udc-core will take the first available gadget driver and attach function driver which is calling usb_gadget_register_driver(). This is the same behaviour we have right now. Only dummy_hcd was tested, the others were compiled tested. Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Anton Tikhomirov <av.tikhomirov@samsung.com> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Dan Carpenter <error27@gmail.com> Cc: Darius Augulis <augulis.darius@gmail.com> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Jingoo Han <jg1.han@samsung.com> Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Li Yang <leoli@freescale.com> Cc: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Mike Frysinger <vapier@gentoo.org> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Pavankumar Kondeti <pkondeti@codeaurora.org> Cc: Roy Huang <roy.huang@analog.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com> Cc: Xiaochen Shen <xiaochen.shen@intel.com> Cc: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> Cc: Yuan-Hsin Chen <yhchen@faraday-tech.com> Cc: cxie4 <cxie4@marvell.com> Cc: linux-geode@lists.infradead.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> [idos@codeaurora.org: Conflicts: drivers/usb/gadget/ci13xxx_udc.c msm72k_udc.c: This driver is not exists in Linux community,so fix this one too. cyasgadget.c: combine other patch from the community ("convert cyasgadget to new udc core") into this commit. Removed the #if 0 block that was in the community version and fix the cause problem, because of which it was under #if 0 block] Signed-off-by: Ido Shayevitz <idos@codeaurora.org> .../staging/westbridge/astoria/gadget/cyasgadget.c | 26 ++++++++++++++-- drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/amd5536udc.c | 18 ++++++++--- drivers/usb/gadget/at91_udc.c | 20 +++++++++--- drivers/usb/gadget/atmel_usba_udc.c | 26 ++++++++++++++-- drivers/usb/gadget/ci13xxx_udc.c | 30 ++++++++++++++----- drivers/usb/gadget/dummy_hcd.c | 31 +++++++++++++------ drivers/usb/gadget/fsl_qe_udc.c | 20 ++++++++++-- drivers/usb/gadget/fsl_udc_core.c | 20 ++++++++++-- drivers/usb/gadget/fusb300_udc.c | 15 +++++++-- drivers/usb/gadget/goku_udc.c | 19 +++++++++--- drivers/usb/gadget/imx_udc.c | 20 +++++++++--- drivers/usb/gadget/langwell_udc.c | 20 ++++++++---- drivers/usb/gadget/m66592-udc.c | 17 ++++++++-- drivers/usb/gadget/msm72k_udc.c | 30 ++++++++++++++++--- drivers/usb/gadget/mv_udc_core.c | 19 +++++++---- drivers/usb/gadget/net2280.c | 18 ++++++++--- drivers/usb/gadget/omap_udc.c | 22 +++++++++++--- drivers/usb/gadget/pch_udc.c | 16 +++++++-- drivers/usb/gadget/pxa25x_udc.c | 19 ++++++++---- drivers/usb/gadget/pxa27x_udc.c | 23 ++++++++++---- drivers/usb/gadget/r8a66597-udc.c | 15 +++++++-- drivers/usb/gadget/s3c-hsotg.c | 19 +++++++++-- drivers/usb/gadget/s3c-hsudc.c | 16 +++++++-- drivers/usb/gadget/s3c2410_udc.c | 29 +++++++++++------- drivers/usb/musb/musb_gadget.c | 23 +++++++++++--- drivers/usb/renesas_usbhs/mod_gadget.c | 20 +++++++++--- 27 files changed, 411 insertions(+), 141 deletions(-) commit5177504241Author: Felipe Balbi <balbi@ti.com> Date: Tue Jun 28 16:33:46 2011 +0300 usb: gadget: introduce UDC Class this class will be used to abstract away several of the duplicated operations scattered among the USB gadget controller drivers. Later, we can add an atomic notifier to tell interested drivers about what's happening with the controller. Notifications such as suspend, resume, enumerated, etc. will be useful, at a minimum, for implementing usb charger detection. As part of the converting process usb_gadget_probe_driver() is no longer part of each udc but pushed into the ->stap() callback. The same for his couterpart. The core is currently set explicit to 'n'. It will be changed to 'y' once all users are converted since it provides functions which clash with other drivers. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/udc-core.c | 418 +++++++++++++++++++++++++++++++++++++++++ include/linux/usb/gadget.h | 7 + 2 files changed, 425 insertions(+), 0 deletions(-) commit9bcc83f456Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Fri Aug 19 18:10:56 2011 +0300 usb: ch9: add function defines from ch9, USB 3.0 spec not to confuse with Table 9-7 in USB 2.0 spec Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> include/linux/usb/ch9.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit0be99a24dbAuthor: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Fri Sep 30 18:08:59 2011 -0400 usb: Add module.h to various dwc3 drivers These files uses the full set of MODULE_ macros and so need to include module.h directly. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.c | 1 + drivers/usb/dwc3/dwc3-omap.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) commitf208a8f461Author: Felipe Balbi <balbi@ti.com> Date: Fri Sep 30 10:58:51 2011 +0300 usb: dwc3: convert structures into bitshifts our parameter structures need to be written to HW, so instead of assuming little endian, we convert those into bit shifts. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 6 +- drivers/usb/dwc3/gadget.c | 40 ++++++------- drivers/usb/dwc3/gadget.h | 139 +++++++++------------------------------------ 3 files changed, 48 insertions(+), 137 deletions(-) commitb141b8cd02Author: Felipe Balbi <balbi@ti.com> Date: Fri Sep 30 10:58:50 2011 +0300 usb: dwc3: gadget: allow clock gating to work The dwc3 core has internal clock gating support. Let's allow that to happen by clearing the disable bit in GCTL register. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 6 ++++++ drivers/usb/dwc3/gadget.c | 8 ++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) commitb333f87fccAuthor: Felipe Balbi <balbi@ti.com> Date: Fri Sep 30 10:58:49 2011 +0300 usb: dwc3: core: cache GHWPARAMS* registers cache the contents of GHWPARAMS* registers in our device structure for easy access. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) commitd8e9f2a2f0Author: Felipe Balbi <balbi@ti.com> Date: Fri Sep 30 10:58:48 2011 +0300 usb: dwc3: add struct dwc3_hwparams That structure will hold a copy of readonly GHWPARAMS* registers for ease accessing by the driver. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) commit2aadc55ef7Author: Felipe Balbi <balbi@ti.com> Date: Fri Sep 30 10:58:47 2011 +0300 usb: dwc3: gadget: implement streams support The following patch adds support for streams to dwc3 driver. While at that, also fix one small issue on endpoint disable where we should clear all flags not only ENABLED. Reviewied-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> Documentation/usb/dwc3.txt | 8 -------- drivers/usb/dwc3/core.h | 6 ++++++ drivers/usb/dwc3/gadget.c | 34 ++++++++++++++++++++++++++++++---- 3 files changed, 36 insertions(+), 12 deletions(-) commit92366a9b25Author: Felipe Balbi <balbi@ti.com> Date: Fri Sep 30 10:58:46 2011 +0300 usb: dwc3: gadget: add support for Bursts We already have the value from gadget drivers, just need to pass it to our controller. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> [idos@codeaurora.org: Integrate in this commit also the change "USB: use usb_endpoint_maxp() instead of le16_to_cpu()" 29cc88979a8818cd8c5019426e945aed118b400e from Linux kernel 3.1. The reason why this change was not cherry-picked separately is because I wanted to reduce impact on msm code tree, and only change dwc3 driver.] Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit4f5db5cf5bAuthor: kuninori.morimoto.gx@renesas.com <kuninori.morimoto.gx@renesas.com> Date: Mon Jul 25 00:39:30 2011 -0700 usb: add usb_endpoint_maxp() macro Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> [idos@codeaurora.org: use __le16_to_cpu instead of le16_to_cpu] Signed-off-by: Ido Shayevitz <idos@codeaurora.org> include/linux/usb/ch9.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) commitbba939f019Author: Paul Zimmerman <Paul.Zimmerman@synopsys.com> Date: Fri Sep 30 10:58:45 2011 +0300 usb: dwc3: gadget: fix DMA offset calculation Fix offset calculation in dwc3_trb_dma_offset() Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit4281539e1dAuthor: Paul Zimmerman <Paul.Zimmerman@synopsys.com> Date: Fri Sep 30 10:58:44 2011 +0300 usb: dwc3: gadget: make DWC3_EP_WEDGE do the right thing This makes DWC3_EP_WEDGE do the right thing, which is prevent DWC3_EP_WEDGE from ever being cleared by a ClearFeature(HALT) command. [ balbi@ti.com : allowed set_wedge to send SetHalt command to controller ] Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commitdf7a63dc19Author: Paul Zimmerman <Paul.Zimmerman@synopsys.com> Date: Fri Sep 30 10:58:43 2011 +0300 usb: dwc3: gadget: driver should not wait for RxFIFO to drain An older version of the databook said to wait for the FIFO to drain, but that has been removed from the newer databooks. Waiting for RxFIFO to drain caused problems when testing against one of the host controllers available in the market. After talking to one of the RTL engineers, he stated that we should _not_ wait for RxFIFO to drain. Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) commita6544d0e1cAuthor: Paul Zimmerman <Paul.Zimmerman@synopsys.com> Date: Fri Sep 30 10:58:42 2011 +0300 usb: dwc3: gadget: fix DEPSTARTCFG for non-EP0 EPs DEPSTARTCFG for non-EP0 EPs must only be sent once per config [ balbi@ti.com : changed config_start to start_config_issued ] Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 2 ++ drivers/usb/dwc3/ep0.c | 1 + drivers/usb/dwc3/gadget.c | 10 +++++++++- 3 files changed, 12 insertions(+), 1 deletions(-) commit9342a6f8b0Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Fri Sep 30 10:58:41 2011 +0300 usb: dwc: remove "All rights reserved" statement. Some people think that this line is not compatible with the GPL. The statement was required due to the Buenos Aires Convention and is now deprecated. I remove it because it is said that it is pointless nowdays. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.c | 1 - drivers/usb/dwc3/core.h | 1 - drivers/usb/dwc3/debug.h | 1 - drivers/usb/dwc3/debugfs.c | 1 - drivers/usb/dwc3/dwc3-omap.c | 1 - drivers/usb/dwc3/dwc3-pci.c | 1 - drivers/usb/dwc3/ep0.c | 1 - drivers/usb/dwc3/gadget.c | 1 - drivers/usb/dwc3/gadget.h | 1 - drivers/usb/dwc3/io.h | 1 - 10 files changed, 0 insertions(+), 10 deletions(-) commitf8336a2d5bAuthor: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Fri Sep 30 10:58:40 2011 +0300 usb: dwc3: ep0: fix debug output Use "ep0in" and "ep0out" instead "ep1in" and "ep0out" which is confusing and not consistent with the remaining output. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit9b580c9667Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Fri Sep 30 10:58:39 2011 +0300 usb: dwc3: ep0: remove second giveback in error case We already give requests back in dwc3_ep0_stall_and_restart() so doing it again here will most likely corrupt the list. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commitb55ee45356Author: Felipe Balbi <balbi@ti.com> Date: Fri Sep 30 10:58:38 2011 +0300 usb: dwc3: ep0: fix debug message The way it was before was really meaningless. Now it looks saner. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit0788d7b5e6Author: Felipe Balbi <balbi@ti.com> Date: Fri Sep 30 10:58:37 2011 +0300 usb: dwc3: ep0: ignore direction on 2-stage transfer We don't need to care about direction on a two stage transfer. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commitb7139d3e59Author: Felipe Balbi <balbi@ti.com> Date: Fri Sep 30 10:58:36 2011 +0300 usb: dwc3: ep0: Make USB30CV happy with SetAddress According to USB 3.0 Specification, a SetAddress() while device is in Configured State has an unspecified behavior (see Section 9.4.6). Still USB30CV wasn't happy with my Stall reply. To make that thing happy, just accept the SetAddress() always. No problems have been observed thus far. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) commit6edd5bdb3bAuthor: Felipe Balbi <balbi@ti.com> Date: Thu Sep 8 21:18:47 2011 +0300 usb: dwc3: gadget: improve debug on link state change It's useful to know which states core is going through, as it might help us figure out misbehavior on specific link states. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit29561f1886Author: Felipe Balbi <balbi@ti.com> Date: Tue Sep 6 10:56:51 2011 +0300 usb: dwc3: omap: set idle and standby modes For now, let's disable IDLE and STANDBY transitions until we have a real HW to validate against. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/dwc3-omap.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) commitecc99439beAuthor: Felipe Balbi <balbi@ti.com> Date: Thu Sep 8 18:27:33 2011 +0300 usb: dwc3: ep0: introduce ep0_expect_in flag This flag will tell us which direction we're expecting on the next (data or status) phase. It will help us catching errors of host going crazy and requesting data of the wrong direction. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 2 ++ drivers/usb/dwc3/ep0.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) commit4454f03ef0Author: Felipe Balbi <balbi@ti.com> Date: Thu Sep 8 18:17:12 2011 +0300 usb: dwc3: ep0: giveback requests on stall_and_restart if we don't, the list will be busy forever. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commitd3ba9a9d63Author: Felipe Balbi <balbi@ti.com> Date: Thu Sep 8 18:16:21 2011 +0300 usb: dwc3: gadget: drop the useless dma_sync_single* calls if req->dma isn't DMA_ADDR_INVALID it means gadget driver mapped the request or allocated from coherent, so it's unnecessary to do anything. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) commitd195b32c82Author: Felipe Balbi <balbi@ti.com> Date: Thu Sep 8 17:42:11 2011 +0300 usb: dwc3: gadget: fix GCTL programming ensure a few bits are cleared before enabling what we need. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) commite207db6804Author: Felipe Balbi <balbi@ti.com> Date: Thu Sep 8 17:41:00 2011 +0300 usb: dwc3: define ScaleDown macro helper We must ensure that those bits aren't set as they should only be used in simulation. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit18b26f81d3Author: Felipe Balbi <balbi@ti.com> Date: Thu Sep 8 17:39:59 2011 +0300 usb: dwc3: Fix definition of DWC3_GCTL_U2RSTECN that should be 1 << 16, not 16. Caused so many problems and we never caught it before. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit4ae8e1c5f7Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Wed Aug 31 17:12:02 2011 +0200 usb: dwc3: gadget: do not map/unmap ZLP transfers If the gadget drivers sends a ZLP we are trying to map this this request which does not work on all implementations. So we simply skip mapping it. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit5248ed14acAuthor: Felipe Balbi <balbi@ti.com> Date: Tue Sep 6 12:00:39 2011 +0300 usb: dwc3: omap: fix IRQ handling In order to ACK the IRQ we must write back to the same register the bits we read. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/dwc3-omap.c | 39 ++++++++++++--------------------------- 1 files changed, 12 insertions(+), 27 deletions(-) commit6e8585e672Author: Felipe Balbi <balbi@ti.com> Date: Tue Sep 6 10:57:41 2011 +0300 usb: dwc3: omap: change IRQ name to dwc3-omap dwc3-wrapper can be used by any other wrapper, using dwc3-omap makes it clear that we're running on OMAP SoC. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/dwc3-omap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit8ff9be9a57Author: Felipe Balbi <balbi@ti.com> Date: Mon Sep 5 13:37:28 2011 +0300 usb: dwc3: add module.h to dwc3-omap.c and core.c We need that header because of THIS_MODULE. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.c | 1 + drivers/usb/dwc3/dwc3-omap.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) commit6f33e1af1aAuthor: Felipe Balbi <balbi@ti.com> Date: Thu Sep 1 22:26:25 2011 +0300 usb: dwc3: omap: distinguish between SW and HW modes The OMAP wrapper allows us to either control internal OTG signals via SW or HW. Different boards might wish to use one or the other mode of operation. Let's have have that information passed via platform_data for now. After DT conversion is finished for OMAP, we can easily convert this to a DT attribute. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/dwc3-omap.c | 22 ++++++++++++++ include/linux/platform_data/dwc3-omap.h | 47 +++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) commit201d9a02eeAuthor: Felipe Balbi <balbi@ti.com> Date: Thu Sep 1 18:33:43 2011 +0300 usb: dwc3: omap: drop DEV_PM_OPS for now We need to have actual HW in order to implement and test that part of the code anyway. Until then it's best to remove it. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/dwc3-omap.c | 41 ----------------------------------------- 1 files changed, 0 insertions(+), 41 deletions(-) commitc6aa9939cbAuthor: Felipe Balbi <balbi@ti.com> Date: Thu Sep 1 18:22:01 2011 +0300 usb: dwc3: omap: use the macro we already have trivial patch, no functional changes. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/dwc3-omap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commite4b324671dAuthor: Felipe Balbi <balbi@ti.com> Date: Thu Sep 1 14:52:52 2011 +0300 usb: dwc3: omap: do not enable DMA Disable Clear IRQ Otherwise that IRQ will trigger forever. It's quite unnecessary. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/dwc3-omap.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commitc93695d156Author: Felipe Balbi <balbi@ti.com> Date: Thu Sep 1 14:46:16 2011 +0300 usb: dwc3: omap: fix dev_dbg() calls dev_dbg() macro expects a device pointer as argument, not a memory base address. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/dwc3-omap.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) commit665b9c7f97Author: Felipe Balbi <balbi@ti.com> Date: Tue Aug 30 15:52:17 2011 +0300 usb: dwc3: use ep0_next_event field Start tracking the next expected event and act on the error conditions as suggested by databook. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) commit4f072fa1d0Author: Felipe Balbi <balbi@ti.com> Date: Tue Aug 30 15:50:40 2011 +0300 usb: dwc3: core: add ep0_next_event field this field will hold the next expected event. In certain cases, host might fall into some error condition and ask from us the wrong Control phase. On such situations, we should stall and restart. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commitaa7b4d0d1fAuthor: Felipe Balbi <balbi@ti.com> Date: Tue Aug 30 15:48:08 2011 +0300 usb: dwc3: drop EP0_STALL state Whenever we issue a Set Stall command on EP0, the state machine will be restarted and Stall is cleared automatically, when core receives the next SETUP packet. There's no need to track that EP0_STALL state. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 1 - drivers/usb/dwc3/ep0.c | 2 -- drivers/usb/dwc3/gadget.c | 10 ++++++++-- 3 files changed, 8 insertions(+), 5 deletions(-) commit0054d1193fAuthor: Felipe Balbi <balbi@ti.com> Date: Tue Aug 30 15:54:53 2011 +0300 usb: dwc3: ep0: clear all EP0 flags when we're going to issue Set Stall command, we should clear DWC3_EP_STALL flag, but also we should clear BUSY, HALTED and all others. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commitc0478e0f39Author: Felipe Balbi <balbi@ti.com> Date: Wed Aug 31 11:51:43 2011 +0300 usb: dwc3: ep0: fix Get Status handling data was prepared on setup_buf but transfer was started on ctrl_req, fix it. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit6062cac8e2Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon Aug 29 16:46:38 2011 +0200 usb: dwc3: gadget: replace mdelay with udelay in the busy loop There are two spots where we wait until the HW finishes processing a certain command. Initially we had a few problems and we used 500ms as a limit to be on a the safe side. Paul Zimmerman mentioned this is little too much. After a debugging session, we noticed that we hardly ever go over 20us and didn't pass 30usec so far. Using mdelay() seems way overloaded. Giving the current numbers 500usec as the upper limit is more than enough. Should it ever timeout then something is definitely wrong. While here, also replace the type with u32 since long does not really fit here. Cc: Paul Zimmerman <paul.zimmerman@synopsys.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) commitb55db3bb7eAuthor: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon Aug 29 13:56:37 2011 +0200 usb: dwc3: gadget: rework the dequeue on RESET & DISCONNECT - since a while we are disabling an endpoint and purging every requests on RESET and DISCONNECT which leads to a warning since the endpoint was disabled twice (once by the UDC, and second time by the gadget). I think UDC should nuke all requests because all those requests become invalid. It's gadget driver's responsability, though, to disable its used endpoints. This is done by merging dwc3_stop_active_transfer() and dwc3_gadget_nuke_reqs() into dwc3_remove_requests(). - dwc3_stop_active_transfer() is now no longer called unconditionaly. This has the advantage that it is always called to disable an active transfer which means if res_trans_idx 0 than something went wrong and it is an error condition because we can't clean up the requests. - Remove the DWC3_EP_WILL_SHUTDOWN which was introduced while introducing the command complete part for dequeue. All requests on req_queued list should be removed during the dwc3_cleanup_done_reqs() callback so there is no reason to go through the list again. We consider it an error condition if requests are still on this list since we never queue TRB without LST=1 (the last requests has always LST=1, there are no requests with LST=0 behind it). [ balbi@ti.com : reworked commit log a bit, made patch apply ] Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 1 - drivers/usb/dwc3/gadget.c | 31 ++++++++++++------------------- 2 files changed, 12 insertions(+), 20 deletions(-) commitfe2b0910d5Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon Aug 29 13:56:36 2011 +0200 usb: dwc3: core: move the core check before soft reset We read the DWC3_GSNPSID register to make sure we got the correct register offset passed. One of the recent commits moved the soft reset before this so in case of the wrong offset we end up with "reset timed out". This patch moves the "id" check before the reset again. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) commit9665fdff2cAuthor: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon Aug 29 13:56:35 2011 +0200 usb: dwc3: debugfs: remove test mode interface There are some issues around for enabling/disabling this mode and handling it. It does not work perfectly (yet). However we have a few gadgets tested successfuly so far. That means we are quite confident that we won't need this in near future. So I'm for removing it and bringing a working version back once there is a need for it. Thanks to Dan Carpenter who spotted the wrong memory handling here. [ balbi@ti.com : made it actually apply ] Cc: Dan Carpenter <error27@gmail.com> Cc: wharms@bfs.de Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/debugfs.c | 94 -------------------------------------------- 1 files changed, 0 insertions(+), 94 deletions(-) commit32e132e3eaAuthor: Felipe Balbi <balbi@ti.com> Date: Sat Aug 27 22:28:36 2011 +0300 usb: dwc3: ep0: simplify EP0 state machine The DesignWare USB3 core tells us which phase of a control transfer should be started, it also tells us which physical endpoint needs that transfer. With these two informations, we have all we need to simply EP0 handling quite a lot and get rid rid of the SW state machine tracking ep0 states. For achieving this perfectly, we needed to add support for situations where we get XferNotReady while endpoint is still busy and XferNotReady while gadget driver still hasn't queued a request. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 12 +- drivers/usb/dwc3/ep0.c | 363 ++++++++++++++++++++------------------------- drivers/usb/dwc3/gadget.c | 3 +- 3 files changed, 163 insertions(+), 215 deletions(-) commitedb4e77ef4Author: Felipe Balbi <balbi@ti.com> Date: Sat Aug 27 22:26:00 2011 +0300 usb: dwc3: core: add flag for EP0 direction Add a flag to keep track of ep0 direction. This flag will be used on a following patch. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit31d1e80389Author: Felipe Balbi <balbi@ti.com> Date: Sat Aug 27 22:18:09 2011 +0300 usb: dwc3: ep0: add handling for unaligned OUT transfers In case we have transfers which aren't aligned to wMaxPacketSize, we need to be careful with how we start the transfer with the HW. OUT transfers _must_ be aligned with wMaxPacketSize and in order to guarantee that, we use a bounce buffer. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) commit64e9634b21Author: Felipe Balbi <balbi@ti.com> Date: Sat Aug 27 22:07:53 2011 +0300 usb: dwc3: add a bounce buffer for control endpoints This core cannot handle OUT transfers which aren't aligned to wMaxPacketSize, but that can happen at least on control endpoint with the USB Audio Class. This patch adds a bounce buffer to be used on the case of a non-aligned ep0out request is queued. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 6 ++++++ drivers/usb/dwc3/gadget.c | 29 ++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) commit6cd800e879Author: Felipe Balbi <balbi@ti.com> Date: Sat Aug 27 22:04:32 2011 +0300 usb: dwc3: core: add defines for XferNotReady event on Control EPs The status field of the Transfer Not Read event is different on Control Endpoints. On this patch we are just adding the defines to be used on a later patch which will re-work the control endpoint handling. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commitc7dbe4f213Author: Felipe Balbi <balbi@ti.com> Date: Sat Aug 27 20:29:58 2011 +0300 usb: dwc3: gadget: improve command completion debug message the previous message had too little meaning. Make it more human readable and use the macro we already had for extracting the command completion status out of DEPCMDn register. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit162e128db0Author: Felipe Balbi <balbi@ti.com> Date: Sat Aug 27 15:10:09 2011 +0300 usb: dwc3: gadget: set request dma to invalid when unmapping if we don't set DMA address to invalid when unmapping, we might fall in a situation where request buffer can't be mapped to DMA again. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commitff4e987bcfAuthor: Felipe Balbi <balbi@ti.com> Date: Sat Aug 27 02:30:33 2011 +0300 usb: dwc3: ep0: fix 'transfered' typo trivial patch. No functional changes. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/ep0.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit7a769ecc90Author: Felipe Balbi <balbi@ti.com> Date: Sat Aug 27 01:40:52 2011 +0300 usb: dwc3: core: add missing @ for kerneldoc trivial patch, no functional changes Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/core.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commite918b57dc8Author: Dan Carpenter <error27@gmail.com> Date: Fri Aug 26 12:21:13 2011 +0300 usb: dwc3: debugfs: add a kfree() on error to dwc3_testmode_open() We may as well fix this potential leak so we don't have to listen to the static checkers complain. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/debugfs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commitb31b612847Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon Aug 22 18:29:13 2011 +0200 usb: dwc3: gaget: clear DWC3_EP_WILL_SHUTDOWN bit Without this patch we won't clear that bit and instead will clear all other bits on our endpoint flag. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit15623d7087Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon Aug 22 17:42:19 2011 +0200 usb: dwc3: gadget: use TRB type 6 for ISOC transfers Type 6 should be used for the first transfer during an interval. This is also what the reference driver is using. Type 7 seems to be for following or additional transfers within the same interval. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit4df3977d9fAuthor: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon Aug 22 17:42:18 2011 +0200 usb: dwc3: gadget: reset resource index to zero If we collected two requests together (i.e. only the last of them has LST=1) then we only have to stop transfer once: The clean-up code will cleanup everything until first TRB with the LST bit set. After XferComplete this index should be no longer valid since there is no transfer pending. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit679dc46637Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Fri Aug 19 19:59:12 2011 +0200 usb: dwc3: gadget: fixing dequeue of TRBs A TRB which is dequeued seems to have its HWO bits set to 1. Therefore we ignore it if we dequeue it after the command is completed. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) commitd9a09a239eAuthor: Randy Dunlap <rdunlap@xenotime.net> Date: Tue Aug 23 12:52:47 2011 -0700 usb: fix dwc3 build when USB_GADGET_DWC3 is not enabled Fix build error when CONFIG_USB_GADGET_DWC3 is not enabled: ERROR: "dwc3_send_gadget_ep_cmd" [drivers/usb/dwc3/dwc3.ko] undefined! Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/gadget.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commitfaea001704Author: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue Aug 23 15:08:54 2011 +1000 usb: include module.h in the DesignWare USB3 DRD driver Fixes this build error: drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init': drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function) Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/dwc3/dwc3-pci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit4dc64e52bdAuthor: Felipe Balbi <balbi@ti.com> Date: Fri Aug 19 18:10:58 2011 +0300 usb: dwc3: Introduce DesignWare USB3 DRD Driver The DesignWare USB3 is a highly configurable IP Core which can be instantiated as Dual-Role Device (DRD), Peripheral Only and Host Only (XHCI) configurations. Several other parameters can be configured like amount of FIFO space, amount of TX and RX endpoints, amount of Host Interrupters, etc. The current driver has been validated with a virtual model of version 1.73a of that core and with an FPGA burned with version 1.83a of the DRD core. We have support for PCIe bus, which is used on FPGA prototyping, and for the OMAP5, more adaptation (or glue) layers can be easily added and the driver is half prepared to handle any possible configuration the HW engineer has chosen considering we have the information on one of the GHWPARAMS registers to do runtime checking of certain features. More runtime checks can, and should, be added in order to make this driver even more flexible with regards to number of endpoints, FIFO sizes, transfer types, etc. While this supports only the device side, for now, we will add support for Host side (xHCI - see the updated series Sebastian has sent [1]) and OTG after we have it all stabilized. [1] http://marc.info/?l=linux-usb&m=131341992020339&w=2 Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> [idos@codeaurora.org: gadget_chips.h: Use 'gadget_is_dwc3(g)' only if CONFIG_USB_GADGET_DWC3 is defined.] Signed-off-by: Ido Shayevitz <idos@codeaurora.org> Documentation/usb/dwc3.txt | 53 + drivers/usb/Kconfig | 2 + drivers/usb/Makefile | 2 + drivers/usb/dwc3/Kconfig | 25 + drivers/usb/dwc3/Makefile | 36 + drivers/usb/dwc3/core.c | 467 +++++++++ drivers/usb/dwc3/core.h | 709 +++++++++++++ drivers/usb/dwc3/debug.h | 51 + drivers/usb/dwc3/debugfs.c | 534 ++++++++++ drivers/usb/dwc3/dwc3-omap.c | 410 ++++++++ drivers/usb/dwc3/dwc3-pci.c | 219 ++++ drivers/usb/dwc3/ep0.c | 782 ++++++++++++++ drivers/usb/dwc3/gadget.c | 2063 +++++++++++++++++++++++++++++++++++++ drivers/usb/dwc3/gadget.h | 292 ++++++ drivers/usb/dwc3/io.h | 55 + drivers/usb/gadget/Kconfig | 12 + drivers/usb/gadget/gadget_chips.h | 4 + 17 files changed, 5716 insertions(+), 0 deletions(-) commit348a4c2038Author: Felipe Balbi <balbi@ti.com> Date: Fri Aug 19 18:10:57 2011 +0300 usb: gadget: introduce gadget_is_dwc3() ... to check whether we're running on DesignWare USB3 DRD Controller. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> [idos@codeaurora.org: Conflicts: gadget_chips.h] Signed-off-by: Ido Shayevitz <idos@codeaurora.org> drivers/usb/gadget/gadget_chips.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Change-Id: I12d5f2f957d39b2ff8031366994689bcd453f213 Signed-off-by: David Brown <davidb@codeaurora.org>
922 lines
28 KiB
C
922 lines
28 KiB
C
/*
|
|
* This file holds USB constants and structures that are needed for
|
|
* USB device APIs. These are used by the USB device model, which is
|
|
* defined in chapter 9 of the USB 2.0 specification and in the
|
|
* Wireless USB 1.0 (spread around). Linux has several APIs in C that
|
|
* need these:
|
|
*
|
|
* - the master/host side Linux-USB kernel driver API;
|
|
* - the "usbfs" user space API; and
|
|
* - the Linux "gadget" slave/device/peripheral side driver API.
|
|
*
|
|
* USB 2.0 adds an additional "On The Go" (OTG) mode, which lets systems
|
|
* act either as a USB master/host or as a USB slave/device. That means
|
|
* the master and slave side APIs benefit from working well together.
|
|
*
|
|
* There's also "Wireless USB", using low power short range radios for
|
|
* peripheral interconnection but otherwise building on the USB framework.
|
|
*
|
|
* Note all descriptors are declared '__attribute__((packed))' so that:
|
|
*
|
|
* [a] they never get padded, either internally (USB spec writers
|
|
* probably handled that) or externally;
|
|
*
|
|
* [b] so that accessing bigger-than-a-bytes fields will never
|
|
* generate bus errors on any platform, even when the location of
|
|
* its descriptor inside a bundle isn't "naturally aligned", and
|
|
*
|
|
* [c] for consistency, removing all doubt even when it appears to
|
|
* someone that the two other points are non-issues for that
|
|
* particular descriptor type.
|
|
*/
|
|
|
|
#ifndef __LINUX_USB_CH9_H
|
|
#define __LINUX_USB_CH9_H
|
|
|
|
#include <linux/types.h> /* __u8 etc */
|
|
#include <asm/byteorder.h> /* le16_to_cpu */
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* CONTROL REQUEST SUPPORT */
|
|
|
|
/*
|
|
* USB directions
|
|
*
|
|
* This bit flag is used in endpoint descriptors' bEndpointAddress field.
|
|
* It's also one of three fields in control requests bRequestType.
|
|
*/
|
|
#define USB_DIR_OUT 0 /* to device */
|
|
#define USB_DIR_IN 0x80 /* to host */
|
|
|
|
/*
|
|
* USB types, the second of three bRequestType fields
|
|
*/
|
|
#define USB_TYPE_MASK (0x03 << 5)
|
|
#define USB_TYPE_STANDARD (0x00 << 5)
|
|
#define USB_TYPE_CLASS (0x01 << 5)
|
|
#define USB_TYPE_VENDOR (0x02 << 5)
|
|
#define USB_TYPE_RESERVED (0x03 << 5)
|
|
|
|
/*
|
|
* USB recipients, the third of three bRequestType fields
|
|
*/
|
|
#define USB_RECIP_MASK 0x1f
|
|
#define USB_RECIP_DEVICE 0x00
|
|
#define USB_RECIP_INTERFACE 0x01
|
|
#define USB_RECIP_ENDPOINT 0x02
|
|
#define USB_RECIP_OTHER 0x03
|
|
/* From Wireless USB 1.0 */
|
|
#define USB_RECIP_PORT 0x04
|
|
#define USB_RECIP_RPIPE 0x05
|
|
|
|
/*
|
|
* Standard requests, for the bRequest field of a SETUP packet.
|
|
*
|
|
* These are qualified by the bRequestType field, so that for example
|
|
* TYPE_CLASS or TYPE_VENDOR specific feature flags could be retrieved
|
|
* by a GET_STATUS request.
|
|
*/
|
|
#define USB_REQ_GET_STATUS 0x00
|
|
#define USB_REQ_CLEAR_FEATURE 0x01
|
|
#define USB_REQ_SET_FEATURE 0x03
|
|
#define USB_REQ_SET_ADDRESS 0x05
|
|
#define USB_REQ_GET_DESCRIPTOR 0x06
|
|
#define USB_REQ_SET_DESCRIPTOR 0x07
|
|
#define USB_REQ_GET_CONFIGURATION 0x08
|
|
#define USB_REQ_SET_CONFIGURATION 0x09
|
|
#define USB_REQ_GET_INTERFACE 0x0A
|
|
#define USB_REQ_SET_INTERFACE 0x0B
|
|
#define USB_REQ_SYNCH_FRAME 0x0C
|
|
|
|
#define USB_REQ_SET_ENCRYPTION 0x0D /* Wireless USB */
|
|
#define USB_REQ_GET_ENCRYPTION 0x0E
|
|
#define USB_REQ_RPIPE_ABORT 0x0E
|
|
#define USB_REQ_SET_HANDSHAKE 0x0F
|
|
#define USB_REQ_RPIPE_RESET 0x0F
|
|
#define USB_REQ_GET_HANDSHAKE 0x10
|
|
#define USB_REQ_SET_CONNECTION 0x11
|
|
#define USB_REQ_SET_SECURITY_DATA 0x12
|
|
#define USB_REQ_GET_SECURITY_DATA 0x13
|
|
#define USB_REQ_SET_WUSB_DATA 0x14
|
|
#define USB_REQ_LOOPBACK_DATA_WRITE 0x15
|
|
#define USB_REQ_LOOPBACK_DATA_READ 0x16
|
|
#define USB_REQ_SET_INTERFACE_DS 0x17
|
|
|
|
/* The Link Power Management (LPM) ECN defines USB_REQ_TEST_AND_SET command,
|
|
* used by hubs to put ports into a new L1 suspend state, except that it
|
|
* forgot to define its number ...
|
|
*/
|
|
|
|
/*
|
|
* USB feature flags are written using USB_REQ_{CLEAR,SET}_FEATURE, and
|
|
* are read as a bit array returned by USB_REQ_GET_STATUS. (So there
|
|
* are at most sixteen features of each type.) Hubs may also support a
|
|
* new USB_REQ_TEST_AND_SET_FEATURE to put ports into L1 suspend.
|
|
*/
|
|
#define USB_DEVICE_SELF_POWERED 0 /* (read only) */
|
|
#define USB_DEVICE_REMOTE_WAKEUP 1 /* dev may initiate wakeup */
|
|
#define USB_DEVICE_TEST_MODE 2 /* (wired high speed only) */
|
|
#define USB_DEVICE_BATTERY 2 /* (wireless) */
|
|
#define USB_DEVICE_B_HNP_ENABLE 3 /* (otg) dev may initiate HNP */
|
|
#define USB_DEVICE_WUSB_DEVICE 3 /* (wireless)*/
|
|
#define USB_DEVICE_A_HNP_SUPPORT 4 /* (otg) RH port supports HNP */
|
|
#define USB_DEVICE_A_ALT_HNP_SUPPORT 5 /* (otg) other RH port does */
|
|
#define USB_DEVICE_DEBUG_MODE 6 /* (special devices only) */
|
|
|
|
/*
|
|
* Test Mode Selectors
|
|
* See USB 2.0 spec Table 9-7
|
|
*/
|
|
#define TEST_J 1
|
|
#define TEST_K 2
|
|
#define TEST_SE0_NAK 3
|
|
#define TEST_PACKET 4
|
|
#define TEST_FORCE_EN 5
|
|
|
|
/* OTG test mode feature bits
|
|
* See ECN OTG2.0 spec Table 6-8
|
|
*/
|
|
#define TEST_OTG_SRP_REQD 6
|
|
#define TEST_OTG_HNP_REQD 7
|
|
|
|
/*
|
|
* New Feature Selectors as added by USB 3.0
|
|
* See USB 3.0 spec Table 9-6
|
|
*/
|
|
#define USB_DEVICE_U1_ENABLE 48 /* dev may initiate U1 transition */
|
|
#define USB_DEVICE_U2_ENABLE 49 /* dev may initiate U2 transition */
|
|
#define USB_DEVICE_LTM_ENABLE 50 /* dev may send LTM */
|
|
#define USB_INTRF_FUNC_SUSPEND 0 /* function suspend */
|
|
|
|
#define USB_INTR_FUNC_SUSPEND_OPT_MASK 0xFF00
|
|
/*
|
|
* Suspend Options, Table 9-7 USB 3.0 spec
|
|
*/
|
|
#define USB_INTRF_FUNC_SUSPEND_LP (1 << (8 + 0))
|
|
#define USB_INTRF_FUNC_SUSPEND_RW (1 << (8 + 1))
|
|
|
|
#define USB_ENDPOINT_HALT 0 /* IN/OUT will STALL */
|
|
|
|
#define OTG_STATUS_SELECTOR 0xF000
|
|
#define HOST_REQUEST_FLAG 0
|
|
#define THOST_REQ_POLL 1500 /* msec (1000 - 2000) */
|
|
#define OTG_TTST_SUSP 70 /* msec (0 - 100) */
|
|
|
|
#define OTG_TTST_VBUS_OFF 1
|
|
|
|
/* Bit array elements as returned by the USB_REQ_GET_STATUS request. */
|
|
#define USB_DEV_STAT_U1_ENABLED 2 /* transition into U1 state */
|
|
#define USB_DEV_STAT_U2_ENABLED 3 /* transition into U2 state */
|
|
#define USB_DEV_STAT_LTM_ENABLED 4 /* Latency tolerance messages */
|
|
|
|
/**
|
|
* struct usb_ctrlrequest - SETUP data for a USB device control request
|
|
* @bRequestType: matches the USB bmRequestType field
|
|
* @bRequest: matches the USB bRequest field
|
|
* @wValue: matches the USB wValue field (le16 byte order)
|
|
* @wIndex: matches the USB wIndex field (le16 byte order)
|
|
* @wLength: matches the USB wLength field (le16 byte order)
|
|
*
|
|
* This structure is used to send control requests to a USB device. It matches
|
|
* the different fields of the USB 2.0 Spec section 9.3, table 9-2. See the
|
|
* USB spec for a fuller description of the different fields, and what they are
|
|
* used for.
|
|
*
|
|
* Note that the driver for any interface can issue control requests.
|
|
* For most devices, interfaces don't coordinate with each other, so
|
|
* such requests may be made at any time.
|
|
*/
|
|
struct usb_ctrlrequest {
|
|
__u8 bRequestType;
|
|
__u8 bRequest;
|
|
__le16 wValue;
|
|
__le16 wIndex;
|
|
__le16 wLength;
|
|
} __attribute__ ((packed));
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/*
|
|
* STANDARD DESCRIPTORS ... as returned by GET_DESCRIPTOR, or
|
|
* (rarely) accepted by SET_DESCRIPTOR.
|
|
*
|
|
* Note that all multi-byte values here are encoded in little endian
|
|
* byte order "on the wire". Within the kernel and when exposed
|
|
* through the Linux-USB APIs, they are not converted to cpu byte
|
|
* order; it is the responsibility of the client code to do this.
|
|
* The single exception is when device and configuration descriptors (but
|
|
* not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD);
|
|
* in this case the fields are converted to host endianness by the kernel.
|
|
*/
|
|
|
|
/*
|
|
* Descriptor types ... USB 2.0 spec table 9.5
|
|
*/
|
|
#define USB_DT_DEVICE 0x01
|
|
#define USB_DT_CONFIG 0x02
|
|
#define USB_DT_STRING 0x03
|
|
#define USB_DT_INTERFACE 0x04
|
|
#define USB_DT_ENDPOINT 0x05
|
|
#define USB_DT_DEVICE_QUALIFIER 0x06
|
|
#define USB_DT_OTHER_SPEED_CONFIG 0x07
|
|
#define USB_DT_INTERFACE_POWER 0x08
|
|
/* these are from a minor usb 2.0 revision (ECN) */
|
|
#define USB_DT_OTG 0x09
|
|
#define USB_DT_DEBUG 0x0a
|
|
#define USB_DT_INTERFACE_ASSOCIATION 0x0b
|
|
/* these are from the Wireless USB spec */
|
|
#define USB_DT_SECURITY 0x0c
|
|
#define USB_DT_KEY 0x0d
|
|
#define USB_DT_ENCRYPTION_TYPE 0x0e
|
|
#define USB_DT_BOS 0x0f
|
|
#define USB_DT_DEVICE_CAPABILITY 0x10
|
|
#define USB_DT_WIRELESS_ENDPOINT_COMP 0x11
|
|
#define USB_DT_WIRE_ADAPTER 0x21
|
|
#define USB_DT_RPIPE 0x22
|
|
#define USB_DT_CS_RADIO_CONTROL 0x23
|
|
/* From the T10 UAS specification */
|
|
#define USB_DT_PIPE_USAGE 0x24
|
|
/* From the USB 3.0 spec */
|
|
#define USB_DT_SS_ENDPOINT_COMP 0x30
|
|
|
|
/* Conventional codes for class-specific descriptors. The convention is
|
|
* defined in the USB "Common Class" Spec (3.11). Individual class specs
|
|
* are authoritative for their usage, not the "common class" writeup.
|
|
*/
|
|
#define USB_DT_CS_DEVICE (USB_TYPE_CLASS | USB_DT_DEVICE)
|
|
#define USB_DT_CS_CONFIG (USB_TYPE_CLASS | USB_DT_CONFIG)
|
|
#define USB_DT_CS_STRING (USB_TYPE_CLASS | USB_DT_STRING)
|
|
#define USB_DT_CS_INTERFACE (USB_TYPE_CLASS | USB_DT_INTERFACE)
|
|
#define USB_DT_CS_ENDPOINT (USB_TYPE_CLASS | USB_DT_ENDPOINT)
|
|
|
|
/* All standard descriptors have these 2 fields at the beginning */
|
|
struct usb_descriptor_header {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_DEVICE: Device descriptor */
|
|
struct usb_device_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__le16 bcdUSB;
|
|
__u8 bDeviceClass;
|
|
__u8 bDeviceSubClass;
|
|
__u8 bDeviceProtocol;
|
|
__u8 bMaxPacketSize0;
|
|
__le16 idVendor;
|
|
__le16 idProduct;
|
|
__le16 bcdDevice;
|
|
__u8 iManufacturer;
|
|
__u8 iProduct;
|
|
__u8 iSerialNumber;
|
|
__u8 bNumConfigurations;
|
|
} __attribute__ ((packed));
|
|
|
|
#define USB_DT_DEVICE_SIZE 18
|
|
|
|
|
|
/*
|
|
* Device and/or Interface Class codes
|
|
* as found in bDeviceClass or bInterfaceClass
|
|
* and defined by www.usb.org documents
|
|
*/
|
|
#define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */
|
|
#define USB_CLASS_AUDIO 1
|
|
#define USB_CLASS_COMM 2
|
|
#define USB_CLASS_HID 3
|
|
#define USB_CLASS_PHYSICAL 5
|
|
#define USB_CLASS_STILL_IMAGE 6
|
|
#define USB_CLASS_PRINTER 7
|
|
#define USB_CLASS_MASS_STORAGE 8
|
|
#define USB_CLASS_HUB 9
|
|
#define USB_CLASS_CDC_DATA 0x0a
|
|
#define USB_CLASS_CSCID 0x0b /* chip+ smart card */
|
|
#define USB_CLASS_CONTENT_SEC 0x0d /* content security */
|
|
#define USB_CLASS_VIDEO 0x0e
|
|
#define USB_CLASS_WIRELESS_CONTROLLER 0xe0
|
|
#define USB_CLASS_MISC 0xef
|
|
#define USB_CLASS_APP_SPEC 0xfe
|
|
#define USB_CLASS_VENDOR_SPEC 0xff
|
|
|
|
#define USB_SUBCLASS_VENDOR_SPEC 0xff
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_CONFIG: Configuration descriptor information.
|
|
*
|
|
* USB_DT_OTHER_SPEED_CONFIG is the same descriptor, except that the
|
|
* descriptor type is different. Highspeed-capable devices can look
|
|
* different depending on what speed they're currently running. Only
|
|
* devices with a USB_DT_DEVICE_QUALIFIER have any OTHER_SPEED_CONFIG
|
|
* descriptors.
|
|
*/
|
|
struct usb_config_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__le16 wTotalLength;
|
|
__u8 bNumInterfaces;
|
|
__u8 bConfigurationValue;
|
|
__u8 iConfiguration;
|
|
__u8 bmAttributes;
|
|
__u8 bMaxPower;
|
|
} __attribute__ ((packed));
|
|
|
|
#define USB_DT_CONFIG_SIZE 9
|
|
|
|
/* from config descriptor bmAttributes */
|
|
#define USB_CONFIG_ATT_ONE (1 << 7) /* must be set */
|
|
#define USB_CONFIG_ATT_SELFPOWER (1 << 6) /* self powered */
|
|
#define USB_CONFIG_ATT_WAKEUP (1 << 5) /* can wakeup */
|
|
#define USB_CONFIG_ATT_BATTERY (1 << 4) /* battery powered */
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_STRING: String descriptor */
|
|
struct usb_string_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__le16 wData[1]; /* UTF-16LE encoded */
|
|
} __attribute__ ((packed));
|
|
|
|
/* note that "string" zero is special, it holds language codes that
|
|
* the device supports, not Unicode characters.
|
|
*/
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_INTERFACE: Interface descriptor */
|
|
struct usb_interface_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__u8 bInterfaceNumber;
|
|
__u8 bAlternateSetting;
|
|
__u8 bNumEndpoints;
|
|
__u8 bInterfaceClass;
|
|
__u8 bInterfaceSubClass;
|
|
__u8 bInterfaceProtocol;
|
|
__u8 iInterface;
|
|
} __attribute__ ((packed));
|
|
|
|
#define USB_DT_INTERFACE_SIZE 9
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_ENDPOINT: Endpoint descriptor */
|
|
struct usb_endpoint_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__u8 bEndpointAddress;
|
|
__u8 bmAttributes;
|
|
__le16 wMaxPacketSize;
|
|
__u8 bInterval;
|
|
|
|
/* NOTE: these two are _only_ in audio endpoints. */
|
|
/* use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof. */
|
|
__u8 bRefresh;
|
|
__u8 bSynchAddress;
|
|
} __attribute__ ((packed));
|
|
|
|
#define USB_DT_ENDPOINT_SIZE 7
|
|
#define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */
|
|
|
|
|
|
/*
|
|
* Endpoints
|
|
*/
|
|
#define USB_ENDPOINT_NUMBER_MASK 0x0f /* in bEndpointAddress */
|
|
#define USB_ENDPOINT_DIR_MASK 0x80
|
|
|
|
#define USB_ENDPOINT_SYNCTYPE 0x0c
|
|
#define USB_ENDPOINT_SYNC_NONE (0 << 2)
|
|
#define USB_ENDPOINT_SYNC_ASYNC (1 << 2)
|
|
#define USB_ENDPOINT_SYNC_ADAPTIVE (2 << 2)
|
|
#define USB_ENDPOINT_SYNC_SYNC (3 << 2)
|
|
|
|
#define USB_ENDPOINT_XFERTYPE_MASK 0x03 /* in bmAttributes */
|
|
#define USB_ENDPOINT_XFER_CONTROL 0
|
|
#define USB_ENDPOINT_XFER_ISOC 1
|
|
#define USB_ENDPOINT_XFER_BULK 2
|
|
#define USB_ENDPOINT_XFER_INT 3
|
|
#define USB_ENDPOINT_MAX_ADJUSTABLE 0x80
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/**
|
|
* usb_endpoint_num - get the endpoint's number
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns @epd's number: 0 to 15.
|
|
*/
|
|
static inline int usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_type - get the endpoint's transfer type
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns one of USB_ENDPOINT_XFER_{CONTROL, ISOC, BULK, INT} according
|
|
* to @epd's transfer type.
|
|
*/
|
|
static inline int usb_endpoint_type(const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_dir_in - check if the endpoint has IN direction
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint is of type IN, otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_dir_out - check if the endpoint has OUT direction
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint is of type OUT, otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_dir_out(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_xfer_bulk - check if the endpoint has bulk transfer type
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint is of type bulk, otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_xfer_bulk(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
|
|
USB_ENDPOINT_XFER_BULK);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_xfer_control - check if the endpoint has control transfer type
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint is of type control, otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_xfer_control(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
|
|
USB_ENDPOINT_XFER_CONTROL);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_xfer_int - check if the endpoint has interrupt transfer type
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint is of type interrupt, otherwise it returns
|
|
* false.
|
|
*/
|
|
static inline int usb_endpoint_xfer_int(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
|
|
USB_ENDPOINT_XFER_INT);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_xfer_isoc - check if the endpoint has isochronous transfer type
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint is of type isochronous, otherwise it returns
|
|
* false.
|
|
*/
|
|
static inline int usb_endpoint_xfer_isoc(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
|
|
USB_ENDPOINT_XFER_ISOC);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_is_bulk_in - check if the endpoint is bulk IN
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint has bulk transfer type and IN direction,
|
|
* otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_is_bulk_in(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_is_bulk_out - check if the endpoint is bulk OUT
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint has bulk transfer type and OUT direction,
|
|
* otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_is_bulk_out(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_is_int_in - check if the endpoint is interrupt IN
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint has interrupt transfer type and IN direction,
|
|
* otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_is_int_in(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_is_int_out - check if the endpoint is interrupt OUT
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint has interrupt transfer type and OUT direction,
|
|
* otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_is_int_out(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_is_isoc_in - check if the endpoint is isochronous IN
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint has isochronous transfer type and IN direction,
|
|
* otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_is_isoc_in(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_is_isoc_out - check if the endpoint is isochronous OUT
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns true if the endpoint has isochronous transfer type and OUT direction,
|
|
* otherwise it returns false.
|
|
*/
|
|
static inline int usb_endpoint_is_isoc_out(
|
|
const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd);
|
|
}
|
|
|
|
/**
|
|
* usb_endpoint_maxp - get endpoint's max packet size
|
|
* @epd: endpoint to be checked
|
|
*
|
|
* Returns @epd's max packet
|
|
*/
|
|
static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
|
|
{
|
|
return __le16_to_cpu(epd->wMaxPacketSize);
|
|
}
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_SS_ENDPOINT_COMP: SuperSpeed Endpoint Companion descriptor */
|
|
struct usb_ss_ep_comp_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__u8 bMaxBurst;
|
|
__u8 bmAttributes;
|
|
__le16 wBytesPerInterval;
|
|
} __attribute__ ((packed));
|
|
|
|
#define USB_DT_SS_EP_COMP_SIZE 6
|
|
/* Bits 4:0 of bmAttributes if this is a bulk endpoint */
|
|
#define USB_SS_MAX_STREAMS(p) (1 << ((p) & 0x1f))
|
|
/* Bits 1:0 of bmAttributes if this is an isoc endpoint */
|
|
#define USB_SS_MULT(p) (1 + ((p) & 0x3))
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_DEVICE_QUALIFIER: Device Qualifier descriptor */
|
|
struct usb_qualifier_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__le16 bcdUSB;
|
|
__u8 bDeviceClass;
|
|
__u8 bDeviceSubClass;
|
|
__u8 bDeviceProtocol;
|
|
__u8 bMaxPacketSize0;
|
|
__u8 bNumConfigurations;
|
|
__u8 bRESERVED;
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_OTG (from OTG 1.0a supplement) */
|
|
struct usb_otg_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__u8 bmAttributes; /* support for HNP, SRP, etc */
|
|
__le16 bcdOTG;
|
|
} __attribute__ ((packed));
|
|
|
|
#define USB_DT_OTG_SIZE 5
|
|
/* from usb_otg_descriptor.bmAttributes */
|
|
#define USB_OTG_SRP (1 << 0)
|
|
#define USB_OTG_HNP (1 << 1) /* swap host/device roles */
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_DEBUG: for special highspeed devices, replacing serial console */
|
|
struct usb_debug_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
/* bulk endpoints with 8 byte maxpacket */
|
|
__u8 bDebugInEndpoint;
|
|
__u8 bDebugOutEndpoint;
|
|
} __attribute__((packed));
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_INTERFACE_ASSOCIATION: groups interfaces */
|
|
struct usb_interface_assoc_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__u8 bFirstInterface;
|
|
__u8 bInterfaceCount;
|
|
__u8 bFunctionClass;
|
|
__u8 bFunctionSubClass;
|
|
__u8 bFunctionProtocol;
|
|
__u8 iFunction;
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_SECURITY: group of wireless security descriptors, including
|
|
* encryption types available for setting up a CC/association.
|
|
*/
|
|
struct usb_security_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__le16 wTotalLength;
|
|
__u8 bNumEncryptionTypes;
|
|
} __attribute__((packed));
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_KEY: used with {GET,SET}_SECURITY_DATA; only public keys
|
|
* may be retrieved.
|
|
*/
|
|
struct usb_key_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__u8 tTKID[3];
|
|
__u8 bReserved;
|
|
__u8 bKeyData[0];
|
|
} __attribute__((packed));
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_ENCRYPTION_TYPE: bundled in DT_SECURITY groups */
|
|
struct usb_encryption_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__u8 bEncryptionType;
|
|
#define USB_ENC_TYPE_UNSECURE 0
|
|
#define USB_ENC_TYPE_WIRED 1 /* non-wireless mode */
|
|
#define USB_ENC_TYPE_CCM_1 2 /* aes128/cbc session */
|
|
#define USB_ENC_TYPE_RSA_1 3 /* rsa3072/sha1 auth */
|
|
__u8 bEncryptionValue; /* use in SET_ENCRYPTION */
|
|
__u8 bAuthKeyIndex;
|
|
} __attribute__((packed));
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_BOS: group of device-level capabilities */
|
|
struct usb_bos_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__le16 wTotalLength;
|
|
__u8 bNumDeviceCaps;
|
|
} __attribute__((packed));
|
|
|
|
#define USB_DT_BOS_SIZE 5
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_DEVICE_CAPABILITY: grouped with BOS */
|
|
struct usb_dev_cap_header {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
__u8 bDevCapabilityType;
|
|
} __attribute__((packed));
|
|
|
|
#define USB_CAP_TYPE_WIRELESS_USB 1
|
|
|
|
struct usb_wireless_cap_descriptor { /* Ultra Wide Band */
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
__u8 bDevCapabilityType;
|
|
|
|
__u8 bmAttributes;
|
|
#define USB_WIRELESS_P2P_DRD (1 << 1)
|
|
#define USB_WIRELESS_BEACON_MASK (3 << 2)
|
|
#define USB_WIRELESS_BEACON_SELF (1 << 2)
|
|
#define USB_WIRELESS_BEACON_DIRECTED (2 << 2)
|
|
#define USB_WIRELESS_BEACON_NONE (3 << 2)
|
|
__le16 wPHYRates; /* bit rates, Mbps */
|
|
#define USB_WIRELESS_PHY_53 (1 << 0) /* always set */
|
|
#define USB_WIRELESS_PHY_80 (1 << 1)
|
|
#define USB_WIRELESS_PHY_107 (1 << 2) /* always set */
|
|
#define USB_WIRELESS_PHY_160 (1 << 3)
|
|
#define USB_WIRELESS_PHY_200 (1 << 4) /* always set */
|
|
#define USB_WIRELESS_PHY_320 (1 << 5)
|
|
#define USB_WIRELESS_PHY_400 (1 << 6)
|
|
#define USB_WIRELESS_PHY_480 (1 << 7)
|
|
__u8 bmTFITXPowerInfo; /* TFI power levels */
|
|
__u8 bmFFITXPowerInfo; /* FFI power levels */
|
|
__le16 bmBandGroup;
|
|
__u8 bReserved;
|
|
} __attribute__((packed));
|
|
|
|
/* USB 2.0 Extension descriptor */
|
|
#define USB_CAP_TYPE_EXT 2
|
|
|
|
struct usb_ext_cap_descriptor { /* Link Power Management */
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
__u8 bDevCapabilityType;
|
|
__le32 bmAttributes;
|
|
#define USB_LPM_SUPPORT (1 << 1) /* supports LPM */
|
|
} __attribute__((packed));
|
|
|
|
#define USB_DT_USB_EXT_CAP_SIZE 7
|
|
|
|
/*
|
|
* SuperSpeed USB Capability descriptor: Defines the set of SuperSpeed USB
|
|
* specific device level capabilities
|
|
*/
|
|
#define USB_SS_CAP_TYPE 3
|
|
struct usb_ss_cap_descriptor { /* Link Power Management */
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
__u8 bDevCapabilityType;
|
|
__u8 bmAttributes;
|
|
#define USB_LTM_SUPPORT (1 << 1) /* supports LTM */
|
|
__le16 wSpeedSupported;
|
|
#define USB_LOW_SPEED_OPERATION (1) /* Low speed operation */
|
|
#define USB_FULL_SPEED_OPERATION (1 << 1) /* Full speed operation */
|
|
#define USB_HIGH_SPEED_OPERATION (1 << 2) /* High speed operation */
|
|
#define USB_5GBPS_OPERATION (1 << 3) /* Operation at 5Gbps */
|
|
__u8 bFunctionalitySupport;
|
|
__u8 bU1devExitLat;
|
|
__le16 bU2DevExitLat;
|
|
} __attribute__((packed));
|
|
|
|
#define USB_DT_USB_SS_CAP_SIZE 10
|
|
|
|
/*
|
|
* Container ID Capability descriptor: Defines the instance unique ID used to
|
|
* identify the instance across all operating modes
|
|
*/
|
|
#define CONTAINER_ID_TYPE 4
|
|
struct usb_ss_container_id_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
__u8 bDevCapabilityType;
|
|
__u8 bReserved;
|
|
__u8 ContainerID[16]; /* 128-bit number */
|
|
} __attribute__((packed));
|
|
|
|
#define USB_DT_USB_SS_CONTN_ID_SIZE 20
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_DT_WIRELESS_ENDPOINT_COMP: companion descriptor associated with
|
|
* each endpoint descriptor for a wireless device
|
|
*/
|
|
struct usb_wireless_ep_comp_descriptor {
|
|
__u8 bLength;
|
|
__u8 bDescriptorType;
|
|
|
|
__u8 bMaxBurst;
|
|
__u8 bMaxSequence;
|
|
__le16 wMaxStreamDelay;
|
|
__le16 wOverTheAirPacketSize;
|
|
__u8 bOverTheAirInterval;
|
|
__u8 bmCompAttributes;
|
|
#define USB_ENDPOINT_SWITCH_MASK 0x03 /* in bmCompAttributes */
|
|
#define USB_ENDPOINT_SWITCH_NO 0
|
|
#define USB_ENDPOINT_SWITCH_SWITCH 1
|
|
#define USB_ENDPOINT_SWITCH_SCALE 2
|
|
} __attribute__((packed));
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_REQ_SET_HANDSHAKE is a four-way handshake used between a wireless
|
|
* host and a device for connection set up, mutual authentication, and
|
|
* exchanging short lived session keys. The handshake depends on a CC.
|
|
*/
|
|
struct usb_handshake {
|
|
__u8 bMessageNumber;
|
|
__u8 bStatus;
|
|
__u8 tTKID[3];
|
|
__u8 bReserved;
|
|
__u8 CDID[16];
|
|
__u8 nonce[16];
|
|
__u8 MIC[8];
|
|
} __attribute__((packed));
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB_REQ_SET_CONNECTION modifies or revokes a connection context (CC).
|
|
* A CC may also be set up using non-wireless secure channels (including
|
|
* wired USB!), and some devices may support CCs with multiple hosts.
|
|
*/
|
|
struct usb_connection_context {
|
|
__u8 CHID[16]; /* persistent host id */
|
|
__u8 CDID[16]; /* device id (unique w/in host context) */
|
|
__u8 CK[16]; /* connection key */
|
|
} __attribute__((packed));
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/* USB 2.0 defines three speeds, here's how Linux identifies them */
|
|
|
|
enum usb_device_speed {
|
|
USB_SPEED_UNKNOWN = 0, /* enumerating */
|
|
USB_SPEED_LOW, USB_SPEED_FULL, /* usb 1.1 */
|
|
USB_SPEED_HIGH, /* usb 2.0 */
|
|
USB_SPEED_WIRELESS, /* wireless (usb 2.5) */
|
|
USB_SPEED_SUPER, /* usb 3.0 */
|
|
};
|
|
|
|
enum usb_device_state {
|
|
/* NOTATTACHED isn't in the USB spec, and this state acts
|
|
* the same as ATTACHED ... but it's clearer this way.
|
|
*/
|
|
USB_STATE_NOTATTACHED = 0,
|
|
|
|
/* chapter 9 and authentication (wireless) device states */
|
|
USB_STATE_ATTACHED,
|
|
USB_STATE_POWERED, /* wired */
|
|
USB_STATE_RECONNECTING, /* auth */
|
|
USB_STATE_UNAUTHENTICATED, /* auth */
|
|
USB_STATE_DEFAULT, /* limited function */
|
|
USB_STATE_ADDRESS,
|
|
USB_STATE_CONFIGURED, /* most functions */
|
|
|
|
USB_STATE_SUSPENDED
|
|
|
|
/* NOTE: there are actually four different SUSPENDED
|
|
* states, returning to POWERED, DEFAULT, ADDRESS, or
|
|
* CONFIGURED respectively when SOF tokens flow again.
|
|
* At this level there's no difference between L1 and L2
|
|
* suspend states. (L2 being original USB 1.1 suspend.)
|
|
*/
|
|
};
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
/*
|
|
* As per USB compliance update, a device that is actively drawing
|
|
* more than 100mA from USB must report itself as bus-powered in
|
|
* the GetStatus(DEVICE) call.
|
|
* http://compliance.usb.org/index.asp?UpdateFile=Electrical&Format=Standard#34
|
|
*/
|
|
#define USB_SELF_POWER_VBUS_MAX_DRAW 100
|
|
|
|
#endif /* __LINUX_USB_CH9_H */
|