Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

1be025d3 · Linus Torvalds <[email protected]> · 2011-10-25 12:23:15 +02:00

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (260 commits)
  usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push()
  usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
  USB: gadget: midi: memory leak in f_midi_bind_config()
  USB: gadget: midi: fix range check in f_midi_out_open()
  QE/FHCI: fixed the CONTROL bug
  usb: renesas_usbhs: tidyup for smatch warnings
  USB: Fix USB Kconfig dependency problem on 85xx/QoirQ platforms
  EHCI: workaround for MosChip controller bug
  usb: gadget: file_storage: fix race on unloading
  USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers
  USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure
  USB: ftdi_sio.c: Fill LSR fields of the ftdi async_icount structure
  USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure
  USB: ftdi_sio.c: Fill the RX field of the ftdi async_icount structure
  USB: ftdi_sio.c: Basic icount infrastructure for ftdi_sio
  usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .
  USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
  USB: Fix runtime wakeup on OHCI
  xHCI/USB: Make xHCI driver have a BOS descriptor.
  usb: gadget: add new usb gadget for ACM and mass storage
  ...

Commit: 1be025d3cb40cd295123af2c394f7229ef9b30ca
Parents: 2d03423b · a2c76b83

Merge commit. Changes below are compared with the first parent: 2d03423b.

Changes

247 files changed · +15136 −4175

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd	added	+46	−0	View file
Documentation/ABI/testing/sysfs-bus-usb	modified	+15	−0	View file
Documentation/usb/dwc3.txt	added	+45	−0	View file
Documentation/usb/power-management.txt	modified	+26	−0	View file
MAINTAINERS	modified	+8	−0	View file
arch/arm/mach-mmp/include/mach/pxa168.h	modified	+7	−0	View file
arch/arm/mach-mmp/pxa168.c	modified	+46	−0	View file
arch/arm/mach-omap2/Makefile	modified	+5	−6	View file
arch/arm/mach-shmobile/board-mackerel.c	modified	+1	−0	View file
drivers/usb/Kconfig	modified	+15	−1	View file
drivers/usb/Makefile	modified	+4	−0	View file
drivers/usb/class/cdc-acm.c	modified	+6	−3	View file
drivers/usb/class/cdc-wdm.c	modified	+1	−1	View file
drivers/usb/class/usbtmc.c	modified	+2	−3	View file
drivers/usb/core/config.c	modified	+107	−4	View file
drivers/usb/core/devices.c	modified	+2	−2	View file
drivers/usb/core/devio.c	modified	+35	−22	View file
drivers/usb/core/driver.c	modified	+15	−1	View file
drivers/usb/core/endpoint.c	modified	+1	−1	View file
drivers/usb/core/hcd-pci.c	modified	+1	−1	View file
drivers/usb/core/hcd.c	modified	+24	−3	View file
drivers/usb/core/hub.c	modified	+183	−128	View file
drivers/usb/core/message.c	modified	+1	−1	View file
drivers/usb/core/quirks.c	modified	+24	−0	View file
drivers/usb/core/sysfs.c	modified	+58	−1	View file
drivers/usb/core/urb.c	modified	+1	−1	View file
drivers/usb/core/usb.c	modified	+1	−0	View file
drivers/usb/core/usb.h	modified	+7	−0	View file
drivers/usb/dwc3/Kconfig	added	+25	−0	View file
drivers/usb/dwc3/Makefile	added	+36	−0	View file
drivers/usb/dwc3/core.c	added	+484	−0	View file
drivers/usb/dwc3/core.h	added	+768	−0	View file
drivers/usb/dwc3/debug.h	added	+50	−0	View file
drivers/usb/dwc3/debugfs.c	added	+441	−0	View file
drivers/usb/dwc3/dwc3-omap.c	added	+401	−0	View file
drivers/usb/dwc3/dwc3-pci.c	added	+219	−0	View file
drivers/usb/dwc3/ep0.c	added	+804	−0	View file
drivers/usb/dwc3/gadget.c	added	+2104	−0	View file
drivers/usb/dwc3/gadget.h	added	+211	−0	View file
drivers/usb/dwc3/io.h	added	+54	−0	View file
drivers/usb/gadget/Kconfig	modified	+42	−5	View file
drivers/usb/gadget/Makefile	modified	+3	−1	View file
drivers/usb/gadget/acm_ms.c	added	+256	−0	View file
drivers/usb/gadget/amd5536udc.c	modified	+3	−17	View file
drivers/usb/gadget/amd5536udc.h	modified	+0	−9	View file
drivers/usb/gadget/at91_udc.c	modified	+11	−21	View file
drivers/usb/gadget/at91_udc.h	modified	+0	−10	View file
drivers/usb/gadget/atmel_usba_udc.c	modified	+6	−7	View file
drivers/usb/gadget/cdc2.c	modified	+0	−9	View file
drivers/usb/gadget/ci13xxx_msm.c	modified	+0	−11	View file
drivers/usb/gadget/ci13xxx_udc.c	modified	+1	−1	View file
drivers/usb/gadget/composite.c	modified	+6	−31	View file
drivers/usb/gadget/config.c	modified	+0	−9	View file
drivers/usb/gadget/dbgp.c	modified	+0	−1	View file
drivers/usb/gadget/dummy_hcd.c	modified	+2	−11	View file
drivers/usb/gadget/epautoconf.c	modified	+1	−11	View file
drivers/usb/gadget/ether.c	modified	+0	−9	View file
drivers/usb/gadget/f_audio.c	modified	+8	−7	View file
drivers/usb/gadget/f_ecm.c	modified	+0	−9	View file
drivers/usb/gadget/f_eem.c	modified	+0	−9	View file
drivers/usb/gadget/f_fs.c	modified	+0	−9	View file
drivers/usb/gadget/f_hid.c	modified	+0	−9	View file
drivers/usb/gadget/f_loopback.c	modified	+0	−9	View file
drivers/usb/gadget/f_mass_storage.c	modified	+111	−85	View file
drivers/usb/gadget/f_midi.c	added	+998	−0	View file
drivers/usb/gadget/f_ncm.c	modified	+0	−9	View file
drivers/usb/gadget/f_obex.c	modified	+0	−9	View file
drivers/usb/gadget/f_phonet.c	modified	+0	−10	View file
drivers/usb/gadget/f_rndis.c	modified	+0	−9	View file
drivers/usb/gadget/f_sourcesink.c	modified	+0	−9	View file
drivers/usb/gadget/f_subset.c	modified	+0	−9	View file
drivers/usb/gadget/f_uvc.c	modified	+0	−1	View file
drivers/usb/gadget/f_uvc.h	modified	+0	−1	View file
drivers/usb/gadget/file_storage.c	modified	+139	−115	View file
drivers/usb/gadget/fsl_qe_udc.c	modified	+1	−1	View file
drivers/usb/gadget/fsl_udc_core.c	modified	+20	−35	View file
drivers/usb/gadget/fusb300_udc.c	modified	+3	−13	View file
drivers/usb/gadget/fusb300_udc.h	modified	+0	−10	View file
drivers/usb/gadget/g_ffs.c	modified	+0	−9	View file
drivers/usb/gadget/gadget_chips.h	modified	+3	−0	View file
drivers/usb/gadget/gmidi.c	modified	+88	−1204	View file
drivers/usb/gadget/hid.c	modified	+0	−9	View file
drivers/usb/gadget/imx_udc.c	modified	+2	−2	View file
drivers/usb/gadget/imx_udc.h	modified	+0	−5	View file
drivers/usb/gadget/inode.c	modified	+0	−9	View file
drivers/usb/gadget/langwell_udc.c	modified	+46	−101	View file
drivers/usb/gadget/langwell_udc.h	modified	+2	−10	View file
drivers/usb/gadget/m66592-udc.c	modified	+3	−13	View file
drivers/usb/gadget/m66592-udc.h	modified	+0	−10	View file
drivers/usb/gadget/mass_storage.c	modified	+1	−10	View file
drivers/usb/gadget/multi.c	modified	+0	−9	View file
drivers/usb/gadget/mv_udc.h	modified	+22	−4	View file
drivers/usb/gadget/mv_udc_core.c	modified	+446	−114	View file
drivers/usb/gadget/mv_udc_phy.c	deleted	+0	−214	View before deletion
drivers/usb/gadget/ncm.c	modified	+0	−9	View file
drivers/usb/gadget/ndis.h	modified	+0	−6	View file
drivers/usb/gadget/net2272.c	modified	+22	−56	View file
drivers/usb/gadget/net2280.c	modified	+20	−67	View file
drivers/usb/gadget/net2280.h	modified	+0	−9	View file
drivers/usb/gadget/omap_udc.c	modified	+4	−14	View file
drivers/usb/gadget/pch_udc.c	modified	+3	−12	View file
drivers/usb/gadget/printer.c	modified	+4	−21	View file
drivers/usb/gadget/pxa25x_udc.c	modified	+9	−21	View file
drivers/usb/gadget/pxa25x_udc.h	modified	+1	−16	View file
drivers/usb/gadget/pxa27x_udc.c	modified	+1	−11	View file
drivers/usb/gadget/pxa27x_udc.h	modified	+0	−9	View file
drivers/usb/gadget/r8a66597-udc.c	modified	+415	−101	View file
drivers/usb/gadget/r8a66597-udc.h	modified	+46	−27	View file
drivers/usb/gadget/s3c-hsotg.c	modified	+3	−7	View file
drivers/usb/gadget/s3c-hsudc.c	modified	+53	−16	View file
drivers/usb/gadget/s3c2410_udc.c	modified	+3	−13	View file
drivers/usb/gadget/s3c2410_udc.h	modified	+0	−10	View file
drivers/usb/gadget/storage_common.c	modified	+167	−18	View file
drivers/usb/gadget/u_ether.c	modified	+0	−9	View file
drivers/usb/gadget/u_ether.h	modified	+0	−9	View file
drivers/usb/gadget/u_serial.c	modified	+1	−2	View file
drivers/usb/gadget/udc-core.c	modified	+3	−18	View file
drivers/usb/gadget/uvc.h	modified	+0	−1	View file
drivers/usb/gadget/uvc_queue.c	modified	+0	−1	View file
drivers/usb/gadget/uvc_v4l2.c	modified	+0	−1	View file
drivers/usb/gadget/uvc_video.c	modified	+0	−1	View file
drivers/usb/gadget/webcam.c	modified	+1	−1	View file
drivers/usb/gadget/zero.c	modified	+0	−9	View file
drivers/usb/host/Kconfig	modified	+24	−4	View file
drivers/usb/host/Makefile	modified	+2	−1	View file
drivers/usb/host/ehci-ath79.c	modified	+1	−1	View file
drivers/usb/host/ehci-au1xxx.c	modified	+2	−2	View file
drivers/usb/host/ehci-dbg.c	modified	+16	−3	View file
drivers/usb/host/ehci-fsl.c	modified	+3	−3	View file
drivers/usb/host/ehci-hcd.c	modified	+51	−13	View file
drivers/usb/host/ehci-hub.c	modified	+4	−6	View file
drivers/usb/host/ehci-mxc.c	modified	+1	−1	View file
drivers/usb/host/ehci-octeon.c	modified	+1	−1	View file
drivers/usb/host/ehci-omap.c	modified	+1	−1	View file
drivers/usb/host/ehci-orion.c	modified	+1	−1	View file
drivers/usb/host/ehci-pci.c	modified	+6	−1	View file
drivers/usb/host/ehci-ps3.c	modified	+1	−1	View file
drivers/usb/host/ehci-pxa168.c	added	+363	−0	View file
drivers/usb/host/ehci-q.c	modified	+14	−17	View file
drivers/usb/host/ehci-s5p.c	modified	+2	−2	View file
drivers/usb/host/ehci-sched.c	modified	+30	−11	View file
drivers/usb/host/ehci-sh.c	modified	+1	−1	View file
drivers/usb/host/ehci-spear.c	modified	+1	−1	View file
drivers/usb/host/ehci-tegra.c	modified	+1	−1	View file
drivers/usb/host/ehci-vt8500.c	modified	+1	−1	View file
drivers/usb/host/ehci-xls.c	added	+161	−0	View file
drivers/usb/host/ehci.h	modified	+24	−0	View file
drivers/usb/host/fhci-hcd.c	modified	+6	−3	View file
drivers/usb/host/fhci-sched.c	modified	+15	−4	View file
drivers/usb/host/imx21-hcd.c	modified	+1	−1	View file
drivers/usb/host/isp116x-hcd.c	modified	+1	−1	View file
drivers/usb/host/isp1362-hcd.c	modified	+4	−4	View file
drivers/usb/host/isp1760-hcd.c	modified	+270	−148	View file
drivers/usb/host/isp1760-hcd.h	modified	+4	−1	View file
drivers/usb/host/isp1760-if.c	modified	+60	−20	View file
drivers/usb/host/ohci-ath79.c	modified	+1	−1	View file
drivers/usb/host/ohci-au1xxx.c	modified	+1	−1	View file
drivers/usb/host/ohci-da8xx.c	modified	+1	−1	View file
drivers/usb/host/ohci-ep93xx.c	modified	+1	−1	View file
drivers/usb/host/ohci-hcd.c	modified	+5	−0	View file
drivers/usb/host/ohci-hub.c	modified	+1	−4	View file
drivers/usb/host/ohci-octeon.c	modified	+1	−1	View file
drivers/usb/host/ohci-omap.c	modified	+2	−2	View file
drivers/usb/host/ohci-omap3.c	modified	+2	−2	View file
drivers/usb/host/ohci-pnx4008.c	modified	+1	−1	View file
drivers/usb/host/ohci-pnx8550.c	modified	+1	−1	View file
drivers/usb/host/ohci-ppc-of.c	modified	+1	−1	View file
drivers/usb/host/ohci-ppc-soc.c	modified	+1	−1	View file
drivers/usb/host/ohci-ps3.c	modified	+1	−1	View file
drivers/usb/host/ohci-pxa27x.c	modified	+1	−1	View file
drivers/usb/host/ohci-q.c	modified	+2	−2	View file
drivers/usb/host/ohci-s3c2410.c	modified	+1	−1	View file
drivers/usb/host/ohci-sa1111.c	modified	+1	−1	View file
drivers/usb/host/ohci-sh.c	modified	+1	−1	View file
drivers/usb/host/ohci-sm501.c	modified	+1	−1	View file
drivers/usb/host/ohci-spear.c	modified	+1	−1	View file
drivers/usb/host/ohci-ssb.c	modified	+1	−1	View file
drivers/usb/host/ohci-tmio.c	modified	+1	−1	View file
drivers/usb/host/ohci-xls.c	added	+151	−0	View file
drivers/usb/host/r8a66597-hcd.c	modified	+2	−2	View file
drivers/usb/host/sl811-hcd.c	modified	+1	−1	View file
drivers/usb/host/uhci-hcd.c	modified	+34	−32	View file
drivers/usb/host/uhci-q.c	modified	+3	−3	View file
drivers/usb/host/xhci-ext-caps.h	modified	+6	−0	View file
drivers/usb/host/xhci-hub.c	modified	+89	−50	View file
drivers/usb/host/xhci-mem.c	modified	+306	−65	View file
drivers/usb/host/xhci-pci.c	modified	+26	−81	View file
drivers/usb/host/xhci-ring.c	modified	+43	−37	View file
drivers/usb/host/xhci.c	modified	+1064	−87	View file
drivers/usb/host/xhci.h	modified	+182	−5	View file
drivers/usb/misc/adutux.c	modified	+7	−7	View file
drivers/usb/misc/ftdi-elan.c	modified	+1	−1	View file
drivers/usb/misc/idmouse.c	modified	+1	−1	View file
drivers/usb/misc/iowarrior.c	modified	+1	−1	View file
drivers/usb/misc/ldusb.c	modified	+2	−2	View file
drivers/usb/misc/legousbtower.c	modified	+2	−2	View file
drivers/usb/misc/usblcd.c	modified	+72	−57	View file
drivers/usb/misc/usbled.c	modified	+14	−11	View file
drivers/usb/misc/usbtest.c	modified	+8	−23	View file
drivers/usb/mon/mon_bin.c	modified	+1	−1	View file
drivers/usb/musb/musb_gadget.c	modified	+44	−27	View file
drivers/usb/musb/musb_gadget_ep0.c	modified	+8	−0	View file
drivers/usb/musb/musb_host.c	modified	+1	−1	View file
drivers/usb/musb/musbhsdma.c	modified	+1	−1	View file
drivers/usb/otg/isp1301_omap.c	modified	+1	−1	View file
drivers/usb/otg/twl6030-usb.c	modified	+0	−16	View file
drivers/usb/renesas_usbhs/Kconfig	modified	+1	−1	View file
drivers/usb/renesas_usbhs/Makefile	modified	+7	−1	View file
drivers/usb/renesas_usbhs/common.c	modified	+211	−25	View file
drivers/usb/renesas_usbhs/common.h	modified	+56	−4	View file
drivers/usb/renesas_usbhs/fifo.c	modified	+198	−24	View file
drivers/usb/renesas_usbhs/fifo.h	modified	+10	−12	View file
drivers/usb/renesas_usbhs/mod.c	modified	+60	−21	View file
drivers/usb/renesas_usbhs/mod.h	modified	+46	−11	View file
drivers/usb/renesas_usbhs/mod_gadget.c	modified	+47	−83	View file
drivers/usb/renesas_usbhs/mod_host.c	added	+1312	−0	View file
drivers/usb/renesas_usbhs/pipe.c	modified	+91	−109	View file
drivers/usb/renesas_usbhs/pipe.h	modified	+16	−11	View file
drivers/usb/serial/Kconfig	modified	+1	−0	View file
drivers/usb/serial/ftdi_sio.c	modified	+64	−27	View file
drivers/usb/serial/ftdi_sio_ids.h	modified	+5	−2	View file
drivers/usb/serial/io_edgeport.c	modified	+2	−2	View file
drivers/usb/serial/ipw.c	modified	+31	−2	View file
drivers/usb/serial/opticon.c	modified	+1	−1	View file
drivers/usb/serial/option.c	modified	+108	−62	View file
drivers/usb/serial/pl2303.c	modified	+1	−3	View file
drivers/usb/serial/pl2303.h	modified	+5	−0	View file
drivers/usb/serial/qcserial.c	modified	+2	−0	View file
drivers/usb/serial/symbolserial.c	modified	+1	−1	View file
drivers/usb/serial/usb-serial.c	modified	+4	−4	View file
drivers/usb/storage/Kconfig	modified	+1	−1	View file
drivers/usb/storage/realtek_cr.c	modified	+107	−9	View file
drivers/usb/storage/transport.c	modified	+19	−15	View file
drivers/usb/storage/usb.c	modified	+13	−3	View file
drivers/usb/usb-common.c	added	+35	−0	View file
drivers/usb/usb-skeleton.c	modified	+1	−1	View file
drivers/usb/wusbcore/wa-hc.c	modified	+1	−1	View file
include/linux/platform_data/dwc3-omap.h	added	+47	−0	View file
include/linux/platform_data/mv_usb.h	added	+50	−0	View file
include/linux/sched.h	modified	+2	−1	View file
include/linux/usb.h	modified	+19	−1	View file
include/linux/usb/ch9.h	modified	+29	−0	View file
include/linux/usb/gadget.h	modified	+2	−2	View file
include/linux/usb/hcd.h	modified	+2	−1	View file
include/linux/usb/r8a66597.h	modified	+60	−0	View file
include/linux/usb/renesas_usbhs.h	modified	+14	−0	View file
kernel/signal.c	modified	+16	−8	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd b/Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
new file mode 100644
index 0000000..60c60fa
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
@@ -0,0 +1,46 @@
+What:		/sys/bus/pci/drivers/ehci_hcd/.../companion
+		/sys/bus/usb/devices/usbN/../companion
+Date:		January 2007
+KernelVersion:	2.6.21
+Contact:	Alan Stern <[email protected]>
+Description:
+		PCI-based EHCI USB controllers (i.e., high-speed USB-2.0
+		controllers) are often implemented along with a set of
+		"companion" full/low-speed USB-1.1 controllers.  When a
+		high-speed device is plugged in, the connection is routed
+		to the EHCI controller; when a full- or low-speed device
+		is plugged in, the connection is routed to the companion
+		controller.
+
+		Sometimes you want to force a high-speed device to connect
+		at full speed, which can be accomplished by forcing the
+		connection to be routed to the companion controller.
+		That's what this file does.  Writing a port number to the
+		file causes connections on that port to be routed to the
+		companion controller, and writing the negative of a port
+		number returns the port to normal operation.
+
+		For example: To force the high-speed device attached to
+		port 4 on bus 2 to run at full speed:
+
+			echo 4 >/sys/bus/usb/devices/usb2/../companion
+
+		To return the port to high-speed operation:
+
+			echo -4 >/sys/bus/usb/devices/usb2/../companion
+
+		Reading the file gives the list of ports currently forced
+		to the companion controller.
+
+		Note: Some EHCI controllers do not have companions; they
+		may contain an internal "transaction translator" or they
+		may be attached directly to a "rate-matching hub".  This
+		mechanism will not work with such controllers.  Also, it
+		cannot be used to force a port on a high-speed hub to
+		connect at full speed.
+
+		Note: When this file was first added, it appeared in a
+		different sysfs directory.  The location given above is
+		correct for 2.6.35 (and probably several earlier kernel
+		versions as well).
+

Documentation/ABI/testing/sysfs-bus-usb

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index 294aa86..e647378 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -142,3 +142,18 @@ Description:
 		such devices.
 Users:
 		usb_modeswitch
+
+What:		/sys/bus/usb/devices/.../power/usb2_hardware_lpm
+Date:		September 2011
+Contact:	Andiry Xu <[email protected]>
+Description:
+		If CONFIG_USB_SUSPEND is set and a USB 2.0 lpm-capable device
+		is plugged in to a xHCI host which support link PM, it will
+		perform a LPM test; if the test is passed and host supports
+		USB2 hardware LPM (xHCI 1.0 feature), USB2 hardware LPM will
+		be enabled for the device and the USB device directory will
+		contain a file named power/usb2_hardware_lpm.  The file holds
+		a string value (enable or disable) indicating whether or not
+		USB2 hardware LPM is enabled for the device. Developer can
+		write y/Y/1 or n/N/0 to the file to enable/disable the
+		feature.

Documentation/usb/dwc3.txt

View file

diff --git a/Documentation/usb/dwc3.txt b/Documentation/usb/dwc3.txt
new file mode 100644
index 0000000..7b590ed
--- /dev/null
+++ b/Documentation/usb/dwc3.txt
@@ -0,0 +1,45 @@
+
+ TODO
+~~~~~~
+Please pick something while reading :)
+
+- Convert interrupt handler to per-ep-thread-irq
+
+  As it turns out some DWC3-commands ~1ms to complete. Currently we spin
+  until the command completes which is bad.
+
+  Implementation idea:
+  - dwc core implements a demultiplexing irq chip for interrupts per
+    endpoint. The interrupt numbers are allocated during probe and belong
+    to the device. If MSI provides per-endpoint interrupt this dummy
+    interrupt chip can be replaced with "real" interrupts.
+  - interrupts are requested / allocated on usb_ep_enable() and removed on
+    usb_ep_disable(). Worst case are 32 interrupts, the lower limit is two
+    for ep0/1.
+  - dwc3_send_gadget_ep_cmd() will sleep in wait_for_completion_timeout()
+    until the command completes.
+  - the interrupt handler is split into the following pieces:
+    - primary handler of the device
+      goes through every event and calls generic_handle_irq() for event
+      it. On return from generic_handle_irq() in acknowledges the event
+      counter so interrupt goes away (eventually).
+
+    - threaded handler of the device
+      none
+
+    - primary handler of the EP-interrupt
+      reads the event and tries to process it. Everything that requries
+      sleeping is handed over to the Thread. The event is saved in an
+      per-endpoint data-structure.
+      We probably have to pay attention not to process events once we
+      handed something to thread so we don't process event X prio Y
+      where X > Y.
+
+    - threaded handler of the EP-interrupt
+      handles the remaining EP work which might sleep such as waiting
+      for command completion.
+
+  Latency:
+   There should be no increase in latency since the interrupt-thread has a
+   high priority and will be run before an average task in user land
+   (except the user changed priorities).

Documentation/usb/power-management.txt

View file

diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt
index c9ffa9c..9d85d96 100644
--- a/Documentation/usb/power-management.txt
+++ b/Documentation/usb/power-management.txt
@@ -487,3 +487,29 @@ succeed, it may still remain active and thus cause the system to
 resume as soon as the system suspend is complete.  Or the remote
 wakeup may fail and get lost.  Which outcome occurs depends on timing
 and on the hardware and firmware design.
+
+
+	xHCI hardware link PM
+	---------------------
+
+xHCI host controller provides hardware link power management to usb2.0
+(xHCI 1.0 feature) and usb3.0 devices which support link PM. By
+enabling hardware LPM, the host can automatically put the device into
+lower power state(L1 for usb2.0 devices, or U1/U2 for usb3.0 devices),
+which state device can enter and resume very quickly.
+
+The user interface for controlling USB2 hardware LPM is located in the
+power/ subdirectory of each USB device's sysfs directory, that is, in
+/sys/bus/usb/devices/.../power/ where "..." is the device's ID. The
+relevant attribute files is usb2_hardware_lpm.
+
+	power/usb2_hardware_lpm
+
+		When a USB2 device which support LPM is plugged to a
+		xHCI host root hub which support software LPM, the
+		host will run a software LPM test for it; if the device
+		enters L1 state and resume successfully and the host
+		supports USB2 hardware LPM, this file will show up and
+		driver will enable hardware LPM	for the device. You
+		can write y/Y/1 or n/N/0 to the file to	enable/disable
+		USB2 hardware LPM manually. This is for	test purpose mainly.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index e1b0c92..37489ec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2136,6 +2136,14 @@ M:	Matthew Garrett <[email protected]>
 S:	Maintained
 F:	drivers/platform/x86/dell-wmi.c
 
+DESIGNWARE USB3 DRD IP DRIVER
+M:	Felipe Balbi <[email protected]>
+L:	[email protected]
+L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
+S:	Maintained
+F:	drivers/usb/dwc3/
+
 DEVICE NUMBER REGISTRY
 M:	Torben Mathiasen <[email protected]>
 W:	http://lanana.org/docs/device-list/index.html

arch/arm/mach-mmp/include/mach/pxa168.h

View file

diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h
index 7f00584..7fb568d 100644
--- a/arch/arm/mach-mmp/include/mach/pxa168.h
+++ b/arch/arm/mach-mmp/include/mach/pxa168.h
@@ -35,6 +35,13 @@ extern struct pxa_device_desc pxa168_device_fb;
 extern struct pxa_device_desc pxa168_device_keypad;
 extern struct pxa_device_desc pxa168_device_eth;
 
+struct pxa168_usb_pdata {
+	/* If NULL, default phy init routine for PXA168 would be called */
+	int (*phy_init)(void __iomem *usb_phy_reg_base);
+};
+/* pdata can be NULL */
+int __init pxa168_add_usb_host(struct pxa168_usb_pdata *pdata);
+
 static inline int pxa168_add_uart(int id)
 {
 	struct pxa_device_desc *d = NULL;

arch/arm/mach-mmp/pxa168.c

View file

diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c
index 0156f53..b2b280c 100644
--- a/arch/arm/mach-mmp/pxa168.c
+++ b/arch/arm/mach-mmp/pxa168.c
@@ -25,6 +25,9 @@
 #include <mach/dma.h>
 #include <mach/devices.h>
 #include <mach/mfp.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <mach/pxa168.h>
 
 #include "common.h"
 #include "clock.h"
@@ -83,6 +86,7 @@ static APBC_CLK(keypad, PXA168_KPC, 0, 32000);
 static APMU_CLK(nand, NAND, 0x19b, 156000000);
 static APMU_CLK(lcd, LCD, 0x7f, 312000000);
 static APMU_CLK(eth, ETH, 0x09, 0);
+static APMU_CLK(usb, USB, 0x12, 0);
 
 /* device and clock bindings */
 static struct clk_lookup pxa168_clkregs[] = {
@@ -104,6 +108,7 @@ static struct clk_lookup pxa168_clkregs[] = {
 	INIT_CLKREG(&clk_lcd, "pxa168-fb", NULL),
 	INIT_CLKREG(&clk_keypad, "pxa27x-keypad", NULL),
 	INIT_CLKREG(&clk_eth, "pxa168-eth", "MFUCLK"),
+	INIT_CLKREG(&clk_usb, "pxa168-ehci", "PXA168-USBCLK"),
 };
 
 static int __init pxa168_init(void)
@@ -169,3 +174,44 @@ PXA168_DEVICE(ssp5, "pxa168-ssp", 4, SSP5, 0xd4021000, 0x40, 60, 61);
 PXA168_DEVICE(fb, "pxa168-fb", -1, LCD, 0xd420b000, 0x1c8);
 PXA168_DEVICE(keypad, "pxa27x-keypad", -1, KEYPAD, 0xd4012000, 0x4c);
 PXA168_DEVICE(eth, "pxa168-eth", -1, MFU, 0xc0800000, 0x0fff);
+
+struct resource pxa168_usb_host_resources[] = {
+	/* USB Host conroller register base */
+	[0] = {
+		.start	= 0xd4209000,
+		.end	= 0xd4209000 + 0x200,
+		.flags	= IORESOURCE_MEM,
+		.name	= "pxa168-usb-host",
+	},
+	/* USB PHY register base */
+	[1] = {
+		.start	= 0xd4206000,
+		.end	= 0xd4206000 + 0xff,
+		.flags	= IORESOURCE_MEM,
+		.name	= "pxa168-usb-phy",
+	},
+	[2] = {
+		.start	= IRQ_PXA168_USB2,
+		.end	= IRQ_PXA168_USB2,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+static u64 pxa168_usb_host_dmamask = DMA_BIT_MASK(32);
+struct platform_device pxa168_device_usb_host = {
+	.name = "pxa168-ehci",
+	.id   = -1,
+	.dev  = {
+		.dma_mask = &pxa168_usb_host_dmamask,
+		.coherent_dma_mask = DMA_BIT_MASK(32),
+	},
+
+	.num_resources = ARRAY_SIZE(pxa168_usb_host_resources),
+	.resource      = pxa168_usb_host_resources,
+};
+
+int __init pxa168_add_usb_host(struct pxa168_usb_pdata *pdata)
+{
+	pxa168_device_usb_host.dev.platform_data = pdata;
+	return platform_device_register(&pxa168_device_usb_host);
+}

arch/arm/mach-omap2/Makefile

View file

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index f343365..7317a2b 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -242,14 +242,11 @@ obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o \
 obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o \
 					   hsmmc.o
 obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \
-					   hsmmc.o \
-					   omap_phy_internal.o
+					   hsmmc.o
 obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o \
-					   hsmmc.o \
-					   omap_phy_internal.o
+					   hsmmc.o
 
-obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o \
-					   omap_phy_internal.o \
+obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o
 
 obj-$(CONFIG_MACH_CRANEBOARD)		+= board-am3517crane.o
 
@@ -260,6 +257,8 @@ obj-$(CONFIG_MACH_TI8168EVM)		+= board-ti8168evm.o
 usbfs-$(CONFIG_ARCH_OMAP_OTG)		:= usb-fs.o
 obj-y					+= $(usbfs-m) $(usbfs-y)
 obj-y					+= usb-musb.o
+obj-y					+= omap_phy_internal.o
+
 obj-$(CONFIG_MACH_OMAP2_TUSB6010)	+= usb-tusb6010.o
 obj-y					+= usb-host.o
 

arch/arm/mach-shmobile/board-mackerel.c

View file

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 17c19dc..802aa58 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -810,6 +810,7 @@ static struct usbhs_private usbhs1_private = {
 		},
 		.driver_param = {
 			.buswait_bwait	= 4,
+			.has_otg	= 1,
 			.pipe_type	= usbhs1_pipe_cfg,
 			.pipe_size	= ARRAY_SIZE(usbhs1_pipe_cfg),
 			.d0_tx_id	= SHDMA_SLAVE_USB1_TX,

drivers/usb/Kconfig

View file

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 48f1781..4ac2750 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -12,6 +12,11 @@ menuconfig USB_SUPPORT
 
 if USB_SUPPORT
 
+config USB_COMMON
+	tristate
+	default y
+	depends on USB || USB_GADGET
+
 # Host-side USB depends on having a host controller
 # NOTE:  dummy_hcd is always an option, but it's ignored here ...
 # NOTE:  SL-811 option should be board-specific ...
@@ -19,6 +24,7 @@ config USB_ARCH_HAS_HCD
 	boolean
 	default y if USB_ARCH_HAS_OHCI
 	default y if USB_ARCH_HAS_EHCI
+	default y if USB_ARCH_HAS_XHCI
 	default y if PCMCIA && !M32R			# sl811_cs
 	default y if ARM				# SL-811
 	default y if BLACKFIN				# SL-811
@@ -54,7 +60,7 @@ config USB_ARCH_HAS_OHCI
 # some non-PCI hcds implement EHCI
 config USB_ARCH_HAS_EHCI
 	boolean
-	default y if PPC_83xx
+	default y if FSL_SOC
 	default y if PPC_MPC512x
 	default y if SOC_AU1200
 	default y if ARCH_IXP4XX
@@ -69,6 +75,12 @@ config USB_ARCH_HAS_EHCI
 	default y if ARCH_MSM
 	default y if MICROBLAZE
 	default y if SPARC_LEON
+	default y if ARCH_MMP
+	default PCI
+
+# some non-PCI HCDs implement xHCI
+config USB_ARCH_HAS_XHCI
+	boolean
 	default PCI
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
@@ -110,6 +122,8 @@ config USB
 
 source "drivers/usb/core/Kconfig"
 
+source "drivers/usb/dwc3/Kconfig"
+
 source "drivers/usb/mon/Kconfig"
 
 source "drivers/usb/wusbcore/Kconfig"

drivers/usb/Makefile

View file

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 30ddf8d..75eca76 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -6,6 +6,8 @@
 
 obj-$(CONFIG_USB)		+= core/
 
+obj-$(CONFIG_USB_DWC3)		+= dwc3/
+
 obj-$(CONFIG_USB_MON)		+= mon/
 
 obj-$(CONFIG_PCI)		+= host/
@@ -51,3 +53,5 @@ obj-$(CONFIG_USB_MUSB_HDRC)	+= musb/
 obj-$(CONFIG_USB_RENESAS_USBHS)	+= renesas_usbhs/
 obj-$(CONFIG_USB_OTG_UTILS)	+= otg/
 obj-$(CONFIG_USB_GADGET)	+= gadget/
+
+obj-$(CONFIG_USB_COMMON)	+= usb-common.o

drivers/usb/class/cdc-acm.c

View file

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index dac7676..3ec6699 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1058,11 +1058,11 @@ made_compressed_probe:
 		goto alloc_fail;
 	}
 
-	ctrlsize = le16_to_cpu(epctrl->wMaxPacketSize);
-	readsize = le16_to_cpu(epread->wMaxPacketSize) *
+	ctrlsize = usb_endpoint_maxp(epctrl);
+	readsize = usb_endpoint_maxp(epread) *
 				(quirks == SINGLE_RX_URB ? 1 : 2);
 	acm->combined_interfaces = combined_interfaces;
-	acm->writesize = le16_to_cpu(epwrite->wMaxPacketSize) * 20;
+	acm->writesize = usb_endpoint_maxp(epwrite) * 20;
 	acm->control = control_interface;
 	acm->data = data_interface;
 	acm->minor = minor;
@@ -1534,6 +1534,9 @@ static const struct usb_device_id acm_ids[] = {
 	{ NOKIA_PCSUITE_ACM_INFO(0x03cd), }, /* Nokia C7 */
 	{ SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */
 
+	/* Support for Owen devices */
+	{ USB_DEVICE(0x03eb, 0x0030), }, /* Owen SI30 */
+
 	/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
 
 	/* Support Lego NXT using pbLua firmware */

drivers/usb/class/cdc-wdm.c

View file

diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 2b9ff51..1d26a71 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -682,7 +682,7 @@ next_desc:
 	if (!ep || !usb_endpoint_is_int_in(ep))
 		goto err;
 
-	desc->wMaxPacketSize = le16_to_cpu(ep->wMaxPacketSize);
+	desc->wMaxPacketSize = usb_endpoint_maxp(ep);
 	desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0;
 
 	desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);

drivers/usb/class/usbtmc.c

View file

diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 3f94ac3..12cf5e7 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -186,8 +186,7 @@ static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data)
 	for (n = 0; n < current_setting->desc.bNumEndpoints; n++)
 		if (current_setting->endpoint[n].desc.bEndpointAddress ==
 			data->bulk_in)
-			max_size = le16_to_cpu(current_setting->endpoint[n].
-						desc.wMaxPacketSize);
+			max_size = usb_endpoint_maxp(&current_setting->endpoint[n].desc);
 
 	if (max_size == 0) {
 		dev_err(dev, "Couldn't get wMaxPacketSize\n");
@@ -636,7 +635,7 @@ static int usbtmc_ioctl_clear(struct usbtmc_device_data *data)
 	for (n = 0; n < current_setting->desc.bNumEndpoints; n++) {
 		desc = &current_setting->endpoint[n].desc;
 		if (desc->bEndpointAddress == data->bulk_in)
-			max_size = le16_to_cpu(desc->wMaxPacketSize);
+			max_size = usb_endpoint_maxp(desc);
 	}
 
 	if (max_size == 0) {

drivers/usb/core/config.c

View file

diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 26678ca..f4bdd0c 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -124,9 +124,9 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
 
 	if (usb_endpoint_xfer_isoc(&ep->desc))
 		max_tx = (desc->bMaxBurst + 1) * (desc->bmAttributes + 1) *
-			le16_to_cpu(ep->desc.wMaxPacketSize);
+			usb_endpoint_maxp(&ep->desc);
 	else if (usb_endpoint_xfer_int(&ep->desc))
-		max_tx = le16_to_cpu(ep->desc.wMaxPacketSize) *
+		max_tx = usb_endpoint_maxp(&ep->desc) *
 			(desc->bMaxBurst + 1);
 	else
 		max_tx = 999999;
@@ -241,7 +241,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum,
 		    cfgno, inum, asnum, d->bEndpointAddress);
 		endpoint->desc.bmAttributes = USB_ENDPOINT_XFER_INT;
 		endpoint->desc.bInterval = 1;
-		if (le16_to_cpu(endpoint->desc.wMaxPacketSize) > 8)
+		if (usb_endpoint_maxp(&endpoint->desc) > 8)
 			endpoint->desc.wMaxPacketSize = cpu_to_le16(8);
 	}
 
@@ -254,7 +254,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum,
 			&& usb_endpoint_xfer_bulk(d)) {
 		unsigned maxp;
 
-		maxp = le16_to_cpu(endpoint->desc.wMaxPacketSize) & 0x07ff;
+		maxp = usb_endpoint_maxp(&endpoint->desc) & 0x07ff;
 		if (maxp != 512)
 			dev_warn(ddev, "config %d interface %d altsetting %d "
 				"bulk endpoint 0x%X has invalid maxpacket %d\n",
@@ -755,3 +755,106 @@ err2:
 		dev_err(ddev, "out of memory\n");
 	return result;
 }
+
+void usb_release_bos_descriptor(struct usb_device *dev)
+{
+	if (dev->bos) {
+		kfree(dev->bos->desc);
+		kfree(dev->bos);
+		dev->bos = NULL;
+	}
+}
+
+/* Get BOS descriptor set */
+int usb_get_bos_descriptor(struct usb_device *dev)
+{
+	struct device *ddev = &dev->dev;
+	struct usb_bos_descriptor *bos;
+	struct usb_dev_cap_header *cap;
+	unsigned char *buffer;
+	int length, total_len, num, i;
+	int ret;
+
+	bos = kzalloc(sizeof(struct usb_bos_descriptor), GFP_KERNEL);
+	if (!bos)
+		return -ENOMEM;
+
+	/* Get BOS descriptor */
+	ret = usb_get_descriptor(dev, USB_DT_BOS, 0, bos, USB_DT_BOS_SIZE);
+	if (ret < USB_DT_BOS_SIZE) {
+		dev_err(ddev, "unable to get BOS descriptor\n");
+		if (ret >= 0)
+			ret = -ENOMSG;
+		kfree(bos);
+		return ret;
+	}
+
+	length = bos->bLength;
+	total_len = le16_to_cpu(bos->wTotalLength);
+	num = bos->bNumDeviceCaps;
+	kfree(bos);
+	if (total_len < length)
+		return -EINVAL;
+
+	dev->bos = kzalloc(sizeof(struct usb_host_bos), GFP_KERNEL);
+	if (!dev->bos)
+		return -ENOMEM;
+
+	/* Now let's get the whole BOS descriptor set */
+	buffer = kzalloc(total_len, GFP_KERNEL);
+	if (!buffer) {
+		ret = -ENOMEM;
+		goto err;
+	}
+	dev->bos->desc = (struct usb_bos_descriptor *)buffer;
+
+	ret = usb_get_descriptor(dev, USB_DT_BOS, 0, buffer, total_len);
+	if (ret < total_len) {
+		dev_err(ddev, "unable to get BOS descriptor set\n");
+		if (ret >= 0)
+			ret = -ENOMSG;
+		goto err;
+	}
+	total_len -= length;
+
+	for (i = 0; i < num; i++) {
+		buffer += length;
+		cap = (struct usb_dev_cap_header *)buffer;
+		length = cap->bLength;
+
+		if (total_len < length)
+			break;
+		total_len -= length;
+
+		if (cap->bDescriptorType != USB_DT_DEVICE_CAPABILITY) {
+			dev_warn(ddev, "descriptor type invalid, skip\n");
+			continue;
+		}
+
+		switch (cap->bDevCapabilityType) {
+		case USB_CAP_TYPE_WIRELESS_USB:
+			/* Wireless USB cap descriptor is handled by wusb */
+			break;
+		case USB_CAP_TYPE_EXT:
+			dev->bos->ext_cap =
+				(struct usb_ext_cap_descriptor *)buffer;
+			break;
+		case USB_SS_CAP_TYPE:
+			dev->bos->ss_cap =
+				(struct usb_ss_cap_descriptor *)buffer;
+			break;
+		case CONTAINER_ID_TYPE:
+			dev->bos->ss_id =
+				(struct usb_ss_container_id_descriptor *)buffer;
+			break;
+		default:
+			break;
+		}
+	}
+
+	return 0;
+
+err:
+	usb_release_bos_descriptor(dev);
+	return ret;
+}

drivers/usb/core/devices.c

View file

diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index 0149c09..d956965 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -190,7 +190,7 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end,

This diff is incomplete. Download the complete patch.