Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (be90a49c) · Commits · 戴 / test

Documentation/kernel-parameters.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -671,7 +671,7 @@ and is between 256 and 4096 characters. It is defined in the file
		earlyprintk= [X86,SH,BLACKFIN]
		earlyprintk=vga
		earlyprintk=serial[,ttySn[,baudrate]]
		earlyprintk=dbgp
		earlyprintk=dbgp[debugController#]

		Append ",keep" to not disable it when the real console
		takes over.

Documentation/usb/authorization.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -16,20 +16,20 @@ Usage:

		Authorize a device to connect:

		$ echo 1 > /sys/usb/devices/DEVICE/authorized
		$ echo 1 > /sys/bus/usb/devices/DEVICE/authorized

		Deauthorize a device:

		$ echo 0 > /sys/usb/devices/DEVICE/authorized
		$ echo 0 > /sys/bus/usb/devices/DEVICE/authorized

		Set new devices connected to hostX to be deauthorized by default (ie:
		lock down):

		$ echo 0 > /sys/bus/devices/usbX/authorized_default
		$ echo 0 > /sys/bus/usb/devices/usbX/authorized_default

		Remove the lock down:

		$ echo 1 > /sys/bus/devices/usbX/authorized_default
		$ echo 1 > /sys/bus/usb/devices/usbX/authorized_default

		By default, Wired USB devices are authorized by default to
		connect. Wireless USB hosts deauthorize by default all new connected
		@@ -47,7 +47,7 @@ USB port):
		boot up
		rc.local ->

		for host in /sys/bus/devices/usb*
		for host in /sys/bus/usb/devices/usb*
		do
		echo 0 > $host/authorized_default
		done

Documentation/usb/usbmon.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ if usbmon is built into the kernel.

		Verify that bus sockets are present.

		# ls /sys/kernel/debug/usbmon
		# ls /sys/kernel/debug/usb/usbmon
		0s 0u 1s 1t 1u 2s 2t 2u 3s 3t 3u 4s 4t 4u
		#

		@@ -58,11 +58,11 @@ Bus=03 means it's bus 3.

		3. Start 'cat'

		# cat /sys/kernel/debug/usbmon/3u > /tmp/1.mon.out
		# cat /sys/kernel/debug/usb/usbmon/3u > /tmp/1.mon.out

		to listen on a single bus, otherwise, to listen on all buses, type:

		# cat /sys/kernel/debug/usbmon/0u > /tmp/1.mon.out
		# cat /sys/kernel/debug/usb/usbmon/0u > /tmp/1.mon.out

		This process will be reading until killed. Naturally, the output can be
		redirected to a desirable location. This is preferred, because it is going
		@@ -305,7 +305,7 @@ Before the call, hdr, data, and alloc should be filled. Upon return, the area
		pointed by hdr contains the next event structure, and the data buffer contains
		the data, if any. The event is removed from the kernel buffer.

		The MON_IOCX_GET copies 48 bytes, MON_IOCX_GETX copies 64 bytes.
		The MON_IOCX_GET copies 48 bytes to hdr area, MON_IOCX_GETX copies 64 bytes.

		MON_IOCX_MFETCH, defined as _IOWR(MON_IOC_MAGIC, 7, struct mon_mfetch_arg)

Documentation/x86/earlyprintk.txt

+37 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ and two USB cables, connected like this:

		[host/target] <-------> [USB debug key] <-------> [client/console]

		1. There are three specific hardware requirements:
		1. There are a number of specific hardware requirements:

		a.) Host/target system needs to have USB debug port capability.

		@@ -42,7 +42,35 @@ and two USB cables, connected like this:
		This is a small blue plastic connector with two USB connections,
		it draws power from its USB connections.

		c.) Thirdly, you need a second client/console system with a regular USB port.
		c.) You need a second client/console system with a high speed USB 2.0
		port.

		d.) The Netchip device must be plugged directly into the physical
		debug port on the "host/target" system. You cannot use a USB hub in
		between the physical debug port and the "host/target" system.

		The EHCI debug controller is bound to a specific physical USB
		port and the Netchip device will only work as an early printk
		device in this port. The EHCI host controllers are electrically
		wired such that the EHCI debug controller is hooked up to the
		first physical and there is no way to change this via software.
		You can find the physical port through experimentation by trying
		each physical port on the system and rebooting. Or you can try
		and use lsusb or look at the kernel info messages emitted by the
		usb stack when you plug a usb device into various ports on the
		"host/target" system.

		Some hardware vendors do not expose the usb debug port with a
		physical connector and if you find such a device send a complaint
		to the hardware vendor, because there is no reason not to wire
		this port into one of the physically accessible ports.

		e.) It is also important to note, that many versions of the Netchip
		device require the "client/console" system to be plugged into the
		right and side of the device (with the product logo facing up and
		readable left to right). The reason being is that the 5 volt
		power supply is taken from only one side of the device and it
		must be the side that does not get rebooted.

		2. Software requirements:

		@@ -56,6 +84,13 @@ and two USB cables, connected like this:
		(If you are using Grub, append it to the 'kernel' line in
		/etc/grub.conf)

		On systems with more than one EHCI debug controller you must
		specify the correct EHCI debug controller number. The ordering
		comes from the PCI bus enumeration of the EHCI controllers. The
		default with no number argument is "0" the first EHCI debug
		controller. To use the second EHCI debug controller, you would
		use the command line: "earlyprintk=dbgp1"

		NOTE: normally earlyprintk console gets turned off once the
		regular console is alive - use "earlyprintk=dbgp,keep" to keep
		this channel open beyond early bootup. This can be useful for

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -2107,12 +2107,12 @@ S: Supported
		F: arch/powerpc/sysdev/qe_lib/
		F: arch/powerpc/include/asm/*qe.h

		FREESCALE HIGHSPEED USB DEVICE DRIVER
		FREESCALE USB PERIPHERIAL DRIVERS
		M: Li Yang <leoli@freescale.com>
		L: linux-usb@vger.kernel.org
		L: linuxppc-dev@ozlabs.org
		S: Maintained
		F: drivers/usb/gadget/fsl_usb2_udc.c
		F: drivers/usb/gadget/fsl*

		FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
		M: Li Yang <leoli@freescale.com>

Admin message