diff options
| author | Linus Torvalds <[email protected]> | 2017-07-03 19:30:55 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-07-03 19:30:55 -0700 | 
| commit | 362f6729cbb1d6bbab59e069f19441b0622ff7ec (patch) | |
| tree | 654070221092c34c97f48fbbdef7d5f02ffc7ba4 /tools/usb/testusb.c | |
| parent | 4422d80ed7d4bdb2d6e9fb890c66c3d9250ba694 (diff) | |
| parent | 6836796de4019944f4ba4c99a360e8250fd2e735 (diff) | |
Merge tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB/PHY updates from Greg KH:
 "Here is the big patchset of USB and PHY driver updates for 4.13-rc1.
  On the PHY side, they decided to move files around to "make things
  easier" in their tree. Hopefully that wasn't a mistake, but in
  linux-next testing, we haven't had any reported problems.
  There's the usual set of gadget and xhci and musb updates in here as
  well, along with a number of smaller updates for a raft of different
  USB drivers. Full details in the shortlog, nothing really major.
  All of these have been in linux-next for a while with no reported
  issues"
* tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (173 commits)
  Add USB quirk for HVR-950q to avoid intermittent device resets
  USB hub_probe: rework ugly goto-into-compound-statement
  usb: host: ohci-pxa27x: Handle return value of clk_prepare_enable
  USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick
  usbip: Fix uninitialized variable bug in vhci
  usb: core: read USB ports from DT in the usbport LED trigger driver
  dt-bindings: leds: document new trigger-sources property
  usb: typec: ucsi: Add ACPI driver
  usb: typec: Add support for UCSI interface
  usb: musb: compress return logic into one line
  USB: serial: propagate late probe errors
  USB: serial: refactor port endpoint setup
  usb: musb: tusb6010_omap: Convert to DMAengine API
  ARM: OMAP2+: DMA: Add slave map entries for 24xx external request lines
  usb: musb: tusb6010: Handle DMA TX completion in DMA callback as well
  usb: musb: tusb6010_omap: Allocate DMA channels upfront
  usb: musb: tusb6010_omap: Create new struct for DMA data/parameters
  usb: musb: tusb6010_omap: Use one musb_ep_select call in tusb_omap_dma_program
  usb: musb: tusb6010: Add MUSB_G_NO_SKB_RESERVE to quirks
  usb: musb: Add quirk to avoid skb reserve in gadget mode
  ...
Diffstat (limited to 'tools/usb/testusb.c')
| -rw-r--r-- | tools/usb/testusb.c | 16 | 
1 files changed, 9 insertions, 7 deletions
diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c index 0692d99b6d8f..2d89b5f686b1 100644 --- a/tools/usb/testusb.c +++ b/tools/usb/testusb.c @@ -387,15 +387,17 @@ int main (int argc, char **argv)  	/* pick defaults that works with all speeds, without short packets.  	 *  	 * Best per-frame data rates: -	 *     high speed, bulk       512 * 13 * 8 = 53248 -	 *                 interrupt 1024 *  3 * 8 = 24576 -	 *     full speed, bulk/intr   64 * 19     =  1216 -	 *                 interrupt   64 *  1     =    64 -	 *      low speed, interrupt    8 *  1     =     8 +	 *     super speed,bulk      1024 * 16 * 8 = 131072 +	 *                 interrupt 1024 *  3 * 8 =  24576 +	 *     high speed, bulk       512 * 13 * 8 =  53248 +	 *                 interrupt 1024 *  3 * 8 =  24576 +	 *     full speed, bulk/intr   64 * 19     =   1216 +	 *                 interrupt   64 *  1     =     64 +	 *      low speed, interrupt    8 *  1     =      8  	 */  	param.iterations = 1000;  	param.length = 1024; -	param.vary = 512; +	param.vary = 1024;  	param.sglen = 32;  	/* for easy use when hotplugging */ @@ -457,7 +459,7 @@ usage:  			"\t-c iterations		default 1000\n"  			"\t-s transfer length	default 1024\n"  			"\t-g sglen		default 32\n" -			"\t-v vary			default 512\n", +			"\t-v vary			default 1024\n",  			argv[0]);  		return 1;  	}  |