CVS commit: src/sys/dev/pci

2018-08-07 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Wed Aug  8 03:15:18 UTC 2018

Modified Files:
src/sys/dev/pci: if_wmvar.h

Log Message:
Add MDIC_WA and CLSEMWA to snprintb() string for WM_F_* flags.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_wmvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_wmvar.h
diff -u src/sys/dev/pci/if_wmvar.h:1.38 src/sys/dev/pci/if_wmvar.h:1.39
--- src/sys/dev/pci/if_wmvar.h:1.38	Thu Apr 12 03:25:08 2018
+++ src/sys/dev/pci/if_wmvar.h	Wed Aug  8 03:15:18 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wmvar.h,v 1.38 2018/04/12 03:25:08 msaitoh Exp $	*/
+/*	$NetBSD: if_wmvar.h,v 1.39 2018/08/08 03:15:18 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -105,7 +105,7 @@
 	"\15" "PCIX"	"\16" "CSA"	"\17" "PCIE"	"\20" "SGMII"	\
 	"\21" "NEWQUEUE" "\22" "ASF_FIRM" "\23" "ARC_SUBSYS" "\24" "AMT" \
 	"\25" "MANAGE"	"\26" "WOL"	"\27" "EEE"	"\30" "ATTACHED" \
-	"\31" "_B24"	"\32" "PCS_DIS_AUTONEGO" "\33" "PLLWA"
+	"\31" "MDIC_WA"	"\32" "PCS_DIS_AUTONEGO" "\33" "PLLWA" "\40" "CLSEMWA"
 
 /*
  * Variations of Intel gigabit Ethernet controller:

CVS commit: src/lib/libcurses

2018-08-07 Thread Simon Burge 
Module Name:src
Committed By:   simonb
Date:   Wed Aug  8 02:26:08 UTC 2018

Modified Files:
src/lib/libcurses: addbytes.c

Log Message:
Avoid curx going beyond end of window when adding a wide character to the
last column.

OK @blymn.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/lib/libcurses/addbytes.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.47 src/lib/libcurses/addbytes.c:1.48
--- src/lib/libcurses/addbytes.c:1.47	Fri Jan  6 14:25:41 2017
+++ src/lib/libcurses/addbytes.c	Wed Aug  8 02:26:08 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: addbytes.c,v 1.47 2017/01/06 14:25:41 roy Exp $	*/
+/*	$NetBSD: addbytes.c,v 1.48 2018/08/08 02:26:08 simonb Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)addbytes.c	8.4 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: addbytes.c,v 1.47 2017/01/06 14:25:41 roy Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.48 2018/08/08 02:26:08 simonb Exp $");
 #endif
 #endif/* not lint */
 
@@ -582,7 +582,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
 		if (newx > *(*lnp)->lastchp)
 			*(*lnp)->lastchp = newx;
 		__touchline(win, *y, sx, (int) win->maxx - 1);
-		win->curx = sx;
+		*x = win->curx = sx;
 	} else {
 		win->curx = *x;

CVS commit: src/usr.sbin/npf/npfd

2018-08-07 Thread Sevan Janiyan 
Module Name:src
Committed By:   sevan
Date:   Tue Aug  7 22:55:47 UTC 2018

Modified Files:
src/usr.sbin/npf/npfd: npfd.8

Log Message:
Simplify the description of npfd, default npflog interface & pcap file are
covered later.
Move advise regarding offline analysis to the CAVEATS section.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/npf/npfd/npfd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/npf/npfd/npfd.8
diff -u src/usr.sbin/npf/npfd/npfd.8:1.4 src/usr.sbin/npf/npfd/npfd.8:1.5
--- src/usr.sbin/npf/npfd/npfd.8:1.4	Tue Aug  7 22:02:08 2018
+++ src/usr.sbin/npf/npfd/npfd.8	Tue Aug  7 22:55:47 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: npfd.8,v 1.4 2018/08/07 22:02:08 sevan Exp $
+.\"	$NetBSD: npfd.8,v 1.5 2018/08/07 22:55:47 sevan Exp $
 .\"	$OpenBSD: pflogd.8,v 1.35 2007/05/31 19:19:47 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Can Erkin Acar.  All rights reserved.
@@ -43,24 +43,16 @@
 .Op Ar expression
 .Sh DESCRIPTION
 .Nm
-is a background daemon which reads packets logged by
+is a background daemon which writes to a file in
+.Xr pcap 3
+format logged packets read from an npflog interface.
+The npflog interface is used by
 .Xr npf 7
-to an
-.\" .Xr npflog 4
-npflog
-interface, normally
-.Pa npflog0 ,
-and writes the packets to a logfile (normally
-.Pa /var/log/npflog0.pcap )
-in
+to log packets as defined in
+.Xr npf.conf 5 .
+The generated
 .Xr pcap 3
-format, which can be read by
-.Xr tcpdump 8 .
-These logs can be reviewed later using the
-.Fl r
-option of
-.Xr tcpdump 8 ,
-hopefully offline in case there are bugs in the packet parsing code of
+files can then be analysed using tools such as
 .Xr tcpdump 8 .
 .Pp
 .Nm
@@ -260,3 +252,7 @@ command appeared in
 .Sh AUTHORS
 This manual page was written by
 .An Can Erkin Acar Aq Mt cana...@openbsd.org .
+.Sh CAVEATS
+Offline analysis of captured data is advised to alleviate issues with
+malicious data intended to exploit bugs in the packet parsing code of
+.Xr tcpdump 8 .

CVS commit: src/usr.sbin/npf/npfd

2018-08-07 Thread Sevan Janiyan 
Module Name:src
Committed By:   sevan
Date:   Tue Aug  7 22:02:08 UTC 2018

Modified Files:
src/usr.sbin/npf/npfd: npfd.8

Log Message:
Escape ellipsis to stop it being interpreted as a macro.
Drop commented out manual which doesn't exist.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/npf/npfd/npfd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/npf/npfd/npfd.8
diff -u src/usr.sbin/npf/npfd/npfd.8:1.3 src/usr.sbin/npf/npfd/npfd.8:1.4
--- src/usr.sbin/npf/npfd/npfd.8:1.3	Sun Jan  8 13:59:53 2017
+++ src/usr.sbin/npf/npfd/npfd.8	Tue Aug  7 22:02:08 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: npfd.8,v 1.3 2017/01/08 13:59:53 wiz Exp $
+.\"	$NetBSD: npfd.8,v 1.4 2018/08/07 22:02:08 sevan Exp $
 .\"	$OpenBSD: pflogd.8,v 1.35 2007/05/31 19:19:47 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Can Erkin Acar.  All rights reserved.
@@ -26,7 +26,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd January 5, 2017
+.Dd August 7, 2018
 .Dt NPFD 8
 .Os
 .Sh NAME
@@ -231,23 +231,22 @@ Each
 rule is marked with an id number, shown using:
 .Bd -literal -offset indent
 # npfctl show
-...
+\&...
 block final all apply "log" # id="45"
-...
+\&...
 .Ed
 .Pp
 This id is the rule id shown by tcpdump:
 .Bd -literal -offset indent
 # tcpdump -enr /var/log/npflog0.pcap
-...
+\&...
 11:26:02.288199 rule 45.rules.0/0(match): block in on sk0: \e
 1.2.3.4.46063 > 5.6.7.8.23231: Flags [S], seq 1, win 8192, \e
 options [mss 1440], length 0
-...
+\&...
 .Ed
 .Sh SEE ALSO
 .Xr pcap 3 ,
-\" .Xr if_npflog 4 ,
 .Xr npf.conf 5 ,
 .Xr npf 7 ,
 .Xr newsyslog 8 ,

CVS commit: src/dist/pf/sbin/pflogd

2018-08-07 Thread Sevan Janiyan 
Module Name:src
Committed By:   sevan
Date:   Tue Aug  7 21:11:19 UTC 2018

Modified Files:
src/dist/pf/sbin/pflogd: pflogd.8

Log Message:
Escape Dx which otherwise gets interpreted as DragonFly.
via r1.49 in OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/dist/pf/sbin/pflogd/pflogd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/dist/pf/sbin/pflogd/pflogd.8
diff -u src/dist/pf/sbin/pflogd/pflogd.8:1.8 src/dist/pf/sbin/pflogd/pflogd.8:1.9
--- src/dist/pf/sbin/pflogd/pflogd.8:1.8	Tue Mar 18 18:20:35 2014
+++ src/dist/pf/sbin/pflogd/pflogd.8	Tue Aug  7 21:11:19 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pflogd.8,v 1.8 2014/03/18 18:20:35 riastradh Exp $
+.\"	$NetBSD: pflogd.8,v 1.9 2018/08/07 21:11:19 sevan Exp $
 .\"	$OpenBSD: pflogd.8,v 1.35 2007/05/31 19:19:47 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Can Erkin Acar.  All rights reserved.
@@ -34,7 +34,7 @@
 .Sh SYNOPSIS
 .Nm pflogd
 .Bk -words
-.Op Fl Dx
+.Op Fl \
 .Op Fl d Ar delay
 .Op Fl f Ar filename
 .Op Fl i Ar interface

CVS commit: src/sys/external/bsd/dwc2

2018-08-07 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Tue Aug  7 16:35:08 UTC 2018

Modified Files:
src/sys/external/bsd/dwc2: dwc2.c

Log Message:
aprint_verbose the core version


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/external/bsd/dwc2/dwc2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.50 src/sys/external/bsd/dwc2/dwc2.c:1.51
--- src/sys/external/bsd/dwc2/dwc2.c:1.50	Tue Aug  7 08:36:30 2018
+++ src/sys/external/bsd/dwc2/dwc2.c	Tue Aug  7 16:35:08 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: dwc2.c,v 1.50 2018/08/07 08:36:30 rin Exp $	*/
+/*	$NetBSD: dwc2.c,v 1.51 2018/08/07 16:35:08 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.50 2018/08/07 08:36:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.51 2018/08/07 16:35:08 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -1328,6 +1328,11 @@ dwc2_init(struct dwc2_softc *sc)
 }
 #endif
 
+	uint32_t snpsid = hsotg->hw_params.snpsid;
+	aprint_verbose_dev(sc->sc_dev, "Core Release: %x.%x%x%x (snpsid=%x)\n",
+	snpsid >> 12 & 0xf, snpsid >> 8 & 0xf,
+	snpsid >> 4 & 0xf, snpsid & 0xf, snpsid);
+
 	return 0;
 
 fail2:

CVS commit: [netbsd-7] src/doc

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 16:07:49 UTC 2018

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
Tickets #1623, #1624, #1625


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-7.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.99 src/doc/CHANGES-7.2:1.1.2.100
--- src/doc/CHANGES-7.2:1.1.2.99	Sun Jul 29 06:44:56 2018
+++ src/doc/CHANGES-7.2	Tue Aug  7 16:07:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.99 2018/07/29 06:44:56 martin Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.100 2018/08/07 16:07:49 martin Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -5788,3 +5788,26 @@ sys/fs/udf/udf_subr.c1.142
 	bug-compatibility for Linux mkudffs 1.3 images.
 	[reinoud, ticket #1622]
 
+sys/arch/i386/stand/misc/Makefile		1.9
+sys/arch/i386/stand/misc/rawr32.exe.uue		delete
+
+	Remove Rawrite32 installer from install media
+	[martin, ticket #1623]
+
+distrib/notes/bebox/prep			1.3
+distrib/notes/common/main			1.547
+distrib/notes/ews4800mips/xfer			1.3
+distrib/notes/i386/xfer1.21
+distrib/notes/news68k/xfer			1.4
+distrib/notes/newsmips/xfer			1.3
+
+	Replace references to i386 install media for Rawrite32 with
+	links to the homepage.
+	[martin, ticket #1624]
+
+external/gpl2/gmake/dist/glob/glob.c		1.5
+	(applied to gnu/dist/gmake)
+
+	Fix build failure on Ubuntu 18.04.
+	[nonaka, ticket #1625]
+

CVS commit: [netbsd-7] src/gnu/dist/gmake/glob

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 16:04:28 UTC 2018

Modified Files:
src/gnu/dist/gmake/glob [netbsd-7]: glob.c

Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1625):

external/gpl2/gmake/dist/glob/glob.c: revision 1.5
(applied to gnu/dist/gmake)

gmake: __alloca and __stat are provided only when building with GLIBC.
Fix a build failure on Ubuntu 18.04.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.62.1 src/gnu/dist/gmake/glob/glob.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/gnu/dist/gmake/glob/glob.c
diff -u src/gnu/dist/gmake/glob/glob.c:1.1.1.1 src/gnu/dist/gmake/glob/glob.c:1.1.1.1.62.1
--- src/gnu/dist/gmake/glob/glob.c:1.1.1.1	Wed Mar 29 21:09:30 2006
+++ src/gnu/dist/gmake/glob/glob.c	Tue Aug  7 16:04:28 2018
@@ -206,7 +206,7 @@ my_realloc (p, n)
 #endif /* __GNU_LIBRARY__ */
 
 
-#if !defined __alloca && !defined __GNU_LIBRARY__
+#if !defined __alloca
 
 # ifdef	__GNUC__
 #  undef alloca
@@ -229,7 +229,7 @@ extern char *alloca ();
 
 #endif
 
-#ifndef __GNU_LIBRARY__
+#if !defined __stat
 # define __stat stat
 # ifdef STAT_MACROS_BROKEN
 #  undef S_ISDIR

CVS commit: [netbsd-7] src/distrib/notes

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 15:53:18 UTC 2018

Modified Files:
src/distrib/notes/bebox [netbsd-7]: prep
src/distrib/notes/common [netbsd-7]: main
src/distrib/notes/ews4800mips [netbsd-7]: xfer
src/distrib/notes/i386 [netbsd-7]: xfer
src/distrib/notes/news68k [netbsd-7]: xfer
src/distrib/notes/newsmips [netbsd-7]: xfer

Log Message:
Pull up following revision(s) (requested by martin in ticket #1624):

distrib/notes/ews4800mips/xfer: revision 1.3
distrib/notes/bebox/prep: revision 1.3
distrib/notes/newsmips/xfer: revision 1.3
distrib/notes/i386/xfer: revision 1.21
distrib/notes/common/main: revision 1.547
distrib/notes/news68k/xfer: revision 1.4

Replace references to i386 install media for Rawrite32 with
links to the homepage.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.26.1 src/distrib/notes/bebox/prep
cvs rdiff -u -r1.510.4.9 -r1.510.4.10 src/distrib/notes/common/main
cvs rdiff -u -r1.2 -r1.2.24.1 src/distrib/notes/ews4800mips/xfer
cvs rdiff -u -r1.20 -r1.20.24.1 src/distrib/notes/i386/xfer
cvs rdiff -u -r1.3 -r1.3.24.1 src/distrib/notes/news68k/xfer
cvs rdiff -u -r1.2 -r1.2.24.1 src/distrib/notes/newsmips/xfer

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/bebox/prep
diff -u src/distrib/notes/bebox/prep:1.2 src/distrib/notes/bebox/prep:1.2.26.1
--- src/distrib/notes/bebox/prep:1.2	Mon Nov 15 21:39:12 2010
+++ src/distrib/notes/bebox/prep	Tue Aug  7 15:53:17 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: prep,v 1.2 2010/11/15 21:39:12 wiz Exp $
+.\"	$NetBSD: prep,v 1.2.26.1 2018/08/07 15:53:17 martin Exp $
 .
 .Pp
 . 
@@ -45,13 +45,8 @@ If you have an x86 PC which runs
 and use it to write the floppy image(s) to floppy disk,
 you can use the
 .Ic Rawrite32
-Windows32 program
-.Pq installed by Pa rawr32.exe
-available in the
-.Pa i386/installation/misc/
-directory of the
-.Nx
-distribution.
+Windows program which can be found at
+.Lk https://www.NetBSD.org/~martin/rawrite32 .
 .Pp
 Also you can create boot.fs in the following way:
 .Pp

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.510.4.9 src/distrib/notes/common/main:1.510.4.10
--- src/distrib/notes/common/main:1.510.4.9	Sun Aug  5 14:07:47 2018
+++ src/distrib/notes/common/main	Tue Aug  7 15:53:17 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.510.4.9 2018/08/05 14:07:47 martin Exp $
+.\"	$NetBSD: main,v 1.510.4.10 2018/08/07 15:53:17 martin Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -257,15 +257,14 @@ with the appropriate device for your sys
 On Windows, you will need to use a program such as Win32 Disk Imager,
 which can be found at
 .Lk http://sourceforge.net/projects/win32diskimager/
+or
+Rawrite32 which can be found at
+.Lk https://www.NetBSD.org/~martin/rawrite32 .
 .if \n[amd64]:\n[i386] \{\
 If you have problems writing a raw image to a floppy,
 the
 .Ic rawrite.exe
 MS-DOS program
-or the
-.Ic Rawrite32
-Windows32 program (installed by
-.Pa rawr32.exe )
 in the
 .Pa \*M/installation/misc/
 directory may be of help.

Index: src/distrib/notes/ews4800mips/xfer
diff -u src/distrib/notes/ews4800mips/xfer:1.2 src/distrib/notes/ews4800mips/xfer:1.2.24.1
--- src/distrib/notes/ews4800mips/xfer:1.2	Fri May 27 17:38:43 2011
+++ src/distrib/notes/ews4800mips/xfer	Tue Aug  7 15:53:17 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: xfer,v 1.2 2011/05/27 17:38:43 tsutsui Exp $
+.\"	$NetBSD: xfer,v 1.2.24.1 2018/08/07 15:53:17 martin Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -59,14 +59,9 @@ If you have an i386 machine which runs
 .Tn Microsoft Windows
 and use it to write the floppy image(s) to floppy disk, you can use the
 .Ic Rawrite32
-Windows32 program.
-It can be installed by
-Pa rawr32.exe
-provided in the
-.Pa i386/installation/misc/
-directory of the
-.Nx
-distribution.
+Windows program.
+It can be downloaded from
+.Lk https://www.NetBSD.org/~martin/rawrite32 .
 .Ic rawrite
 utility for the
 .Tn MS-DOS

Index: src/distrib/notes/i386/xfer
diff -u src/distrib/notes/i386/xfer:1.20 src/distrib/notes/i386/xfer:1.20.24.1
--- src/distrib/notes/i386/xfer:1.20	Fri May 27 17:38:43 2011
+++ src/distrib/notes/i386/xfer	Tue Aug  7 15:53:17 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: xfer,v 1.20 2011/05/27 17:38:43 tsutsui Exp $
+.\"	$NetBSD: xfer,v 1.20.24.1 2018/08/07 15:53:17 martin Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -59,21 +59,16 @@ If you are using
 .Tn Microsoft Windows
 to write the floppy image(s) to floppy disk, you can use the
 .Ic Rawrite32
-Windows32 program.
-It can be installed by
-Pa rawr32.exe
-provieded in the
-.Pa i386/installation/misc
-directory of the
-.Nx
-distribution.
+Windows program.
+It can be downloaded from
+.Lk

CVS commit: [netbsd-7] src/sys/arch/i386/stand/misc

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 15:51:29 UTC 2018

Modified Files:
src/sys/arch/i386/stand/misc [netbsd-7]: Makefile
Removed Files:
src/sys/arch/i386/stand/misc [netbsd-7]: rawr32.exe.uue

Log Message:
Pull up following revision(s) (requested by martin in ticket #1623):

sys/arch/i386/stand/misc/rawr32.exe.uue: file removal
sys/arch/i386/stand/misc/Makefile: revision 1.9

Remove Rawrite32 installer - no point having an outdated version on
some install media, the windows machine it needs to run on will
have internet and can easily download it.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.34.1 src/sys/arch/i386/stand/misc/Makefile
cvs rdiff -u -r1.4.24.2 -r0 src/sys/arch/i386/stand/misc/rawr32.exe.uue

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/i386/stand/misc/Makefile
diff -u src/sys/arch/i386/stand/misc/Makefile:1.7 src/sys/arch/i386/stand/misc/Makefile:1.7.34.1
--- src/sys/arch/i386/stand/misc/Makefile:1.7	Wed Oct 27 18:29:46 2010
+++ src/sys/arch/i386/stand/misc/Makefile	Tue Aug  7 15:51:28 2018
@@ -1,8 +1,7 @@
-#	$NetBSD: Makefile,v 1.7 2010/10/27 18:29:46 martin Exp $
+#	$NetBSD: Makefile,v 1.7.34.1 2018/08/07 15:51:28 martin Exp $
 
 MISC_FILES=	rawrite.c
 UUDECODE_FILES=	pfdisk.doc pfdisk.exe pfdisktc.zip \
-		rawr32.exe \
 		rawrite.doc rawrite.exe
 
 .include

CVS commit: [netbsd-8] src/doc

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 13:40:40 UTC 2018

Modified Files:
src/doc [netbsd-8]: CHANGES-8.1

Log Message:
Tickets #950, #956, #958, #959, #960, #961, #962


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-8.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.1
diff -u src/doc/CHANGES-8.1:1.1.2.6 src/doc/CHANGES-8.1:1.1.2.7
--- src/doc/CHANGES-8.1:1.1.2.6	Tue Jul 31 17:09:45 2018
+++ src/doc/CHANGES-8.1	Tue Aug  7 13:40:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.1,v 1.1.2.6 2018/07/31 17:09:45 martin Exp $
+# $NetBSD: CHANGES-8.1,v 1.1.2.7 2018/08/07 13:40:40 martin Exp $
 
 A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1
 release:
@@ -295,3 +295,50 @@ usr.sbin/arp/arp.c1.63
 	arp(8): Fix the host output with -dav argument.
 	[nonaka, ticket #957]
 
+doc/TODO.smpnet	1.20
+sys/dev/pci/if_lmc.c1.65
+sys/dev/pci/if_lmc.h1.25
+
+	Move txintr_setup() stuff from lmc_interrupt() and do it in
+	ifnet_start() so we can use bpf_mtap() in the TX path.
+	[msaitoh, ticket #950]
+
+usr.bin/m4/eval.c1.27
+
+	Avoid an infinite loop.
+	[kre, ticket #956]
+
+sbin/cgdconfig/cgdconfig.8			1.39,1.40
+sbin/cgdconfig/cgdconfig.c			1.46-1.48
+
+	Add '-e' option (echo the passphrase).
+	[alnsn, ticket #958]
+
+external/bsd/cron/dist/entry.c			1.9,1.10
+
+	Avoid negative random values when using '?' in a crontab.
+	[kre, ticket #959]
+
+sys/arch/x86/x86/cpu.c1.159
+
+	Don't call svs_pdir_switch if SVS is disabled.
+	[maxv, ticket #960]
+
+sys/dev/pci/ixgbe/ix_txrx.c			1.49
+sys/dev/pci/ixgbe/ixgbe.c			1.163
+sys/dev/pci/ixgbe/ixgbe.h			1.51
+sys/dev/pci/ixgbe/ixgbe_netbsd.c		1.8
+sys/dev/pci/ixgbe/ixgbe_osdep.h			1.23
+sys/dev/pci/ixgbe/ixgbe_type.h			1.36
+sys/dev/pci/ixgbe/ixgbe_x550.c			1.13
+
+	ixg(4):
+	Add force_10_100_autonego sysctl. The default value is 0 (false).
+	Make jcl allocation per queue to reduce mutex spin.
+	[msaitoh, ticket #961]
+
+share/man/man4/ifmedia.4			1.30
+
+	Add some missing IFM_* entries.
+	[msaitoh, ticket #962]
+

CVS commit: [netbsd-8] src/share/man/man4

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 13:36:41 UTC 2018

Modified Files:
src/share/man/man4 [netbsd-8]: ifmedia.4

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #962):

share/man/man4/ifmedia.4: revision 1.30

Add some missing IFM_* entries.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.40.1 src/share/man/man4/ifmedia.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/ifmedia.4
diff -u src/share/man/man4/ifmedia.4:1.29 src/share/man/man4/ifmedia.4:1.29.40.1
--- src/share/man/man4/ifmedia.4:1.29	Fri Apr 10 17:07:15 2009
+++ src/share/man/man4/ifmedia.4	Tue Aug  7 13:36:41 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ifmedia.4,v 1.29 2009/04/10 17:07:15 joerg Exp $
+.\"	$NetBSD: ifmedia.4,v 1.29.40.1 2018/08/07 13:36:41 martin Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2004
 .\"	The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 7, 2006
+.Dd August 3, 2018
 .Dt IFMEDIA 4
 .Os
 .Sh NAME
@@ -134,8 +134,12 @@ connector.  [100baseT4, 100T4]
 1000BASE-SX, 1Gb/s over multi-mode fiber optic cables. (short waves)
 [1000baseSX, 1000SX]
 .It Dv IFM_1000_LX
-1000BASE-LX, 1Gb/s over single-mode fiber optic cables. (long waves)
+1000BASE-LX, 1Gb/s over single-mode fiber or multi-mode fiber optic cables.
+(long waves)
 [1000baseLX, 1000LX]
+.It Dv IFM_1000_BX10
+1000BASE-BX10, 1Gb/s over bidirectional fiber optic cables. (long waves)
+[1000BASE-BX10]
 .It Dv IFM_1000_CX
 1000BASE-CX, 1Gb/s over shielded twisted pair. (twinax)
 [1000baseCX, 1000CX]
@@ -143,8 +147,37 @@ connector.  [100baseT4, 100T4]
 1000BASE-T, 1Gb/s over category 5 unshielded twisted pair, 802.3ab, RJ45
 connector.
 [1000baseT, 1000T]
+.It Dv IFM_1000_KX
+1000BASE-KX, 1Gb/s backplane.
+[1000BASE-KX, 1000baseKX]
+.It Dv IFM_2500_SX
+2500BASE-SX, 2.5Gb/s over multi-mode fiber optic cables.
+[2500baseSX, 2500SX]
+.It Dv IFM_2500_T
+2.5GBASE-T, 2.5Gb/s over category 5e.
+[2.5GBASE-T, 2500baseT]
+.It Dv IFM_2500_KX
+2500BASE-KX, 2.5Gb/s backplane.
+[2500BASE-KX, 2500baseKX]
+.It Dv IFM_5000_T
+5GBASE-T, 5Gb/s over category 6.
+[5GBASE-T, 5GbaseT]
+.It Dv IFM_10G_CX4
+10GBASE-CX4, 10Gb/s over XAUI 4-lane PCS and copper cables.
+[10GbaseCX4, 10GCX4, 10GBASE-CX4]
 .It Dv IFM_10G_LR
 10GBASE-LR, 10Gb/s over single-mode fiber optic cables.  [10GbaseLR, 10GLR]
+.It Dv IFM_10G_LRM
+10GBASE-LR, 10Gb/s over single-mode fiber optic cables.  [10GbaseLRM]
+.It Dv IFM_10G_SR
+10GBASE-SR, 10Gb/s over multi-mode fiber optic cables.
+[10GbaseSR, 10GSR, 10GBASE-SR]
+.It Dv IFM_10G_T
+10GBASE-T, 10Gb/s over unshielded twisted pair, RJ45 connector.
+[10Gbase-T]
+.It Dv IFM_10G_TWINAX
+SFP+ direct attach, 10Gb/s over twinaxial cable.
+[10Gbase-Twinax]
 .El
 .Pp
 The following media option is defined for Ethernet:

CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 13:33:23 UTC 2018

Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_netbsd.c ixgbe_osdep.h ixgbe_type.h ixgbe_x550.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #961):

sys/dev/pci/ixgbe/ixgbe_x550.c: revision 1.13
sys/dev/pci/ixgbe/ixgbe.h: revision 1.51
sys/dev/pci/ixgbe/ixgbe_type.h: revision 1.36
sys/dev/pci/ixgbe/ixgbe_osdep.h: revision 1.23
sys/dev/pci/ixgbe/ixgbe_netbsd.c: revision 1.8
sys/dev/pci/ixgbe/ixgbe.c: revision 1.163
sys/dev/pci/ixgbe/ix_txrx.c: revision 1.49

  Add force_10_100_autonego sysctl. The default value is 0(false).

This sysctl is only for 550EM_a with PHY firmware for a while.

  Make jcl allocation per queue to reduce mutex spin. Tested by me and
knakahara.


To generate a diff of this commit:
cvs rdiff -u -r1.24.2.11 -r1.24.2.12 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.88.2.21 -r1.88.2.22 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.24.6.13 -r1.24.6.14 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c
cvs rdiff -u -r1.17.6.4 -r1.17.6.5 src/sys/dev/pci/ixgbe/ixgbe_osdep.h
cvs rdiff -u -r1.22.2.6 -r1.22.2.7 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.5.6.4 -r1.5.6.5 src/sys/dev/pci/ixgbe/ixgbe_x550.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.11 src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.12
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.11	Sat Jun  9 14:59:43 2018
+++ src/sys/dev/pci/ixgbe/ix_txrx.c	Tue Aug  7 13:33:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.24.2.11 2018/06/09 14:59:43 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.24.2.12 2018/08/07 13:33:23 martin Exp $ */
 
 /**
 
@@ -1343,7 +1343,7 @@ ixgbe_refresh_mbufs(struct rx_ring *rxr,
 	while (j != limit) {
 		rxbuf = >rx_buffers[i];
 		if (rxbuf->buf == NULL) {
-			mp = ixgbe_getjcl(>jcl_head, M_NOWAIT,
+			mp = ixgbe_getjcl(>jcl_head, M_NOWAIT,
 			MT_DATA, M_PKTHDR, rxr->mbuf_sz);
 			if (mp == NULL) {
 rxr->no_jmbuf.ev_count++;
@@ -1505,6 +1505,17 @@ ixgbe_setup_receive_ring(struct rx_ring 
 	/* Free current RX buffer structs and their mbufs */
 	ixgbe_free_receive_ring(rxr);
 
+	IXGBE_RX_UNLOCK(rxr);
+	/*
+	 * Now reinitialize our supply of jumbo mbufs.  The number
+	 * or size of jumbo mbufs may have changed.
+	 * Assume all of rxr->ptag are the same.
+	 */
+	ixgbe_jcl_reinit(adapter, rxr->ptag->dt_dmat, rxr,
+	(2 * adapter->num_rx_desc), adapter->rx_mbuf_sz);
+
+	IXGBE_RX_LOCK(rxr);
+
 	/* Now replenish the mbufs */
 	for (int j = 0; j != rxr->num_desc; ++j) {
 		struct mbuf *mp;
@@ -1534,7 +1545,7 @@ ixgbe_setup_receive_ring(struct rx_ring 
 #endif /* DEV_NETMAP */
 
 		rxbuf->flags = 0;
-		rxbuf->buf = ixgbe_getjcl(>jcl_head, M_NOWAIT,
+		rxbuf->buf = ixgbe_getjcl(>jcl_head, M_NOWAIT,
 		MT_DATA, M_PKTHDR, adapter->rx_mbuf_sz);
 		if (rxbuf->buf == NULL) {
 			error = ENOBUFS;
@@ -1611,15 +1622,6 @@ ixgbe_setup_receive_structures(struct ad
 	struct rx_ring *rxr = adapter->rx_rings;
 	intj;
 
-	/*
-	 * Now reinitialize our supply of jumbo mbufs.  The number
-	 * or size of jumbo mbufs may have changed.
-	 * Assume all of rxr->ptag are the same.
-	 */
-	ixgbe_jcl_reinit(adapter, rxr->ptag->dt_dmat,
-	(2 * adapter->num_rx_desc) * adapter->num_queues,
-	adapter->rx_mbuf_sz);
-
 	for (j = 0; j < adapter->num_queues; j++, rxr++)
 		if (ixgbe_setup_receive_ring(rxr))
 			goto fail;

Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.21 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.22
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.21	Thu Jul 26 23:21:54 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Tue Aug  7 13:33:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.21 2018/07/26 23:21:54 snj Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.22 2018/08/07 13:33:23 martin Exp $ */
 
 /**
 
@@ -3315,6 +3315,15 @@ ixgbe_add_device_sysctls(struct adapter 
 			aprint_error_dev(dev, "could not create sysctl\n");
 	}
 
+	if ((hw->mac.type == ixgbe_mac_X550EM_a)
+	&& (hw->phy.type == ixgbe_phy_fw))
+		if (sysctl_createv(log, 0, , , CTLFLAG_READWRITE,
+		CTLTYPE_BOOL, "force_10_100_autonego",
+		SYSCTL_DESCR("Force autonego on 10M and 100M"),
+		NULL, 0, >phy.force_10_100_autonego, 0,
+		CTL_CREATE, CTL_EOL) != 0)
+			aprint_error_dev(dev, "could not create sysctl\n");
+
 	if (adapter->feat_cap & IXGBE_FEATURE_EEE) {
 		if (sysctl_createv(log, 0, , , CTLFLAG_READWRITE,
 		CTLTYPE_INT, "eee_state",

Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u

CVS commit: [netbsd-8] src/sys/arch/x86/x86

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 13:28:59 UTC 2018

Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: cpu.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #960):

sys/arch/x86/x86/cpu.c: revision 1.159

Oh. Don't call svs_pdir_switch if SVS is disabled, that's not needed.

I was playing around with PMCs, and was wondering why some cache misses
were occurring in svs_pdir_switch while I had SVS disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.130.2.6 -r1.130.2.7 src/sys/arch/x86/x86/cpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.130.2.6 src/sys/arch/x86/x86/cpu.c:1.130.2.7
--- src/sys/arch/x86/x86/cpu.c:1.130.2.6	Sat Apr 14 10:11:49 2018
+++ src/sys/arch/x86/x86/cpu.c	Tue Aug  7 13:28:59 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.130.2.6 2018/04/14 10:11:49 martin Exp $	*/
+/*	$NetBSD: cpu.c,v 1.130.2.7 2018/08/07 13:28:59 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.130.2.6 2018/04/14 10:11:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.130.2.7 2018/08/07 13:28:59 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
@@ -1265,7 +1265,9 @@ void
 cpu_load_pmap(struct pmap *pmap, struct pmap *oldpmap)
 {
 #ifdef SVS
-	svs_pdir_switch(pmap);
+	if (svs_enabled) {
+		svs_pdir_switch(pmap);
+	}
 #endif
 
 #ifdef PAE

CVS commit: [netbsd-8] src/external/bsd/cron/dist

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 13:24:59 UTC 2018

Modified Files:
src/external/bsd/cron/dist [netbsd-8]: entry.c

Log Message:
Pull up following revision(s) (requested by kre in ticket #959):

external/bsd/cron/dist/entry.c: revision 1.9,1.10

Fix from Michael Kaufmann in PR bin/53476

Do modulus using unsigned arith, and then convert the result to
int, rather than converting the arc4random() result to int (which
might be negative) and performing a modulus on that (with a
potentially negative answer).

Add some more "crappy error detection" - the low value of
the range of random_with_range() must not be negative (or now
we are doing unsigned modulus we might generate a very big result).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.8.1 src/external/bsd/cron/dist/entry.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/cron/dist/entry.c
diff -u src/external/bsd/cron/dist/entry.c:1.7 src/external/bsd/cron/dist/entry.c:1.7.8.1
--- src/external/bsd/cron/dist/entry.c:1.7	Fri Nov 20 23:43:52 2015
+++ src/external/bsd/cron/dist/entry.c	Tue Aug  7 13:24:59 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: entry.c,v 1.7 2015/11/20 23:43:52 christos Exp $	*/
+/*	$NetBSD: entry.c,v 1.7.8.1 2018/08/07 13:24:59 martin Exp $	*/
 
 /*
  * Copyright 1988,1990,1993,1994 by Paul Vixie
@@ -26,7 +26,7 @@
 #if 0
 static char rcsid[] = "Id: entry.c,v 1.17 2004/01/23 18:56:42 vixie Exp";
 #else
-__RCSID("$NetBSD: entry.c,v 1.7 2015/11/20 23:43:52 christos Exp $");
+__RCSID("$NetBSD: entry.c,v 1.7.8.1 2018/08/07 13:24:59 martin Exp $");
 #endif
 #endif
 
@@ -450,10 +450,10 @@ random_with_range(int low, int high)
 {
 	/* Kind of crappy error detection, but...
 	 */
-	if (low >= high)
+	if (low < 0 || low >= high)
 		return low;
 	else
-		return (int)arc4random() % (high - low + 1) + low;
+		return (int)(arc4random() % (unsigned)((high - low + 1) + low));
 }
 
 static int

CVS commit: [netbsd-8] src/sbin/cgdconfig

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 13:19:52 UTC 2018

Modified Files:
src/sbin/cgdconfig [netbsd-8]: cgdconfig.8 cgdconfig.c

Log Message:
Pull up following revision(s) (requested by alnsn in ticket #958):

sbin/cgdconfig/cgdconfig.c: revision 1.46
sbin/cgdconfig/cgdconfig.c: revision 1.47
sbin/cgdconfig/cgdconfig.c: revision 1.48
sbin/cgdconfig/cgdconfig.8: revision 1.39
sbin/cgdconfig/cgdconfig.8: revision 1.40

Add '-e' option (echo the passphrase) and wipe the passphrase after use.
XXX Using memset for wiping isn't a good idea because memset is likely
optimised away by gcc. This should be revisited.

Missed one change when doing a manual merge of my patch with kre's commit.

use explicit_memset(3)

With the change to use getpass_r the 128 byte passphrase limit no
longer applies, so update the BUGS section here to reflect that change.
The limit now is 1023 whichever method is used to fetch the passphrase.


To generate a diff of this commit:
cvs rdiff -u -r1.36.6.1 -r1.36.6.2 src/sbin/cgdconfig/cgdconfig.8
cvs rdiff -u -r1.41.6.1 -r1.41.6.2 src/sbin/cgdconfig/cgdconfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/cgdconfig/cgdconfig.8
diff -u src/sbin/cgdconfig/cgdconfig.8:1.36.6.1 src/sbin/cgdconfig/cgdconfig.8:1.36.6.2
--- src/sbin/cgdconfig/cgdconfig.8:1.36.6.1	Tue Jul 31 16:01:12 2018
+++ src/sbin/cgdconfig/cgdconfig.8	Tue Aug  7 13:19:51 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgdconfig.8,v 1.36.6.1 2018/07/31 16:01:12 martin Exp $
+.\" $NetBSD: cgdconfig.8,v 1.36.6.2 2018/08/07 13:19:51 martin Exp $
 .\"
 .\" Copyright (c) 2002, The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -35,17 +35,17 @@
 .Nd configuration utility for the cryptographic disk driver
 .Sh SYNOPSIS
 .Nm
-.Op Fl npv
+.Op Fl enpv
 .Op Fl V Ar vmeth
 .Ar cgd dev
 .Op Ar paramsfile
 .Nm
 .Fl C
-.Op Fl npv
+.Op Fl enpv
 .Op Fl f Ar configfile
 .Nm
 .Fl G
-.Op Fl npv
+.Op Fl enpv
 .Op Fl i Ar ivmeth
 .Op Fl k Ar kgmeth
 .Op Fl o Ar outfile
@@ -89,6 +89,8 @@ The options are as follows:
 .Bl -tag -width configfile
 .It Fl C
 Configure all the devices listed in the cgd configuration file.
+.It Fl e
+Echo the passphase.
 .It Fl f Ar configfile
 Specify the configuration file explicitly, rather than using the default
 configuration file
@@ -447,14 +449,4 @@ The
 utility appeared in
 .Nx 2.0 .
 .Sh BUGS
-Since
-.Nm
-without
-.Fl p
-uses
-.Xr getpass 3
-to read in the passphrase,
-it is limited to sysconf(_SC_PASS_MAX) (128) characters.
-With
-.Fl p
-the limit is 1023 characters.
+Pass phrases are limited to 1023 bytes.

Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.41.6.1 src/sbin/cgdconfig/cgdconfig.c:1.41.6.2
--- src/sbin/cgdconfig/cgdconfig.c:1.41.6.1	Tue Jul 31 16:01:12 2018
+++ src/sbin/cgdconfig/cgdconfig.c	Tue Aug  7 13:19:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.41.6.1 2018/07/31 16:01:12 martin Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.41.6.2 2018/08/07 13:19:51 martin Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2002, 2003\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.41.6.1 2018/07/31 16:01:12 martin Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.41.6.2 2018/08/07 13:19:51 martin Exp $");
 #endif
 
 #include 
@@ -89,8 +89,10 @@ int	nflag = 0;
 
 /* if pflag is set to PFLAG_STDIN read from stdin rather than getpass(3) */
 
-#define	PFLAG_GETPASS	0x01
-#define	PFLAG_STDIN	0x02
+#define	PFLAG_GETPASS		0x01
+#define	PFLAG_GETPASS_ECHO	0x02
+#define	PFLAG_GETPASS_MASK	0x03
+#define	PFLAG_STDIN		0x04
 int	pflag = PFLAG_GETPASS;
 
 static int	configure(int, char **, struct params *, int);
@@ -136,11 +138,11 @@ static void
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: %s [-npv] [-V vmeth] cgd dev "
+	(void)fprintf(stderr, "usage: %s [-enpv] [-V vmeth] cgd dev "
 	"[paramsfile]\n", getprogname());
-	(void)fprintf(stderr, "   %s -C [-npv] [-f configfile]\n",
+	(void)fprintf(stderr, "   %s -C [-enpv] [-f configfile]\n",
 	getprogname());
-	(void)fprintf(stderr, "   %s -G [-npv] [-i ivmeth] [-k kgmeth] "
+	(void)fprintf(stderr, "   %s -G [-enpv] [-i ivmeth] [-k kgmeth] "
 	"[-o outfile] paramsfile\n", getprogname());
 	(void)fprintf(stderr, "   %s -g [-nv] [-i ivmeth] [-k kgmeth] "
 	"[-o outfile] alg [keylen]\n", getprogname());
@@ -201,7 +203,7 @@ main(int argc, char **argv)
 	p = params_new();
 	kg = NULL;
 
-	while ((ch = getopt(argc, argv, "CGUV:b:f:gi:k:lno:spuv")) != -1)
+	while ((ch = getopt(argc, argv, "CGUV:b:ef:gi:k:lno:spuv")) != -1)
 		switch (ch) {
 		case 'C':
 			set_action(, ACTION_CONFIGALL);
@@ -230,6 +232,9 @@ main(int argc, char **argv)
 p = params_combine(p, tp);
 			}
 			break;
+		case 'e':
+			pflag =

CVS commit: [netbsd-8] src/usr.bin/m4

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 13:11:12 UTC 2018

Modified Files:
src/usr.bin/m4 [netbsd-8]: eval.c

Log Message:
Pull up following revision(s) (requested by kre in ticket #956):

usr.bin/m4/eval.c: revision 1.27

Avoid an infinite loop caused by a line accidentally dropped
in 1.22 (almost 30 months ago!)
[ Discovered by rhialto@ ]


To generate a diff of this commit:
cvs rdiff -u -r1.24.8.1 -r1.24.8.2 src/usr.bin/m4/eval.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/m4/eval.c
diff -u src/usr.bin/m4/eval.c:1.24.8.1 src/usr.bin/m4/eval.c:1.24.8.2
--- src/usr.bin/m4/eval.c:1.24.8.1	Wed Apr 11 14:27:51 2018
+++ src/usr.bin/m4/eval.c	Tue Aug  7 13:11:12 2018
@@ -1,5 +1,5 @@
 /*	$OpenBSD: eval.c,v 1.66 2008/08/21 21:01:47 espie Exp $	*/
-/*	$NetBSD: eval.c,v 1.24.8.1 2018/04/11 14:27:51 martin Exp $	*/
+/*	$NetBSD: eval.c,v 1.24.8.2 2018/08/07 13:11:12 martin Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
 #include "nbtool_config.h"
 #endif
 #include 
-__RCSID("$NetBSD: eval.c,v 1.24.8.1 2018/04/11 14:27:51 martin Exp $");
+__RCSID("$NetBSD: eval.c,v 1.24.8.2 2018/08/07 13:11:12 martin Exp $");
 
 #include 
 #include 
@@ -987,6 +987,7 @@ map(char *dest, const char *src, const c
 			}
 		} else {
 			while (*src) {
+sch = (unsigned char)(*src++);
 dch = mapvec[sch];
 while (dch != sch) {
 	sch = dch;

CVS commit: [netbsd-8] src

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 13:02:31 UTC 2018

Modified Files:
src/doc [netbsd-8]: TODO.smpnet
src/sys/dev/pci [netbsd-8]: if_lmc.c if_lmc.h

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #950):

sys/dev/pci/if_lmc.h: revision 1.25
sys/dev/pci/if_lmc.c: revision 1.65
doc/TODO.smpnet: revision 1.20

Move txintr_setup() stuff from lmc_interrupt() and do it in ifnet_start().
Now we can use bpf_mtap() in the TX path. Not tested.


To generate a diff of this commit:
cvs rdiff -u -r1.11.6.1 -r1.11.6.2 src/doc/TODO.smpnet
cvs rdiff -u -r1.63 -r1.63.6.1 src/sys/dev/pci/if_lmc.c
cvs rdiff -u -r1.24 -r1.24.6.1 src/sys/dev/pci/if_lmc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/TODO.smpnet
diff -u src/doc/TODO.smpnet:1.11.6.1 src/doc/TODO.smpnet:1.11.6.2
--- src/doc/TODO.smpnet:1.11.6.1	Sat Oct 21 19:43:54 2017
+++ src/doc/TODO.smpnet	Tue Aug  7 13:02:31 2018
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.11.6.1 2017/10/21 19:43:54 snj Exp $
+$NetBSD: TODO.smpnet,v 1.11.6.2 2018/08/07 13:02:31 martin Exp $
 
 MP-safe components
 ==
@@ -96,7 +96,7 @@ This is the list of the functions that h
 
  - sca_frame_process() @ sys/dev/ic/hd64570.c
  - en_intr() @ sys/dev/ic/midway.c
- - rxintr_cleanup() and txintr_cleanup() @ sys/dev/pci/if_lmc.c
+ - rxintr_cleanup() @ sys/dev/pci/if_lmc.c
  - ipr_rx_data_rdy() @ sys/netisdn/i4b_ipr.c
 
 Ideally we should make the functions run in softint somehow, but we don't have

Index: src/sys/dev/pci/if_lmc.c
diff -u src/sys/dev/pci/if_lmc.c:1.63 src/sys/dev/pci/if_lmc.c:1.63.6.1
--- src/sys/dev/pci/if_lmc.c:1.63	Tue Jan 24 09:05:28 2017
+++ src/sys/dev/pci/if_lmc.c	Tue Aug  7 13:02:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.63 2017/01/24 09:05:28 ozaki-r Exp $ */
+/* $NetBSD: if_lmc.c,v 1.63.6.1 2018/08/07 13:02:31 martin Exp $ */
 
 /*-
  * Copyright (c) 2002-2006 David Boggs. 
@@ -74,7 +74,7 @@
  */
 
 # include 
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.63 2017/01/24 09:05:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.63.6.1 2018/08/07 13:02:31 martin Exp $");
 # include 	/* OS version */
 # include "opt_inet.h"	/* INET6, INET */
 # include "opt_altq_enabled.h" /* ALTQ */
@@ -3388,7 +3388,7 @@ ifnet_output(struct ifnet *ifp, struct m
 }
   else
 /* Process tx pkts; do not process rx pkts. */
-lmc_interrupt(sc, 0, 0);
+ifnet_start(ifp);
 
   return error;
   }
@@ -3466,9 +3466,43 @@ static void  /* context: process */
 ifnet_start(struct ifnet *ifp)
   {
   softc_t *sc = IFP2SC(ifp);
+  int activity;
 
-  /* Process tx pkts; do not process rx pkts. */
-  lmc_interrupt(sc, 0, 0);
+  /* Do this FIRST!  Otherwise UPs deadlock and MPs spin. */
+  WRITE_CSR(sc, TLP_STATUS, READ_CSR(sc, TLP_STATUS));
+
+  /* If any CPU is inside this critical section, then */
+  /*  other CPUs should go away without doing anything. */
+  if (BOTTOM_TRYLOCK(sc) == 0)
+{
+sc->status.cntrs.lck_intr++;
+return;
+}
+
+  /* In Linux, pci_alloc_consistent() means DMA */
+  /*  descriptors do not need explicit syncing? */
+#if BSD
+  {
+  struct desc_ring *ring = >txring;
+  DMA_SYNC(sc->txring.map, sc->txring.size_descs,
+   BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+  }
+#endif
+
+  do
+{
+activity = txintr_setup(sc);
+} while (activity);
+
+#if BSD
+  {
+  struct desc_ring *ring = >txring;
+  DMA_SYNC(sc->txring.map, sc->txring.size_descs,
+   BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+  }
+#endif
+
+  BOTTOM_UNLOCK(sc);
   }
 
 static void  /* context: softirq */
@@ -4294,7 +4328,7 @@ rxintr_cleanup(softc_t *sc)
 sc->status.cntrs.ipackets++;
 
 /* Berkeley Packet Filter */
-LMC_BPF_MTAP(sc, first_mbuf);
+bpf_mtap_softint(sc->ifp, first_mbuf);
 
 /* Give this good packet to the network stacks. */
 sc->quota--;
@@ -,9 +4478,6 @@ txintr_cleanup(softc_t *sc)
 /* Include CRC and one flag byte in output byte count. */
 sc->status.cntrs.obytes += m->m_pkthdr.len + sc->config.crc_len +1;
 sc->status.cntrs.opackets++;
-
-/* Berkeley Packet Filter */
-LMC_BPF_MTAP(sc, m);
 	}
 
   m_freem(m);
@@ -4564,6 +4595,9 @@ txintr_setup(softc_t *sc)
   /* Enqueue the mbuf; txintr_cleanup will free it. */
   mbuf_enqueue(ring, sc->tx_mbuf);
 
+  /* Berkeley Packet Filter */
+  bpf_mtap(sc->ifp, sc->tx_mbuf);
+
   /* The transmitter has room for another packet. */
   sc->tx_mbuf = NULL;
 
@@ -4969,7 +5003,6 @@ lmc_interrupt(void *arg, int quota, int 
   do
 {
 activity  = txintr_cleanup(sc);
-activity += txintr_setup(sc);
 activity += rxintr_cleanup(sc);
 activity += rxintr_setup(sc);
 } while (activity);

Index: src/sys/dev/pci/if_lmc.h
diff -u src/sys/dev/pci/if_lmc.h:1.24 src/sys/dev/pci/if_lmc.h:1.24.6.1
--- src/sys/dev/pci/if_lmc.h:1.24	Tue

CVS commit: src/external/bsd/nvi/dist/ex

2018-08-07 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Tue Aug  7 11:41:23 UTC 2018

Modified Files:
src/external/bsd/nvi/dist/ex: ex_script.c

Log Message:
Use wp and wlen instead of ip and ilen for consistency.
No binary changes intended.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/nvi/dist/ex/ex_script.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/nvi/dist/ex/ex_script.c
diff -u src/external/bsd/nvi/dist/ex/ex_script.c:1.8 src/external/bsd/nvi/dist/ex/ex_script.c:1.9
--- src/external/bsd/nvi/dist/ex/ex_script.c:1.8	Mon Nov  6 03:27:34 2017
+++ src/external/bsd/nvi/dist/ex/ex_script.c	Tue Aug  7 11:41:23 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ex_script.c,v 1.8 2017/11/06 03:27:34 rin Exp $ */
+/*	$NetBSD: ex_script.c,v 1.9 2018/08/07 11:41:23 rin Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -19,7 +19,7 @@
 static const char sccsid[] = "Id: ex_script.c,v 10.38 2001/06/25 15:19:19 skimo Exp  (Berkeley) Date: 2001/06/25 15:19:19 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: ex_script.c,v 1.8 2017/11/06 03:27:34 rin Exp $");
+__RCSID("$NetBSD: ex_script.c,v 1.9 2018/08/07 11:41:23 rin Exp $");
 #endif
 
 #include 
@@ -262,17 +262,17 @@ sscr_exec(SCR *sp, db_recno_t lno)
 	ssize_t nw;
 	char *bp = NULL;
 	const char *p;
-	const CHAR_T *ip;
-	size_t ilen;
+	const CHAR_T *wp;
+	size_t wlen;
 
 	sc = sp->script;
 
 	/* If there's a prompt on the last line, append the command. */
 	if (db_last(sp, _lno))
 		return (1);
-	if (db_get(sp, last_lno, DBG_FATAL, __UNCONST(), ))
+	if (db_get(sp, last_lno, DBG_FATAL, __UNCONST(), ))
 		return (1);
-	INT2CHAR(sp, ip, ilen, p, last_len);
+	INT2CHAR(sp, wp, wlen, p, last_len);
 	if (last_len == sc->sh_prompt_len &&
 	memcmp(p, sc->sh_prompt, last_len) == 0) {
 		matchprompt = 1;
@@ -282,16 +282,16 @@ sscr_exec(SCR *sp, db_recno_t lno)
 		matchprompt = 0;
 
 	/* Get something to execute. */
-	if (db_eget(sp, lno, __UNCONST(), , )) {
+	if (db_eget(sp, lno, __UNCONST(), , )) {
 		if (isempty)
 			goto empty;
 		goto err1;
 	}
 
 	/* Empty lines aren't interesting. */
-	if (ilen == 0)
+	if (wlen == 0)
 		goto empty;
-	INT2CHAR(sp, ip, ilen, p, len);
+	INT2CHAR(sp, wp, wlen, p, len);
 
 	/* Delete any prompt. */
 	if (len >= sc->sh_prompt_len &&
@@ -318,8 +318,8 @@ err2:		if (nw == 0)
 	if (matchprompt) {
 		ADD_SPACE_GOTO(sp, char, bp, blen, last_len + len);
 		memmove(bp + last_len, p, len);
-		CHAR2INT(sp, bp, last_len + len, ip, ilen);
-		if (db_set(sp, last_lno, ip, ilen))
+		CHAR2INT(sp, bp, last_len + len, wp, wlen);
+		if (db_set(sp, last_lno, wp, wlen))
 err1:			rval = 1;
 	}
 	if (matchprompt)
@@ -432,8 +432,8 @@ sscr_insert(SCR *sp)
 	size_t len;
 	ssize_t nr;
 	char bp[1024];
-	const CHAR_T *ip;
-	size_t ilen = 0;
+	const CHAR_T *wp;
+	size_t wlen = 0;
 
 	/* Find out where the end of the file is. */
 	if (db_last(sp, ))
@@ -459,8 +459,8 @@ more:	switch (nr = read(sc->sh_master, e
 	for (p = t = bp; p < endp; ++p) {
 		if (*p == '\r' || *p == '\n') {
 			len = p - t;
-			if (CHAR2INT(sp, t, len, ip, ilen) ||
-			db_append(sp, 1, lno++, ip, ilen))
+			if (CHAR2INT(sp, t, len, wp, wlen) ||
+			db_append(sp, 1, lno++, wp, wlen))
 return (1);
 			t = p + 1;
 		}
@@ -481,8 +481,8 @@ more:	switch (nr = read(sc->sh_master, e
 		FD_SET(sc->sh_master, );
 		if (select(sc->sh_master + 1, , NULL, NULL, ) == 1) {
 			if (len == sizeof(bp)) {
-if (CHAR2INT(sp, t, len, ip, ilen) ||
-db_append(sp, 1, lno++, ip, ilen))
+if (CHAR2INT(sp, t, len, wp, wlen) ||
+db_append(sp, 1, lno++, wp, wlen))
 	return (1);
 endp = bp;
 			} else {
@@ -497,10 +497,10 @@ more:	switch (nr = read(sc->sh_master, e
 
 	/* Append the remains into the file, and the cursor moves to EOF. */
 	if (len > 0) {
-		if (CHAR2INT(sp, t, len, ip, ilen) ||
-		db_append(sp, 1, lno++, ip, ilen))
+		if (CHAR2INT(sp, t, len, wp, wlen) ||
+		db_append(sp, 1, lno++, wp, wlen))
 			return (1);
-		sp->cno = ilen - 1;
+		sp->cno = wlen - 1;
 	} else
 		sp->cno = 0;
 	sp->lno = lno;

CVS commit: src/external/bsd/nvi/dist/common

2018-08-07 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Tue Aug  7 11:25:45 UTC 2018

Modified Files:
src/external/bsd/nvi/dist/common: vi_db1.c

Log Message:
Remove unnecessary buffer allocation and memcpy.
Partially taken from nvi2.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/nvi/dist/common/vi_db1.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/nvi/dist/common/vi_db1.c
diff -u src/external/bsd/nvi/dist/common/vi_db1.c:1.9 src/external/bsd/nvi/dist/common/vi_db1.c:1.10
--- src/external/bsd/nvi/dist/common/vi_db1.c:1.9	Fri Nov 10 14:35:25 2017
+++ src/external/bsd/nvi/dist/common/vi_db1.c	Tue Aug  7 11:25:45 2018
@@ -15,7 +15,7 @@
 static const char sccsid[] = "Id: db1.c,v 10.1 2002/03/09 12:53:57 skimo Exp  (Berkeley) Date: 2002/03/09 12:53:57 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: vi_db1.c,v 1.9 2017/11/10 14:35:25 rin Exp $");
+__RCSID("$NetBSD: vi_db1.c,v 1.10 2018/08/07 11:25:45 rin Exp $");
 #endif
 
 #include 
@@ -98,7 +98,6 @@ db_get(SCR *sp, db_recno_t lno, u_int32_
 	db_recno_t l1, l2;
 	const CHAR_T *wp;
 	size_t wlen;
-	size_t nlen;
 
 	/*
 	 * The underlying recno stuff handles zero by returning NULL, but
@@ -159,11 +158,6 @@ db_get(SCR *sp, db_recno_t lno, u_int32_
 	sp->c_lno = OOBLNO;
 
 nocache:
-	nlen = 1024;
-retry:
-	/* data.size contains length in bytes */
-	BINC_GOTO(sp, CHAR_T, sp->c_lp, sp->c_blen, nlen);
-
 	/* Get the line from the underlying database. */
 	key.data = 
 	key.size = sizeof(lno);
@@ -179,12 +173,8 @@ err3:		if (lenp != NULL)
 		if (pp != NULL)
 			*pp = NULL;
 		return (1);
-	case 0:
-		if (data.size > nlen) {
-			nlen = data.size;
-			goto retry;
-		} else
-			memcpy(sp->c_lp, data.data, data.size);
+	default:
+		break;
 	}
 
 	if (FILE2INT(sp, data.data, data.size, wp, wlen)) {
@@ -199,7 +189,8 @@ err3:		if (lenp != NULL)
 	if (wp != data.data) {
 	BINC_GOTOW(sp, sp->c_lp, sp->c_blen, wlen);
 	MEMCPYW(sp->c_lp, wp, wlen);
-	}
+	} else
+	sp->c_lp = data.data;
 	sp->c_lno = lno;
 	sp->c_len = wlen;
 
@@ -560,8 +551,8 @@ alloc_err:
 		msgq(sp, M_DBERR, "007|unable to get last line");
 		*lnop = 0;
 		return (1);
-case 0:
-		;
+	default:
+		break;
 	}
 
 	memcpy(, key.data, sizeof(lno));
@@ -570,8 +561,11 @@ alloc_err:
 	FILE2INT(sp, data.data, data.size, wp, wlen);
 
 	/* Fill the cache. */
-	BINC_GOTOW(sp, sp->c_lp, sp->c_blen, wlen);
-	MEMCPYW(sp->c_lp, wp, wlen);
+	if (wp != data.data) {
+		BINC_GOTOW(sp, sp->c_lp, sp->c_blen, wlen);
+		MEMCPYW(sp->c_lp, wp, wlen);
+	} else
+		sp->c_lp = data.data;
 	sp->c_lno = lno;
 	sp->c_len = wlen;
 	}

CVS commit: src/sys/arch/x86

2018-08-07 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Tue Aug  7 10:50:12 UTC 2018

Modified Files:
src/sys/arch/x86/include: specialreg.h
src/sys/arch/x86/x86: errata.c

Log Message:
Add five errata for AMD Family 17h (Ryzen etc), tested by Patrick Welche,
thanks. Also add two errata for Family 16h, not yet tested, so not yet
enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/x86/errata.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.128 src/sys/arch/x86/include/specialreg.h:1.129
--- src/sys/arch/x86/include/specialreg.h:1.128	Fri Jul 13 09:37:32 2018
+++ src/sys/arch/x86/include/specialreg.h	Tue Aug  7 10:50:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.128 2018/07/13 09:37:32 maxv Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.129 2018/08/07 10:50:12 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -857,6 +857,9 @@
 #define 	NB_CFG_INITAPICCPUIDLO	(1ULL << 54)
 
 #define MSR_LS_CFG	0xc0011020
+#define 	LS_CFG_ERRATA_1033	__BIT(4)
+#define 	LS_CFG_ERRATA_793	__BIT(15)
+#define 	LS_CFG_ERRATA_1095	__BIT(57)
 #define 	LS_CFG_DIS_LS2_SQUISH	0x0200
 #define 	LS_CFG_DIS_SSB_F15H	0x0040ULL
 #define 	LS_CFG_DIS_SSB_F16H	0x0002ULL
@@ -865,6 +868,7 @@
 #define MSR_IC_CFG	0xc0011021
 #define 	IC_CFG_DIS_SEQ_PREFETCH	0x0800
 #define 	IC_CFG_DIS_IND		0x4000
+#define 	IC_CFG_ERRATA_776	__BIT(26)
 
 #define MSR_DC_CFG	0xc0011022
 #define 	DC_CFG_DIS_CNV_WC_SSO	0x0008
@@ -879,8 +883,15 @@
 #define 	BU_CFG_WBPFSMCCHKDIS	0x2000ULL
 #define 	BU_CFG_WBENHWSBDIS	0x0001ULL
 
+#define MSR_FP_CFG	0xc0011028
+#define 	FP_CFG_ERRATA_1049	__BIT(4)
+
 #define MSR_DE_CFG	0xc0011029
 #define 	DE_CFG_ERRATA_721	0x0001
+#define 	DE_CFG_ERRATA_1021	__BIT(13)
+
+#define MSR_LS_CFG2	0xc001102d
+#define 	LS_CFG2_ERRATA_1091	__BIT(34)
 
 /* AMD Family10h MSRs */
 #define MSR_OSVW_ID_LENGTH		0xc0010140

Index: src/sys/arch/x86/x86/errata.c
diff -u src/sys/arch/x86/x86/errata.c:1.23 src/sys/arch/x86/x86/errata.c:1.24
--- src/sys/arch/x86/x86/errata.c:1.23	Tue Jan  5 10:20:22 2016
+++ src/sys/arch/x86/x86/errata.c	Tue Aug  7 10:50:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: errata.c,v 1.23 2016/01/05 10:20:22 hannken Exp $	*/
+/*	$NetBSD: errata.c,v 1.24 2018/08/07 10:50:12 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.23 2016/01/05 10:20:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.24 2018/08/07 10:50:12 maxv Exp $");
 
 #include 
 #include 
@@ -70,8 +70,8 @@ typedef enum cpurev {
 	BH_E4, CH_CG, CH_D0, DH_CG, DH_D0, DH_E3, DH_E6, JH_E1,
 	JH_E6, SH_B0, SH_B3, SH_C0, SH_CG, SH_D0, SH_E4, SH_E5,
 	DR_BA, DR_B2, DR_B3, RB_C2, RB_C3, BL_C2, BL_C3, DA_C2,
-	DA_C3, HY_D0, HY_D1, HY_D1_G34R1,  PH_E0, LN_B0,
-	OINK
+	DA_C3, HY_D0, HY_D1, HY_D1_G34R1,  PH_E0, LN_B0, KB_A1,
+	ML_A1, ZP_B1, ZP_B2, PiR_B2, OINK
 } cpurev_t;
 
 static const u_int cpurevs[] = {
@@ -89,7 +89,9 @@ static const u_int cpurevs[] = {
 	RB_C2, 0x0100f42, RB_C3, 0x0100f43, BL_C2, 0x0100f52,
 	BL_C3, 0x0100f53, DA_C2, 0x0100f62, DA_C3, 0x0100f63,
 	HY_D0, 0x0100f80, HY_D1, 0x0100f81, HY_D1_G34R1, 0x0100f91,
-	PH_E0, 0x0100fa0, LN_B0, 0x0300f10,
+	PH_E0, 0x0100fa0, LN_B0, 0x0300f10, KB_A1, 0x0700F01,
+	ML_A1, 0x0730F01, ZP_B1, 0x0800F11, ZP_B2, 0x0800F12,
+	PiR_B2, 0x0800F82,
 	OINK
 };
 
@@ -142,6 +144,26 @@ static const uint8_t x86_errata_set11[] 
 	DA_C3, HY_D0, HY_D1, HY_D1_G34R1,  PH_E0, LN_B0, OINK
 };
 
+#ifdef notyet_f16h
+static const uint8_t x86_errata_set12[] = {
+	KB_A1, OINK
+};
+#endif
+
+static const uint8_t x86_errata_set13[] = {
+	ZP_B1, ZP_B2, PiR_B2, OINK
+};
+
+static const uint8_t x86_errata_set14[] = {
+	ZP_B1, OINK
+};
+
+#ifdef notyet_f16h
+static const uint8_t x86_errata_set15[] = {
+	KB_A1, ML_A1, OINK
+};
+#endif
+
 static bool x86_errata_setmsr(struct cpu_info *, errata_t *);
 static bool x86_errata_testmsr(struct cpu_info *, errata_t *);
 
@@ -285,6 +307,62 @@ static errata_t errata[] = {
 		721, FALSE, MSR_DE_CFG, x86_errata_set11,
 		x86_errata_setmsr, DE_CFG_ERRATA_721
 	},
+#ifdef notyet_f16h	/* TODO: needs to be tested */
+	/*
+	 * 776: Incorrect Processor Branch Prediction for Two Consecutive
+	 * Linear Pages
+	 */
+	{
+		776, FALSE, MSR_IC_CFG, x86_errata_set12,
+		x86_errata_setmsr, IC_CFG_ERRATA_776
+	},
+	/*
+	 * 793: Specific Combination of Writes to Write Combined Memory
+	 * Types and Locked Instructions May Cause Core Hang
+	 */
+	{
+		793, FALSE, MSR_LS_CFG, x86_errata_set15,
+		x86_errata_setmsr, LS_CFG_ERRATA_793
+	},
+#endif
+	/*
+	 * 1021: Load Operation May Receive Stale Data From Older Store
+	 * Operation
+	 */

CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm

2018-08-07 Thread Andreas Gustafsson 
Module Name:src
Committed By:   gson
Date:   Tue Aug  7 09:01:52 UTC 2018

Modified Files:
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_arm.c
vchiq_kern_lib.c

Log Message:
One newline is enough.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.19 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.20
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.19	Thu Nov 30 20:25:55 2017
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c	Tue Aug  7 09:01:52 2018
@@ -1489,7 +1489,7 @@ dump_phys_mem(void *virt_addr, uint32_t 
 	pages = kmalloc(sizeof(struct page *) * num_pages, GFP_KERNEL);
 	if (pages == NULL) {
 		vchiq_log_error(vchiq_arm_log_level,
-			"Unable to allocation memory for %d pages\n",
+			"Unable to allocation memory for %d pages",
 			num_pages);
 		return;
 	}

Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c:1.6 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c:1.7
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c:1.6	Wed Jan 28 09:41:04 2015
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c	Tue Aug  7 09:01:52 2018
@@ -84,17 +84,17 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_IN
 	}
 	if (i==VCHIQ_INIT_RETRIES) {
 		vchiq_log_error(vchiq_core_log_level,
-			"%s: videocore not initialized\n", __func__);
+			"%s: videocore not initialized", __func__);
 		goto failed;
 	} else if (i>0) {
 		vchiq_log_warning(vchiq_core_log_level,
-			"%s: videocore initialized after %d retries\n", __func__, i);
+			"%s: videocore initialized after %d retries", __func__, i);
 	}
 
 	instance = kzalloc(sizeof(*instance), GFP_KERNEL);
 	if (!instance) {
 		vchiq_log_error(vchiq_core_log_level,
-			"%s: error allocating vchiq instance\n", __func__);
+			"%s: error allocating vchiq instance", __func__);
 		goto failed;
 	}

CVS commit: src/sys/external/bsd/dwc2

2018-08-07 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Tue Aug  7 08:36:31 UTC 2018

Modified Files:
src/sys/external/bsd/dwc2: dwc2.c

Log Message:
Do not call usb_syncmem(9) with len = 0 to avoid diagnostic assertion
failure in bus_dmamap_sync(9) on Raspberry Pi 3 Model B running in
aarch64 mode.

Workaround for PR port-evbarm/53503.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/external/bsd/dwc2/dwc2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.49 src/sys/external/bsd/dwc2/dwc2.c:1.50
--- src/sys/external/bsd/dwc2/dwc2.c:1.49	Mon Apr  9 16:21:11 2018
+++ src/sys/external/bsd/dwc2/dwc2.c	Tue Aug  7 08:36:30 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: dwc2.c,v 1.49 2018/04/09 16:21:11 jakllsch Exp $	*/
+/*	$NetBSD: dwc2.c,v 1.50 2018/08/07 08:36:30 rin Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.49 2018/04/09 16:21:11 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.50 2018/08/07 08:36:30 rin Exp $");
 
 #include "opt_usb.h"
 
@@ -1475,7 +1475,9 @@ void dwc2_host_complete(struct dwc2_hsot
 		 * everything else does.
 		 */
 		if (!(xfertype == UE_CONTROL &&
-		UGETW(xfer->ux_request.wLength) == 0)) {
+		UGETW(xfer->ux_request.wLength) == 0) &&
+		xfer->ux_actlen > 0	/* XXX PR/53503 */
+		) {
 			int rd = usbd_xfer_isread(xfer);
 
 			usb_syncmem(>ux_dmabuf, 0, xfer->ux_actlen,

CVS commit: src/distrib/notes

2018-08-07 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Aug  7 08:26:42 UTC 2018

Modified Files:
src/distrib/notes: Makefile
src/distrib/notes/common: contents main postinstall
Removed Files:
src/distrib/notes/xen: Makefile hardware install instopt prep upgrade
xfer

Log Message:
Remove leftovers from the separate xen port (which is now part of i386
and amd64)


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/notes/Makefile
cvs rdiff -u -r1.177 -r1.178 src/distrib/notes/common/contents
cvs rdiff -u -r1.548 -r1.549 src/distrib/notes/common/main
cvs rdiff -u -r1.82 -r1.83 src/distrib/notes/common/postinstall
cvs rdiff -u -r1.2 -r0 src/distrib/notes/xen/Makefile \
src/distrib/notes/xen/install src/distrib/notes/xen/upgrade
cvs rdiff -u -r1.3 -r0 src/distrib/notes/xen/hardware \
src/distrib/notes/xen/instopt src/distrib/notes/xen/prep
cvs rdiff -u -r1.4 -r0 src/distrib/notes/xen/xfer

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/Makefile
diff -u src/distrib/notes/Makefile:1.45 src/distrib/notes/Makefile:1.46
--- src/distrib/notes/Makefile:1.45	Wed Jan 24 09:04:40 2018
+++ src/distrib/notes/Makefile	Tue Aug  7 08:26:42 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.45 2018/01/24 09:04:40 skrll Exp $
+#	$NetBSD: Makefile,v 1.46 2018/08/07 08:26:42 martin Exp $
 #
 
 .include 
@@ -47,7 +47,6 @@ SUBDIR+= sun2
 SUBDIR+= sun3
 SUBDIR+= vax
 SUBDIR+= x68k
-SUBDIR+= xen
 .endif
 
 .include 

Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.177 src/distrib/notes/common/contents:1.178
--- src/distrib/notes/common/contents:1.177	Thu Aug  2 16:26:09 2018
+++ src/distrib/notes/common/contents	Tue Aug  7 08:26:42 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.177 2018/08/02 16:26:09 maxv Exp $
+.\"	$NetBSD: contents,v 1.178 2018/08/07 08:26:42 martin Exp $
 .\"
 .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -315,7 +315,7 @@ Method), below.
 .\}
 .
 .if !\n[alpha]:\n[bebox]:\n[cats]:\n[evbppc]:\n[mvme68k]:\n[macppc]:\
-\n[sgimips]:\n[sandpoint]:\n[sparc]:\n[xen] \{\
+\n[sgimips]:\n[sandpoint]:\n[sparc] \{\
 .		It Pa misc/
 .
 Miscellaneous \*M installation utilities; see
@@ -819,9 +819,6 @@ and the same kernel in the format needed
 These kernels are specific to the IBM 405GP based Walnut evaluation board.
 .\}
 .el \{\
-.ie \n[xen] \{\
-.\}
-.el \{\
 .It Sy kern-GENERIC
 This set contains a
 .Nx*M
@@ -837,7 +834,6 @@ This set also contains an a.out kernel n
 .Pa /netbsd.aout
 that your system may need to boot.
 .\}
-.\} \" !\n[xen]
 .\} \" !\n[evbppc]
 .\} \" !\n[sparc64]
 .\} \" !\n[sparc]

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.548 src/distrib/notes/common/main:1.549
--- src/distrib/notes/common/main:1.548	Fri Jun 29 12:34:13 2018
+++ src/distrib/notes/common/main	Tue Aug  7 08:26:42 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.548 2018/06/29 12:34:13 roy Exp $
+.\"	$NetBSD: main,v 1.549 2018/08/07 08:26:42 martin Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -47,7 +47,7 @@
 .as MACHINE_LIST " i386 ibmnws iyonix landisk luna68k mac68k macppc mipsco
 .as MACHINE_LIST " mmeye mvme68k mvmeppc netwinder news68k newsmips next68k
 .as MACHINE_LIST " ofppc playstation2 pmax prep rs6000 sandpoint sbmips
-.as MACHINE_LIST " sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus .
+.as MACHINE_LIST " sgimips shark sparc sparc64 sun2 sun3 vax x68k zaurus .
 .so \*[.CURDIR]/../common/macros
 .
 .Dd May 9, 2015
@@ -678,12 +678,6 @@ own checksum files, just as the source d
 .so hardware ---
 .br_ne 7P
 .
-.if \n[xen] \{.Ss "Installation options"
-.br_ne 7P
-.
-.so instopt ---
-.\}
-.
 .Ss "Getting the NetBSD System on to Useful Media"
 .
 .so xfer ---

Index: src/distrib/notes/common/postinstall
diff -u src/distrib/notes/common/postinstall:1.82 src/distrib/notes/common/postinstall:1.83
--- src/distrib/notes/common/postinstall:1.82	Wed Jan 24 09:04:41 2018
+++ src/distrib/notes/common/postinstall	Tue Aug  7 08:26:42 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: postinstall,v 1.82 2018/01/24 09:04:41 skrll Exp $
+.\"	$NetBSD: postinstall,v 1.83 2018/08/07 08:26:42 martin Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -179,7 +179,6 @@ For example:
 .if \n[shark] .ds IFname cs0
 .if \n[sparc64]   .ds IFname hme0
 .if \n[x68k]  .ds IFname ne0
-.if \n[xen]   .ds IFname xennet0
 .
 .Dl ifconfig_\*[IFname]="inet 192.0.2.123 netmask 255.255.255.0"
 .Pp

CVS commit: src/external/bsd/nvi

2018-08-07 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Tue Aug  7 08:05:48 UTC 2018

Modified Files:
src/external/bsd/nvi/dist/cl: cl_funcs.c cl_main.c
src/external/bsd/nvi/dist/common: gs.h options.c options_f.c
src/external/bsd/nvi/dist/docs/vi.man: vi.1
src/external/bsd/nvi/dist/ip: ip_funcs.c ip_main.c
src/external/bsd/nvi/dist/vi: v_replace.c v_txt.c vi.c
src/external/bsd/nvi/usr.bin/nvi: Makefile

Log Message:
Add imctrl and imkey options, inspired by cannactrl and fepkey options in
nvi-m17n by itojun.

If imctrl option is set, input method is controlled by using escape
sequences compatible to Tera Term and RLogin. The state of input method in
commands specified by imkey option is saved and restored automatically.
Input method is then deactivated on returning to command mode.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/nvi/dist/cl/cl_funcs.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/nvi/dist/cl/cl_main.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/common/gs.h \
src/external/bsd/nvi/dist/common/options_f.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/common/options.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/docs/vi.man/vi.1
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/ip/ip_funcs.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/ip/ip_main.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/vi/v_replace.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/vi/v_txt.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nvi/dist/vi/vi.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/nvi/usr.bin/nvi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/nvi/dist/cl/cl_funcs.c
diff -u src/external/bsd/nvi/dist/cl/cl_funcs.c:1.8 src/external/bsd/nvi/dist/cl/cl_funcs.c:1.9
--- src/external/bsd/nvi/dist/cl/cl_funcs.c:1.8	Sun Feb  4 09:15:45 2018
+++ src/external/bsd/nvi/dist/cl/cl_funcs.c	Tue Aug  7 08:05:47 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cl_funcs.c,v 1.8 2018/02/04 09:15:45 mrg Exp $ */
+/*	$NetBSD: cl_funcs.c,v 1.9 2018/08/07 08:05:47 rin Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -16,7 +16,7 @@
 static const char sccsid[] = "Id: cl_funcs.c,v 10.72 2002/03/02 23:18:33 skimo Exp  (Berkeley) Date: 2002/03/02 23:18:33 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: cl_funcs.c,v 1.8 2018/02/04 09:15:45 mrg Exp $");
+__RCSID("$NetBSD: cl_funcs.c,v 1.9 2018/08/07 08:05:47 rin Exp $");
 #endif
 
 #include 
@@ -465,6 +465,41 @@ cl_ex_adjust(SCR *sp, exadj_t action)
 	return (0);
 }
 
+#ifdef IMCTRL
+/*
+ * cl_imctrl --
+ *	Control the state of input method by using escape sequences compatible
+ *	to Tera Term and RLogin.
+ *
+ * PUBLIC: void cl_imctrl __P((SCR *, imctrl_t));
+ */
+void
+cl_imctrl(SCR *sp, imctrl_t action)
+{
+#define	TT_IM_OFF	"\033[
@@ -442,6 +442,9 @@ cl_func_std(WIN *wp)
 	gp->scr_event = cl_event;
 	gp->scr_ex_adjust = cl_ex_adjust;
 	gp->scr_fmap = cl_fmap;
+#ifdef IMCTRL
+	gp->scr_imctrl = cl_imctrl;
+#endif
 	gp->scr_insertln = cl_insertln;
 	gp->scr_keyval = cl_keyval;
 	gp->scr_move = cl_move;

Index: src/external/bsd/nvi/dist/common/gs.h
diff -u src/external/bsd/nvi/dist/common/gs.h:1.3 src/external/bsd/nvi/dist/common/gs.h:1.4
--- src/external/bsd/nvi/dist/common/gs.h:1.3	Mon Nov 25 22:43:46 2013
+++ src/external/bsd/nvi/dist/common/gs.h	Tue Aug  7 08:05:47 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: gs.h,v 1.3 2013/11/25 22:43:46 christos Exp $ */
+/*	$NetBSD: gs.h,v 1.4 2018/08/07 08:05:47 rin Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -45,6 +45,11 @@ typedef enum { EX_TERM_CE, EX_TERM_SCROL
 /* Screen attribute arguments to scr_attr(). */
 typedef enum { SA_ALTERNATE, SA_INVERSE } scr_attr_t;
 
+#ifdef IMCTRL
+/* Input method control arguments to scr_imctrl(). */
+typedef enum { IMCTRL_INIT, IMCTRL_OFF, IMCTRL_ON } imctrl_t;
+#endif
+
 /* Key type arguments to scr_keyval(). */
 typedef enum { KEY_VEOF, KEY_VERASE, KEY_VKILL, KEY_VWERASE } scr_keyval_t;
 
@@ -152,6 +157,10 @@ struct _gs {
 	__P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
 	/* Get terminal key value. */
 	int	(*scr_keyval) __P((SCR *, scr_keyval_t, CHAR_T *, int *));
+#ifdef IMCTRL
+	/* Control the state of input method. */
+	void	(*scr_imctrl) __P((SCR *, imctrl_t));
+#endif
 	/* Insert a line. */
 	int	(*scr_insertln) __P((SCR *));
 	/* Handle an option change. */
Index: src/external/bsd/nvi/dist/common/options_f.c
diff -u src/external/bsd/nvi/dist/common/options_f.c:1.3 src/external/bsd/nvi/dist/common/options_f.c:1.4
--- src/external/bsd/nvi/dist/common/options_f.c:1.3	Sun Jan 26 21:43:45 2014
+++ src/external/bsd/nvi/dist/common/options_f.c	Tue Aug  7 08:05:47 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: options_f.c,v 1.3 2014/01/26 21:43:45

CVS commit: src/doc

2018-08-07 Thread Ryota Ozaki 
Module Name:src
Committed By:   ozaki-r
Date:   Tue Aug  7 07:19:09 UTC 2018

Modified Files:
src/doc: TODO.smpnet

Log Message:
Categorize non MP-safe components into protected and unprotected ones


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/doc/TODO.smpnet

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/TODO.smpnet
diff -u src/doc/TODO.smpnet:1.20 src/doc/TODO.smpnet:1.21
--- src/doc/TODO.smpnet:1.20	Mon Jun 25 09:32:28 2018
+++ src/doc/TODO.smpnet	Tue Aug  7 07:19:09 2018
@@ -1,8 +1,11 @@
-$NetBSD: TODO.smpnet,v 1.20 2018/06/25 09:32:28 msaitoh Exp $
+$NetBSD: TODO.smpnet,v 1.21 2018/08/07 07:19:09 ozaki-r Exp $
 
 MP-safe components
 ==
 
+They work without the big kernel lock (KERNEL_LOCK), i.e., with NET_MPSAFE
+kernel option.  Some components scale up and some don't.
+
  - Device drivers
- vioif(4)
- vmx(4)
@@ -34,8 +37,25 @@ MP-safe components
 Non MP-safe components and kernel options
 =
 
+The components and options aren't MP-safe, i.e., requires the big kernel lock,
+yet.  Some of them can be used safely even if NET_MPSAFE is enabled because
+they're still protected by the big kernel lock.  The others aren't protected and
+so unsafe, e.g, they may crash the kernel.
+
+Protected ones
+--
+
  - Device drivers
- Most drivers other than ones listed in the above section
+ - Layer 4
+   - DCCP
+   - SCTP
+   - TCP
+   - UDP
+
+Unprotected ones
+
+
  - Layer 2
- ARCNET (if_arcsubr.c)
- ATM (if_atmsubr.c)
@@ -51,11 +71,6 @@ Non MP-safe components and kernel option
- PIM
- MPLS (mpls(4))
- IPv6 address selection policy
- - Layer 4
-   - DCCP
-   - SCTP
-   - TCP
-   - UDP
  - Interfaces
- agr(4)
- carp(4)

CVS commit: src/doc

2018-08-07 Thread Ryota Ozaki 
Module Name:src
Committed By:   ozaki-r
Date:   Tue Aug  7 07:19:28 UTC 2018

Modified Files:
src/doc: TODO.smpnet

Log Message:
Add ipsecif(4)


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/doc/TODO.smpnet

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/TODO.smpnet
diff -u src/doc/TODO.smpnet:1.21 src/doc/TODO.smpnet:1.22
--- src/doc/TODO.smpnet:1.21	Tue Aug  7 07:19:09 2018
+++ src/doc/TODO.smpnet	Tue Aug  7 07:19:28 2018
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.21 2018/08/07 07:19:09 ozaki-r Exp $
+$NetBSD: TODO.smpnet,v 1.22 2018/08/07 07:19:28 ozaki-r Exp $
 
 MP-safe components
 ==
@@ -21,6 +21,7 @@ kernel option.  Some components scale up
- All except for items in the below section
  - Interfaces
- gif(4)
+   - ipsecif(4)
- l2tp(4)
- pppoe(4)
  - if_spppsubr.c