MFhead @ r292285

5 files changed, 34 insertions, 9 deletions

diff --git a/tools/build/options/makeman b/tools/build/options/makeman
index acc0eb5..52f72ee 100755
--- a/tools/build/options/makeman
+++ b/tools/build/options/makeman
@@ -197,11 +197,14 @@ for the build can be controlled via the
 variable, which defaults to
 .Pa /etc/src-env.conf .
 Some examples that may only be set in this file are
-.Va MAKEOBJDIRPREFIX ,
 .Va WITH_DIRDEPS_BUILD ,
 and
 .Va WITH_META_MODE
 as they are environment-only variables.
+Note that
+.Va MAKEOBJDIRPREFIX
+may be set here only when using
+.Va WITH_DIRDEPS_BUILD .
 .Pp
 The values of variables are ignored regardless of their setting;
 even if they would be set to
diff --git a/tools/debugscripts/README b/tools/debugscripts/README
index 2081531..a218368 100644
--- a/tools/debugscripts/README
+++ b/tools/debugscripts/README
@@ -14,8 +14,8 @@ perform kernel debugging, you would do:
   (kgdb) 
 
 
-This directory also contains a kgdb script that given a crash dump number
-automatically extract the path to the kernel source, run gdb to extract
-information about kernel modules loaded, and then rerun gdb loading the
+This directory also contains a kgdb script that, given a crash dump number,
+automatically extracts the path to the kernel source, runs gdb to extract
+information about kernel modules loaded, and then reruns gdb loading the
 necessary symbols for the modules.  You need to make sure you build the
 modules w/ debugging symbols separately to get things to work.
diff --git a/tools/tools/ath/athratestats/Makefile b/tools/tools/ath/athratestats/Makefile
index 938f0cb..b5397be 100644
--- a/tools/tools/ath/athratestats/Makefile
+++ b/tools/tools/ath/athratestats/Makefile
@@ -7,7 +7,7 @@ PROG=	athratestats
 
 SRCS=	main.c opt_ah.h ah_osdep.h
 
-LIBADD+=	curses
+LIBADD+=	ncurses
 
 CLEANFILES+=	opt_ah.h ah_osdep.h
 
diff --git a/tools/tools/ioat/ioatcontrol.8 b/tools/tools/ioat/ioatcontrol.8
index 002759f..9e156fd 100644
--- a/tools/tools/ioat/ioatcontrol.8
+++ b/tools/tools/ioat/ioatcontrol.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 9, 2015
+.Dd December 14, 2015
 .Dt IOATCONTROL 8
 .Os
 .Sh NAME
@@ -33,10 +33,12 @@
 .Xr ioat 4
 .Sh SYNOPSIS
 .Nm
+.Op Fl c Ar period
 .Op Fl E
 .Op Fl f
 .Op Fl m
 .Op Fl V
+.Op Fl z
 .Ar channel_number
 .Ar num_txns
 .Ar [ bufsize
@@ -44,9 +46,11 @@
 .Ar [ duration ] ] ]
 .Nm
 .Fl r
+.Op Fl c Ar period
 .Op Fl v
 .Op Fl V
 .Op Fl w
+.Op Fl z
 .Ar channel_number
 .Ar address
 .Ar [ bufsize ]
@@ -57,6 +61,8 @@ allows one to issue some number of test operations to the
 driver on a specific hardware channel.
 The arguments are as follows:
 .Bl -tag -width Ds
+.It Fl c Ar period
+Configure the channel's interrupt coalescing period, in microseconds.
 .It Fl E
 Test non-contiguous 8k copy.
 .It Fl f
@@ -67,6 +73,8 @@ tests copy)
 Test memcpy instead of DMA.
 .It Fl V
 Verify copies/fills for accuracy
+.It Fl z
+Zero device statistics before running test.
 .El
 .Pp
 Alternatively one can use
@@ -76,6 +84,8 @@ to issue DMA to or from a specific
 .Ar address .
 The arguments in "raw" mode are:
 .Bl -tag -width Ds
+.It Fl c Ar period
+As above.
 .It Fl v
 .Ar address
 is a kernel virtual address (by default,
@@ -90,6 +100,8 @@ Write to the specified
 .Nm
 .Fl r
 reads)
+.It Fl z
+As above.
 .El
 .Pp
 .Nm
diff --git a/tools/tools/ioat/ioatcontrol.c b/tools/tools/ioat/ioatcontrol.c
index d40ae15..32decc7 100644
--- a/tools/tools/ioat/ioatcontrol.c
+++ b/tools/tools/ioat/ioatcontrol.c
@@ -48,10 +48,14 @@ static void
 usage(void)
 {
 
-	printf("Usage: %s [-E|-f|-m] [-V] <channel #> <txns> [<bufsize> "
+	printf("Usage: %s [-E|-f|-m] OPTIONS <channel #> <txns> [<bufsize> "
 	    "[<chain-len> [duration]]]\n", getprogname());
-	printf("       %s -r [-vV] <channel #> <addr> [<bufsize>]\n",
+	printf("       %s -r [-v] OPTIONS <channel #> <addr> [<bufsize>]\n\n",
 	    getprogname());
+	printf("       OPTIONS:\n");
+	printf("           -c <period> - Enable interrupt coalescing (us)\n");
+	printf("           -V          - Enable verification\n");
+	printf("           -z          - Zero device stats before test\n");
 	exit(EX_USAGE);
 }
 
@@ -103,8 +107,11 @@ main(int argc, char **argv)
 	fflag = rflag = Eflag = mflag = false;
 	modeflags = 0;
 
-	while ((ch = getopt(argc, argv, "EfmrvVw")) != -1) {
+	while ((ch = getopt(argc, argv, "c:EfmrvVwz")) != -1) {
 		switch (ch) {
+		case 'c':
+			t.coalesce_period = atoi(optarg);
+			break;
 		case 'E':
 			Eflag = true;
 			modeflags++;
@@ -130,6 +137,9 @@ main(int argc, char **argv)
 		case 'w':
 			t.raw_write = true;
 			break;
+		case 'z':
+			t.zero_stats = true;
+			break;
 		default:
 			usage();
 		}