subject:"CVS commit\\\: \\\[netbsd\\\-7\\\] src"

CVS commit: [netbsd-7] src/sys/arch/xen/conf

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 07:50:37 UTC 2016

Modified Files:
src/sys/arch/xen/conf [netbsd-7]: files.xen

Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #1326):
sys/arch/xen/conf/files.xen: revision 1.141
make CPU microcode loading dependent on both DOM0OPS AND CPU_UCODE


To generate a diff of this commit:
cvs rdiff -u -r1.133.4.1 -r1.133.4.2 src/sys/arch/xen/conf/files.xen

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/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.133.4.1 src/sys/arch/xen/conf/files.xen:1.133.4.2
--- src/sys/arch/xen/conf/files.xen:1.133.4.1	Sun Sep 25 12:11:33 2016
+++ src/sys/arch/xen/conf/files.xen	Sun Dec 18 07:50:37 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.xen,v 1.133.4.1 2016/09/25 12:11:33 bouyer Exp $
+#	$NetBSD: files.xen,v 1.133.4.2 2016/12/18 07:50:37 snj Exp $
 #	NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 #	NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp 
 
@@ -92,9 +92,9 @@ file	arch/xen/x86/xen_pmap.c
 file	arch/xen/x86/xen_intr.c
 file	arch/xen/x86/xenfunc.c
 
-file	arch/xen/xen/xen_ucode.c	dom0ops | cpu_ucode needs-flag
-file	arch/x86/x86/cpu_ucode_amd.c	dom0ops | cpu_ucode needs-flag
-file	arch/x86/x86/cpu_ucode_intel.c	dom0ops | cpu_ucode needs-flag
+file	arch/xen/xen/xen_ucode.c	dom0ops & cpu_ucode needs-flag
+file	arch/x86/x86/cpu_ucode_amd.c	dom0ops & cpu_ucode needs-flag
+file	arch/x86/x86/cpu_ucode_intel.c	dom0ops & cpu_ucode needs-flag
 
 file	arch/xen/xen/xen_machdep.c
 file	arch/xen/xen/xen_debug.c

CVS commit: [netbsd-7] src/usr.bin/calendar/calendars

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 07:47:22 UTC 2016

Modified Files:
src/usr.bin/calendar/calendars [netbsd-7]: calendar.birthday
calendar.christian calendar.history calendar.holiday
calendar.judaic calendar.netbsd calendar.usholiday

Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #1325):
usr.bin/calendar/calendars/calendar.birthday: revision 1.26
usr.bin/calendar/calendars/calendar.christian: revision 1.6
usr.bin/calendar/calendars/calendar.history: revisions 1.33, 1.34
usr.bin/calendar/calendars/calendar.holiday: revisions 1.26, 1.27
usr.bin/calendar/calendars/calendar.judaic: revision 1.6
usr.bin/calendar/calendars/calendar.netbsd: revisions 1.36, 1.37
usr.bin/calendar/calendars/calendar.usholiday: revision 1.7
note the release of NetBSD 7.0
--
Fix typo - Bahamas starts with a 'B' not with a 'G'
--
typo
--
allexander the greeeat, his name struck fear into hearts of men!
...but let's conquer that fear and give ol' alex a consistent and
correct date of death.
(he died of fever in baabylooo)
--
update floating holidays for 2017 in preparation for pullup for 7.1 release


To generate a diff of this commit:
cvs rdiff -u -r1.24.6.1 -r1.24.6.2 \
src/usr.bin/calendar/calendars/calendar.birthday
cvs rdiff -u -r1.4.10.1 -r1.4.10.2 \
src/usr.bin/calendar/calendars/calendar.christian \
src/usr.bin/calendar/calendars/calendar.judaic
cvs rdiff -u -r1.30.4.1 -r1.30.4.2 \
src/usr.bin/calendar/calendars/calendar.history
cvs rdiff -u -r1.23.2.1 -r1.23.2.2 \
src/usr.bin/calendar/calendars/calendar.holiday
cvs rdiff -u -r1.32.2.1 -r1.32.2.2 \
src/usr.bin/calendar/calendars/calendar.netbsd
cvs rdiff -u -r1.4.10.2 -r1.4.10.3 \
src/usr.bin/calendar/calendars/calendar.usholiday

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/calendar/calendars/calendar.birthday
diff -u src/usr.bin/calendar/calendars/calendar.birthday:1.24.6.1 src/usr.bin/calendar/calendars/calendar.birthday:1.24.6.2
--- src/usr.bin/calendar/calendars/calendar.birthday:1.24.6.1	Fri Nov  6 00:52:36 2015
+++ src/usr.bin/calendar/calendars/calendar.birthday	Sun Dec 18 07:47:22 2016
@@ -142,7 +142,7 @@
 06/07	George Bryan "Beau" Brummel born, 1778
 06/07	Alan Mathison Turing died, 1954
 06/08	Frank Lloyd Wright born in Richland Center, Wisconsin, 1869
-06/13	Alexander the Great dies (323 BC)
+06/11	Alexander the Great dies (323 BC)
 06/15	Edward (Edvard Hagerup) Grieg born in Bergen, Norway, 1843
 06/16	Hammurabi the Great dies, Babylon, 1686 BC
 06/18	M.C. Escher born, 1898

Index: src/usr.bin/calendar/calendars/calendar.christian
diff -u src/usr.bin/calendar/calendars/calendar.christian:1.4.10.1 src/usr.bin/calendar/calendars/calendar.christian:1.4.10.2
--- src/usr.bin/calendar/calendars/calendar.christian:1.4.10.1	Fri Nov  6 00:52:36 2015
+++ src/usr.bin/calendar/calendars/calendar.christian	Sun Dec 18 07:47:22 2016
@@ -1,17 +1,17 @@
 01/06*	Epiphany
-02/09*	Shrove Tuesday / Mardi Gras (day before Ash Wednesday)
-02/10*	Ash Wednesday (First day of Lent)
-03/20*	Palm Sunday (7 days before Easter)
-03/24*	Maundy Thursday (3 days before Easter)
-03/25*	Good Friday (2 days before Easter)
-03/27*	Easter Sunday
-05/01*	Rogation Sunday
-05/05*	Ascension Day (10 days before Pentecost)
-05/15*	Pentecost (Whitsunday)
-05/16*	Whitmonday
-05/22*	Trinity Sunday (7 days after Pentecost)
-05/26*	Corpus Christi (11 days after Pentecost)
+02/28*	Shrove Tuesday / Mardi Gras (day before Ash Wednesday)
+03/01*	Ash Wednesday (First day of Lent)
+04/09*	Palm Sunday (7 days before Easter)
+04/13*	Maundy Thursday (3 days before Easter)
+04/14*	Good Friday (2 days before Easter)
+04/16*	Easter Sunday
+05/21*	Rogation Sunday
+05/25*	Ascension Day (10 days before Pentecost)
+06/04*	Pentecost (Whitsunday)
+06/05*	Whitmonday
+06/11*	Trinity Sunday (7 days after Pentecost)
+06/15*	Corpus Christi (11 days after Pentecost)
 10/18	Feast Day of St. Luke
-11/29*	First Sunday of Advent (4th Sunday before Christmas)
+12/03*	First Sunday of Advent (4th Sunday before Christmas)
 12/06	St. Nicholas' Day
 12/25	Feast of the Nativity (Christmas)
Index: src/usr.bin/calendar/calendars/calendar.judaic
diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.4.10.1 src/usr.bin/calendar/calendars/calendar.judaic:1.4.10.2
--- src/usr.bin/calendar/calendars/calendar.judaic:1.4.10.1	Fri Nov  6 00:52:36 2015
+++ src/usr.bin/calendar/calendars/calendar.judaic	Sun Dec 18 07:47:22 2016
@@ -1,27 +1,27 @@
-01/25*  Tu B'Shvat (Feast of Trees)
-03/23*	Fast of Esther (Battle of Purim; 1 day before Purim; fast day)
-03/24*	Purim (Feast of Lots; 30 days before Pesach)
-04/23*	Pesach (First Day of Passover; sabbatical)
-04/24*	Pesach (sabbatical)
-04/25*	Pesach (sabbatical)
-04/26*	Pesach (Last Day of Passover; 8th day of Pesach;

CVS commit: [netbsd-7] src/sys

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 07:40:50 UTC 2016

Modified Files:
src/sys/modules/npf [netbsd-7]: Makefile
src/sys/net/npf [netbsd-7]: files.npf npf_impl.h npf_tableset.c
src/sys/rump/net/lib/libnpf [netbsd-7]: Makefile
Added Files:
src/sys/net/npf [netbsd-7]: lpm.c lpm.h
Removed Files:
src/sys/net/npf [netbsd-7]: npf_tableset_ptree.c

Log Message:
Pull up following revision(s) (requested by rmind in ticket #1319):
sys/modules/npf/Makefile: revision 1.19
sys/net/npf/files.npf: revision 1.18
sys/net/npf/lpm.c: revision 1.1
sys/net/npf/lpm.h: revision 1.1
sys/net/npf/npf_impl.h: revision 1.62
sys/net/npf/npf_tableset.c: revision 1.24
sys/net/npf/npf_tableset_ptree.c: file removal
sys/rump/net/lib/libnpf/Makefile: revision 1.18
This patches ditches the ptree(3) library, because it is broken (you
can get missing entries!).  Instead, as a temporary solution, we switch
to a simple linear scan of the hash tables for the longest-prefix-match
(lpm.c lpm.h) algorithm. In fact, with few unique prefixes in the set,
on modern hardware this simple algorithm is pretty fast anyway!
--
ditch ptree and use lpm
--
remove ptree add lpm


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/modules/npf/Makefile
cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/net/npf/files.npf
cvs rdiff -u -r0 -r1.1.2.2 src/sys/net/npf/lpm.c src/sys/net/npf/lpm.h
cvs rdiff -u -r1.58.2.3 -r1.58.2.4 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/net/npf/npf_tableset.c
cvs rdiff -u -r1.1 -r0 src/sys/net/npf/npf_tableset_ptree.c
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/rump/net/lib/libnpf/Makefile

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

Modified files:

Index: src/sys/modules/npf/Makefile
diff -u src/sys/modules/npf/Makefile:1.17 src/sys/modules/npf/Makefile:1.17.2.1
--- src/sys/modules/npf/Makefile:1.17	Sat Jul 19 18:24:17 2014
+++ src/sys/modules/npf/Makefile	Sun Dec 18 07:40:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/07/19 18:24:17 rmind Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2016/12/18 07:40:50 snj Exp $
 #
 # Public Domain.
 #
@@ -13,7 +13,7 @@ SRCS=		npf.c npf_alg.c npf_conf.c npf_ct
 SRCS+=		npf_bpf.c npf_if.c npf_inet.c npf_mbuf.c npf_nat.c
 SRCS+=		npf_ruleset.c npf_conn.c npf_conndb.c npf_rproc.c
 SRCS+=		npf_state.c npf_state_tcp.c npf_tableset.c
-SRCS+=		npf_tableset_ptree.c npf_sendpkt.c npf_worker.c
+SRCS+=		lpm.c npf_sendpkt.c npf_worker.c
 
 CPPFLAGS+=	-DINET6
 

Index: src/sys/net/npf/files.npf
diff -u src/sys/net/npf/files.npf:1.17 src/sys/net/npf/files.npf:1.17.2.1
--- src/sys/net/npf/files.npf:1.17	Sat Jul 19 18:24:16 2014
+++ src/sys/net/npf/files.npf	Sun Dec 18 07:40:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.npf,v 1.17 2014/07/19 18:24:16 rmind Exp $
+# $NetBSD: files.npf,v 1.17.2.1 2016/12/18 07:40:50 snj Exp $
 #
 # Public Domain.
 #
@@ -19,7 +19,6 @@ file	net/npf/npf_bpf.c			npf
 file	net/npf/npf_ruleset.c			npf
 file	net/npf/npf_rproc.c			npf
 file	net/npf/npf_tableset.c			npf
-file	net/npf/npf_tableset_ptree.c		npf
 file	net/npf/npf_if.c			npf
 file	net/npf/npf_inet.c			npf
 file	net/npf/npf_conn.c			npf
@@ -31,6 +30,9 @@ file	net/npf/npf_alg.c			npf
 file	net/npf/npf_sendpkt.c			npf
 file	net/npf/npf_worker.c			npf
 
+# LPM
+file	net/npf/lpm.cnpf
+
 # Built-in extensions.
 file	net/npf/npf_ext_log.c			npf
 file	net/npf/npf_ext_normalize.c		npf

Index: src/sys/net/npf/npf_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.58.2.3 src/sys/net/npf/npf_impl.h:1.58.2.4
--- src/sys/net/npf/npf_impl.h:1.58.2.3	Wed Feb  4 07:13:04 2015
+++ src/sys/net/npf/npf_impl.h	Sun Dec 18 07:40:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_impl.h,v 1.58.2.3 2015/02/04 07:13:04 snj Exp $	*/
+/*	$NetBSD: npf_impl.h,v 1.58.2.4 2016/12/18 07:40:50 snj Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -49,7 +49,6 @@
 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -228,8 +227,6 @@ bool		npf_bpf_validate(const void *, siz
 void		npf_tableset_sysinit(void);
 void		npf_tableset_sysfini(void);
 
-extern const pt_tree_ops_t npf_table_ptree_ops;
-
 npf_tableset_t *npf_tableset_create(u_int);
 void		npf_tableset_destroy(npf_tableset_t *);
 int		npf_tableset_insert(npf_tableset_t *, npf_table_t *);

Index: src/sys/net/npf/npf_tableset.c
diff -u src/sys/net/npf/npf_tableset.c:1.22 src/sys/net/npf/npf_tableset.c:1.22.2.1
--- src/sys/net/npf/npf_tableset.c:1.22	Mon Aug 11 01:54:12 2014
+++ src/sys/net/npf/npf_tableset.c	Sun Dec 18 07:40:50 2016
@@ -1,7 +1,7 @@
-/*	$NetBSD: npf_tableset.c,v 1.22 2014/08/11 01:54:12 rmind Exp $	*/
+/*	$NetBSD: npf_tableset.c,v 1.22.2.1 2016/12/18 07:40:50 snj Exp $	*/
 
 /*-
- * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009-2016 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This material is based upon

CVS commit: [netbsd-7] src/share/misc

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 07:12:06 UTC 2016

Modified Files:
src/share/misc [netbsd-7]: bsd-family-tree

Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1317):
share/misc/bsd-family-tree: revisions 1.57, 1.58
Sync with FreeBSD r305215
--
Add NetBSD rcs tag which was lost with r1.13.
Add NetBSD 7.0.1
heads up by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.2.1 src/share/misc/bsd-family-tree

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

Modified files:

Index: src/share/misc/bsd-family-tree
diff -u src/share/misc/bsd-family-tree:1.56 src/share/misc/bsd-family-tree:1.56.2.1
--- src/share/misc/bsd-family-tree:1.56	Fri May 30 07:26:06 2014
+++ src/share/misc/bsd-family-tree	Sun Dec 18 07:12:06 2016
@@ -110,9 +110,11 @@ FreeBSD 2.1  | | |  
  | | | | | NetBSD 1.3.2| |
  | FreeBSD 2.2.7 | | ||| |
  | | | | |||   BSD/OS 4.0
- | v | | ||| |
  | FreeBSD 2.2.8 | | ||| |
- |   | | ||OpenBSD 2.4   |
+ | | | | ||| |
+ | v | | ||OpenBSD 2.4   |
+ | FreeBSD 2.2.9 | | ||| |
+ |   | | ||| |
 FreeBSD 3.0 <* | |v| |
  | | | NetBSD 1.3.3| |
  *---FreeBSD 3.1   | | | |
@@ -279,30 +281,76 @@ FreeBSD 5.2   |  |  
  | |   |  |  | |  |   OpenBSD 5.3  DragonFly 3.4.1
  | |   |  |  | |   NetBSD  |   |
  | |   |  |  | |6.0.2  |   |
+ | |   |  |  | |  ||   | 
+ | |   |  |  | |   NetBSD  |   |
+ | |   |  |  | |6.0.3  |   |
  | |   |  |  | |  ||   |
- | |   |  |  | |  NetBSD 6.0.3 |   |
- | |   |  |  | |  ||   |
- | |   |  |  | |  NetBSD 6.0.4 |   |
+ | |   |  |  | |   NetBSD  |   |
+ | |   |  |  | |6.0.4  |   |
  | |   |  |  | |  ||   |
- | |   |  |  | |  NetBSD 6.0.5 |   |
+ | |   |  |  | |   NetBSD  |   |
+ | |   |  |  | |6.0.5  |   |
  | |   |  |  | |   |   |
- | |   |  |  |  `-NetBSD 6.1   |   |
+ | |   |  |  | |`-NetBSD 6.1   |   |
  | |FreeBSD   |  |   | |   |
  | |  8.4 |  |NetBSD 6.1.1 |   |
  | |  |  |   | |   |
  |  FreeBSD   |  |NetBSD 6.1.2 |   |
  |9.2  Mac OS X  |   | |   |
- |   10.9|   |OpenBSD 5.4  |
- ||  |   | |   DragonFly 3.6.0
- ||  |   | |   |
- *--FreeBSD   |  |NetBSD 6.1.3 |   |
- |   10.0 |  |   | |   |
- ||  |NetBSD 6.1.4 |   |
+ | | 10.9|   |OpenBSD 5.4  |
+ | `-.|  |   | |   DragonFly 3.6.0
+ |\   |  |   | |   |
+ *--FreeBSD|  |  |NetBSD 6.1.3 |   |
+ |   10.0  |  |  |   | |   |
+ | |   |  |  |   | |   DragonFly 3.6.1
+ | |   |  |  |   | |   |
+ | |   |  |  |   | |   |
+ | |   |  |  |   | |   DragonFly 3.6.2
+ | |   |  |  |NetBSD 6.1.4 |   |
+ | |   |  |  |   | |   |
+ | |   |  |  |   |OpenBSD 5.5  |
+ | |

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

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 07:01:57 UTC 2016

Modified Files:
src/sys/arch/x86/include [netbsd-7]: pmap.h
src/sys/arch/x86/x86 [netbsd-7]: pmap.c vm_machdep.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1316):
sys/arch/x86/x86/pmap.c: revision 1.223
sys/arch/x86/x86/vm_machdep.c: revision 1.26
sys/arch/x86/include/pmap.h: revision 1.61
PR/49691: KAMADA Ken'ichi: free deferred ptp mappings if present.
XXX: pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.55.4.1 -r1.55.4.2 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.183.2.4 -r1.183.2.5 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.25 -r1.25.4.1 src/sys/arch/x86/x86/vm_machdep.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/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.55.4.1 src/sys/arch/x86/include/pmap.h:1.55.4.2
--- src/sys/arch/x86/include/pmap.h:1.55.4.1	Thu Apr 23 07:31:16 2015
+++ src/sys/arch/x86/include/pmap.h	Sun Dec 18 07:01:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.55.4.1 2015/04/23 07:31:16 snj Exp $	*/
+/*	$NetBSD: pmap.h,v 1.55.4.2 2016/12/18 07:01:57 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -479,6 +479,7 @@ void	pmap_kenter_ma(vaddr_t, paddr_t, vm
 int	pmap_enter_ma(struct pmap *, vaddr_t, paddr_t, paddr_t,
 	vm_prot_t, u_int, int);
 bool	pmap_extract_ma(pmap_t, vaddr_t, paddr_t *);
+void	pmap_free_ptps(struct vm_page *);
 
 /*
  * Hooks for the pool allocator.

Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.183.2.4 src/sys/arch/x86/x86/pmap.c:1.183.2.5
--- src/sys/arch/x86/x86/pmap.c:1.183.2.4	Fri Feb 26 21:50:54 2016
+++ src/sys/arch/x86/x86/pmap.c	Sun Dec 18 07:01:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.183.2.4 2016/02/26 21:50:54 snj Exp $	*/
+/*	$NetBSD: pmap.c,v 1.183.2.5 2016/12/18 07:01:57 snj Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183.2.4 2016/02/26 21:50:54 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183.2.5 2016/12/18 07:01:57 snj Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -2405,7 +2405,7 @@ pmap_create(void)
  * pmap_free_ptps: put a list of ptps back to the freelist.
  */
 
-static void
+void
 pmap_free_ptps(struct vm_page *empty_ptps)
 {
 	struct vm_page *ptp;

Index: src/sys/arch/x86/x86/vm_machdep.c
diff -u src/sys/arch/x86/x86/vm_machdep.c:1.25 src/sys/arch/x86/x86/vm_machdep.c:1.25.4.1
--- src/sys/arch/x86/x86/vm_machdep.c:1.25	Tue Mar 11 20:55:19 2014
+++ src/sys/arch/x86/x86/vm_machdep.c	Sun Dec 18 07:01:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.25 2014/03/11 20:55:19 para Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.25.4.1 2016/12/18 07:01:57 snj Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.25 2014/03/11 20:55:19 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.25.4.1 2016/12/18 07:01:57 snj Exp $");
 
 #include "opt_mtrr.h"
 
@@ -249,6 +249,12 @@ cpu_lwp_free(struct lwp *l, int proc)
 	if (proc && l->l_proc->p_md.md_flags & MDP_USEDMTRR)
 		mtrr_clean(l->l_proc);
 #endif
+	/*
+	 * Free deferred mappings if any.
+	 */
+	struct vm_page *empty_ptps = l->l_md.md_gc_ptp;
+	l->l_md.md_gc_ptp = NULL;
+	pmap_free_ptps(empty_ptps);
 }
 
 /*

CVS commit: [netbsd-7] src/share/man/man3

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 06:52:03 UTC 2016

Modified Files:
src/share/man/man3 [netbsd-7]: bits.3

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1315):
share/man/man3/bits.3: revision 1.17
These have been able to handle uintmax-width masks since creation.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.4.1 src/share/man/man3/bits.3

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/man3/bits.3
diff -u src/share/man/man3/bits.3:1.16 src/share/man/man3/bits.3:1.16.4.1
--- src/share/man/man3/bits.3:1.16	Tue Mar 18 18:20:39 2014
+++ src/share/man/man3/bits.3	Sun Dec 18 06:52:03 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bits.3,v 1.16 2014/03/18 18:20:39 riastradh Exp $
+.\"	$NetBSD: bits.3,v 1.16.4.1 2016/12/18 06:52:03 snj Exp $
 .\"
 .\" Copyright (c) 2006, 2010 David Young.  All rights reserved.
 .\"
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 17, 2012
+.Dd November 6, 2016
 .Dt BITS 3
 .Os
 .Sh NAME
@@ -146,8 +146,3 @@ contributed the macro names
 .Fn SHIFTIN
 and
 .Fn SHIFTOUT .
-.Sh BUGS
-.Fn __BIT
-and
-.Fn __BITS
-can only express 32-bit bitmasks.

CVS commit: [netbsd-7] src/share/man/man9

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 06:43:24 UTC 2016

Modified Files:
src/share/man/man9 [netbsd-7]: fileassoc.9

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1314):
share/man/man9/fileassoc.9: revision 1.28
Merge changes from David H. Gutteridge in PR misc/51611
Thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.4.1 src/share/man/man9/fileassoc.9

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/man9/fileassoc.9
diff -u src/share/man/man9/fileassoc.9:1.27 src/share/man/man9/fileassoc.9:1.27.4.1
--- src/share/man/man9/fileassoc.9:1.27	Tue Mar 18 18:20:40 2014
+++ src/share/man/man9/fileassoc.9	Sun Dec 18 06:43:24 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: fileassoc.9,v 1.27 2014/03/18 18:20:40 riastradh Exp $
+.\" $NetBSD: fileassoc.9,v 1.27.4.1 2016/12/18 06:43:24 snj Exp $
 .\"
 .\" Copyright (c) 2006 Elad Efrat 
 .\" All rights reserved.
@@ -25,12 +25,12 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 26, 2010
+.Dd November 7, 2016
 .Dt FILEASSOC 9
 .Os
 .Sh NAME
 .Nm fileassoc
-.Nd in-kernel, file-system independent, file-meta data association
+.Nd in-kernel, file system independent, file meta-data association
 .Sh SYNOPSIS
 .In sys/fileassoc.h
 .Ft int
@@ -56,12 +56,12 @@
 .Sh DESCRIPTION
 The
 .Nm
-KPI allows association of meta-data with files independent of file-system
+KPI allows association of meta-data with files independent of file system
 support for such elaborate meta-data.
 .Pp
 When plugging a new fileassoc to the system, a developer can specify private
 data to be associated with every file, as well as (potentially different)
-private data to be associated with every file-system mount.
+private data to be associated with every file system mount.
 .Pp
 For example, a developer might choose to associate a custom ACL with every
 file, and a count of total files with ACLs with the mount.
@@ -88,7 +88,7 @@ KPI it is important to keep in mind that
 management only for
 .Nm
 internal memory.
-Any additional memory stored in the tables (such as private data-structures
+Any additional memory stored in the tables (such as private data structures
 used by custom fileassocs) should be allocated and freed by the developer.
 .Pp
 .Nm
@@ -172,7 +172,7 @@ from
 .Pp
 If specified, the fileassoc's
 .Dq cleanup routine
-will be called with a pointer to the private data-structure.
+will be called with a pointer to the private data structure.
 .Pp
 .It Fn fileassoc_table_run "mp" "id" "cb" "cookie"
 For each entry for
@@ -225,7 +225,7 @@ for the fileassoc specified by
 .Pp
 If specified, the fileassoc's
 .Dq cleanup routine
-will be called with a pointer to the private data-structure and indication of
+will be called with a pointer to the private data structure and indication of
 .Dv FILEASSOC_CLEANUP_FILE .
 .El
 .Sh EXAMPLES
@@ -334,6 +334,8 @@ The
 .Nm
 is implemented within
 .Pa src/sys/kern/kern_fileassoc.c .
+.Sh SEE ALSO
+.Xr veriexec 9
 .Sh HISTORY
 The
 .Nm

CVS commit: [netbsd-7] src/usr.sbin/paxctl

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 06:41:33 UTC 2016

Modified Files:
src/usr.sbin/paxctl [netbsd-7]: paxctl.8

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1313):
usr.sbin/paxctl/paxctl.8: revision 1.15
Merge changes from David H. Gutteridge in PR misc/51612
Thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.4.1 src/usr.sbin/paxctl/paxctl.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/paxctl/paxctl.8
diff -u src/usr.sbin/paxctl/paxctl.8:1.14 src/usr.sbin/paxctl/paxctl.8:1.14.4.1
--- src/usr.sbin/paxctl/paxctl.8:1.14	Tue Mar 18 18:20:47 2014
+++ src/usr.sbin/paxctl/paxctl.8	Sun Dec 18 06:41:33 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: paxctl.8,v 1.14 2014/03/18 18:20:47 riastradh Exp $
+.\"	$NetBSD: paxctl.8,v 1.14.4.1 2016/12/18 06:41:33 snj Exp $
 .\"
 .\" Copyright 2006 Elad Efrat 
 .\" Copyright 2008 Christos Zoulas 
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 17, 2009
+.Dd November 7, 2016
 .Dt PAXCTL 8
 .Os
 .Sh NAME
@@ -110,8 +110,9 @@ The
 utility currently uses
 .Xr elf 5
 .Dq note
-sections to mark executables as PaX Segvguard enabled.
+sections to mark executables as having PaX flags enabled.
 This will be done using
 .Xr fileassoc 9
 in the future so that we can control who does the marking and
-not altering the binary file signature.
+not altering the binary file signature. (Note this also means that
+at present any flags set do not survive binary file upgrades.)

CVS commit: [netbsd-7] src/external/bsd/nvi

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 06:37:30 UTC 2016

Modified Files:
src/external/bsd/nvi [netbsd-7]: Makefile.inc
src/external/bsd/nvi/dist/cl [netbsd-7]: cl.h cl_main.c cl_screen.c
cl_term.c
src/external/bsd/nvi/dist/common [netbsd-7]: key.h vi_db1.c
src/external/bsd/nvi/dist/docs/vi.man [netbsd-7]: vi.1
src/external/bsd/nvi/dist/ex [netbsd-7]: ex_map.c ex_script.c
src/external/bsd/nvi/usr.bin/nvi [netbsd-7]: Makefile

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1312):
external/bsd/nvi/Makefile.inc: revisions 1.2-1.4
external/bsd/nvi/dist/cl/cl.h: revision 1.3
external/bsd/nvi/dist/cl/cl_main.c: revision 1.5
external/bsd/nvi/dist/cl/cl_screen.c: revision 1.5
external/bsd/nvi/dist/cl/cl_term.c: revision 1.5
external/bsd/nvi/dist/common/key.h: revision 1.3
external/bsd/nvi/dist/common/vi_db1.c: revision 1.8
external/bsd/nvi/dist/docs/vi.man/vi.1: revisions 1.3, 1.4
external/bsd/nvi/dist/ex/ex_map.c: revision 1.4
external/bsd/nvi/dist/ex/ex_script.c: revisions 1.5, 1.6
external/bsd/nvi/usr.bin/nvi/Makefile: revision 1.7
PR/50092: Rin Okuyama: Fix memory leaks in vi when resizing.
--
PR/50484: Rin Okuyama: fix the script command of vi(1)
--
Fix > 1024 char lines in script. (Rin Okuyama)
--
remove CONST; it is unused from Brad Harder
--
add default: to appease gcc.
--
Restore the first line of the copyright header, which accidentally got
zapped in -r1.2.
--
PR 51446 Brad Harder: fix synopsis for :tagprev


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 src/external/bsd/nvi/Makefile.inc
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/nvi/dist/cl/cl.h
cvs rdiff -u -r1.4 -r1.4.6.1 src/external/bsd/nvi/dist/cl/cl_main.c \
src/external/bsd/nvi/dist/cl/cl_screen.c \
src/external/bsd/nvi/dist/cl/cl_term.c
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/nvi/dist/common/key.h
cvs rdiff -u -r1.7 -r1.7.6.1 src/external/bsd/nvi/dist/common/vi_db1.c
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/nvi/dist/docs/vi.man/vi.1
cvs rdiff -u -r1.3 -r1.3.6.1 src/external/bsd/nvi/dist/ex/ex_map.c
cvs rdiff -u -r1.4 -r1.4.6.1 src/external/bsd/nvi/dist/ex/ex_script.c
cvs rdiff -u -r1.5 -r1.5.2.1 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/Makefile.inc
diff -u src/external/bsd/nvi/Makefile.inc:1.1 src/external/bsd/nvi/Makefile.inc:1.1.6.1
--- src/external/bsd/nvi/Makefile.inc:1.1	Fri Nov 22 16:00:45 2013
+++ src/external/bsd/nvi/Makefile.inc	Sun Dec 18 06:37:30 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.1 2013/11/22 16:00:45 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.1.6.1 2016/12/18 06:37:30 snj Exp $
 
 .include 
 
@@ -7,4 +7,4 @@ DIST= ${NETBSDSRCDIR}/external/bsd/nvi/d
 BINDIR=/usr/bin
 
 CWARNFLAGS.clang+=	-Wno-error=unused-const-variable
-VERSION=1.81.6-2013-11-20
+VERSION=1.81.6-2013-11-20nb3

Index: src/external/bsd/nvi/dist/cl/cl.h
diff -u src/external/bsd/nvi/dist/cl/cl.h:1.2 src/external/bsd/nvi/dist/cl/cl.h:1.2.6.1
--- src/external/bsd/nvi/dist/cl/cl.h:1.2	Fri Nov 22 15:52:05 2013
+++ src/external/bsd/nvi/dist/cl/cl.h	Sun Dec 18 06:37:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cl.h,v 1.2 2013/11/22 15:52:05 christos Exp $ */
+/*	$NetBSD: cl.h,v 1.2.6.1 2016/12/18 06:37:30 snj Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -42,6 +42,8 @@ typedef struct _cl_private {
 	struct termios ex_enter;/* Terminal values to enter ex. */
 	struct termios vi_enter;/* Terminal values to enter vi. */
 
+	SCREEN	*screen;	/* Curses screen. */
+
 	char	*el;		/* Clear to EOL terminal string. */
 	char	*cup;		/* Cursor movement terminal string. */
 	char	*cuu1;		/* Cursor up terminal string. */
@@ -77,6 +79,8 @@ typedef struct _cl_private {
 #define	CL_SIGTERM	0x0100	/* SIGTERM arrived. */
 #define	CL_SIGWINCH	0x0200	/* SIGWINCH arrived. */
 #define	CL_STDIN_TTY	0x0400	/* Talking to a terminal. */
+#define	CL_SETUPTERM	0x0800	/* Terminal initialized. */
+#define	CL_CHANGE_TERM	0x1000	/* Terminal changed. */
 	u_int32_t flags;
 } CL_PRIVATE;
 

Index: src/external/bsd/nvi/dist/cl/cl_main.c
diff -u src/external/bsd/nvi/dist/cl/cl_main.c:1.4 src/external/bsd/nvi/dist/cl/cl_main.c:1.4.6.1
--- src/external/bsd/nvi/dist/cl/cl_main.c:1.4	Sun Jan 26 21:43:45 2014
+++ src/external/bsd/nvi/dist/cl/cl_main.c	Sun Dec 18 06:37:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cl_main.c,v 1.4 2014/01/26 21:43:45 christos Exp $ */
+/*	$NetBSD: cl_main.c,v 1.4.6.1 2016/12/18 06:37:30 snj 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_main.c,v 10.54 2001/07/29 19:07:27 skimo Exp  (Berkeley) Date:

CVS commit: [netbsd-7] src/lib/libc/stdlib

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 06:31:01 UTC 2016

Modified Files:
src/lib/libc/stdlib [netbsd-7]: strtod.3 strtol.3 strtoul.3

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1311):
lib/libc/stdlib/strtod.3: revisions 1.21-1.29
lib/libc/stdlib/strtol.3: revision 1.36-1.38
lib/libc/stdlib/strtoul.3: revision 1.36
strtod yields ERANGE for below-subnormal magnitudes, not underflow.
For a floating-point computation, in the language of IEEE 754,
`underflow' means the output was rounded and is too small to be
represented *normally*.
There are many nonzero floating-point numbers to which the exact
output may have been rounded -- namely subnormals.  The condition
under which strtod returns ERANGE for small magnitudes is when the
magnitude of the exact result is so small it is rounded to zero, not
even to a subnormal.
While here, use parallel language about large magnitudes instead of
the (albeit correct) word `overflow', to avoid temptation to treat
`underflow' as the opposite notion with zero instead of infinity.
--
Bump date for previous.
--
Fix description of ERANGE cases again.
Do use the technical terms `overflow' and `underflow', because strtod
sets ERANGE precisely to indicate either of these two conditions, and
they are the right keywords that one might be looking for.
Note that strtod may set ERANGE even if it returns noninfinity and
nonzero -- specifically, if the result is subnormal.  This part was
wrong before I `fixed' it and remained wrong after I `fixed' it
earlier this year.
--
Add example for strtod.
This illustrates all the cases you might be interested in and asserts
theorems in those cases.
--
Fix infinity detection with isinf(d), not d == HUGE_VAL.
Negative infinity counts as overflow too.
Simplify.
--
EXIT_FAILURE police
--
Distinguish altogether invalid syntax from trailing garbage.
--
Distinguish invalid syntax from trailing garbage cases.  Clarify.
--
Simplify error condition case.
Add assertions to reflect its implications.
--
Tidy up the second example too.
--
Update strtoul(3) example to reflect clarifications in strtol(3).
--
Fix phrasing about `out-of-band' and `sentinel value'.
Either an out-of-band channel, or an in-band sentinel value, could
indicate an error, but an out-of-band sentinel value is a silly
proposition.
Noted by uwe@.
--
Use the keywords `underflow' and `overflow' in ERANGE summary.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.50.1 src/lib/libc/stdlib/strtod.3
cvs rdiff -u -r1.26.24.2 -r1.26.24.3 src/lib/libc/stdlib/strtol.3
cvs rdiff -u -r1.25.24.2 -r1.25.24.3 src/lib/libc/stdlib/strtoul.3

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

Modified files:

Index: src/lib/libc/stdlib/strtod.3
diff -u src/lib/libc/stdlib/strtod.3:1.20 src/lib/libc/stdlib/strtod.3:1.20.50.1
--- src/lib/libc/stdlib/strtod.3:1.20	Wed Oct 24 13:42:10 2007
+++ src/lib/libc/stdlib/strtod.3	Sun Dec 18 06:31:01 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: strtod.3,v 1.20 2007/10/24 13:42:10 reed Exp $
+.\"	$NetBSD: strtod.3,v 1.20.50.1 2016/12/18 06:31:01 snj Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\" from: @(#)strtod.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd March 12, 2006
+.Dd November 4, 2016
 .Dt STRTOD 3
 .Os
 .Sh NAME
@@ -151,7 +151,9 @@ If no conversion is performed, zero is r
 is stored in the location referenced by
 .Fa endptr .
 .Pp
-If the correct value would cause overflow, plus or minus
+If the correct value is too large in magnitude to be represented
+.Pq Sq overflow ,
+plus or minus
 .Dv HUGE_VAL ,
 .Dv HUGE_VALF ,
 or
@@ -160,15 +162,58 @@ is returned (according to the return typ
 .Dv ERANGE
 is stored in
 .Va errno .
-If the correct value would cause underflow, zero is
-returned and
+.Pp
+If the correct value is too small in magnitude to be represented
+normally with full precision
+.Pq Sq underflow ,
+the closest subnormal value, or zero, is returned, and
 .Dv ERANGE
 is stored in
 .Va errno .
+.Sh EXAMPLES
+Since there is no out-of-band channel or sentinel value to indicate an
+error, callers who wish to know whether there was overflow or underflow
+must set
+.Va errno
+to zero before calling
+.Fn strtod ,
+.Fn strtof ,
+or
+.Fn strtold ;
+in the case of no underflow or overflow, these functions preserve
+.Va errno .
+.Pp
+To check for syntax errors, callers must
+.Em also
+check whether
+.Fa endptr
+was updated to reflect the true end of the string in order to determine
+whether the full string was consumed or whether there were additional
+erroneous characters in it.
+.Bd -literal -offset abcd
+char *end;
+double d;
+
+\&...
+
+errno = 0;
+d = strtod(s, );
+if (end == s)
+	errx(EXIT_FAILURE, "invalid syntax");
+if (end[0] != '\e0')
+	errx(EXIT_FAILURE, "trailing garbage");
+if (errno) {
+	assert(errno ==

CVS commit: [netbsd-7] src/common/lib/libc/stdlib

2016-12-17 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Dec 18 06:23:23 UTC 2016

Modified Files:
src/common/lib/libc/stdlib [netbsd-7]: _strtoul.h

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1310):
common/lib/libc/stdlib/_strtoul.h: revision 1.10
Set *endptr in all paths out of strtoul and family.
XXX pullup-6
XXX pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.6.1 src/common/lib/libc/stdlib/_strtoul.h

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

Modified files:

Index: src/common/lib/libc/stdlib/_strtoul.h
diff -u src/common/lib/libc/stdlib/_strtoul.h:1.7 src/common/lib/libc/stdlib/_strtoul.h:1.7.6.1
--- src/common/lib/libc/stdlib/_strtoul.h:1.7	Fri May 17 12:55:56 2013
+++ src/common/lib/libc/stdlib/_strtoul.h	Sun Dec 18 06:23:22 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: _strtoul.h,v 1.7 2013/05/17 12:55:56 joerg Exp $ */
+/* $NetBSD: _strtoul.h,v 1.7.6.1 2016/12/18 06:23:22 snj Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -67,7 +67,10 @@ INT_FUNCNAME(_int_, _FUNCNAME, _l)(const
 	if (base && (base < 2 || base > 36)) {
 #if !defined(_KERNEL) && !defined(_STANDALONE)
 		errno = EINVAL;
-		return(0);
+		if (endptr != NULL)
+			/* LINTED interface specification */
+			*endptr = __UNCONST(nptr);
+		return 0;
 #else
 		panic("%s: invalid base %d", __func__, base);
 #endif

CVS commit: [netbsd-7] src/doc

2016-12-14 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Dec 14 19:33:33 UTC 2016

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

Log Message:
1320-1322


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.133 -r1.1.2.134 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.133 src/doc/CHANGES-7.1:1.1.2.134
--- src/doc/CHANGES-7.1:1.1.2.133	Wed Dec 14 10:52:38 2016
+++ src/doc/CHANGES-7.1	Wed Dec 14 19:33:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.133 2016/12/14 10:52:38 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.134 2016/12/14 19:33:33 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7573,3 +7573,26 @@ external/public-domain/tz/tzdata2netbsd 
 	Update tzdata to 2016j.
 	[kre, ticket #1324]
 
+sys/external/bsd/drm2/drm/drmfb.c		1.3
+sys/external/bsd/drm2/i915drm/intelfb.c		1.14
+sys/external/bsd/drm2/include/drm/drmfb.h	1.2
+sys/external/bsd/drm2/nouveau/nouveaufb.c	1.4
+
+	Fix misaligned linebytes in nouveaufb.  PR kern/51181.
+	[riastradh, ticket #1322]
+
+sys/dev/usb/usbdevs1.728
+sys/dev/usb/usbdevs_data.h			regen
+sys/dev/usb/usbdevs.hregen
+
+	Rename "CH341 serial/parallel" to "CH341 USB-Serial Bridge",
+	and add a second device id for this chip.
+	[bouyer, ticket #1320]
+
+sys/dev/usb/uchcom.c1.17
+
+	- For newer (0x30-on) CH340 devices, don't update LCR1/LCR2.
+	  With this change, currently available devices now work.
+	- Match USB_PRODUCT_WINCHIPHEAD2_CH341_2.
+	[bouyer, ticket #1321]
+

CVS commit: [netbsd-7] src/sys/dev/usb

2016-12-14 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Dec 14 19:18:58 UTC 2016

Modified Files:
src/sys/dev/usb [netbsd-7]: uchcom.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1321):
sys/dev/usb/uchcom.c: revision 1.17
Followling an advice in a linux forum, don't update LCR1/LCR2.
With this change this CH340 usb/serial based device:
https://www.olimex.com/Products/Breadboarding/BB-CH340T/open-source-hardware
(the chip is written H340T)
works as expected. As I'm not sure if this is needed for older device,
make this change for sc_version 0x30 or newer only.
While there, match USB_PRODUCT_WINCHIPHEAD2_CH341_2 too.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/dev/usb/uchcom.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/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.13 src/sys/dev/usb/uchcom.c:1.13.4.1
--- src/sys/dev/usb/uchcom.c:1.13	Sat Mar 15 19:20:27 2014
+++ src/sys/dev/usb/uchcom.c	Wed Dec 14 19:18:58 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uchcom.c,v 1.13 2014/03/15 19:20:27 martin Exp $	*/
+/*	$NetBSD: uchcom.c,v 1.13.4.1 2016/12/14 19:18:58 snj Exp $	*/
 
 /*
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13 2014/03/15 19:20:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.4.1 2016/12/14 19:18:58 snj Exp $");
 
 /*
  * driver for WinChipHead CH341/340, the worst USB-serial chip in the world.
@@ -91,6 +91,7 @@ int	uchcomdebug = 0;
 #define UCHCOM_REG_LCR2		0x25
 
 #define UCHCOM_VER_20		0x20
+#define UCHCOM_VER_30		0x30
 
 #define UCHCOM_BASE_UNKNOWN	0
 #define UCHCOM_BPS_MOD_BASE	2000
@@ -176,6 +177,7 @@ static const struct uchcom_divider_recor
 static const struct usb_devno uchcom_devs[] = {
 	{ USB_VENDOR_WINCHIPHEAD, USB_PRODUCT_WINCHIPHEAD_CH341SER },
 	{ USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341 },
+	{ USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341_2 },
 };
 #define uchcom_lookup(v, p)	usb_lookup(uchcom_devs, v, p)
 
@@ -570,6 +572,7 @@ update_version(struct uchcom_softc *sc)
 		usbd_errstr(err));
 		return EIO;
 	}
+	DPRINTF(("%s: update_version %d\n", device_xname(sc->sc_dev), sc->sc_version));
 
 	return 0;
 }
@@ -715,50 +718,52 @@ set_dte_rate(struct uchcom_softc *sc, ui
 static int
 set_line_control(struct uchcom_softc *sc, tcflag_t cflag)
 {
-	usbd_status err;
-	uint8_t lcr1val = 0, lcr2val = 0;
+	if (sc->sc_version < UCHCOM_VER_30) {
+		usbd_status err;
+		uint8_t lcr1val = 0, lcr2val = 0;
 
-	err = read_reg(sc, UCHCOM_REG_LCR1, , UCHCOM_REG_LCR2, );
-	if (err) {
-		aprint_error_dev(sc->sc_dev, "cannot get LCR: %s\n",
-		usbd_errstr(err));
-		return EIO;
-	}
+		err = read_reg(sc, UCHCOM_REG_LCR1, , UCHCOM_REG_LCR2, );
+		if (err) {
+			aprint_error_dev(sc->sc_dev, "cannot get LCR: %s\n",
+			usbd_errstr(err));
+			return EIO;
+		}
 
-	lcr1val &= ~UCHCOM_LCR1_MASK;
-	lcr2val &= ~UCHCOM_LCR2_MASK;
+		lcr1val &= ~UCHCOM_LCR1_MASK;
+		lcr2val &= ~UCHCOM_LCR2_MASK;
 
-	/*
-	 * XXX: it is difficult to handle the line control appropriately:
-	 *   - CS8, !CSTOPB and any parity mode seems ok, but
-	 *   - the chip doesn't have the function to calculate parity
-	 * in !CS8 mode.
-	 *   - it is unclear that the chip supports CS5,6 mode.
-	 *   - it is unclear how to handle stop bits.
-	 */
-
-	switch (ISSET(cflag, CSIZE)) {
-	case CS5:
-	case CS6:
-	case CS7:
-		return EINVAL;
-	case CS8:
-		break;
-	}
+		/*
+		 * XXX: it is difficult to handle the line control appropriately:
+		 *   - CS8, !CSTOPB and any parity mode seems ok, but
+		 *   - the chip doesn't have the function to calculate parity
+		 * in !CS8 mode.
+		 *   - it is unclear that the chip supports CS5,6 mode.
+		 *   - it is unclear how to handle stop bits.
+		 */
+
+		switch (ISSET(cflag, CSIZE)) {
+		case CS5:
+		case CS6:
+		case CS7:
+			return EINVAL;
+		case CS8:
+			break;
+		}
 
-	if (ISSET(cflag, PARENB)) {
-		lcr1val |= UCHCOM_LCR1_PARENB;
-		if (ISSET(cflag, PARODD))
-			lcr2val |= UCHCOM_LCR2_PARODD;
-		else
-			lcr2val |= UCHCOM_LCR2_PAREVEN;
-	}
+		if (ISSET(cflag, PARENB)) {
+			lcr1val |= UCHCOM_LCR1_PARENB;
+			if (ISSET(cflag, PARODD))
+lcr2val |= UCHCOM_LCR2_PARODD;
+			else
+lcr2val |= UCHCOM_LCR2_PAREVEN;
+		}
 
-	err = write_reg(sc, UCHCOM_REG_LCR1, lcr1val, UCHCOM_REG_LCR2, lcr2val);
-	if (err) {
-		aprint_error_dev(sc->sc_dev, "cannot set LCR: %s\n",
-		usbd_errstr(err));
-		return EIO;
+		err = write_reg(sc, UCHCOM_REG_LCR1, lcr1val, UCHCOM_REG_LCR2, lcr2val);
+		if (err) {
+			aprint_error_dev(sc->sc_dev, "cannot set LCR: %s\n",
+			usbd_errstr(err));
+			return EIO;
+		}
 	}
 
 	return 0;

CVS commit: [netbsd-7] src/sys/dev/usb

2016-12-14 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Dec 14 19:16:56 UTC 2016

Modified Files:
src/sys/dev/usb [netbsd-7]: usbdevs.h usbdevs_data.h

Log Message:
regen for ticket 1320


To generate a diff of this commit:
cvs rdiff -u -r1.672.2.6 -r1.672.2.7 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.673.2.6 -r1.673.2.7 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.672.2.6 src/sys/dev/usb/usbdevs.h:1.672.2.7
--- src/sys/dev/usb/usbdevs.h:1.672.2.6	Thu Dec  8 07:50:15 2016
+++ src/sys/dev/usb/usbdevs.h	Wed Dec 14 19:16:55 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.672.2.6 2016/12/08 07:50:15 snj Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.672.2.7 2016/12/14 19:16:55 snj Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp
+ *	NetBSD: usbdevs,v 1.680.2.7 2016/12/14 19:16:14 snj Exp
  */
 
 /*
@@ -3384,7 +3384,8 @@
 
 /* WinChipHead products */
 #define	USB_PRODUCT_WINCHIPHEAD_CH341SER	0x5523		/* CH341/CH340 USB-Serial Bridge */
-#define	USB_PRODUCT_WINCHIPHEAD2_CH341	0x7523		/* CH341 serial/parallel */
+#define	USB_PRODUCT_WINCHIPHEAD2_CH341	0x7523		/* CH341 USB-Serial Bridge */
+#define	USB_PRODUCT_WINCHIPHEAD2_CH341_2	0x5523		/* CH341 USB-Serial Bridge */
 
 /* Wistron NeWeb products */
 #define	USB_PRODUCT_WISTRONNEWEB_WNC0600	0x0326		/* WNC-0600USB */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.673.2.6 src/sys/dev/usb/usbdevs_data.h:1.673.2.7
--- src/sys/dev/usb/usbdevs_data.h:1.673.2.6	Thu Dec  8 07:50:15 2016
+++ src/sys/dev/usb/usbdevs_data.h	Wed Dec 14 19:16:55 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.673.2.6 2016/12/08 07:50:15 snj Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.673.2.7 2016/12/14 19:16:55 snj Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp
+ *	NetBSD: usbdevs,v 1.680.2.7 2016/12/14 19:16:14 snj Exp
  */
 
 /*
@@ -10184,7 +10184,11 @@ const struct usb_product usb_products[] 
 	},
 	{
 	USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341,
-	"CH341 serial/parallel",
+	"CH341 USB-Serial Bridge",
+	},
+	{
+	USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341_2,
+	"CH341 USB-Serial Bridge",
 	},
 	{
 	USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_WNC0600,
@@ -10535,4 +10539,4 @@ const struct usb_product usb_products[] 
 	"Prestige",
 	},
 };
-const int usb_nproducts = 2084;
+const int usb_nproducts = 2085;

CVS commit: [netbsd-7] src/sys/dev/usb

2016-12-14 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Dec 14 19:16:14 UTC 2016

Modified Files:
src/sys/dev/usb [netbsd-7]: usbdevs

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1320):
sys/dev/usb/usbdevs: revision 1.728
Rename "CH341 serial/parallel" to "CH341 USB-Serial Bridge", and
add a second device id for this chip.
>From FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.680.2.6 -r1.680.2.7 src/sys/dev/usb/usbdevs

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/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.680.2.6 src/sys/dev/usb/usbdevs:1.680.2.7
--- src/sys/dev/usb/usbdevs:1.680.2.6	Thu Dec  8 07:49:42 2016
+++ src/sys/dev/usb/usbdevs	Wed Dec 14 19:16:14 2016
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp $
+$NetBSD: usbdevs,v 1.680.2.7 2016/12/14 19:16:14 snj Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -3377,7 +3377,8 @@ product WESTERN EXTHDD		0x0400	External 
 
 /* WinChipHead products */
 product WINCHIPHEAD CH341SER	0x5523	CH341/CH340 USB-Serial Bridge
-product WINCHIPHEAD2 CH341	0x7523	CH341 serial/parallel
+product WINCHIPHEAD2 CH341	0x7523	CH341 USB-Serial Bridge
+product WINCHIPHEAD2 CH341_2	0x5523	CH341 USB-Serial Bridge
 
 /* Wistron NeWeb products */
 product WISTRONNEWEB WNC0600	0x0326	WNC-0600USB

CVS commit: [netbsd-7] src/sys/external/bsd/drm2

2016-12-14 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Dec 14 19:13:24 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/drm [netbsd-7]: drmfb.c
src/sys/external/bsd/drm2/i915drm [netbsd-7]: intelfb.c
src/sys/external/bsd/drm2/include/drm [netbsd-7]: drmfb.h
src/sys/external/bsd/drm2/nouveau [netbsd-7]: nouveaufb.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1322):
sys/external/bsd/drm2/drm/drmfb.c: revision 1.3
sys/external/bsd/drm2/i915drm/intelfb.c: revision 1.14
sys/external/bsd/drm2/include/drm/drmfb.h: revision 1.2
sys/external/bsd/drm2/nouveau/nouveaufb.c: revision 1.4
add da_fb_linebytes to drmfb_attach_args and use it to pass linebytes
from nouveau code to drmfb. keep the same linebytes logic for i915.
nvidia hardware needs 256 byte alignment, so aligning to just 64 was
not enough.
fixes broken console with a width of 1440px (PR kern/51181)
ok riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/external/bsd/drm2/drm/drmfb.c
cvs rdiff -u -r1.9.4.3 -r1.9.4.4 src/sys/external/bsd/drm2/i915drm/intelfb.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
src/sys/external/bsd/drm2/include/drm/drmfb.h
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \
src/sys/external/bsd/drm2/nouveau/nouveaufb.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/drm2/drm/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.1.2.3 src/sys/external/bsd/drm2/drm/drmfb.c:1.1.2.4
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.1.2.3	Thu Feb 11 23:17:06 2016
+++ src/sys/external/bsd/drm2/drm/drmfb.c	Wed Dec 14 19:13:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: drmfb.c,v 1.1.2.3 2016/02/11 23:17:06 snj Exp $	*/
+/*	$NetBSD: drmfb.c,v 1.1.2.4 2016/12/14 19:13:24 snj Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.1.2.3 2016/02/11 23:17:06 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.1.2.4 2016/12/14 19:13:24 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -103,9 +103,7 @@ drmfb_attach(struct drmfb_softc *sc, con
 	prop_dictionary_set_uint32(dict, "width", sizes->surface_width);
 	prop_dictionary_set_uint32(dict, "height", sizes->surface_height);
 	prop_dictionary_set_uint8(dict, "depth", sizes->surface_bpp);
-	prop_dictionary_set_uint16(dict, "linebytes",
-	roundup2((sizes->surface_width * howmany(sizes->surface_bpp, 8)),
-		64));
+	prop_dictionary_set_uint16(dict, "linebytes", da->da_fb_linebytes);
 	prop_dictionary_set_uint32(dict, "address", 0); /* XXX >32-bit */
 	CTASSERT(sizeof(uintptr_t) <= sizeof(uint64_t));
 	prop_dictionary_set_uint64(dict, "virtual_address",

Index: src/sys/external/bsd/drm2/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.9.4.3 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.9.4.4
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.9.4.3	Thu Apr 23 07:31:17 2015
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c	Wed Dec 14 19:13:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: intelfb.c,v 1.9.4.3 2015/04/23 07:31:17 snj Exp $	*/
+/*	$NetBSD: intelfb.c,v 1.9.4.4 2016/12/14 19:13:24 snj Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.9.4.3 2015/04/23 07:31:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.9.4.4 2016/12/14 19:13:24 snj Exp $");
 
 #include 
 #include 
@@ -164,11 +164,14 @@ intelfb_attach_task(struct i915drmkms_ta
 	struct intelfb_softc *const sc = container_of(task,
 	struct intelfb_softc, sc_attach_task);
 	const struct intelfb_attach_args *const ifa = >sc_ifa;
+	const struct drm_fb_helper_surface_size *const sizes = >ifa_fb_sizes;
 	const struct drmfb_attach_args da = {
 		.da_dev = sc->sc_dev,
 		.da_fb_helper = ifa->ifa_fb_helper,
 		.da_fb_sizes = >ifa_fb_sizes,
 		.da_fb_vaddr = bus_space_vaddr(ifa->ifa_fb_bst, sc->sc_fb_bsh),
+		.da_fb_linebytes = roundup2((sizes->surface_width *
+		howmany(sizes->surface_bpp, 8)), 64),
 		.da_params = _drmfb_params,
 	};
 	int error;

Index: src/sys/external/bsd/drm2/include/drm/drmfb.h
diff -u src/sys/external/bsd/drm2/include/drm/drmfb.h:1.1.2.2 src/sys/external/bsd/drm2/include/drm/drmfb.h:1.1.2.3
--- src/sys/external/bsd/drm2/include/drm/drmfb.h:1.1.2.2	Fri Mar  6 21:39:10 2015
+++ src/sys/external/bsd/drm2/include/drm/drmfb.h	Wed Dec 14 19:13:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: drmfb.h,v 1.1.2.2 2015/03/06 21:39:10 snj Exp $	*/
+/*	$NetBSD: drmfb.h,v 1.1.2.3 2016/12/14 19:13:24 snj Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -76,6 +76,7 @@ struct drmfb_attach_args {
 	struct drm_fb_helper		*da_fb_helper;
 	const struct drm_fb_helper_surface_size	*da_fb_sizes;
 	void*da_fb_vaddr;
+	uint32_t			da_fb_linebytes;
 	const struct drmfb_params	*da_params;
 };
 

Index:

CVS commit: [netbsd-7] src/doc

2016-12-14 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Dec 14 10:52:39 UTC 2016

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

Log Message:
Ammend #1305 for additional changes


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.132 -r1.1.2.133 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.132 src/doc/CHANGES-7.1:1.1.2.133
--- src/doc/CHANGES-7.1:1.1.2.132	Wed Dec 14 08:21:17 2016
+++ src/doc/CHANGES-7.1	Wed Dec 14 10:52:38 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.132 2016/12/14 08:21:17 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.133 2016/12/14 10:52:38 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7524,8 +7524,7 @@ distrib/sets/lists/xdebug/md.i386		1.21 
 distrib/sets/lists/xserver/md.amd64		1.85-1.87
 distrib/sets/lists/xserver/md.i386		1.103-1.105
 external/mit/xorg/lib/Makefile			1.36
-external/mit/xorg/lib/gallium/Makefile		1.8
-external/mit/xorg/lib/gallium/Makefile		1.9
+external/mit/xorg/lib/gallium/Makefile		1.8,1.9,1.11,1.15
 external/mit/xorg/lib/libdrm/drm/Makefile	1.7
 external/mit/xorg/lib/libdrm_nouveau/Makefile	1.1
 external/mit/xorg/lib/libdrm_nouveau/shlib_version 1.1

CVS commit: [netbsd-7] src/external/mit/xorg/lib/gallium

2016-12-14 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Dec 14 10:50:52 UTC 2016

Modified Files:
src/external/mit/xorg/lib/gallium [netbsd-7]: Makefile

Log Message:
Pull up revisions 1.11 and 1.15, requested by snj in #1305:

don't look for libdrm_nouveau unless we've built it.
only build the radeon and nouveau drivers on i386/amd64/evbarm,
where they're useful.  this saves almost 2MB in text/data on shark.


To generate a diff of this commit:
cvs rdiff -u -r1.6.2.4 -r1.6.2.5 src/external/mit/xorg/lib/gallium/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/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.6.2.4 src/external/mit/xorg/lib/gallium/Makefile:1.6.2.5
--- src/external/mit/xorg/lib/gallium/Makefile:1.6.2.4	Mon Dec 12 09:32:35 2016
+++ src/external/mit/xorg/lib/gallium/Makefile	Wed Dec 14 10:50:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6.2.4 2016/12/12 09:32:35 msaitoh Exp $
+# $NetBSD: Makefile,v 1.6.2.5 2016/12/14 10:50:52 martin Exp $
 
 # Link the gallium mega driver.
 
@@ -13,16 +13,7 @@ LIB=		gallium_dri
 DRIDIR=		${X11USRLIBDIR}/modules/dri
 DRIDEBUGDIR=	${DEBUGDIR}${X11USRLIBDIR}/modules/dri
 
-DRIVERS=	kms_swrast swrast
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-DRIVERS+=	r600 nouveau
-.endif
-
-CPPFLAGS+= \
-	-I${DESTDIR}${X11INCDIR}/libdrm
-
-# cargo culted.
-#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
 
 GALLIUM_SUBDIRS= \
 	auxiliary \
@@ -44,21 +35,44 @@ GALLIUM_SUBDIRS= \
 	drivers/noop \
 	drivers/trace \
 	drivers/rbug \
+	drivers/softpipe \
+	winsys/sw/null \
+	winsys/sw/dri \
+	winsys/sw/kms-dri \
+	state_trackers/dri
+
+GALLIUM_SUBDIRS_ATI= \
 	drivers/radeon \
 	drivers/r600 \
 	drivers/r600/sb \
+	winsys/radeon/drm
+
+GALLIUM_SUBDIRS_NOUVEAU= \
 	drivers/nouveau \
 	drivers/nouveau/nv30 \
 	drivers/nouveau/nv50 \
 	drivers/nouveau/codegen \
 	drivers/nouveau/nvc0 \
-	drivers/softpipe \
-	winsys/radeon/drm \
-	winsys/nouveau/drm \
-	winsys/sw/null \
-	winsys/sw/dri \
-	winsys/sw/kms-dri \
-	state_trackers/dri
+	winsys/nouveau/drm
+
+BUILD_RADEON=0
+BUILD_NOUVEAU=0
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_RADEON=1
+.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_NOUVEAU=1
+.endif
+
+DRIVERS=		kms_swrast swrast
+.if ${BUILD_RADEON} == 1
+DRIVERS+=		r600
+GALLIUM_SUBDIRS+=	${GALLIUM_SUBDIRS_ATI}
+.endif
+.if ${BUILD_NOUVEAU} == 1
+DRIVERS+=		nouveau
+GALLIUM_SUBDIRS+=	${GALLIUM_SUBDIRS_NOUVEAU}
+.endif
 
 GALLIUM_NAMES=	kms_swrast r600 swrant
 
@@ -535,10 +549,17 @@ SRCS+=	${GALLIUM_SOURCES.${_d}}
 
 .include "../libloader.mk"
 
+
 LIBDPLIBS+=	m		${.CURDIR}/../../../../../lib/libm
+.if ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
 LIBDPLIBS+= 	drm		${.CURDIR}/../libdrm
+.if ${BUILD_RADEON} == 1
 LIBDPLIBS+= 	drm_radeon	${.CURDIR}/../libdrm_radeon
+.endif	# ${BUILD_RADEON} == 1
+.if ${BUILD_NOUVEAU} == 1
 LIBDPLIBS+= 	drm_nouveau	${.CURDIR}/../libdrm_nouveau
+.endif	# ${BUILD_NOUVEAU} == 1
+.endif	# ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
 LIBDPLIBS+= 	glapi		${.CURDIR}/../libglapi
 LIBDPLIBS+=	expat		${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
 
@@ -576,14 +597,22 @@ CPPFLAGS.target.c += \
 	-DGALLIUM_NOOP \
 	-DGALLIUM_RBUG \
 	-DGALLIUM_TRACE \
-	-DGALLIUM_R200 \
-	-DGALLIUM_R600 \
-	-DGALLIUM_NOUVEAU \
 	-DGALLIUM_SOFTPIPE \
 	-I${X11SRCDIR.MesaLib}/src/gallium/state_trackers/dri \
 	-I${X11SRCDIR.MesaLib}/src/loader \
 	-I${X11SRCDIR.MesaLib}/src/gallium/winsys
 
+.if ${BUILD_RADEON} == 1
+CPPFLAGS.target.c += \
+	-DGALLIUM_R200 \
+	-DGALLIUM_R600
+.endif	# ${BUILD_RADEON} == 1
+
+.if ${BUILD_NOUVEAU} == 1
+CPPFLAGS.target.c += \
+	-DGALLIUM_NOUVEAU
+.endif	# ${BUILD_NOUVEAU} == 1
+
 CWARNFLAGS.clang+=	-Wno-error=constant-conversion \
 			-Wno-error=tautological-constant-out-of-range-compare \
 			-Wno-error=pointer-sign \

CVS commit: [netbsd-7] src/doc

2016-12-14 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Dec 14 08:21:17 UTC 2016

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

Log Message:
update 1324


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.131 -r1.1.2.132 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.131 src/doc/CHANGES-7.1:1.1.2.132
--- src/doc/CHANGES-7.1:1.1.2.131	Tue Dec 13 07:34:53 2016
+++ src/doc/CHANGES-7.1	Wed Dec 14 08:21:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.131 2016/12/13 07:34:53 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.132 2016/12/14 08:21:17 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7543,6 +7543,7 @@ lib/libc/time/zic.cpatch
 	[kre, ticket #1323]
 
 distrib/sets/lists/base/mi			1.1125, 1.1128, 1.1132, 1.1137, 1.1139, 1.1140
+doc/3RDPARTY	patch
 external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.3
 external/public-domain/tz/dist/LICENSE  up to 1.1.1.2
 external/public-domain/tz/dist/Makefile up to 1.1.1.16

CVS commit: [netbsd-7] src/doc

2016-12-14 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Dec 14 08:20:42 UTC 2016

Modified Files:
src/doc [netbsd-7]: 3RDPARTY

Log Message:
Apply patch (requested by kre in ticket #1324):
Update tz info.


To generate a diff of this commit:
cvs rdiff -u -r1.1145.2.31 -r1.1145.2.32 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1145.2.31 src/doc/3RDPARTY:1.1145.2.32
--- src/doc/3RDPARTY:1.1145.2.31	Sat Nov  5 17:54:05 2016
+++ src/doc/3RDPARTY	Wed Dec 14 08:20:41 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1145.2.31 2016/11/05 17:54:05 martin Exp $
+#	$NetBSD: 3RDPARTY,v 1.1145.2.32 2016/12/14 08:20:41 snj Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1300,15 +1300,15 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2014j / tzdata2015f
-Current Vers:	tzcode2015b / tzdata2015f
+Version:	tzcode2014j (+ upgraded zic) / tzdata2016j
+Current Vers:	tzcode2016j / tzdata2016j
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
 Old Archive Site:	ftp://elsie.nci.nih.gov/pub/
 Home Page:	http://www.iana.org/time-zones
 Mailing List:	t...@iana.org
-Responsible:	kleink, christos, apb
+Responsible:	kleink, christos, kre
 License:	Public domain
 Location:	lib/libc/time/zoneinfo, external/public-domain/tz/share
 Notes:

CVS commit: [netbsd-7] src/doc

2016-12-12 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Dec 13 07:34:53 UTC 2016

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

Log Message:
1323, 1324


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.130 -r1.1.2.131 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.130 src/doc/CHANGES-7.1:1.1.2.131
--- src/doc/CHANGES-7.1:1.1.2.130	Mon Dec 12 10:22:20 2016
+++ src/doc/CHANGES-7.1	Tue Dec 13 07:34:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.130 2016/12/12 10:22:20 msaitoh Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.131 2016/12/13 07:34:53 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7535,3 +7535,41 @@ share/mk/bsd.own.mk1.875 via patch
 
 	Build xf86-video-nouveau and libdrm_nouveau on x86.
 	[snj, ticket #1305]
+
+lib/libc/time/private.hpatch
+lib/libc/time/zic.cpatch
+
+	Make zic properly parse newer tzdata files.
+	[kre, ticket #1323]
+
+distrib/sets/lists/base/mi			1.1125, 1.1128, 1.1132, 1.1137, 1.1139, 1.1140
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.3
+external/public-domain/tz/dist/LICENSE  up to 1.1.1.2
+external/public-domain/tz/dist/Makefile up to 1.1.1.16
+external/public-domain/tz/dist/NEWS up to 1.1.1.16
+external/public-domain/tz/dist/README   up to 1.1.1.5
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.6
+external/public-domain/tz/dist/Theory   up to 1.1.1.9
+external/public-domain/tz/dist/africa   up to 1.1.1.9
+external/public-domain/tz/dist/antarctica   up to 1.1.1.7
+external/public-domain/tz/dist/asia up to 1.1.1.15
+external/public-domain/tz/dist/australasia  up to 1.1.1.10
+external/public-domain/tz/dist/backward up to 1.1.1.6
+external/public-domain/tz/dist/backzone up to 1.1.1.10
+external/public-domain/tz/dist/etcetera up to 1.1.1.2
+external/public-domain/tz/dist/europe   up to 1.1.1.16
+external/public-domain/tz/dist/factory  up to 1.1.1.2
+external/public-domain/tz/dist/iso3166.tab  up to 1.1.1.4
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.6
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.7
+external/public-domain/tz/dist/northamerica up to 1.1.1.14
+external/public-domain/tz/dist/southamerica up to 1.1.1.10
+external/public-domain/tz/dist/version  up to 1.1.1.3
+external/public-domain/tz/dist/zone.tab up to 1.1.1.10
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.12
+external/public-domain/tz/share/zoneinfo/Makefile up to 1.3
+external/public-domain/tz/tzdata2netbsd up to 1.11
+
+	Update tzdata to 2016j.
+	[kre, ticket #1324]
+

CVS commit: [netbsd-7] src/lib/libc/time

2016-12-12 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Dec 13 06:39:13 UTC 2016

Modified Files:
src/lib/libc/time [netbsd-7]: private.h zic.c

Log Message:
Pull up following revision(s) (requested by kre in ticket #1323):
lib/libc/time/private.h: patch
lib/libc/time/zic.c: patch
Make zic properly parse newer tzdata files.


To generate a diff of this commit:
cvs rdiff -u -r1.33.2.1 -r1.33.2.2 src/lib/libc/time/private.h
cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/lib/libc/time/zic.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/libc/time/private.h
diff -u src/lib/libc/time/private.h:1.33.2.1 src/lib/libc/time/private.h:1.33.2.2
--- src/lib/libc/time/private.h:1.33.2.1	Sun Jan 25 09:11:03 2015
+++ src/lib/libc/time/private.h	Tue Dec 13 06:39:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: private.h,v 1.33.2.1 2015/01/25 09:11:03 martin Exp $	*/
+/*	$NetBSD: private.h,v 1.33.2.2 2016/12/13 06:39:13 snj Exp $	*/
 
 #ifndef PRIVATE_H
 #define PRIVATE_H
@@ -477,6 +477,17 @@ const char *	scheck(const char * string,
 #define TYPE_SIGNED(type) (/*CONSTCOND*/((type) -1) < 0)
 #endif /* !defined TYPE_SIGNED */
 
+#define TWOS_COMPLEMENT(t) (/*CONSTCOND*/(t) ~ (t) 0 < 0)
+
+/* Max and min values of the integer type T, of which only the bottom
+   B bits are used, and where the highest-order used bit is considered
+   to be a sign bit if T is signed.  */
+#define MAXVAL(t, b) /*LINTED*/	\
+  ((t) (((t) 1 << ((b) - 1 - TYPE_SIGNED(t)))			\
+	- 1 + ((t) 1 << ((b) - 1 - TYPE_SIGNED(t)
+#define MINVAL(t, b)		\
+  ((t) (TYPE_SIGNED(t) ? - TWOS_COMPLEMENT(t) - MAXVAL(t, b) : 0))
+
 #ifdef LOCALTIME_IMPLEMENTATION
 /* The minimum and maximum finite time values.  */
 static time_t const time_t_min =

Index: src/lib/libc/time/zic.c
diff -u src/lib/libc/time/zic.c:1.46.2.1 src/lib/libc/time/zic.c:1.46.2.2
--- src/lib/libc/time/zic.c:1.46.2.1	Sun Jan 25 09:11:03 2015
+++ src/lib/libc/time/zic.c	Tue Dec 13 06:39:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: zic.c,v 1.46.2.1 2015/01/25 09:11:03 martin Exp $	*/
+/*	$NetBSD: zic.c,v 1.46.2.2 2016/12/13 06:39:13 snj Exp $	*/
 /*
 ** This file is in the public domain, so clarified as of
 ** 2006-07-17 by Arthur David Olson.
@@ -10,7 +10,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: zic.c,v 1.46.2.1 2015/01/25 09:11:03 martin Exp $");
+__RCSID("$NetBSD: zic.c,v 1.46.2.2 2016/12/13 06:39:13 snj Exp $");
 #endif /* !defined lint */
 
 #include "private.h"
@@ -88,6 +88,7 @@ struct zone {
 	zic_t		z_gmtoff;
 	const char *	z_rule;
 	const char *	z_format;
+	char		z_format_specifier;
 
 	zic_t		z_stdoff;
 
@@ -145,6 +146,16 @@ static bool	yearistype(int year, const c
 static int	atcomp(const void *avp, const void *bvp);
 static void	updateminmax(zic_t x);
 
+/* Bound on length of what %z can expand to.  */
+enum { PERCENT_Z_LEN_BOUND = sizeof "+995959" - 1 };
+
+/* If true, work around a bug in Qt 5.6.1 and earlier, which mishandles
+   tz binary files whose POSIX-TZ-style strings contain '<'; see
+   QTBUG-53071 .  This
+   workaround will no longer be needed when Qt 5.6.1 and earlier are
+   obsolete, say in the year 2021.  */
+enum { WORK_AROUND_QTBUG_53071 = 1 };
+
 static int		charcnt;
 static bool		errors;
 static bool		warnings;
@@ -154,7 +165,7 @@ static bool		leapseen;
 static zic_t		leapminyear;
 static zic_t		leapmaxyear;
 static int		linenum;
-static size_t		max_abbrvar_len;
+static size_t		max_abbrvar_len = PERCENT_Z_LEN_BOUND;
 static size_t		max_format_len;
 static zic_t		max_year;
 static zic_t		min_year;
@@ -350,6 +361,7 @@ static const int	len_years[2] = {
 
 static struct attype {
 	zic_t		at;
+	bool		dontmerge;
 	unsigned char	type;
 } *			attypes;
 static zic_t		gmtoffs[TZ_MAX_TYPES];
@@ -588,7 +600,7 @@ _("%s: More than one -L option specified
 noise = true;
 break;
 			case 's':
-warning(_("-s ignored\n"));
+warning(_("-s ignored"));
 break;
 		}
 	if (optind == argc - 1 && strcmp(argv[optind], "=") == 0)
@@ -641,31 +653,44 @@ _("%s: More than one -L option specified
 	return errors ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
-static void
+static bool
 componentcheck(char const *name, char const *component,
 	   char const *component_end)
 {
 	enum { component_len_max = 14 };
-	size_t component_len = component_end - component;
+	ptrdiff_t component_len = component_end - component;
+	if (component_len == 0) {
+	  if (!*name)
+	error (_("empty file name"));
+	  else
+	error (_(component == name
+		 ? "file name '%s' begins with '/'"
+		 : *component_end
+		 ? "file name '%s' contains '//'"
+		 : "file name '%s' ends with '/'"),
+		   name);
+	  return false;
+	}
 	if (0 < component_len && component_len <= 2
 	&& component[0] == '.' && component_end[-1] == '.') {
-		fprintf(stderr, _("%s: file name '%s' contains"
-  " '%.*s' component"),
-			progname, name,

CVS commit: [netbsd-7] src/doc

2016-12-12 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 10:22:20 UTC 2016

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

Log Message:
Update for ticket 1304.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.129 -r1.1.2.130 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.129 src/doc/CHANGES-7.1:1.1.2.130
--- src/doc/CHANGES-7.1:1.1.2.129	Mon Dec 12 09:34:08 2016
+++ src/doc/CHANGES-7.1	Mon Dec 12 10:22:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.129 2016/12/12 09:34:08 msaitoh Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.130 2016/12/12 10:22:20 msaitoh Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7381,9 +7381,137 @@ sys/external/bsd/drm2/ttm/ttm_bus_dma.c	
 - i915: avoid taking locks during interrupts
 	[snj, ticket #1280]
 
+xsrc/external/mit/xf86-video-nouveau/dist/COPYING patch
+xsrc/external/mit/xf86-video-nouveau/dist/Makefile.am patch
+xsrc/external/mit/xf86-video-nouveau/dist/ChangeLog patch
+xsrc/external/mit/xf86-video-nouveau/dist/INSTALL patch
+xsrc/external/mit/xf86-video-nouveau/dist/Makefile.in patch
+xsrc/external/mit/xf86-video-nouveau/dist/aclocal.m4 patch
+xsrc/external/mit/xf86-video-nouveau/dist/compile patch
+xsrc/external/mit/xf86-video-nouveau/dist/config.guess patch
+xsrc/external/mit/xf86-video-nouveau/dist/config.h.in patch
+xsrc/external/mit/xf86-video-nouveau/dist/config.sub patch
+xsrc/external/mit/xf86-video-nouveau/dist/configure patch
+xsrc/external/mit/xf86-video-nouveau/dist/configure.ac patch
+xsrc/external/mit/xf86-video-nouveau/dist/depcomp patch
+xsrc/external/mit/xf86-video-nouveau/dist/install-sh patch	
+xsrc/external/mit/xf86-video-nouveau/dist/ltmain.sh patch
+xsrc/external/mit/xf86-video-nouveau/dist/missing patch
+xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.am patch
+xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.in patch
+xsrc/external/mit/xf86-video-nouveau/dist/man/nouveau.man patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.am patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.in patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_dri2.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_wfb.c	patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_accel_common.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_const.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_type.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy85b5.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy90b5.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copya0b5.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_exa.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_local.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_accel.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_dma.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_rop.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv_shadow.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c patch
+xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c

CVS commit: [netbsd-7] src/external/mit/xorg

2016-12-12 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 10:01:17 UTC 2016

Added Files:
src/external/mit/xorg/lib/libdrm_nouveau [netbsd-7]: Makefile
shlib_version
src/external/mit/xorg/server/drivers/xf86-video-nouveau [netbsd-7]:
Makefile

Log Message:
Add three miissing files for ticket #1305 requested by snj.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2.2.2 src/external/mit/xorg/lib/libdrm_nouveau/Makefile \
src/external/mit/xorg/lib/libdrm_nouveau/shlib_version
cvs rdiff -u -r0 -r1.6.2.2 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile

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

Added files:

Index: src/external/mit/xorg/lib/libdrm_nouveau/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libdrm_nouveau/Makefile:1.2.2.2
--- /dev/null	Mon Dec 12 10:01:17 2016
+++ src/external/mit/xorg/lib/libdrm_nouveau/Makefile	Mon Dec 12 10:01:17 2016
@@ -0,0 +1,25 @@
+#  $NetBSD: Makefile,v 1.2.2.2 2016/12/12 10:01:17 msaitoh Exp $
+
+.include 
+
+LIB=	drm_nouveau
+.PATH: ${X11SRCDIR.drm}
+.PATH: ${X11SRCDIR.drm}/nouveau
+
+SRCS=	nouveau.c \
+	pushbuf.c \
+	bufctx.c \
+	abi16.c
+
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
+
+LIBDPLIBS=	drm	${.CURDIR}/../libdrm
+
+PKGCONFIG=	libdrm_nouveau
+PKGDIST=	drm
+
+.include "../libdrm/Makefile.defines"
+
+.include 
+.include 
Index: src/external/mit/xorg/lib/libdrm_nouveau/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libdrm_nouveau/shlib_version:1.2.2.2
--- /dev/null	Mon Dec 12 10:01:17 2016
+++ src/external/mit/xorg/lib/libdrm_nouveau/shlib_version	Mon Dec 12 10:01:17 2016
@@ -0,0 +1,4 @@
+#	$NetBSD: shlib_version,v 1.2.2.2 2016/12/12 10:01:17 msaitoh Exp $
+#
+major=2
+minor=0

Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.6.2.2
--- /dev/null	Mon Dec 12 10:01:17 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile	Mon Dec 12 10:01:17 2016
@@ -0,0 +1,51 @@
+#	$NetBSD: Makefile,v 1.6.2.2 2016/12/12 10:01:17 msaitoh Exp $
+
+DRIVER=		xf86-video-nouveau
+DRIVER_NAME=	nouveau_drv
+
+SRCS=		nouveau_copy.c \
+		nouveau_copy85b5.c \
+		nouveau_copy90b5.c \
+		nouveau_copya0b5.c \
+		nouveau_exa.c \
+		nouveau_xv.c \
+		nouveau_dri2.c \
+		nouveau_present.c \
+		nouveau_sync.c \
+		nouveau_wfb.c \
+		nv_accel_common.c \
+		nv_driver.c \
+		nv_shadow.c \
+		nv04_exa.c \
+		nv04_xv_ovl.c \
+		nv04_xv_blit.c \
+		nv10_exa.c \
+		nv10_xv_ovl.c \
+		nv30_exa.c \
+		nv30_xv_tex.c \
+		nv40_exa.c \
+		nv40_xv_tex.c \
+		nv50_accel.c \
+		nv50_exa.c \
+		nv50_xv.c \
+		nvc0_accel.c \
+		nvc0_exa.c \
+		nvc0_xv.c \
+		drmmode_display.c \
+		vl_hwmc.c
+
+LIBDPLIBS+=	drm_nouveau ${.CURDIR}/../../../lib/libdrm_nouveau
+
+MAN=		nouveau.4
+
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
+
+CPPFLAGS+=	-DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
+CPPFLAGS+=	-DNV_MINOR_VERSION=${PACKAGE_MINOR}
+CPPFLAGS+=	-DNV_PATCHLEVEL=${PACKAGE_PATCH}
+CPPFLAGS+=	-DNV_DRIVER_DATE=${DRIVER_DATE}
+
+.include "../Makefile.xf86-driver"
+
+# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
+DRIVER_DATE!=awk '/^Date:/{print "\"" $0 "\"";exit}' ${X11SRCDIR.${DRIVER}}/ChangeLog

CVS commit: [netbsd-7] src/doc

2016-12-12 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 09:34:08 UTC 2016

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

Log Message:
Ticket 1280, 1304 and 1305.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.128 -r1.1.2.129 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.128 src/doc/CHANGES-7.1:1.1.2.129
--- src/doc/CHANGES-7.1:1.1.2.128	Mon Dec 12 08:08:33 2016
+++ src/doc/CHANGES-7.1	Mon Dec 12 09:34:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.128 2016/12/12 08:08:33 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.129 2016/12/12 09:34:08 msaitoh Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7348,3 +7348,62 @@ usr.sbin/mld6query/mld6.c			1.15
 	PR/51353: Patrick Mackey: mld6query "-r" option is not recognised
 	[riastradh, ticket #1308]
 
+sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c 1.4
+sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_object.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c 1.11
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nvd0.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_base.c 1.5
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nv40.c 1.2
+sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/nouveau_subdev_devinit_nv04.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c 1.2
+sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_nv50.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c 1.7
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_dp.c 1.2
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c 1.4
+sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c 1.8
+sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c	1.7
+sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_driver.h 1.3
+sys/external/bsd/drm2/drm/drm_vma_manager.c	1.4
+sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h 1.14
+sys/external/bsd/drm2/include/drm/ttm/ttm_page_alloc.h 1.2
+sys/external/bsd/drm2/nouveau/nouveau_pci.c	1.8
+sys/external/bsd/drm2/ttm/ttm_bus_dma.c		1.2
+
+	DRMKMS fixes:
+	- nouveau:
+	  + fix non-DEBUG builds
+	  + misc cleanup
+  + use bus_space_subregion to get fifo channels out of mmio
+	registers
+- suspend/resume improvements
+- make sure rbtrees are empty on destruction
+- i915: avoid taking locks during interrupts
+	[snj, ticket #1280]
+
+xsrc/external/mit/xorg-server/dist/include/list.h	1.3
+
+	Add list_append() macro that xf86-video-nouveau 1.0.11 wants.
+	[snj, ticket #1304]
+
+distrib/sets/lists/xbase/md.amd64		1.15 via patch
+distrib/sets/lists/xbase/md.i386		1.29
+distrib/sets/lists/xcomp/md.amd64		1.43 via patch
+distrib/sets/lists/xcomp/md.i386		1.48 via patch
+distrib/sets/lists/xcomp/mi			1.175
+distrib/sets/lists/xdebug/md.amd64		1.22 via patch
+distrib/sets/lists/xdebug/md.i386		1.21 via patch
+distrib/sets/lists/xserver/md.amd64		1.85-1.87
+distrib/sets/lists/xserver/md.i386		1.103-1.105
+external/mit/xorg/lib/Makefile			1.36
+external/mit/xorg/lib/gallium/Makefile		1.8
+external/mit/xorg/lib/gallium/Makefile		1.9
+external/mit/xorg/lib/libdrm/drm/Makefile	1.7
+external/mit/xorg/lib/libdrm_nouveau/Makefile	1.1
+external/mit/xorg/lib/libdrm_nouveau/shlib_version 1.1
+external/mit/xorg/server/drivers/Makefile	1.70
+external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile 1.1, 1.2 via patch
+share/mk/bsd.own.mk1.875 via patch
+
+	Build xf86-video-nouveau and libdrm_nouveau on x86.
+	[snj, ticket #1305]

CVS commit: [netbsd-7] src

2016-12-12 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 09:32:35 UTC 2016

Modified Files:
src/distrib/sets/lists/xbase [netbsd-7]: md.amd64 md.i386
src/distrib/sets/lists/xcomp [netbsd-7]: md.amd64 md.i386 mi
src/distrib/sets/lists/xdebug [netbsd-7]: md.amd64 md.i386
src/distrib/sets/lists/xserver [netbsd-7]: md.amd64 md.i386
src/external/mit/xorg/lib [netbsd-7]: Makefile
src/external/mit/xorg/lib/gallium [netbsd-7]: Makefile
src/external/mit/xorg/lib/libdrm/drm [netbsd-7]: Makefile
src/external/mit/xorg/server/drivers [netbsd-7]: Makefile
src/share/mk [netbsd-7]: bsd.own.mk

Log Message:
Pull up following revision(s) (requested by snj in ticket #1305):
distrib/sets/lists/xbase/md.amd64: revision 1.15 via patch
distrib/sets/lists/xbase/md.i386: revision 1.29
distrib/sets/lists/xcomp/md.amd64: revision 1.43 via patch
distrib/sets/lists/xcomp/md.i386: revision 1.48 via patch
distrib/sets/lists/xcomp/mi: revision 1.175
distrib/sets/lists/xdebug/md.amd64: revision 1.22 via patch
distrib/sets/lists/xdebug/md.i386: revision 1.21 via patch
distrib/sets/lists/xserver/md.amd64: revisions 1.85-1.87
distrib/sets/lists/xserver/md.i386: revision 1.103-1.105
external/mit/xorg/lib/Makefile: revision 1.36
external/mit/xorg/lib/gallium/Makefile: revision 1.8, 1.9
external/mit/xorg/lib/libdrm/drm/Makefile: revision 1.7
external/mit/xorg/lib/libdrm_nouveau/Makefile: revision 1.1
external/mit/xorg/lib/libdrm_nouveau/shlib_version: revision 1.1
external/mit/xorg/server/drivers/Makefile: revision 1.70
external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile: revisions 
1.1, 1.2 via patch
share/mk/bsd.own.mk: revision 1.875 via patch
Build xf86-video-nouveau and libdrm_nouveau on x86.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.4.1 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.27 -r1.27.4.1 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.38 -r1.38.2.1 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.45 -r1.45.2.1 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.152.2.6 -r1.152.2.7 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.6.4.3 -r1.6.4.4 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.6.4.4 -r1.6.4.5 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.73.4.3 -r1.73.4.4 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.92.4.3 -r1.92.4.4 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.29.2.2 -r1.29.2.3 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.6.2.3 -r1.6.2.4 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.6 -r1.6.4.1 src/external/mit/xorg/lib/libdrm/drm/Makefile
cvs rdiff -u -r1.63.10.2 -r1.63.10.3 \
src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.829.2.9 -r1.829.2.10 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/distrib/sets/lists/xbase/md.amd64
diff -u src/distrib/sets/lists/xbase/md.amd64:1.11 src/distrib/sets/lists/xbase/md.amd64:1.11.4.1
--- src/distrib/sets/lists/xbase/md.amd64:1.11	Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xbase/md.amd64	Mon Dec 12 09:32:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.11 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: md.amd64,v 1.11.4.1 2016/12/12 09:32:34 msaitoh Exp $
 ./usr/X11R7/lib/libI810XvMC.so			-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1		-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1.0		-unknown-		xorg
@@ -14,4 +14,7 @@
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2.0		-unknown-		xorg
 ./usr/X11R7/share/pciids/pci.ids		-unknown-		obsolete

Index: src/distrib/sets/lists/xbase/md.i386
diff -u src/distrib/sets/lists/xbase/md.i386:1.27 src/distrib/sets/lists/xbase/md.i386:1.27.4.1
--- src/distrib/sets/lists/xbase/md.i386:1.27	Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xbase/md.i386	Mon Dec 12 09:32:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.27 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: md.i386,v 1.27.4.1 2016/12/12 09:32:34 msaitoh Exp $
 ./usr/X11R7/lib/libI810XvMC.so			-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1		-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1.0		-unknown-		xorg
@@ -14,4 +14,7 @@
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2		-unknown-		xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2.0		-unknown-		xorg

CVS commit: [netbsd-7] src/sys/external/bsd/drm2

2016-12-12 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Mon Dec 12 09:13:43 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_gpu_error.c
src/sys/external/bsd/drm2/dist/drm/nouveau [netbsd-7]: nouveau_bo.c
nouveau_connector.c nouveau_dp.c nouveau_gem.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/core [netbsd-7]:
nouveau_core_object.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device 
[netbsd-7]:
nouveau_engine_device_base.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp [netbsd-7]:
nouveau_engine_disp_nvd0.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo [netbsd-7]:
nouveau_engine_fifo_base.c nouveau_engine_fifo_nv40.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit 
[netbsd-7]:
nouveau_subdev_devinit_nv04.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm [netbsd-7]:
nouveau_subdev_mxm_mxms.c nouveau_subdev_mxm_nv50.c
src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]: radeon_ttm.c
src/sys/external/bsd/drm2/dist/drm/ttm [netbsd-7]: ttm_tt.c
src/sys/external/bsd/drm2/dist/include/drm/ttm [netbsd-7]:
ttm_bo_driver.h
src/sys/external/bsd/drm2/drm [netbsd-7]: drm_vma_manager.c
src/sys/external/bsd/drm2/include/drm [netbsd-7]: drm_wait_netbsd.h
src/sys/external/bsd/drm2/include/drm/ttm [netbsd-7]: ttm_page_alloc.h
src/sys/external/bsd/drm2/nouveau [netbsd-7]: nouveau_pci.c
src/sys/external/bsd/drm2/ttm [netbsd-7]: ttm_bus_dma.c

Log Message:
Pull up following revision(s) (requested by snj in ticket #1280):
sys/external/bsd/drm2/ttm/ttm_bus_dma.c: revision 1.2
sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h: revision 1.14
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_dp.c: revision 1.2
sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c: revision 1.7

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c:
 revision 1.11

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nv40.c:
 revision 1.2
sys/external/bsd/drm2/dist/include/drm/ttm/ttm_bo_driver.h: revision 1.3
sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c: revision 1.8
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c: revision 1.3
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c: revision 1.4

sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/nouveau_subdev_devinit_nv04.c:
 revision 1.3
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c: revision 1.7
sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_object.c: 
revision 1.3
sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c: revision 1.4

sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_mxms.c:
 revision 1.2

sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_nv50.c:
 revision 1.3

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nvd0.c:
 revision 1.3

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_base.c:
 revision 1.5
sys/external/bsd/drm2/include/drm/ttm/ttm_page_alloc.h: revision 1.2
sys/external/bsd/drm2/drm/drm_vma_manager.c: revision 1.4
sys/external/bsd/drm2/nouveau/nouveau_pci.c: revision 1.8
- fix non-debug build
- Use %"PRIx8", not %hx, for uint8_t.  %hx is for unsigned short.
- Flush unused function. Found by joerg.
- Make sure rbtrees are empty on desctruction.
  If related to PR kern/51076, might help catch the bug a bit earlier.
- revert rev 1.6.  we don't have access to those files as normal files
  and possible will get them directly elsewhere soon.
  (if i hack my nouveau to ignore fireware failure, it end up having
  a vaguely working console and slowly working X, which is better than
  the current situation.)
- Avoid possible null pointer dereference. Found by Coverity, CID 709895.
- Mark fallthrough to suppress Coverity complaints.
  CID 143119
  CID 143120
  CID 143121
  CID 143122
  CID 143123
  CID 143124
- Sanity-check that the encoder we found is not null.
  I think the previous code guarantees that finding this encoder should
  work, so this should be a moot point. CID 145720.
- Mark intended fallthrough to suppress Coverity CID 201378.
- Mark fallthrough with a comment to appease Coverity, CID 703385.
- Make it clearer to Coverity that there's no array overrun. CID 989067.
- Rework ttm tt swapin/swapout logic.
  Rather than handling `swapping in/out' here, per se, we let uvm do
  that, we interpret `swap out' as `deactivate pages', and we add
  generic ttm operations to wire and unwire pages, for the ttm_tt
  driver to use.
  This fixes certain graphics buffer eviction logic, which enables

CVS commit: [netbsd-7] src/doc

2016-12-12 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Dec 12 08:08:33 UTC 2016

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

Log Message:
tickets 1301-1303, 1306-1308


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.127 -r1.1.2.128 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.127 src/doc/CHANGES-7.1:1.1.2.128
--- src/doc/CHANGES-7.1:1.1.2.127	Fri Dec  9 05:41:31 2016
+++ src/doc/CHANGES-7.1	Mon Dec 12 08:08:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.127 2016/12/09 05:41:31 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.128 2016/12/12 08:08:33 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7216,3 +7216,135 @@ sys/edv/pci/pcidevs_data.h			regen
 	i82567V-3 is not ICH9 but ICH8.
 	[msaitoh, ticket #1300]
 
+sys/dev/mii/atphy.c1.18
+sys/dev/mii/ihphy.c1.10
+sys/dev/mii/ikphy.c1.12
+sys/dev/mii/inphy.c1.55
+sys/dev/mii/makphy.c1.42
+
+	Set mii_mpd{oui,model,rev}. It's required to check
+	the values in wm(4) correctly.
+	[msaitoh, ticket #1301]
+
+sys/dev/pci/if_wm.c1.390, 1.392-1.395, 1.397, 1.419-1.425, 1.427-1.428, 1.430-1.435, 1.437-1.453 via patch
+sys/dev/pci/if_wmreg.h1.89-1.93 via patch
+sys/dev/pci/if_wmvar.h1.31-1.32
+sys/dev/mii/mii.h1.19-1.20
+sys/dev/mii/igphyreg.h1.7-1.10
+sys/dev/mii/ikphyreg.h1.3
+sys/dev/mii/inbmphyreg.h			1.4-1.9
+
+	Update wm(4) up to if_wm.c rev. 1.453 except MSI/MSI-X, multiqueue and
+	NET_MPSAFE:
+	- Add I219 support. It's not stable so it's disabled by default.
+	- wm_gate_hw_phy_config_ich8lan() is for younger than PCH2.
+	- Drop the host wakeup bit after resetting PHY on PCH and newer
+	  devices.
+	- Increase delay while toggling LANPHYPC
+	- Move call of wm_reset() in wm_attach() after setting PHY and NVM
+	  related flags because those flags are used in wm_reset().
+	- Use mutex for NVM access on ICH8 and newer devices. Same as FreeBSD.
+	- Rewrite PHY related lock stuff. Almost the same as FreeBSD.
+	  This change will fix a bug that PHY read/write fail on some cases.
+	- Increase delay in wm_phy_resetisblocked(). Same as FreeBSD.
+	- Use semaphore in wm_hv_phy_workaround_ich8lan() and
+	  wm_k1_gig_workaround_hv()
+	- Use wm_gii_mdic_readreg/writereg() in wm_access_phy_wakeup_reg_bm()
+	  because these functions are called with taking lock.
+	- 82567V_3 is BME1000_E_2(bm). Tested with Advantech AIMB-212 1st
+	  Ethernet port.
+	- Use wm_gmii_82544_{read,write}reg() on non-82567 ICH8, 9 and 10.
+	- Remove an 82578 workaround which was for PCH rev < 3. FreeBSD
+	  removed this workaround in r228386.
+	- Add an 82578 workaround which is for PHY rev < 2. From FreeBSD and
+	  Linux.
+	- Fix wm(4) input drop packet counter. WMREG_RNBC is incremented when
+	  there is no available buffers in host memory. However, ethernet
+	  controller can receive packets in such case if there is space in
+	  phy's FIFO. That is, ethernet controller drops packet only if there
+	  is no available buffers *and* there is no space in phy's FIFO. So,
+	  the number of dropped packets should be added WMREG_MPC only.
+	- Use MII_ADDRMASK.
+	- Define WMPHY_I217, WMPHY_VF and WMPHY_210.
+	- Use BME1000_PHY_PAGE_SELECT in wm_gmii_bm_{read,write}reg(). This
+	  change has no effect because GG82563_PHY_PAGE_SELECT and
+	  BME1000_PHY_PAGE_SELECT have the same value.
+	- Fix PHY access on  82567(ICH8 or ICH10), 82574 and 82583:
+	  - Use wm_gmii_bm_{read,write}reg() on 82574 and 82573.
+	  - Issue page select correctly on BM PHYs.
+	- Fix workaround which did dummy read BM_WUC register. This code was
+	  changed to drop BM_WUC_HOST_WU_BIT of BM_PROT_GEN_CFG register in
+	  FreeBSD r228386. The code was added rev. 1.149, but the location was
+	  not the best.
+	- wm_gmii_hv_{read/write}reg*(): USE PHY address 1 for some special
+	  registers.
+	- Add check code for an 82578 workaround. Not completed yet.
+	- wm_release_hw_control(): Remove extra line. No any effect.
+	- Add "10/100" into non-gigabit devices' name.
+	- Call wm_enable_wakeup() in wm_detach() and wm_suspend(). Now wake on
+	  lan works on Thinkpad X61(ICH8).
+	- Fix wm_access_phy_wakeup_reg_bm(). This change has no effect because
+	  this function is used for WUC register and our driver currenlty
+	  doesn't access to it.
+	- Call wm_enable_phy_wakeup() on PCH2 and newer, too. Now these devices
+	  can do WOL. Tested with Thinkpad X220(PCH2).
+	- Set CTRL_MEHE correctly (PCH_{LPT,SPT} only).
+	- Add three workarounds for PCH_{LPT,SPT}.
+	- Fix a bug that 8257[56], 82580, I35[04] and I21[01] didn't use
+	  wm_{get,release}_hw_control() correctly.
+	- Sync wm_smbustopci() with Linux and FreeBSD. This change effects PCH
+	  and newer devices.
+	- Move the location of wm_smbustopci() call.
+	- Fix flag check in wm_get_wakeup()
+	  - 8254[17]* and

CVS commit: [netbsd-7] src/usr.sbin/mld6query

2016-12-11 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Dec 12 07:49:01 UTC 2016

Modified Files:
src/usr.sbin/mld6query [netbsd-7]: mld6.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1308):
usr.sbin/mld6query/mld6.c: revision 1.15
PR/51353: Patrick Mackey: mld6query  "-r" option is not recognised
XXX: pullup 7


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.20.1 src/usr.sbin/mld6query/mld6.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.sbin/mld6query/mld6.c
diff -u src/usr.sbin/mld6query/mld6.c:1.14 src/usr.sbin/mld6query/mld6.c:1.14.20.1
--- src/usr.sbin/mld6query/mld6.c:1.14	Tue Aug 30 21:18:11 2011
+++ src/usr.sbin/mld6query/mld6.c	Mon Dec 12 07:49:01 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mld6.c,v 1.14 2011/08/30 21:18:11 joerg Exp $	*/
+/*	$NetBSD: mld6.c,v 1.14.20.1 2016/12/12 07:49:01 snj Exp $	*/
 /*	$KAME: mld6.c,v 1.9 2000/12/04 06:29:37 itojun Exp $	*/
 
 /*
@@ -81,7 +81,7 @@ main(int argc, char *argv[])
 	int ch;
 
 	type = MLD_LISTENER_QUERY;
-	while ((ch = getopt(argc, argv, "d")) != -1) {
+	while ((ch = getopt(argc, argv, "dr")) != -1) {
 		switch (ch) {
 		case 'd':
 			type = MLD_LISTENER_DONE;

CVS commit: [netbsd-7] src/lib/libterminfo

2016-12-11 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Dec 12 07:37:53 UTC 2016

Modified Files:
src/lib/libterminfo [netbsd-7]: curterm.c term.c termcap.c terminfo.3
tparm.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1307):
lib/libterminfo/curterm.c: revisions 1.11, 1.12
lib/libterminfo/term.c: revisions 1.18-1.20
lib/libterminfo/termcap.c: revisions 1.18, 1.19
lib/libterminfo/terminfo.3: revision 1.13
lib/libterminfo/tparm.c: revision 1.16
terminfo.3: fix ti_puts prototype
--
PR/50092: Fix memory leak.
--
PR/50092: Rin Okuyama: Fix memory leak.
--
We have the max length; use snprintf.
--
>From PR/50092:
- handle calling _ti_readterm with an existing initialized terminal
- simplify free code
Also:
- fix an inconsistency in userdefs count computation
--
Always copy the area buffer, even when the length was the same
(from Rin Okuyama)
--
- if we are freeing cur_term, set it to NULL.
- preserve and free "last" properly.
--
off-by-one in memcpy. Found by ASAN (Carsten Kunze)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.4.1 src/lib/libterminfo/curterm.c
cvs rdiff -u -r1.17 -r1.17.6.1 src/lib/libterminfo/term.c
cvs rdiff -u -r1.17 -r1.17.18.1 src/lib/libterminfo/termcap.c
cvs rdiff -u -r1.12 -r1.12.4.1 src/lib/libterminfo/terminfo.3
cvs rdiff -u -r1.15 -r1.15.6.1 src/lib/libterminfo/tparm.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/libterminfo/curterm.c
diff -u src/lib/libterminfo/curterm.c:1.10 src/lib/libterminfo/curterm.c:1.10.4.1
--- src/lib/libterminfo/curterm.c:1.10	Mon Nov 18 20:51:03 2013
+++ src/lib/libterminfo/curterm.c	Mon Dec 12 07:37:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: curterm.c,v 1.10 2013/11/18 20:51:03 joerg Exp $ */
+/* $NetBSD: curterm.c,v 1.10.4.1 2016/12/12 07:37:53 snj Exp $ */
 
 /*
  * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: curterm.c,v 1.10 2013/11/18 20:51:03 joerg Exp $");
+__RCSID("$NetBSD: curterm.c,v 1.10.4.1 2016/12/12 07:37:53 snj Exp $");
 
 #include 
 #include 
@@ -139,7 +139,10 @@ del_curterm(TERMINAL *oterm)
 	free(oterm->nums);
 	free(oterm->flags);
 	free(oterm->_userdefs);
+	free(oterm->_buf);
 	free(oterm);
+	if (oterm == cur_term)
+		cur_term = NULL;
 	return OK;
 }
 

Index: src/lib/libterminfo/term.c
diff -u src/lib/libterminfo/term.c:1.17 src/lib/libterminfo/term.c:1.17.6.1
--- src/lib/libterminfo/term.c:1.17	Fri Jun  7 13:16:18 2013
+++ src/lib/libterminfo/term.c	Mon Dec 12 07:37:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.17 2013/06/07 13:16:18 roy Exp $ */
+/* $NetBSD: term.c,v 1.17.6.1 2016/12/12 07:37:53 snj Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: term.c,v 1.17 2013/06/07 13:16:18 roy Exp $");
+__RCSID("$NetBSD: term.c,v 1.17.6.1 2016/12/12 07:37:53 snj Exp $");
 
 #include 
 
@@ -54,6 +54,23 @@ const char *_ti_database;
 #include "compiled_terms.c"
 
 static int
+allocset(void *pp, int init, size_t nelem, size_t elemsize)
+{
+	void **p = pp;
+	if (*p) {
+		memset(*p, init, nelem * elemsize);
+		return 0;
+	}
+
+	if ((*p = calloc(nelem, elemsize)) == NULL)
+		return -1;
+
+	if (init != 0)
+		memset(*p, init, nelem * elemsize);
+	return 0;
+}
+
+static int
 _ti_readterm(TERMINAL *term, const char *cap, size_t caplen, int flags)
 {
 	uint8_t ver;
@@ -61,27 +78,30 @@ _ti_readterm(TERMINAL *term, const char 
 	size_t len;
 	TERMUSERDEF *ud;
 
+	if (caplen == 0)
+		goto out;
 	ver = *cap++;
+	caplen--;
 	/* Only read version 1 structures */
-	if (ver != 1) {
-		errno = EINVAL;
-		return -1;
-	}
+	if (ver != 1)
+		goto out;
 
-	term->flags = calloc(TIFLAGMAX + 1, sizeof(char));
-	if (term->flags == NULL)
-		return -1;
-	term->nums = malloc((TINUMMAX + 1) * sizeof(short));
-	if (term->nums == NULL)
+
+	if (allocset(>flags, 0, TIFLAGMAX + 1, sizeof(*term->flags)) == -1)
 		return -1;
-	memset(term->nums, (short)-1, (TINUMMAX + 1) * sizeof(short));
-	term->strs = calloc(TISTRMAX + 1, sizeof(char *));
-	if (term->strs == NULL)
+
+	if (allocset(>nums, -1, TINUMMAX + 1, sizeof(*term->nums)) == -1)
 		return -1;
-	term->_arealen = caplen;
-	term->_area = malloc(term->_arealen);
-	if (term->_area == NULL)
+
+	if (allocset(>strs, 0, TISTRMAX + 1, sizeof(*term->strs)) == -1)
 		return -1;
+
+	if (term->_arealen != caplen) {
+		term->_arealen = caplen;
+		term->_area = realloc(term->_area, term->_arealen);
+		if (term->_area == NULL)
+			return -1;
+	}
 	memcpy(term->_area, cap, term->_arealen);
 
 	cap = term->_area;
@@ -158,9 +178,16 @@ _ti_readterm(TERMINAL *term, const char 
 	num = le16dec(cap);
 	cap += sizeof(uint16_t);
 	if (num != 0) {
-		term->_nuserdefs = le16dec(cap);
-		term->_userdefs = malloc(sizeof(*term->_userdefs) * num);
+		num = le16dec(cap);
 		cap += sizeof(uint16_t);
+		if

CVS commit: [netbsd-7] src/sys/kern

2016-12-11 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Dec 12 07:29:16 UTC 2016

Modified Files:
src/sys/kern [netbsd-7]: subr_xcall.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1306):
sys/kern/subr_xcall.c: revision 1.19
Fix a race condition of low priority xcall
xc_lowpri and xc_thread are racy and xc_wait may return during/before
executing all xcall callbacks, resulting in a kernel panic at worst.
xc_lowpri serializes multiple jobs by a mutex and a cv. If all xcall
callbacks are done, xc_wait returns and also xc_lowpri accepts a next job.
The problem is that a counter that counts the number of finished xcall
callbacks is incremented *before* actually executing a xcall callback
(see xc_tailp++ in xc_thread). So xc_lowpri accepts a next job before
all xcall callbacks complete and a next job begins to run its xcall callbacks.
Even worse the counter is global and shared between jobs, so if a xcall
callback of the next job completes, the shared counter is incremented,
which confuses wc_wait of the previous job as all xcall callbacks of the
previous job are done and wc_wait of the previous job returns during/before
executing its xcall callbacks.
How to fix: there are actually two counters that count the number of finished
xcall callbacks for low priority xcall for historical reasons (I guess):
xc_tailp and xc_low_pri.xc_donep. xc_low_pri.xc_donep is incremented correctly
while xc_tailp is incremented wrongly, i.e., before executing a xcall callback.
We can fix the issue by dropping xc_tailp and using only xc_low_pri.xc_donep.
PR kern/51632


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.4.1 src/sys/kern/subr_xcall.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/kern/subr_xcall.c
diff -u src/sys/kern/subr_xcall.c:1.18 src/sys/kern/subr_xcall.c:1.18.4.1
--- src/sys/kern/subr_xcall.c:1.18	Tue Nov 26 21:13:05 2013
+++ src/sys/kern/subr_xcall.c	Mon Dec 12 07:29:16 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_xcall.c,v 1.18 2013/11/26 21:13:05 rmind Exp $	*/
+/*	$NetBSD: subr_xcall.c,v 1.18.4.1 2016/12/12 07:29:16 snj Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.18 2013/11/26 21:13:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.18.4.1 2016/12/12 07:29:16 snj Exp $");
 
 #include 
 #include 
@@ -105,7 +105,6 @@ typedef struct {
 
 /* Low priority xcall structures. */
 static xc_state_t	xc_low_pri	__cacheline_aligned;
-static uint64_t		xc_tailp	__cacheline_aligned;
 
 /* High priority xcall structures. */
 static xc_state_t	xc_high_pri	__cacheline_aligned;
@@ -134,7 +133,6 @@ xc_init(void)
 	memset(xclo, 0, sizeof(xc_state_t));
 	mutex_init(>xc_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(>xc_busy, "xclocv");
-	xc_tailp = 0;
 
 	memset(xchi, 0, sizeof(xc_state_t));
 	mutex_init(>xc_lock, MUTEX_DEFAULT, IPL_SOFTSERIAL);
@@ -256,7 +254,7 @@ xc_lowpri(xcfunc_t func, void *arg1, voi
 	uint64_t where;
 
 	mutex_enter(>xc_lock);
-	while (xc->xc_headp != xc_tailp) {
+	while (xc->xc_headp != xc->xc_donep) {
 		cv_wait(>xc_busy, >xc_lock);
 	}
 	xc->xc_arg1 = arg1;
@@ -277,7 +275,7 @@ xc_lowpri(xcfunc_t func, void *arg1, voi
 		ci->ci_data.cpu_xcall_pending = true;
 		cv_signal(>ci_data.cpu_xcall);
 	}
-	KASSERT(xc_tailp < xc->xc_headp);
+	KASSERT(xc->xc_donep < xc->xc_headp);
 	where = xc->xc_headp;
 	mutex_exit(>xc_lock);
 
@@ -302,7 +300,7 @@ xc_thread(void *cookie)
 	mutex_enter(>xc_lock);
 	for (;;) {
 		while (!ci->ci_data.cpu_xcall_pending) {
-			if (xc->xc_headp == xc_tailp) {
+			if (xc->xc_headp == xc->xc_donep) {
 cv_broadcast(>xc_busy);
 			}
 			cv_wait(>ci_data.cpu_xcall, >xc_lock);
@@ -312,7 +310,6 @@ xc_thread(void *cookie)
 		func = xc->xc_func;
 		arg1 = xc->xc_arg1;
 		arg2 = xc->xc_arg2;
-		xc_tailp++;
 		mutex_exit(>xc_lock);
 
 		KASSERT(func != NULL);

CVS commit: [netbsd-7] src/lib/libc/stdio

2016-12-11 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Dec 12 07:23:47 UTC 2016

Modified Files:
src/lib/libc/stdio [netbsd-7]: funopen.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1303):
lib/libc/stdio/funopen.c: revision 1.15
PR/51572: calling funopen on each printw call is a tad excessive, but this
is not a reason for funopen to leak. Always call the close function since we
are indirecting through our cookie and we need to free it.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.10.1 src/lib/libc/stdio/funopen.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/libc/stdio/funopen.c
diff -u src/lib/libc/stdio/funopen.c:1.14 src/lib/libc/stdio/funopen.c:1.14.10.1
--- src/lib/libc/stdio/funopen.c:1.14	Wed Mar 28 15:21:11 2012
+++ src/lib/libc/stdio/funopen.c	Mon Dec 12 07:23:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: funopen.c,v 1.14 2012/03/28 15:21:11 christos Exp $	*/
+/*	$NetBSD: funopen.c,v 1.14.10.1 2016/12/12 07:23:46 snj Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)funopen.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: funopen.c,v 1.14 2012/03/28 15:21:11 christos Exp $");
+__RCSID("$NetBSD: funopen.c,v 1.14.10.1 2016/12/12 07:23:46 snj Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -138,6 +138,8 @@ cclosefn(void *dookie)
 	void *c = d->cookie;
 	int (*cf)(void *) = d->closefn;
 	free(dookie);
+	if (cf == NULL)
+		return 0;
 	return (*cf)(c);
 }
 
@@ -163,8 +165,7 @@ funopen(const void *cookie,
 	d->readfn ? creadfn : NULL,
 	d->writefn ? cwritefn : NULL,
 	d->seekfn ? cseekfn : NULL,
-	NULL,
-	d->closefn ? cclosefn : NULL);
+	NULL, cclosefn);
 	if (fp != NULL)
 		return fp;
 	free(d);

CVS commit: [netbsd-7] src/sys/dev

2016-12-11 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Dec 12 07:18:29 UTC 2016

Modified Files:
src/sys/dev/mii [netbsd-7]: igphyreg.h ikphyreg.h inbmphyreg.h mii.h
src/sys/dev/pci [netbsd-7]: if_wm.c if_wmreg.h if_wmvar.h

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1302):
sys/dev/mii/igphyreg.h: revisions 1.7-1.10
sys/dev/mii/ikphyreg.h: revisions 1.3
sys/dev/mii/inbmphyreg.h: revisions 1.4-1.9
sys/dev/mii/mii.h: revisions 1.19-1.20
sys/dev/pci/if_wm.c: revisions 1.390, 1.392-1.395, 1.397, 1.419-1.425, 
1.427-1.428, 1.430-1.435, 1.437-1.453 via patch
sys/dev/pci/if_wmreg.: revisions 1.89-1.93 via patch
sys/dev/pci/if_wmvar.h: revisions 1.31-1.32
Update wm(4) up to if_wm.c rev. 1.453 except MSI/MSI-X, multiqueue and
NET_MPSAFE:
- Add I219 support. It's not stable so it's disabled by default.
- wm_gate_hw_phy_config_ich8lan() is for younger than PCH2.
- Drop the host wakeup bit after resetting PHY on PCH and newer
  devices.
- Increase delay while toggling LANPHYPC
- Move call of wm_reset() in wm_attach() after setting PHY and NVM
  related flags because those flags are used in wm_reset().
- Use mutex for NVM access on ICH8 and newer devices. Same as FreeBSD.
- Rewrite PHY related lock stuff. Almost the same as FreeBSD.
  This change will fix a bug that PHY read/write fail on some cases.
- Increase delay in wm_phy_resetisblocked(). Same as FreeBSD.
- Use semaphore in wm_hv_phy_workaround_ich8lan() and
  wm_k1_gig_workaround_hv()
- Use wm_gii_mdic_readreg/writereg() in wm_access_phy_wakeup_reg_bm()
  because these functions are called with taking lock.
- 82567V_3 is BME1000_E_2(bm). Tested with Advantech AIMB-212 1st
  Ethernet port.
- Use wm_gmii_82544_{read,write}reg() on non-82567 ICH8, 9 and 10.
- Remove an 82578 workaround which was for PCH rev < 3. FreeBSD
  removed this workaround in r228386.
- Add an 82578 workaround which is for PHY rev < 2. From FreeBSD and
  Linux.
- Fix wm(4) input drop packet counter. WMREG_RNBC is incremented when
  there is no available buffers in host memory. However, ethernet
  controller can receive packets in such case if there is space in
  phy's FIFO. That is, ethernet controller drops packet only if there
  is no available buffers *and* there is no space in phy's FIFO. So,
  the number of dropped packets should be added WMREG_MPC only.
- Use MII_ADDRMASK.
- Define WMPHY_I217, WMPHY_VF and WMPHY_210.
- Use BME1000_PHY_PAGE_SELECT in wm_gmii_bm_{read,write}reg(). This
  change has no effect because GG82563_PHY_PAGE_SELECT and
  BME1000_PHY_PAGE_SELECT have the same value.
- Fix PHY access on  82567(ICH8 or ICH10), 82574 and 82583:
  - Use wm_gmii_bm_{read,write}reg() on 82574 and 82573.
  - Issue page select correctly on BM PHYs.
- Fix workaround which did dummy read BM_WUC register. This code was
  changed to drop BM_WUC_HOST_WU_BIT of BM_PROT_GEN_CFG register in
  FreeBSD r228386. The code was added rev. 1.149, but the location was
  not the best.
- wm_gmii_hv_{read/write}reg*(): USE PHY address 1 for some special
  registers.
- Add check code for an 82578 workaround. Not completed yet.
- wm_release_hw_control(): Remove extra line. No any effect.
- Add "10/100" into non-gigabit devices' name.
- Call wm_enable_wakeup() in wm_detach() and wm_suspend(). Now wake on
  lan works on Thinkpad X61(ICH8).
- Fix wm_access_phy_wakeup_reg_bm(). This change has no effect because
  this function is used for WUC register and our driver currenlty
  doesn't access to it.
- Call wm_enable_phy_wakeup() on PCH2 and newer, too. Now these devices
  can do WOL. Tested with Thinkpad X220(PCH2).
- Set CTRL_MEHE correctly (PCH_{LPT,SPT} only).
- Add three workarounds for PCH_{LPT,SPT}.
- Fix a bug that 8257[56], 82580, I35[04] and I21[01] didn't use
  wm_{get,release}_hw_control() correctly.
- Sync wm_smbustopci() with Linux and FreeBSD. This change effects PCH
  and newer devices.
- Move the location of wm_smbustopci() call.
- Fix flag check in wm_get_wakeup()
  - 8254[17]* and 8257[124] should not set WM_F_ARC_SUBSYS_VALID.
  - Add missing WM_T_82541_2 and WM_T_82547_2.
- Fix WOL related setting of the WUC register for other than PCH* in
  wm_enable_wakeup(). Tested with 82567V(ICH8) and 82583V.
- Use common MII_ADDRMASK.
- igphy(4): No binary change:
  - s/IGPPHY/IGPHY/
  - Fix the definition of PLHR_VALID_CHANNEL_*
  - Fix the definition of MSE_CHANNEL_*
  - Add MII_IGPHY_POWER_MGMT.
- Add some KASSERT.
- Add comment. Modify comment.
- Add debug code.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.36.1 src/sys/dev/mii/igphyreg.h
cvs rdiff -u -r1.2 -r1.2.34.1 src/sys/dev/mii/ikphyreg.h
cvs rdiff -u -r1.3 -r1.3.30.1 src/sys/dev/mii/inbmphyreg.h
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/dev/mii/mii.h
cvs rdiff -u -r1.289.2.10 -r1.289.2.11 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.60.2.5 -r1.60.2.6 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.19.2.4 -r1.19.2.5

CVS commit: [netbsd-7] src/sys/dev/mii

2016-12-11 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Dec 12 07:04:31 UTC 2016

Modified Files:
src/sys/dev/mii [netbsd-7]: atphy.c ihphy.c ikphy.c inphy.c makphy.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1301):
sys/dev/mii/inphy.c: revision 1.55
sys/dev/mii/makphy.c: revision 1.42
sys/dev/mii/ikphy.c: revision 1.12
sys/dev/mii/atphy.c: revision 1.18
sys/dev/mii/ihphy.c: revision 1.10
Set mii_mpd_{oui,model,rev}.
--
Set mii_mpd_{oui,model,rev}.
--
Set mii_mpd_{oui,model,rev}.
--
Set mii_mpd_{oui,rev}.


To generate a diff of this commit:
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/mii/ihphy.c
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/dev/mii/ikphy.c
cvs rdiff -u -r1.53 -r1.53.2.1 src/sys/dev/mii/inphy.c
cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/dev/mii/makphy.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/mii/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.16.2.1 src/sys/dev/mii/atphy.c:1.16.2.2
--- src/sys/dev/mii/atphy.c:1.16.2.1	Wed Nov  4 18:19:58 2015
+++ src/sys/dev/mii/atphy.c	Mon Dec 12 07:04:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: atphy.c,v 1.16.2.1 2015/11/04 18:19:58 riz Exp $ */
+/*	$NetBSD: atphy.c,v 1.16.2.2 2016/12/12 07:04:31 snj Exp $ */
 /*	$OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $	*/
 
 /*-
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.16.2.1 2015/11/04 18:19:58 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.16.2.2 2016/12/12 07:04:31 snj Exp $");
 
 #include 
 #include 
@@ -146,6 +146,9 @@ atphy_attach(device_t parent, device_t s
 	sc->mii_dev = self;
 	sc->mii_inst = mii->mii_instance;
 	sc->mii_phy = ma->mii_phyno;
+	sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+	sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+	sc->mii_mpd_rev = MII_REV(ma->mii_id2);
 	sc->mii_funcs = _funcs;
 	sc->mii_pdata = mii;
 	sc->mii_flags = ma->mii_flags;

Index: src/sys/dev/mii/ihphy.c
diff -u src/sys/dev/mii/ihphy.c:1.8 src/sys/dev/mii/ihphy.c:1.8.2.1
--- src/sys/dev/mii/ihphy.c:1.8	Mon Jun 16 16:48:16 2014
+++ src/sys/dev/mii/ihphy.c	Mon Dec 12 07:04:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ihphy.c,v 1.8 2014/06/16 16:48:16 msaitoh Exp $	*/
+/*	$NetBSD: ihphy.c,v 1.8.2.1 2016/12/12 07:04:31 snj Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.8 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.8.2.1 2016/12/12 07:04:31 snj Exp $");
 
 #include 
 #include 
@@ -132,6 +132,9 @@ ihphyattach(device_t parent, device_t se
 	sc->mii_dev = self;
 	sc->mii_inst = mii->mii_instance;
 	sc->mii_phy = ma->mii_phyno;
+	sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+	sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+	sc->mii_mpd_rev = MII_REV(ma->mii_id2);
 	sc->mii_funcs = _funcs;
 	sc->mii_pdata = mii;
 	sc->mii_flags = ma->mii_flags;

Index: src/sys/dev/mii/ikphy.c
diff -u src/sys/dev/mii/ikphy.c:1.10 src/sys/dev/mii/ikphy.c:1.10.2.1
--- src/sys/dev/mii/ikphy.c:1.10	Mon Jun 16 16:48:16 2014
+++ src/sys/dev/mii/ikphy.c	Mon Dec 12 07:04:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ikphy.c,v 1.10 2014/06/16 16:48:16 msaitoh Exp $	*/
+/*	$NetBSD: ikphy.c,v 1.10.2.1 2016/12/12 07:04:31 snj Exp $	*/
 
 /***
 Copyright (c) 2001-2005, Intel Corporation 
@@ -59,7 +59,7 @@ POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.10 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.10.2.1 2016/12/12 07:04:31 snj Exp $");
 
 #include 
 #include 
@@ -125,6 +125,9 @@ ikphyattach(device_t parent, device_t se
 	sc->mii_dev = self;
 	sc->mii_inst = mii->mii_instance;
 	sc->mii_phy = ma->mii_phyno;
+	sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+	sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+	sc->mii_mpd_rev = MII_REV(ma->mii_id2);
 	sc->mii_funcs = _funcs;
 	sc->mii_pdata = mii;
 	sc->mii_flags = ma->mii_flags;

Index: src/sys/dev/mii/inphy.c
diff -u src/sys/dev/mii/inphy.c:1.53 src/sys/dev/mii/inphy.c:1.53.2.1
--- src/sys/dev/mii/inphy.c:1.53	Mon Jun 16 16:48:16 2014
+++ src/sys/dev/mii/inphy.c	Mon Dec 12 07:04:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: inphy.c,v 1.53 2014/06/16 16:48:16 msaitoh Exp $	*/
+/*	$NetBSD: inphy.c,v 1.53.2.1 2016/12/12 07:04:31 snj Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.53 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.53.2.1 2016/12/12 07:04:31 snj Exp $");
 
 #include 
 #include 
@@ -137,6 +137,9 @@ inphyattach(device_t parent, device_t se
 	sc->mii_dev = self;
 	sc->mii_inst = mii->mii_instance;
 	sc->mii_phy =

CVS commit: [netbsd-7] src/doc

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 05:41:31 UTC 2016

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

Log Message:
1294-1300


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.126 -r1.1.2.127 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.126 src/doc/CHANGES-7.1:1.1.2.127
--- src/doc/CHANGES-7.1:1.1.2.126	Thu Dec  8 08:12:10 2016
+++ src/doc/CHANGES-7.1	Fri Dec  9 05:41:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.126 2016/12/08 08:12:10 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.127 2016/12/09 05:41:31 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7163,3 +7163,56 @@ sys/arch/x86/x86/procfs_machdep.c		1.12-
 	- Update some Linux mapping unused in /proc/cpuinfo.
 	[msaitoh, ticket #1293]
 
+sys/dev/pci/ichsmb.c1.43-1.44
+
+	ichsmb(4): Add Braswell PCU SMBus and Intel 100 Series SMBus.
+	[msaitoh, ticket #1294]
+
+sys/arch/x86/pci/ichlpcib.c			1.50
+
+	Add Core 5G (mobile) LPC support.
+	[msaitoh, ticket #1295]
+
+sys/dev/pci/pci_subr.c1.155 via patch
+
+	Protect against buffer overflow.
+	[pgoyette, ticket #1296]
+
+sys/arch/amd64/conf/ALL1.37
+sys/arch/amd64/conf/GENERIC			1.436
+sys/arch/amd64/conf/XEN3_DOM0			1.120
+sys/arch/i386/conf/ALL1.400
+sys/arch/i386/conf/GENERIC			1.1138
+sys/arch/i386/conf/XEN3_DOM0			1.99
+
+	x86 kernel configs:
+	- Add ichsmb(4), spdmem(4) and iic(4) to XEN3_DOM0.
+	- Add sdtemp(4). For ALL kernels, it's enabled. For others, it's
+	commented out.
+	[msaitoh, ticket #1297]
+
+sys/dev/pci/pcidevs1.1246
+sys/dev/pci/pcidevs.hregen
+sys/dev/pci/pcidevs_data.h			regen
+sys/dev/pci/piixide.c1.65
+
+	Correct name of 82801HBM AHCI SATA Controller and
+	SATA RAID Controller.
+	[msaitoh, ticket #1298]
+
+sys/dev/mii/miidevs1.123, 1.124
+sys/dev/mii/miidevs.hregen
+sys/dev/mii/miidevs_data.h			regen
+
+	- Add xxMarvell E6060 6-port 10/100 Fast Ethernet Switch
+	- Add Marvell 88E1512.
+	[msaitoh, ticket #1299]
+
+sys/dev/pci/if_wm.c1.426
+sys/dev/pci/pcidevs1.1270
+sys/dev/pci/pcidevs.hregen
+sys/edv/pci/pcidevs_data.h			regen
+
+	i82567V-3 is not ICH9 but ICH8.
+	[msaitoh, ticket #1300]
+

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

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 05:28:26 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs.h pcidevs_data.h

Log Message:
regen for ticket 1300


To generate a diff of this commit:
cvs rdiff -u -r1.1192.2.8 -r1.1192.2.9 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1191.2.8 -r1.1191.2.9 src/sys/dev/pci/pcidevs_data.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/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1192.2.8 src/sys/dev/pci/pcidevs.h:1.1192.2.9
--- src/sys/dev/pci/pcidevs.h:1.1192.2.8	Fri Dec  9 05:16:34 2016
+++ src/sys/dev/pci/pcidevs.h	Fri Dec  9 05:28:12 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1192.2.8 2016/12/09 05:16:34 snj Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1192.2.9 2016/12/09 05:28:12 snj Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp
+ *	NetBSD: pcidevs,v 1.1199.2.9 2016/12/09 05:27:30 snj Exp
  */
 
 /*
@@ -2975,7 +2975,7 @@
 #define	PCI_PRODUCT_INTEL_82870P2_PPB	0x1460		/* 82870P2 P64H2 PCI-PCI Bridge */
 #define	PCI_PRODUCT_INTEL_82870P2_IOxAPIC	0x1461		/* 82870P2 P64H2 IOxAPIC */
 #define	PCI_PRODUCT_INTEL_82870P2_HPLUG	0x1462		/* 82870P2 P64H2 Hot Plug Controller */
-#define	PCI_PRODUCT_INTEL_82801I_82567V_3	0x1501		/* i82567V-3 LAN Controller */
+#define	PCI_PRODUCT_INTEL_82801H_82567V_3	0x1501		/* i82567V-3 LAN Controller */
 #define	PCI_PRODUCT_INTEL_PCH2_LV_LM	0x1502		/* 82579LM Gigabit Network Connection */
 #define	PCI_PRODUCT_INTEL_PCH2_LV_V	0x1503		/* 82579V Gigabit Network Connection */
 #define	PCI_PRODUCT_INTEL_82599_SFP_EM	0x1507		/* 82599 10G Ethernet Express Module */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1191.2.8 src/sys/dev/pci/pcidevs_data.h:1.1191.2.9
--- src/sys/dev/pci/pcidevs_data.h:1.1191.2.8	Fri Dec  9 05:16:35 2016
+++ src/sys/dev/pci/pcidevs_data.h	Fri Dec  9 05:28:13 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1191.2.8 2016/12/09 05:16:35 snj Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1191.2.9 2016/12/09 05:28:13 snj Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp
+ *	NetBSD: pcidevs,v 1.1199.2.9 2016/12/09 05:27:30 snj Exp
  */
 
 /*
@@ -4686,7 +4686,7 @@ static const uint16_t pci_products[] = {
 	19362, 19370, 17461, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82870P2_HPLUG, 
 	19362, 19370, 19376, 19380, 6293, 0,
-	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_82567V_3, 
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_82567V_3, 
 	19385, 4534, 6293, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH2_LV_LM, 
 	19395, 5547, 3888, 18507, 0,

CVS commit: [netbsd-7] src/sys/dev/mii

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 05:23:31 UTC 2016

Modified Files:
src/sys/dev/mii [netbsd-7]: miidevs

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1299):
sys/dev/mii/miidevs: revisions 1.123, 1.124
Add xxMarvell E6060 6-port 10/100 Fast Ethernet Switch
--
Add Marvell 88E1512.


To generate a diff of this commit:
cvs rdiff -u -r1.120.2.1 -r1.120.2.2 src/sys/dev/mii/miidevs

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/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.120.2.1 src/sys/dev/mii/miidevs:1.120.2.2
--- src/sys/dev/mii/miidevs:1.120.2.1	Sat Jan 17 13:46:39 2015
+++ src/sys/dev/mii/miidevs	Fri Dec  9 05:23:31 2016
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.120.2.1 2015/01/17 13:46:39 martin Exp $
+$NetBSD: miidevs,v 1.120.2.2 2016/12/09 05:23:31 snj Exp $
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -261,6 +261,8 @@ model xxMARVELL E1112		0x0009 Marvell 88
 model xxMARVELL E1149		0x000b Marvell 88E1149 Gigabit PHY
 model xxMARVELL E		0x000c Marvell 88E Gigabit PHY
 model xxMARVELL E1145		0x000d Marvell 88E1145 Quad Gigabit PHY
+model xxMARVELL E6060		0x0010 Marvell 88E6060 6-Port 10/100 Fast Ethernet Switch
+model xxMARVELL E1512		0x001d Marvell 88E1512 Gigabit PHY
 model xxMARVELL E1116		0x0021 Marvell 88E1116 Gigabit PHY
 model xxMARVELL E1118		0x0022 Marvell 88E1118 Gigabit PHY
 model xxMARVELL E1116R		0x0024 Marvell 88E1116R Gigabit PHY

CVS commit: [netbsd-7] src/sys/dev/mii

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 05:23:58 UTC 2016

Modified Files:
src/sys/dev/mii [netbsd-7]: miidevs.h miidevs_data.h

Log Message:
regen for ticket 1299


To generate a diff of this commit:
cvs rdiff -u -r1.123.2.1 -r1.123.2.2 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.111.2.1 -r1.111.2.2 src/sys/dev/mii/miidevs_data.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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.123.2.1 src/sys/dev/mii/miidevs.h:1.123.2.2
--- src/sys/dev/mii/miidevs.h:1.123.2.1	Sat Jan 17 14:13:40 2015
+++ src/sys/dev/mii/miidevs.h	Fri Dec  9 05:23:58 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs.h,v 1.123.2.1 2015/01/17 14:13:40 martin Exp $	*/
+/*	$NetBSD: miidevs.h,v 1.123.2.2 2016/12/09 05:23:58 snj Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.120.2.1 2015/01/17 13:46:39 martin Exp
+ *	NetBSD: miidevs,v 1.120.2.2 2016/12/09 05:23:31 snj Exp
  */
 
 /*-
@@ -383,6 +383,10 @@
 #define	MII_STR_xxMARVELL_E	"Marvell 88E Gigabit PHY"
 #define	MII_MODEL_xxMARVELL_E1145	0x000d
 #define	MII_STR_xxMARVELL_E1145	"Marvell 88E1145 Quad Gigabit PHY"
+#define	MII_MODEL_xxMARVELL_E6060	0x0010
+#define	MII_STR_xxMARVELL_E6060	"Marvell 88E6060 6-Port 10/100 Fast Ethernet Switch"
+#define	MII_MODEL_xxMARVELL_E1512	0x001d
+#define	MII_STR_xxMARVELL_E1512	"Marvell 88E1512 Gigabit PHY"
 #define	MII_MODEL_xxMARVELL_E1116	0x0021
 #define	MII_STR_xxMARVELL_E1116	"Marvell 88E1116 Gigabit PHY"
 #define	MII_MODEL_xxMARVELL_E1118	0x0022

Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.111.2.1 src/sys/dev/mii/miidevs_data.h:1.111.2.2
--- src/sys/dev/mii/miidevs_data.h:1.111.2.1	Sat Jan 17 14:13:40 2015
+++ src/sys/dev/mii/miidevs_data.h	Fri Dec  9 05:23:58 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs_data.h,v 1.111.2.1 2015/01/17 14:13:40 martin Exp $	*/
+/*	$NetBSD: miidevs_data.h,v 1.111.2.2 2016/12/09 05:23:58 snj Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.120.2.1 2015/01/17 13:46:39 martin Exp
+ *	NetBSD: miidevs,v 1.120.2.2 2016/12/09 05:23:31 snj Exp
  */
 
 /*-
@@ -152,6 +152,8 @@ struct mii_knowndev mii_knowndevs[] = {
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1149, MII_STR_xxMARVELL_E1149 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E, MII_STR_xxMARVELL_E },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1145, MII_STR_xxMARVELL_E1145 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E6060, MII_STR_xxMARVELL_E6060 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1512, MII_STR_xxMARVELL_E1512 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116, MII_STR_xxMARVELL_E1116 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1118, MII_STR_xxMARVELL_E1118 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R, MII_STR_xxMARVELL_E1116R },

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

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 05:27:30 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: if_wm.c pcidevs

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1300):
sys/dev/pci/pcidevs: revision 1.1270
sys/dev/pci/if_wm.c: revision 1.426
i82567V-3 is not ICH9 but ICH8.
--
82567V-3 is not ICH9 but ICH8.


To generate a diff of this commit:
cvs rdiff -u -r1.289.2.9 -r1.289.2.10 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.1199.2.8 -r1.1199.2.9 src/sys/dev/pci/pcidevs

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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.289.2.9 src/sys/dev/pci/if_wm.c:1.289.2.10
--- src/sys/dev/pci/if_wm.c:1.289.2.9	Fri Feb 26 22:08:17 2016
+++ src/sys/dev/pci/if_wm.c	Fri Dec  9 05:27:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.289.2.9 2016/02/26 22:08:17 snj Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.289.2.10 2016/12/09 05:27:30 snj Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.9 2016/02/26 22:08:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.10 2016/12/09 05:27:30 snj Exp $");
 
 #include 
 #include 
@@ -1029,6 +1029,9 @@ static const struct wm_product {
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82801H_IFE_G,
 	  "Intel i82801H IFE (G) LAN Controller",
 	  WM_T_ICH8,		WMP_F_COPPER },
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82801H_82567V_3,
+	  "82567V-3 LAN Controller",
+	  WM_T_ICH8,		WMP_F_COPPER },
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82801I_IGP_AMT,
 	  "82801I (AMT) LAN Controller",
 	  WM_T_ICH9,		WMP_F_COPPER },
@@ -1056,9 +1059,6 @@ static const struct wm_product {
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82801I_BM,
 	  "82567LM-4 LAN Controller",
 	  WM_T_ICH9,		WMP_F_COPPER },
-	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82801I_82567V_3,
-	  "82567V-3 LAN Controller",
-	  WM_T_ICH9,		WMP_F_COPPER },
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82801J_R_BM_LM,
 	  "82567LM-2 LAN Controller",
 	  WM_T_ICH10,		WMP_F_COPPER },

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1199.2.8 src/sys/dev/pci/pcidevs:1.1199.2.9
--- src/sys/dev/pci/pcidevs:1.1199.2.8	Fri Dec  9 05:15:18 2016
+++ src/sys/dev/pci/pcidevs	Fri Dec  9 05:27:30 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp $
+$NetBSD: pcidevs,v 1.1199.2.9 2016/12/09 05:27:30 snj Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2968,7 +2968,7 @@ product INTEL 82439HX		0x1250	82439HX (T
 product INTEL 82870P2_PPB	0x1460	82870P2 P64H2 PCI-PCI Bridge
 product INTEL 82870P2_IOxAPIC	0x1461	82870P2 P64H2 IOxAPIC
 product INTEL 82870P2_HPLUG	0x1462	82870P2 P64H2 Hot Plug Controller
-product INTEL 82801I_82567V_3	0x1501	i82567V-3 LAN Controller
+product INTEL 82801H_82567V_3	0x1501	i82567V-3 LAN Controller
 product INTEL PCH2_LV_LM	0x1502	82579LM Gigabit Network Connection
 product INTEL PCH2_LV_V		0x1503	82579V Gigabit Network Connection
 product INTEL 82599_SFP_EM	0x1507	82599 10G Ethernet Express Module

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

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 05:15:18 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs piixide.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1298):
sys/dev/pci/piixide.c: revision 1.65
sys/dev/pci/pcidevs: revision 1.1246
- s/82081/82801/ from OpenBSD.
- 0x2829 is SATA. 0x282a is RAID.
--
Rename macro (sync with pcidevs rev. 1.1246). No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.1199.2.7 -r1.1199.2.8 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.64 -r1.64.12.1 src/sys/dev/pci/piixide.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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1199.2.7 src/sys/dev/pci/pcidevs:1.1199.2.8
--- src/sys/dev/pci/pcidevs:1.1199.2.7	Thu Dec  8 07:56:45 2016
+++ src/sys/dev/pci/pcidevs	Fri Dec  9 05:15:18 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1199.2.7 2016/12/08 07:56:45 snj Exp $
+$NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3571,8 +3571,8 @@ product INTEL 82801H_SATA_2	0x2825	82801
 product INTEL C610_SATA_RAID_3	0x2826	C61x/X99 SATA Controller (RAID)
 product INTEL C610_SSATA_RAID_2	0x2827	C61x/X99 sSATA Controller (RAID)
 product INTEL 82801HEM_SATA	0x2828	82801HEM SATA Controller
-product INTEL 82801HBM_SATA_1	0x2829  82801HBM SATA Controller
-product INTEL 82801HBM_SATA_2	0x282a	82081HBM SATA Controller
+product INTEL 82801HBM_SATA_AHCI 0x2829  82801HBM AHCI SATA Controller
+product INTEL 82801HBM_SATA_RAID 0x282a	82801HBM SATA RAID Controller
 product INTEL 82801H_USB_1	0x2830	82801H USB UHCI Controller
 product INTEL 82801H_USB_2	0x2831	82801H USB UHCI Controller
 product INTEL 82801H_USB_3	0x2832	82801H USB UHCI Controller

Index: src/sys/dev/pci/piixide.c
diff -u src/sys/dev/pci/piixide.c:1.64 src/sys/dev/pci/piixide.c:1.64.12.1
--- src/sys/dev/pci/piixide.c:1.64	Wed Nov 14 01:05:49 2012
+++ src/sys/dev/pci/piixide.c	Fri Dec  9 05:15:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: piixide.c,v 1.64 2012/11/14 01:05:49 jakllsch Exp $	*/
+/*	$NetBSD: piixide.c,v 1.64.12.1 2016/12/09 05:15:18 snj Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.64 2012/11/14 01:05:49 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.64.12.1 2016/12/09 05:15:18 snj Exp $");
 
 #include 
 #include 
@@ -203,14 +203,14 @@ static const struct pciide_product_desc 
 	  "Intel 82801HBM IDE Controller (ICH8M)",
 	  piix_chip_map,
 	},
-	{ PCI_PRODUCT_INTEL_82801HBM_SATA_1,
+	{ PCI_PRODUCT_INTEL_82801HBM_SATA_AHCI,
 	  0,
-	  "Intel 82801HBM Serial ATA Controller (ICH8M)",
+	  "Intel 82801HBM Serial ATA AHCI Controller (ICH8M)",
 	  piixsata_chip_map,
 	},
-	{ PCI_PRODUCT_INTEL_82801HBM_SATA_2,
+	{ PCI_PRODUCT_INTEL_82801HBM_SATA_RAID,
 	  0,
-	  "Intel 82801HBM Serial ATA Controller (ICH8M)",
+	  "Intel 82801HBM Serial ATA RAID Controller (ICH8M)",
 	  piixsata_chip_map,
 	},
 	{ PCI_PRODUCT_INTEL_82801HEM_SATA,

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

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 05:10:45 UTC 2016

Modified Files:
src/sys/arch/amd64/conf [netbsd-7]: ALL GENERIC XEN3_DOM0
src/sys/arch/i386/conf [netbsd-7]: ALL GENERIC XEN3_DOM0

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1297):
sys/arch/amd64/conf/ALL: revision 1.37
sys/arch/amd64/conf/GENERIC: revision 1.436
sys/arch/amd64/conf/XEN3_DOM0: revision 1.120
sys/arch/i386/conf/ALL: revision 1.400
sys/arch/i386/conf/GENERIC: revision 1.1138
sys/arch/i386/conf/XEN3_DOM0: revision 1.99
Add sdtemp(4)
--
Add ichsmb(4), spdmem(4) and sdtemp(4).


To generate a diff of this commit:
cvs rdiff -u -r1.13.2.3 -r1.13.2.4 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.392.2.7 -r1.392.2.8 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.103.2.4 -r1.103.2.5 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.380.2.2 -r1.380.2.3 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1107.2.8 -r1.1107.2.9 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.85.2.5 -r1.85.2.6 src/sys/arch/i386/conf/XEN3_DOM0

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/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.13.2.3 src/sys/arch/amd64/conf/ALL:1.13.2.4
--- src/sys/arch/amd64/conf/ALL:1.13.2.3	Fri May 15 03:44:17 2015
+++ src/sys/arch/amd64/conf/ALL	Fri Dec  9 05:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.13.2.3 2015/05/15 03:44:17 snj Exp $
+# $NetBSD: ALL,v 1.13.2.4 2016/12/09 05:10:45 snj Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ALL-$Revision: 1.13.2.3 $"
+#ident 		"ALL-$Revision: 1.13.2.4 $"
 
 maxusers	64		# estimated number of users
 
@@ -668,6 +668,13 @@ spdmem* at iic? addr 0x55
 spdmem* at iic? addr 0x56
 spdmem* at iic? addr 0x57
 sdtemp* at iic? addr 0x18
+sdtemp* at iic? addr 0x19
+sdtemp* at iic? addr 0x1a
+sdtemp* at iic? addr 0x1b
+sdtemp* at iic? addr 0x1c
+sdtemp* at iic? addr 0x1d
+sdtemp* at iic? addr 0x1e
+sdtemp* at iic? addr 0x1f
 
 # I2O devices
 iop*	at pci? dev ? function ?	# I/O processor

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.392.2.7 src/sys/arch/amd64/conf/GENERIC:1.392.2.8
--- src/sys/arch/amd64/conf/GENERIC:1.392.2.7	Fri May 15 03:44:17 2015
+++ src/sys/arch/amd64/conf/GENERIC	Fri Dec  9 05:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392.2.7 2015/05/15 03:44:17 snj Exp $
+# $NetBSD: GENERIC,v 1.392.2.8 2016/12/09 05:10:45 snj Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.392.2.7 $"
+#ident 		"GENERIC-$Revision: 1.392.2.8 $"
 
 maxusers	64		# estimated number of users
 
@@ -515,6 +515,14 @@ iic*	at ichsmb?
 #spdmem* at iic? addr 0x55
 #spdmem* at iic? addr 0x56
 #spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
 
 # I2O devices
 iop*	at pci? dev ? function ?	# I/O processor

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.4 src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.5
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.4	Wed Jul 22 16:53:34 2015
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Fri Dec  9 05:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.103.2.4 2015/07/22 16:53:34 snj Exp $
+# $NetBSD: XEN3_DOM0,v 1.103.2.5 2016/12/09 05:10:45 snj Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -299,11 +299,33 @@ amdtemp* at amdnb_misc?			# AMD CPU Temp
 amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
 #iic*	at amdpm?			# sensors below are on this bus
 
+# Intel ICH SMBus controller
+ichsmb* at pci? dev ? function ?
+iic*	at ichsmb?
+
 # Thermal monitor and fan controller
 #dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
 #dbcool* at iic? addr 0x2D		# Tyan S2881
 #dbcool* at iic? addr 0x2E		# Tyan S2882-D
 
+# Serial Presence Detect capable memory modules
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
+
 # Winbond LPC Super I/O
 #wbsio*	at isa? port 0x2e
 #wbsio*	at isa? port 0x4e

Index: src/sys/arch/i386/conf/ALL
diff -u

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

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 04:56:25 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: pci_subr.c

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #1296):
sys/dev/pci/pci_subr.c: revision 1.155 via patch
Protect against buffer overflow.


To generate a diff of this commit:
cvs rdiff -u -r1.124.2.2 -r1.124.2.3 src/sys/dev/pci/pci_subr.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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.124.2.2 src/sys/dev/pci/pci_subr.c:1.124.2.3
--- src/sys/dev/pci/pci_subr.c:1.124.2.2	Sun Dec 14 16:49:35 2014
+++ src/sys/dev/pci/pci_subr.c	Fri Dec  9 04:56:25 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.124.2.2 2014/12/14 16:49:35 martin Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.124.2.3 2016/12/09 04:56:25 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.124.2.2 2014/12/14 16:49:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.124.2.3 2016/12/09 04:56:25 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -54,6 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v
 #include 
 #else
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -618,6 +619,43 @@ pci_findproduct_stub(pcireg_t id_reg)
 }
 #endif
 
+/*
+ * Append a formatted string to dest without writing more than len
+ * characters (including the trailing NUL character).  dest and len
+ * are updated for use in subsequent calls to snappendf().
+ *
+ * Returns 0 on success, a negative value if vnsprintf() fails, or
+ * a positive value if the dest buffer would have overflowed.
+ */
+
+static int __printflike(3,4)
+snappendf(char **dest, size_t *len, const char * restrict fmt, ...)
+{
+	va_list	ap;
+	int count;
+
+	va_start(ap, fmt);
+	count = vsnprintf(*dest, *len, fmt, ap);
+	va_end(ap);
+
+	/* Let vsnprintf() errors bubble up to caller */
+	if (count < 0 || *len == 0)
+		return count;
+
+	/* Handle overflow */
+	if ((size_t)count >= *len) {
+		*dest += *len - 1;
+		*len = 1;
+		return 1;
+	}
+
+	/* Update dest & len to point at trailing NUL */
+	*dest += count;
+	*len -= count;
+		
+	return 0;
+}
+
 void
 pci_devinfo(pcireg_t id_reg, pcireg_t class_reg, int showclass, char *cp,
 size_t l)
@@ -631,9 +669,6 @@ pci_devinfo(pcireg_t id_reg, pcireg_t cl
 	const char *unmatched = pci_unmatched;
 	const char *vendor_namep, *product_namep;
 	const struct pci_class *classp, *subclassp, *interfacep;
-	char *ep;
-
-	ep = cp + l;
 
 	vendor = PCI_VENDOR(id_reg);
 	product = PCI_PRODUCT(id_reg);
@@ -669,39 +704,35 @@ pci_devinfo(pcireg_t id_reg, pcireg_t cl
 	}
 
 	if (vendor_namep == NULL)
-		cp += snprintf(cp, ep - cp, "%svendor 0x%04x product 0x%04x",
+		(void)snappendf(, , "%svendor 0x%04x product 0x%04x",
 		unmatched, vendor, product);
 	else if (product_namep != NULL)
-		cp += snprintf(cp, ep - cp, "%s %s", vendor_namep,
-		product_namep);
+		(void)snappendf(, , "%s %s", vendor_namep, product_namep);
 	else
-		cp += snprintf(cp, ep - cp, "%s product 0x%04x",
+		(void)snappendf(, , "%s product 0x%04x",
 		vendor_namep, product);
 	if (showclass) {
-		cp += snprintf(cp, ep - cp, " (");
+		(void)snappendf(, , " (");
 		if (classp->name == NULL)
-			cp += snprintf(cp, ep - cp,
+			(void)snappendf(, ,
 			"class 0x%02x, subclass 0x%02x", class, subclass);
 		else {
 			if (subclassp == NULL || subclassp->name == NULL)
-cp += snprintf(cp, ep - cp,
-"%s, subclass 0x%02x",
+(void)snappendf(, , "%s, subclass 0x%02x",
 classp->name, subclass);
 			else
-cp += snprintf(cp, ep - cp, "%s %s",
+(void)snappendf(, , "%s %s",
 subclassp->name, classp->name);
 		}
 		if ((interfacep == NULL) || (interfacep->name == NULL)) {
 			if (interface != 0)
-cp += snprintf(cp, ep - cp,
-", interface 0x%02x", interface);
+(void)snappendf(, , ", interface 0x%02x",
+interface);
 		} else if (strncmp(interfacep->name, "", 1) != 0)
-			cp += snprintf(cp, ep - cp, ", %s",
-			interfacep->name);
+			(void)snappendf(, , ", %s", interfacep->name);
 		if (revision != 0)
-			cp += snprintf(cp, ep - cp, ", revision 0x%02x",
-			revision);
-		cp += snprintf(cp, ep - cp, ")");
+			(void)snappendf(, , ", revision 0x%02x", revision);
+		(void)snappendf(, , ")");
 	}
 }

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

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 04:48:44 UTC 2016

Modified Files:
src/sys/arch/x86/pci [netbsd-7]: ichlpcib.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1295):
sys/arch/x86/pci/ichlpcib.c: revision 1.50
Add Core 5G (mobile) LPC support.


To generate a diff of this commit:
cvs rdiff -u -r1.43.4.5 -r1.43.4.6 src/sys/arch/x86/pci/ichlpcib.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/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.43.4.5 src/sys/arch/x86/pci/ichlpcib.c:1.43.4.6
--- src/sys/arch/x86/pci/ichlpcib.c:1.43.4.5	Sun Aug 28 03:38:15 2016
+++ src/sys/arch/x86/pci/ichlpcib.c	Fri Dec  9 04:48:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichlpcib.c,v 1.43.4.5 2016/08/28 03:38:15 snj Exp $	*/
+/*	$NetBSD: ichlpcib.c,v 1.43.4.6 2016/12/09 04:48:44 snj Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.5 2016/08/28 03:38:15 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.6 2016/12/09 04:48:44 snj Exp $");
 
 #include 
 #include 
@@ -261,6 +261,8 @@ static struct lpcib_device {
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z97_LPC, 1, 0 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X99_LPC, 1, 0 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X99_LPC_2, 1, 0 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_M_LPC_4, 1, 0 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_M_LPC_7, 1, 0 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C222_LPC, 1, 0 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C224_LPC, 1, 0 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C226_LPC, 1, 0 },

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

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Dec  9 04:43:08 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: ichsmb.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1294):
sys/dev/pci/ichsmb.c: revisions 1.43-1.44
ichsmb(4): Add Braswell PCU SMBus and Intel 100 Series SMBus.


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.2 -r1.37.2.3 src/sys/dev/pci/ichsmb.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.37.2.2 src/sys/dev/pci/ichsmb.c:1.37.2.3
--- src/sys/dev/pci/ichsmb.c:1.37.2.2	Thu Apr 30 19:27:20 2015
+++ src/sys/dev/pci/ichsmb.c	Fri Dec  9 04:43:08 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichsmb.c,v 1.37.2.2 2015/04/30 19:27:20 snj Exp $	*/
+/*	$NetBSD: ichsmb.c,v 1.37.2.3 2016/12/09 04:43:08 snj Exp $	*/
 /*	$OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.37.2.2 2015/04/30 19:27:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.37.2.3 2016/12/09 04:43:08 snj Exp $");
 
 #include 
 #include 
@@ -111,9 +111,11 @@ ichsmb_match(device_t parent, cfdata_t m
 		case PCI_PRODUCT_INTEL_7SERIES_SMB:
 		case PCI_PRODUCT_INTEL_8SERIES_SMB:
 		case PCI_PRODUCT_INTEL_9SERIES_SMB:
+		case PCI_PRODUCT_INTEL_100SERIES_SMB:
 		case PCI_PRODUCT_INTEL_CORE4G_M_SMB:
 		case PCI_PRODUCT_INTEL_CORE5G_M_SMB:
 		case PCI_PRODUCT_INTEL_BAYTRAIL_PCU_SMB:
+		case PCI_PRODUCT_INTEL_BSW_PCU_SMB:
 		case PCI_PRODUCT_INTEL_C600_SMBUS:
 		case PCI_PRODUCT_INTEL_C600_SMB_0:
 		case PCI_PRODUCT_INTEL_C600_SMB_1:

CVS commit: [netbsd-7] src/doc

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 08:12:10 UTC 2016

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

Log Message:
tickets 1286-1293


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.125 -r1.1.2.126 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.125 src/doc/CHANGES-7.1:1.1.2.126
--- src/doc/CHANGES-7.1:1.1.2.125	Thu Dec  8 00:15:50 2016
+++ src/doc/CHANGES-7.1	Thu Dec  8 08:12:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.125 2016/12/08 00:15:50 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.126 2016/12/08 08:12:10 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6990,3 +6990,176 @@ usr.sbin/cpuctl/arch/i386.c			1.72-1.74
 	- Add new TLB descriptor 0x64 and 0xc4.
 	[msaitoh, ticket #1285]
 
+sys/dev/i2c/sdtemp.c1.26-1.32 via patch
+sys/dev/i2c/sdtemp_reg.h			1.8-1.12
+share/man/man4/sdtemp.41.5-1.6
+
+	Changes for sdtemp(4):
+	- Add support for Atmel AT30TS00, AT30TSE004, Giantec GT30TS00,
+	  GT34TS02, Microchip MCP9804, MCP98244, IDT TS3000GB[02], TS3001GB2,
+	  TSE2004GB2, On Semiconductor CAT34TS02C and CAT34TS04.
+	- Add JEDEC TSE2004av support. If a device conforms TES2004av, it can
+	  be used without adding new entry into the matching table.
+	- Check the temperature resolution field in the capability register
+	  instead of the hard coded value in the match table. With this change,
+	  some devices' temperature resolution would be fixed.
+	- The resolution register is a vendor specific register.
+	- All of IDT devices have the resolution register.
+	- The address of the resolution register of Microchip MCP98244 is
+	  different from other Microchip devices.
+	- Show accuracy, range, resolution, high voltage standoff and shutdown.
+	- Show timeout with AB_DEBUG.
+	- Fix dmesg of STTS2004.
+	[msaitoh, ticket #1286]
+
+sys/arch/arm/include/armreg.h			1.111
+
+	Fix CORTEXA9Rx definitions.
+	[msaitoh, ticket #1287]
+
+distrib/sets/lists/man/mi			1.1521, 1.1522
+lib/libc/stdlib/Makefile.inc			1.92
+
+	Add malloc.conf.5 (link to jemalloc.3).
+	[msaitoh, ticket #1288]
+
+sys/dev/usb/usbdevs			1.683-1.684, 1.686-1.689, 1.691-1.695, 1.697-1.700, 1.702-1.711, 1.713-1.715, 1.717-1.727
+sys/dev/usb/usbdevs.h			regen
+sys/dev/usb/usbdevs_data.h		regen
+
+	- Add Realtek RTL8152, RTL8153, RTL8192EU.
+	- Add Atheros AR3012.
+	- Add Validity Sensors, Inc. and their devices. PR#45732 from
+	  Greg A. Woods.
+	- Add some SMSC devices (PR#49484)
+	- Add Silicon Labs EC3 USB debug adapter.
+	- Add Xbox 360 Wireless Receiver.
+	- Add Arduino, TP-Link, Compare, DataApex, Evoluton Robotics devices.
+	- Add another RTL8192CU device of Asustek.
+	- Add Belkin Components RTL8192CPU, RTL8188CU and F7D2102.
+	- Add another RTL8188CUS. device of Chicony Electronics.
+	- Add another RTL8192CU and DWA-131 rev. B of D-Link.
+	- Add Guillemot RTL8192CU.
+	- Add Hawking RTL8192CU.
+	- Add IO-DATA WN-G150UM and RTL8192CU.
+	- Add another RTL8188RU of Realtek.
+	- Add Huawei U8150, E353_HiLink.
+	- Add vendor ID of Ingenic Semiconductor Ltd.
+	- Add Conexant USB Modem.
+	- Add TI TUSB3410, MSP-FET430UIF and MSP-FET430UIF JTAG.
+	  Part of PR#49814.
+	- Add Lenovo ThinkPad Compact USB keyboard with TrackPoint.
+	- Add Panasonic Lumix Camera DMC-FS45 from kern/49809.
+	- Add Asustek USB-N53 and USB-N66.
+	- Add D-Link DWA-1xx devices.
+	- Add Ralink RT3573 and RT5572.
+	- Add Sitecom Europe ET3072 and LN-031.
+	- Add Elecom WDC-433SU2M2.
+	- Add Apple iPhone[45], iPad[23] and iPad Mini.
+	- Add Century CT-USB1HUB.
+	- Add MosChip MCS7832 Ethernet Adapter.
+	- Add another RTL8188CU of Realtek.
+	- Add DisplayLink MIMO, Polaris2 USB dock, Plugable docking station,
+	  FY-DVI and FY-DVI2.
+	- Add a NetChip USB-IDE bridge.
+	- Add MS Confort Mouse 6000 from Martijn van Buul (PR#50701).
+	- Add NTT DOCOMO L-05A.
+	- Add Buffalo WI-U2-300D.
+	- Add Sandisk Cruzer (PR#46547).
+	- Add D-Link DWA 125 rev. D1 USB wireless network adapter
+	  from Jake Slazenger (part of PR#51529).
+	- Add C-Meida USB Pnp Sound.
+	- Add AboCom RTL8188EU.
+	- Add Intel Advanced-N 6235 Combo Bluetooth.
+	- Add Validity Sensors VFS491.
+	- Add Linksys HG20F9 Ethernet.
+	[msaitoh, ticket #1289]
+
+sys/dev/pci/satalink.c1.53
+
+	Remove PCI_PRODUCT_CMDTECH_240's entry because CMDTECH_AAR_1210SA
+	has the same ID.
+	[msaitoh, ticket #1290]
+
+sys/dev/pci/pcidevs1.1221-1.1245, 1.1247-1.1262, 1.1264-1.1269, 1.1271-1.1273
+sys/dev/pci/pcidevs.hregen
+sys/dev/pci/pcidevs_data.h			regen
+
+	- Add SystemBase SB16C1050 UARTs.
+	- Add D-Link DFE520TX (part of PR#49889 reported by Maxim Tsyplakov).
+	- Add Realtek RTL8188EE and RTL8192CE
+	- Add PLX Technology PEX 8111.
+	- Add some Red Hat devices.
+	- Add Samsung SM951.
+	- Add several NVIDIA geforce and NVS cards.
+	- Add some ATI/AMD

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

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 08:06:38 UTC 2016

Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: procfs_machdep.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1293):
sys/arch/x86/x86/procfs_machdep.c: revisions 1.12-1.14
Update for x86 /proc/cpuinfo:
- Add ptsc, avx512dq, avx512bw, avx512vl and rdt_a.
- Update VIA/Cyrix/Centaur-defined bits. Part of PR#39950.
- Remove pcommit.
- Update some Linux mapping unused in /proc/cpuinfo.


To generate a diff of this commit:
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/sys/arch/x86/x86/procfs_machdep.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/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.1 src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.2
--- src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.1	Sun Mar  6 17:58:22 2016
+++ src/sys/arch/x86/x86/procfs_machdep.c	Thu Dec  8 08:06:38 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_machdep.c,v 1.6.4.1 2016/03/06 17:58:22 martin Exp $ */
+/*	$NetBSD: procfs_machdep.c,v 1.6.4.2 2016/12/08 08:06:38 snj Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6.4.1 2016/03/06 17:58:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6.4.2 2016/12/08 08:06:38 snj Exp $");
 
 #include 
 #include 
@@ -61,13 +61,13 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
  *  x86/include/asm/cpufeatures.h.
  */
 static const char * const x86_features[][32] = {
-	{ /* (0) Common */
+	{ /* (0) Common: 0x001 edx */
 	"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
 	"cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
 	"pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",
 	"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe"},
 
-	{ /* (1) AMD-defined: 8001 edx */
+	{ /* (1) AMD-defined: 0x8001 edx */
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
@@ -86,7 +86,7 @@ static const char * const x86_features[]
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 
-	{ /* (4) Intel-defined: 8001 ecx */
+	{ /* (4) Intel-defined: 0x0001 ecx */
 	"pni", "pclmulqdq", "dtes64", "monitor", "ds_cpl", "vmx", "smx", "est",
 	"tm2", "ssse3", "cid", "sdbg", "fma", "cx16", "xtpr", "pdcm",
 	NULL, "pcid", "dca", "sse4_1", "sse4_2", "x2apic", "movbe", "popcnt",
@@ -95,7 +95,7 @@ static const char * const x86_features[]
 
 	{ /* (5) VIA/Cyrix/Centaur-defined */
 	NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	"ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 
@@ -105,12 +105,13 @@ static const char * const x86_features[]
 	"3dnowprefetch", "osvw", "ibs", "xop", "skinit", "wdt", NULL, "lwp",
 	"fma4", "tce", NULL, "nodeid_msr",
 	NULL, "tbm", "topoext", "perfctr_core",
-	"perfctr_nb", NULL, "bpext", NULL, "perfctr_l2", "mwaitx", NULL, NULL},
+	"perfctr_nb", NULL, "bpext", "ptsc",
+	"perfctr_l2", "mwaitx", NULL, NULL},
 
 	{ /* (7) Linux mapping */
-	"ida", "arat", "cpb", "ebp", NULL, "pln", "pts", "dtherm",
-	"hw_pstate", "proc_feedback", "hwp", "hwp_notify", "hwp_act_window",
-	"hwp_epp", "hwp_pkg_req", "intel_pt",
+	NULL, NULL, "cpb", "ebp", NULL, "pln", "pts", "dtherm",
+	"hw_pstate", "proc_feedback", NULL, NULL,
+	NULL, NULL, NULL, "intel_pt",
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 
@@ -124,11 +125,11 @@ static const char * const x86_features[]
 
 	{ /* (9) Intel-defined: 0007 ebx */
 	"fsgsbase", "tsc_adjust", NULL, "bmi1", "hle", "avx2", NULL, "smep",
-	"bmi2", "erms", "invpcid", "rtm", "cqm", NULL, "mpx", NULL,
-	"avx512f", NULL, "rdseed", "adx",
-	"smap", NULL, "pcommit", "clflushopt",
+	"bmi2", "erms", "invpcid", "rtm", "cqm", NULL, "mpx", "rdt_a",
+	"avx512f", "avx512dq", "rdseed", "adx",
+	"smap", NULL, NULL, "clflushopt",
 	"clwb", NULL, "avx512pf", "avx512er",
-	"avx512cd", "sha_ni", NULL, NULL},
+	"avx512cd", "sha_ni", "avx512bw", "avx512vl"},
 
 	{ /* (10) 000d eax */
 	"xsaveopt", "xsavec", "xgetbv1", "xsaves", NULL, NULL, NULL, NULL,

CVS commit: [netbsd-7] src

2016-12-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 08:03:59 UTC 2016

Modified Files:
src/share/man/man4 [netbsd-7]: puc.4
src/sys/dev/pci [netbsd-7]: pucdata.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1292):
sys/dev/pci/pucdata.c: revisions 1.95-1.98
share/man/man4/puc.4: revisions 1.39-40
Add three devices to puc(4):
- Add support for SystemBase SB16C1050 PCI serial card. PR#49819
  reported by Roberto E. Vargas Caballero.
- Add another Intel Q45 KT.
- Add Intel 100 Series Chipset KT.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.8.1 src/share/man/man4/puc.4
cvs rdiff -u -r1.93.4.1 -r1.93.4.2 src/sys/dev/pci/pucdata.c

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/puc.4
diff -u src/share/man/man4/puc.4:1.38 src/share/man/man4/puc.4:1.38.8.1
--- src/share/man/man4/puc.4:1.38	Fri Oct 26 11:43:43 2012
+++ src/share/man/man4/puc.4	Thu Dec  8 08:03:59 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.38 2012/10/26 11:43:43 msaitoh Exp $
+.\" $NetBSD: puc.4,v 1.38.8.1 2016/12/08 08:03:59 snj Exp $
 .\"
 .\" Copyright (c) 1998 Christopher G. Demetriou
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" <>
 .\"
-.Dd October 26, 2012
+.Dd May 4, 2015
 .Dt PUC 4
 .Os
 .Sh NAME
@@ -165,6 +165,7 @@ The driver currently supports the follow
 .It Tn "SUNIX 5099 (4 port serial and 1 port parallel)"
 .It Tn "Syba Tech Ltd. PCI-4S"
 .It Tn "Syba Tech Ltd. PCI-4S2P-550-ECP"
+.It Tn "SystemBase SB16C1050PCI (2 port serial)"
 .It Tn "SystemBase SB16C1054PCI (4 port serial)"
 .It Tn "SystemBase SB16C1058PCI (8 port serial)"
 .It Tn "US Robotics (3Com) 3CP5609 PCI 16550 Modem"
@@ -217,7 +218,8 @@ driver appeared in
 .Sh AUTHORS
 The
 .Nm
-driver was written by Chris Demetriou.
+driver was written by
+.An Chris Demetriou .
 .Sh BUGS
 The current design of this driver keeps any
 .Nm com

Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.93.4.1 src/sys/dev/pci/pucdata.c:1.93.4.2
--- src/sys/dev/pci/pucdata.c:1.93.4.1	Thu Apr 30 19:27:20 2015
+++ src/sys/dev/pci/pucdata.c	Thu Dec  8 08:03:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pucdata.c,v 1.93.4.1 2015/04/30 19:27:20 snj Exp $	*/
+/*	$NetBSD: pucdata.c,v 1.93.4.2 2016/12/08 08:03:59 snj Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Christopher G. Demetriou.  All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.93.4.1 2015/04/30 19:27:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.93.4.2 2016/12/08 08:03:59 snj Exp $");
 
 #include 
 #include 
@@ -477,7 +477,7 @@ const struct puc_device_description puc_
 		{ PUC_PORT_TYPE_COM, PCI_BAR2, 0x00, COM_FREQ },
 	},
 	},
- 
+
 	/* Lava Computers 2SP-PCI */
 	{   "Lava Computers 2SP-PCI parallel port",
 	{	PCI_VENDOR_LAVA,	PCI_PRODUCT_LAVA_TWOSP_1P, 0, 0 },
@@ -1315,7 +1315,7 @@ const struct puc_device_description puc_
 	},
 
 	{   "SUNIX 5008 1P",
-	{	PCI_VENDOR_SUNIX2, 	PCI_PRODUCT_SUNIX2_SER5,
+	{	PCI_VENDOR_SUNIX2,	PCI_PRODUCT_SUNIX2_SER5,
 		0x1fd4,	0x0100 },
 	{	0x,	0x,	0x,	0xeff0 },
 	{
@@ -1469,7 +1469,7 @@ const struct puc_device_description puc_
 	},
 
 	/*
-	 * Nanjing QinHeng Electronics 
+	 * Nanjing QinHeng Electronics
 	 * Products based on CH353 chip which can be
 	 * configured to provide various combinations
 	 * including 2 serial ports and a parallel port
@@ -1857,6 +1857,14 @@ const struct puc_device_description puc_
 	},
 	},
 
+	/* Intel Q45 KT (again) */
+	{   "Intel Q45 KT",
+	{	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q45_KT_1, 0, 0 },
+	{	0x,	0x,	0,	0	},
+	{
+		{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+	},
+	},
 	/* Intel 5 Series and Intel 3400 Series KT */
 	{   "Intel 5 Series KT",
 	{	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_KT, 0, 0 },
@@ -1902,6 +1910,15 @@ const struct puc_device_description puc_
 	},
 	},
 
+	/* Intel 100 Series KT */
+	{   "Intel 100 Series KT",
+	{	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_KT, 0, 0 },
+	{	0x,	0x,	0,	0	},
+	{
+		{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+	},
+	},
+
 	/* Intel C600/X79 Series KT */
 	{   "Intel C600/X79 Series KT",
 	{	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_KT, 0, 0 },
@@ -2783,6 +2800,16 @@ const struct puc_device_description puc_
 	},
 	},
 
+	/* SystemBase SB16C1050 UARTs */
+	{   "SystemBase SB16C1050",
+	{	PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1050, 0, 0 },
+	{	0x, 0x,		 0, 0 },
+	{
+		{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8},
+		{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8},
+	},
+	},
+
 	/* SystemBase SB16C1054 UARTs */
 	{   "SystemBase SB16C1054",
 	{	PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1054, 0, 0 },

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

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 07:58:04 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs.h pcidevs_data.h

Log Message:
regen for ticket 1291


To generate a diff of this commit:
cvs rdiff -u -r1.1192.2.6 -r1.1192.2.7 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1191.2.6 -r1.1191.2.7 src/sys/dev/pci/pcidevs_data.h

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

diffs are larger than 1MB and have been omitted

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

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 07:56:45 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1291):
sys/dev/pci/pcidevs: revisions 1.1221-1.1245, 1.1247-1.1262, 
1.1264-1.1269, 1.1271-1.1273
- Add SystemBase SB16C1050 UARTs.
- Add D-Link DFE520TX (part of PR#49889 reported by Maxim Tsyplakov).
- Add Realtek RTL8188EE and RTL8192CE
- Add PLX Technology PEX 8111.
- Add some Red Hat devices.
- Add Samsung SM951.
- Add several NVIDIA geforce and NVS cards.
- Add some ATI/AMD devices.
- Add Radeon HD 2400 and TSB82AA2 IEEE 1394 Host Controller.
  Reported by T. M. Pederson (PR#40987).
- Add some Edimax, AWT, Fusion-io and Ralink devices of ral(4).
- Add MSI RT3090, Edimax RT3591, Ralink RT 536[02] and RT5390 of
  ral(4).
- Add vendor ID of Super Micro.
- Add MegaRAID SAS3008.
- Fix entries. The following problems were found while sorting entries:
  - Remove the following entries because the value is duplicated:
CMDTECH_240 (CMDTECH_AAR_1210SA has the same value)
INTEL_C610_SATA_RAID (INTEL_82801H_SATA_RAID has the same vaule)
INTEL_C610_PCIE_1_3 (82801BA_HPB has the same value)
GEFORCE_610M3   (GEFORCE_610M2 has the same value)
  - RADEON_RV350_NQ is not 0x4e41 but 0x4e51
  - 82801JD_SATA_RAID is not 0x3a02 but 0x3a05.
  - The following two entries have the same number. Fix one of them:
DH89XXCL_USB_2 to 0x23b5(was 0x23b4 (== DH89XXCL_USB_1))
5500_HB to 0x3404 and change the desc (was 0x3403 (== 3400_HB))
82X58_PCIE_0_1 to 0x3421(was 0x3420 (== 82X58_PCIE_0_0))
82801JI_THERMAL to 0x3a32   (was 0x3a30 (== 82801JI_SMB))
- Add the following Intel entries:
  - PCIe NVMe SSD.
  - Dual Band Wireless AC 3165.
  - I219 family Ethernet devices.
  - Dual Band Wireless AC 3165, 4165 and 8260 devices.
  - 82597EX_SR (part of PR#47750).
  - Braswell devices.
  - Core 6G devices.
  - 100 series chipset devices.
  - Xeon D devices.
  - Xeon 5[56]00 devices.
  - Xeon E7 v4 devices.
- Add "Core i7-6xxxK" to some Intel devices' description.
- Fix Intel XE5_V3_IMC1_DDRIO_[34]'s values.
- Add another ID for Intel 82Q45 KT.
- Add some entries of Intel 965 Express Chipset.
- Add some Intel Xeon E5 v3 devices.
- Add some Intel 1st gen Core PCI devices.
- Add some Intel Core 5G devices.
- Add some Intel Core i7-6xxxK devices.
- Add some Intel Core i7-800 and i5-700 devices.
- Add some Intel 10G devices.
- Add ASMedia ASM1042A USB 3.0 Host Controller.
- Add ASMEDIA ASM1083/1085/1142.
- Add Marvell Armada38x and 88AP510.
- Add Qualcomm Atheros QCA986x/988x.
- Add Atheros AR9565 Wireless LAN.
- Sort entries in device ID's order.
- Fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.1199.2.6 -r1.1199.2.7 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1199.2.6 src/sys/dev/pci/pcidevs:1.1199.2.7
--- src/sys/dev/pci/pcidevs:1.1199.2.6	Sun Apr 19 16:26:23 2015
+++ src/sys/dev/pci/pcidevs	Thu Dec  8 07:56:45 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1199.2.6 2015/04/19 16:26:23 riz Exp $
+$NetBSD: pcidevs,v 1.1199.2.7 2016/12/08 07:56:45 snj Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -529,10 +529,9 @@ vendor ITE		0x1283	Integrated Technology
 vendor ESSTECH2		0x1285	ESS Technology
 vendor TRITECH		0x1292	TriTech Microelectronics
 vendor KOFAX		0x1296	Kofax Image Products
-vendor ALTEON		0x12ae	Alteon
 vendor RISCOM		0x12aa	RISCom
+vendor ALTEON		0x12ae	Alteon
 vendor USR		0x12b9	US Robotics (3Com)
-vendor USR2		0x16ec	US Robotics
 vendor PICTUREEL	0x12c5	Picture Elements
 vendor NVIDIA_SGS	0x12d2	Nvidia & SGS-Thomson Microelectronics
 vendor PERICOM		0x12d8	Pericom Semiconductors
@@ -568,12 +567,13 @@ vendor ICENSEMBLE	0x1412	IC Ensemble / V
 vendor MICROSOFT	0x1414	Microsoft
 vendor OXFORDSEMI	0x1415	Oxford Semiconductor
 vendor CHELSIO		0x1425	Chelsio Communications
+vendor EDIMAX		0x1432	Edimax
 vendor TAMARACK		0x143d	Tamarack Microelectronics
 vendor SAMSUNGELEC3	0x144d	Samsung Electronics (3rd vendor ID)
 vendor ASKEY		0x144f	Askey Computer
 vendor AVERMEDIA	0x1461	Avermedia Technologies
+vendor MSI		0x1462 	Micro-star International Co Ltd
 vendor SYSTEMBASE	0x14a1	System Base
-vendor MARVELL2		0x1b4b	Marvell
 vendor AIRONET		0x14b9	Aironet Wireless Communications
 vendor COMPAL		0x14c0	COMPAL Electronics
 vendor MYRICOM		0x14c1	Myricom
@@ -584,6 +584,7 @@ vendor BROADCOM		0x14e4	Broadcom
 vendor PLANEX		0x14ea	Planex Communications
 vendor CONEXANT		0x14f1	Conexant Systems
 vendor DELTA		0x1500	Delta Electronics
+vendor MYSON		0x1516	Myson-Century Technology
 vendor ENE		0x1524	ENE Technology
 vendor TERRATEC		0x153b	TerraTec Electronic
 vendor PERLE		0x155f	Perle Systems
@@ -594,18 +595,19 @@ vendor FARADAY		0x159b	Faraday Technolog
 vendor

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

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 07:52:51 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: satalink.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1290):
sys/dev/pci/satalink.c: revision 1.53
Remove PCI_PRODUCT_CMDTECH_240's entry because CMDTECH_AAR_1210SA has
the same ID.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.4.1 src/sys/dev/pci/satalink.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/satalink.c
diff -u src/sys/dev/pci/satalink.c:1.52 src/sys/dev/pci/satalink.c:1.52.4.1
--- src/sys/dev/pci/satalink.c:1.52	Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/satalink.c	Thu Dec  8 07:52:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: satalink.c,v 1.52 2014/03/29 19:28:25 christos Exp $	*/
+/*	$NetBSD: satalink.c,v 1.52.4.1 2016/12/08 07:52:51 snj Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.52 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.52.4.1 2016/12/08 07:52:51 snj Exp $");
 
 #include 
 #include 
@@ -275,11 +275,6 @@ static const struct pciide_product_desc 
 	  "Silicon Image SATALink 3112",
 	  sii3112_chip_map,
 	},
-	{ PCI_PRODUCT_CMDTECH_240,
-	  0,
-	  "Silicon Image SATALink Sil240",
-	  sii3112_chip_map,
-	},
 	{ PCI_PRODUCT_CMDTECH_3512,
 	  0,
 	  "Silicon Image SATALink 3512",

CVS commit: [netbsd-7] src/sys/dev/usb

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 07:50:17 UTC 2016

Modified Files:
src/sys/dev/usb [netbsd-7]: usbdevs.h usbdevs_data.h

Log Message:
regen for ticket 1289


To generate a diff of this commit:
cvs rdiff -u -r1.672.2.5 -r1.672.2.6 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.673.2.5 -r1.673.2.6 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.672.2.5 src/sys/dev/usb/usbdevs.h:1.672.2.6
--- src/sys/dev/usb/usbdevs.h:1.672.2.5	Sun Sep 18 06:01:05 2016
+++ src/sys/dev/usb/usbdevs.h	Thu Dec  8 07:50:15 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.672.2.5 2016/09/18 06:01:05 snj Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.672.2.6 2016/12/08 07:50:15 snj Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp
+ *	NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp
  */
 
 /*
@@ -324,6 +324,7 @@
 #define	USB_VENDOR_ARASAN	0x07da		/* Arasan Chip Systems */
 #define	USB_VENDOR_ALLIEDCABLE	0x07e6		/* Allied Cable */
 #define	USB_VENDOR_STSN	0x07ef		/* STSN */
+#define	USB_VENDOR_CENTURY	0x07f7		/* CENTURY Corporation */
 #define	USB_VENDOR_BEWAN	0x07fa		/* Bewan */
 #define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics */
 #define	USB_VENDOR_BROADLOGIC	0x0827		/* BroadLogic */
@@ -493,6 +494,7 @@
 #define	USB_VENDOR_MOBILITY	0x1342		/* Mobility */
 #define	USB_VENDOR_DICKSMITH	0x1371		/* Dick Smith Electronics */
 #define	USB_VENDOR_NETGEAR3	0x1385		/* Netgear */
+#define	USB_VENDOR_VALIDITY	0x138a		/* Validity Sensors, Inc. */
 #define	USB_VENDOR_BALTECH	0x13ad		/* Baltech */
 #define	USB_VENDOR_CISCOLINKSYS	0x13b1		/* Cisco-Linksys */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
@@ -557,9 +559,12 @@
 #define	USB_VENDOR_PARA	0x20b8		/* PARA Industrial */
 #define	USB_VENDOR_TRENDNET	0x20f4		/* TRENDnet */
 #define	USB_VENDOR_DLINK3	0x2101		/* D-Link */
+#define	USB_VENDOR_VIALABS	0x2109		/* VIA Labs */
 #define	USB_VENDOR_ERICSSON	0x2282		/* Ericsson */
 #define	USB_VENDOR_MOTOROLA2	0x22b8		/* Motorola */
 #define	USB_VENDOR_PINNACLE	0x2304		/* Pinnacle Systems */
+#define	USB_VENDOR_ARDUINO	0x2341		/* Arduino SA */
+#define	USB_VENDOR_TPLINK	0x2357		/* TP-Link */
 #define	USB_VENDOR_TRIPPLITE	0x2478		/* Tripp-Lite */
 #define	USB_VENDOR_HIROSE	0x2631		/* Hirose Electric */
 #define	USB_VENDOR_NHJ	0x2770		/* NHJ */
@@ -580,6 +585,7 @@
 #define	USB_VENDOR_SWEEX	0x5173		/* Sweex */
 #define	USB_VENDOR_ONSPEC2	0x55aa		/* OnSpec Electronic Inc. */
 #define	USB_VENDOR_ZINWELL	0x5a57		/* Zinwell */
+#define	USB_VENDOR_INGENIC	0x601a		/* Ingenic Semiconductor Ltd. */
 #define	USB_VENDOR_SITECOM	0x6189		/* Sitecom */
 #define	USB_VENDOR_SPRINGERDESIGN	0x6400		/* Springer Design, Inc. */
 #define	USB_VENDOR_ARKMICROCHIPS	0x6547		/* ArkMicroChips */
@@ -592,6 +598,9 @@
 #define	USB_VENDOR_NETGEAR4	0x9846		/* Netgear */
 #define	USB_VENDOR_xxFTDI	0x9e88		/* FTDI */
 #define	USB_VENDOR_CACE	0xcace		/* CACE Technologies */
+#define	USB_VENDOR_COMPARE	0xcdab		/* Compare */
+#define	USB_VENDOR_DATAAPEX	0xdaae		/* DataApex */
+#define	USB_VENDOR_EVOLUTION	0xdeee		/* Evolution Robotics */
 #define	USB_VENDOR_EMPIA	0xeb1a		/* eMPIA Technology */
 #define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
 #define	USB_VENDOR_USRP	0xfffe		/* GNU Radio USRP */
@@ -647,6 +656,7 @@
 #define	USB_PRODUCT_ABOCOM_UFE2000	0x420a		/* UFE2000 USB2.0 Fast Ethernet Adapter */
 #define	USB_PRODUCT_ABOCOM_WL54	0x6001		/* WL54 */
 #define	USB_PRODUCT_ABOCOM_RTL8192CU	0x8178		/* RTL8192CU */
+#define	USB_PRODUCT_ABOCOM_RTL8188EU	0x8179		/* RTL8188EU */
 #define	USB_PRODUCT_ABOCOM_RTL8188CU_1	0x8188		/* RTL8188CU */
 #define	USB_PRODUCT_ABOCOM_RTL8188CU_2	0x8189		/* RTL8188CU */
 #define	USB_PRODUCT_ABOCOM_XX10	0xabc1		/* XX10 */
@@ -863,7 +873,14 @@
 #define	USB_PRODUCT_APPLE_IPOD_TOUCH_4G	0x129e		/* iPod Touch 4G */
 #define	USB_PRODUCT_APPLE_IPHONE_3G	0x1292		/* iPhone 3G */
 #define	USB_PRODUCT_APPLE_IPHONE_3GS	0x1294		/* iPhone 3GS */
+#define	USB_PRODUCT_APPLE_IPHONE_4	0x1297		/* iPhone 4 */
+#define	USB_PRODUCT_APPLE_IPHONE_4_VZW	0x129c		/* iPhone 4 (VZW) */
+#define	USB_PRODUCT_APPLE_IPHONE_4S	0x12a0		/* iPhone 4S */
+#define	USB_PRODUCT_APPLE_IPHONE_5	0x12a8		/* iPhone 5 */
 #define	USB_PRODUCT_APPLE_IPAD	0x129a		/* Apple iPad */
+#define	USB_PRODUCT_APPLE_IPAD_2	0x12a2		/* Apple iPad 2 */
+#define	USB_PRODUCT_APPLE_IPAD_3	0x12a6		/* Apple iPad 3 */
+#define	USB_PRODUCT_APPLE_IPAD_MINI	0x12ab		/* Apple iPad Mini */
 #define	USB_PRODUCT_APPLE_ETHERNET	0x1402		/* Apple USB to Ethernet */
 #define	USB_PRODUCT_APPLE_BLUETOOTH2	0x8205		/* Bluetooth */
 #define	USB_PRODUCT_APPLE_BLUETOOTH_HOST_C	0x821f		/* Bluetooth USB Host Controller */
@@ -912,8 +929,11 @@
 #define	USB_PRODUCT_ASUSTEK_USBN10	0x1786		/* USB-N10 */
 #define

CVS commit: [netbsd-7] src/sys/dev/usb

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 07:49:42 UTC 2016

Modified Files:
src/sys/dev/usb [netbsd-7]: usbdevs

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1289):
sys/dev/usb/usbdevs: revisions 1.683-1.684, 1.686-1.689, 1.691-1.695, 
1.697-1.700, 1.702-1.711, 1.713-1.715, 1.717-1.727
- Add Realtek RTL8152, RTL8153, RTL8192EU.
- Add Atheros AR3012.
- Add Validity Sensors, Inc. and their devices. PR#45732 from
  Greg A. Woods.
- Add some SMSC devices (PR#49484)
- Add Silicon Labs EC3 USB debug adapter.
- Add Xbox 360 Wireless Receiver.
- Add Arduino, TP-Link, Compare, DataApex, Evoluton Robotics devices.
- Add another RTL8192CU device of Asustek.
- Add Belkin Components RTL8192CPU, RTL8188CU and F7D2102.
- Add another RTL8188CUS. device of Chicony Electronics.
- Add another RTL8192CU and DWA-131 rev. B of D-Link.
- Add Guillemot RTL8192CU.
- Add Hawking RTL8192CU.
- Add IO-DATA WN-G150UM and RTL8192CU.
- Add another RTL8188RU of Realtek.
- Add Huawei U8150, E353_HiLink.
- Add vendor ID of Ingenic Semiconductor Ltd.
- Add Conexant USB Modem.
- Add TI TUSB3410, MSP-FET430UIF and MSP-FET430UIF JTAG.
  Part of PR#49814.
- Add Lenovo ThinkPad Compact USB keyboard with TrackPoint.
- Add Panasonic Lumix Camera DMC-FS45 from kern/49809.
- Add Asustek USB-N53 and USB-N66.
- Add D-Link DWA-1xx devices.
- Add Ralink RT3573 and RT5572.
- Add Sitecom Europe ET3072 and LN-031.
- Add Elecom WDC-433SU2M2.
- Add Apple iPhone[45], iPad[23] and iPad Mini.
- Add Century CT-USB1HUB.
- Add MosChip MCS7832 Ethernet Adapter.
- Add another RTL8188CU of Realtek.
- Add DisplayLink MIMO, Polaris2 USB dock, Plugable docking station,
  FY-DVI and FY-DVI2.
- Add a NetChip USB-IDE bridge.
- Add MS Confort Mouse 6000 from Martijn van Buul (PR#50701).
- Add NTT DOCOMO L-05A.
- Add Buffalo WI-U2-300D.
- Add Sandisk Cruzer (PR#46547).
- Add D-Link DWA 125 rev. D1 USB wireless network adapter
  from Jake Slazenger (part of PR#51529).
- Add C-Meida USB Pnp Sound.
- Add AboCom RTL8188EU.
- Add Intel Advanced-N 6235 Combo Bluetooth.
- Add Validity Sensors VFS491.
- Add Linksys HG20F9 Ethernet.


To generate a diff of this commit:
cvs rdiff -u -r1.680.2.5 -r1.680.2.6 src/sys/dev/usb/usbdevs

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/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.680.2.5 src/sys/dev/usb/usbdevs:1.680.2.6
--- src/sys/dev/usb/usbdevs:1.680.2.5	Sun Sep 18 06:00:20 2016
+++ src/sys/dev/usb/usbdevs	Thu Dec  8 07:49:42 2016
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp $
+$NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -317,6 +317,7 @@ vendor APTIO		0x07d2	Aptio Products
 vendor ARASAN		0x07da	Arasan Chip Systems
 vendor ALLIEDCABLE	0x07e6	Allied Cable
 vendor STSN		0x07ef	STSN
+vendor CENTURY		0x07f7	CENTURY Corporation
 vendor BEWAN		0x07fa	Bewan
 vendor ZOOM		0x0803	Zoom Telephonics
 vendor BROADLOGIC	0x0827	BroadLogic
@@ -486,6 +487,7 @@ vendor AINCOMM		0x12fd	Aincomm
 vendor MOBILITY		0x1342	Mobility
 vendor DICKSMITH	0x1371	Dick Smith Electronics
 vendor NETGEAR3		0x1385	Netgear
+vendor VALIDITY		0x138a	Validity Sensors, Inc.
 vendor BALTECH		0x13ad	Baltech
 vendor CISCOLINKSYS	0x13b1	Cisco-Linksys
 vendor SHARK		0x13d2	Shark
@@ -550,9 +552,12 @@ vendor HAUPPAUGE2	0x2040	Hauppauge Compu
 vendor PARA		0x20b8	PARA Industrial
 vendor TRENDNET		0x20f4	TRENDnet
 vendor DLINK3		0x2101  D-Link
+vendor VIALABS		0x2109	VIA Labs
 vendor ERICSSON		0x2282	Ericsson
 vendor MOTOROLA2	0x22b8	Motorola
 vendor PINNACLE		0x2304	Pinnacle Systems
+vendor ARDUINO		0x2341	Arduino SA
+vendor TPLINK		0x2357	TP-Link
 vendor TRIPPLITE	0x2478	Tripp-Lite
 vendor HIROSE		0x2631	Hirose Electric
 vendor NHJ		0x2770	NHJ
@@ -573,6 +578,7 @@ vendor AVERATEC		0x50c2	Averatec
 vendor SWEEX		0x5173	Sweex
 vendor ONSPEC2		0x55aa	OnSpec Electronic Inc.
 vendor ZINWELL		0x5a57	Zinwell
+vendor INGENIC 		0x601a	Ingenic Semiconductor Ltd.
 vendor SITECOM		0x6189	Sitecom
 vendor SPRINGERDESIGN	0x6400	Springer Design, Inc.
 vendor ARKMICROCHIPS	0x6547	ArkMicroChips
@@ -585,6 +591,9 @@ vendor MOSCHIP		0x9710	MosChip Semicondu
 vendor NETGEAR4		0x9846	Netgear
 vendor xxFTDI		0x9e88  FTDI
 vendor CACE		0xcace	CACE Technologies
+vendor COMPARE		0xcdab	Compare
+vendor DATAAPEX		0xdaae	DataApex
+vendor EVOLUTION	0xdeee	Evolution Robotics
 vendor EMPIA		0xeb1a	eMPIA Technology
 vendor HP2		0xf003	Hewlett Packard
 vendor USRP		0xfffe	GNU Radio USRP
@@ -640,6 +649,7 @@ product ABOCOM XX9		0x4104	XX9
 product ABOCOM UFE2000		0x420a	UFE2000 USB2.0 Fast Ethernet Adapter
 product ABOCOM WL54		0x6001	WL54
 product ABOCOM RTL8192CU	0x8178	RTL8192CU
+product ABOCOM RTL8188EU	0x8179	RTL8188EU
 product ABOCOM RTL8188CU_1	0x8188	RTL8188CU
 product ABOCOM RTL8188CU_2	0x8189	RTL8188CU
 product ABOCOM XX10		0xabc1	XX10

CVS commit: [netbsd-7] src

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 07:43:44 UTC 2016

Modified Files:
src/distrib/sets/lists/man [netbsd-7]: mi
src/lib/libc/stdlib [netbsd-7]: Makefile.inc

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1288):
distrib/sets/lists/man/mi: revisions 1.1521, 1.1522
lib/libc/stdlib/Makefile.inc: revision 1.92
Add malloc.conf.5 (link to jemalloc.3).
--
Add malloc.conf.0 to fix build with MKCATPAGES


To generate a diff of this commit:
cvs rdiff -u -r1.1485.2.10 -r1.1485.2.11 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.82.2.2 -r1.82.2.3 src/lib/libc/stdlib/Makefile.inc

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

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1485.2.10 src/distrib/sets/lists/man/mi:1.1485.2.11
--- src/distrib/sets/lists/man/mi:1.1485.2.10	Thu Oct  6 05:51:23 2016
+++ src/distrib/sets/lists/man/mi	Thu Dec  8 07:43:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1485.2.10 2016/10/06 05:51:23 snj Exp $
+# $NetBSD: mi,v 1.1485.2.11 2016/12/08 07:43:44 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2109,6 +2109,7 @@
 ./usr/share/man/cat5/magic.0			man-util-catman		.cat
 ./usr/share/man/cat5/mailer.conf.0		man-mailwrapper-catman	.cat
 ./usr/share/man/cat5/man.conf.0			man-man-catman		.cat
+./usr/share/man/cat5/malloc.conf.0		man-sys-catman		.cat
 ./usr/share/man/cat5/map3270.0			man-obsolete		obsolete
 ./usr/share/man/cat5/master.0			man-postfix-catman	postfix,.cat
 ./usr/share/man/cat5/master.passwd.0		man-sys-catman		.cat
@@ -5076,6 +5077,7 @@
 ./usr/share/man/html5/lvm.conf.html		man-lvm-htmlman		lvm,html
 ./usr/share/man/html5/magic.html		man-util-htmlman	html
 ./usr/share/man/html5/mailer.conf.html		man-mailwrapper-htmlman	html
+./usr/share/man/html5/malloc.conf.html		man-sys-htmlman		html
 ./usr/share/man/html5/man.conf.html		man-man-htmlman		html
 ./usr/share/man/html5/map3270.html		man-obsolete		obsolete
 ./usr/share/man/html5/master.html		man-postfix-htmlman	postfix,html
@@ -7995,6 +7997,7 @@
 ./usr/share/man/man5/lvm.conf.5			man-lvm-man		lvm,.man
 ./usr/share/man/man5/magic.5			man-util-man		.man
 ./usr/share/man/man5/mailer.conf.5		man-mailwrapper-man	.man
+./usr/share/man/man5/malloc.conf.5		man-sys-man		.man
 ./usr/share/man/man5/man.conf.5			man-man-man		.man
 ./usr/share/man/man5/map3270.5			man-obsolete		obsolete
 ./usr/share/man/man5/master.5			man-postfix-man		postfix,.man

Index: src/lib/libc/stdlib/Makefile.inc
diff -u src/lib/libc/stdlib/Makefile.inc:1.82.2.2 src/lib/libc/stdlib/Makefile.inc:1.82.2.3
--- src/lib/libc/stdlib/Makefile.inc:1.82.2.2	Sat May 16 17:58:46 2015
+++ src/lib/libc/stdlib/Makefile.inc	Thu Dec  8 07:43:44 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.82.2.2 2015/05/16 17:58:46 snj Exp $
+#	$NetBSD: Makefile.inc,v 1.82.2.3 2016/12/08 07:43:44 snj Exp $
 #	from: @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
 
 # stdlib sources
@@ -69,6 +69,7 @@ MLINKS+=hcreate.3 hdestroy.3 hcreate.3 h
 MLINKS+=hcreate.3 hcreate_r.3 hcreate.3 hdestroy_r.3 hcreate.3 hsearch_r.3
 MLINKS+=hcreate.3 hdestroy1.3 hcreate.3 hdestroy1_r.3
 MLINKS+=insque.3 remque.3
+MLINKS+=jemalloc.3 malloc.conf.5
 MLINKS+=lsearch.3 lfind.3
 MLINKS+=malloc.3 calloc.3 malloc.3 realloc.3 malloc.3 free.3
 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3

CVS commit: [netbsd-7] src/sys/arch/arm/include

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 07:41:14 UTC 2016

Modified Files:
src/sys/arch/arm/include [netbsd-7]: armreg.h

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1287):
sys/arch/arm/include/armreg.h: revision 1.111
Fix CORTEXA9Rx definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.97.2.1 -r1.97.2.2 src/sys/arch/arm/include/armreg.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/arch/arm/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.97.2.1 src/sys/arch/arm/include/armreg.h:1.97.2.2
--- src/sys/arch/arm/include/armreg.h:1.97.2.1	Sun Nov  9 16:05:25 2014
+++ src/sys/arch/arm/include/armreg.h	Thu Dec  8 07:41:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: armreg.h,v 1.97.2.1 2014/11/09 16:05:25 martin Exp $	*/
+/*	$NetBSD: armreg.h,v 1.97.2.2 2016/12/08 07:41:14 snj Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -220,9 +220,10 @@
 #define CPU_ID_CORTEXA8R1	0x411fc080
 #define CPU_ID_CORTEXA8R2	0x412fc080
 #define CPU_ID_CORTEXA8R3	0x413fc080
-#define CPU_ID_CORTEXA9R2	0x411fc090
-#define CPU_ID_CORTEXA9R3	0x412fc090
-#define CPU_ID_CORTEXA9R4	0x413fc090
+#define CPU_ID_CORTEXA9R1	0x411fc090
+#define CPU_ID_CORTEXA9R2	0x412fc090
+#define CPU_ID_CORTEXA9R3	0x413fc090
+#define CPU_ID_CORTEXA9R4	0x414fc090
 #define CPU_ID_CORTEXA15R2	0x412fc0f0
 #define CPU_ID_CORTEXA15R3	0x413fc0f0
 #define CPU_ID_CORTEX_P(n)	((n & 0xff0ff000) == 0x410fc000)

CVS commit: [netbsd-7] src

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 07:34:34 UTC 2016

Modified Files:
src/share/man/man4 [netbsd-7]: sdtemp.4
src/sys/dev/i2c [netbsd-7]: sdtemp.c sdtemp_reg.h

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1286):
sys/dev/i2c/sdtemp.c: revisions 1.26-1.32 via patch
sys/dev/i2c/sdtemp_reg.h: revisions 1.8-1.12
share/man/man4/sdtemp.4: revisions1.5-1.6
Changes for sdtemp(4):
- Add support for Atmel AT30TS00, AT30TSE004, Giantec GT30TS00,
  GT34TS02, Microchip MCP9804, MCP98244, IDT TS3000GB[02], TS3001GB2,
  TSE2004GB2, On Semiconductor CAT34TS02C and CAT34TS04.
- Add JEDEC TSE2004av support. If a device conforms TES2004av, it can
  be used without adding new entry into the matching table.
- Check the temperature resolution field in the capability register
  instead of the hard coded value in the match table. With this change,
  some devices' temperature resolution would be fixed.
- The resolution register is a vendor specific register.
- All of IDT devices have the resolution register.
- The address of the resolution register of Microchip MCP98244 is
  different from other Microchip devices.
- Show accuracy, range, resolution, high voltage standoff and shutdown.
- Show timeout with AB_DEBUG.
- Fix dmesg of STTS2004.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.20.1 src/share/man/man4/sdtemp.4
cvs rdiff -u -r1.23.4.1 -r1.23.4.2 src/sys/dev/i2c/sdtemp.c
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/i2c/sdtemp_reg.h

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/sdtemp.4
diff -u src/share/man/man4/sdtemp.4:1.4 src/share/man/man4/sdtemp.4:1.4.20.1
--- src/share/man/man4/sdtemp.4:1.4	Tue Oct 11 17:53:27 2011
+++ src/share/man/man4/sdtemp.4	Thu Dec  8 07:34:34 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sdtemp.4,v 1.4 2011/10/11 17:53:27 njoly Exp $
+.\"	$NetBSD: sdtemp.4,v 1.4.20.1 2016/12/08 07:34:34 snj Exp $
 .\"
 .\" Copyright (c) 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 8, 2011
+.Dd July 28, 2016
 .Dt SDTEMP 4
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@ driver provides support for the
 .Tn Microchip Technology
 MCP9805/98242 and other chips that conform to JEDEC Standard 21-C section
 4.7.
-Memory module temperature sensors are optional on DDR2 and DDR3 SDRAM DIMMs.
+Memory module temperature sensors are optional on DDR2 and newer DIMMs.
 Sensors provided by this driver, including the on-chip thresholds for the
 Alarm Window and Critical level, are accessed through the
 .Xr envsys 4
@@ -61,32 +61,51 @@ supports temperature ranges from -256 to
 .Pp
 Chips supported by the
 .Nm
-driver include:
+driver include TSE2004av compliant devices and:
 .Pp
 .Bl -bullet -offset indent
 .It
-.Tn Catalyst
-.Em CAT34TS02
+.Tn Analog Devices
+.Em ADT7408
+.It
+.Tn Atmel
+.Em AT30TS00
+and
+.Em AT30TSE004
+.It
+.Tn On semiconductor (Catalyst)
+.Em CAT34TS02 ,
+.Em CAT34TS02C ,
+.Em CAT34TS04
 and
 .Em CAT6095
 .It
-.Tn Analog Devices
-.Em ADT7408
+.Tn Giantec Semiconductor
+.Em GT30TS00
+and
+.Em GT34TS02
 .It
 .Tn Integrated Deviced Technology
-.Em TSE2002B3
+.Em TSE2002B3 ,
+.Em TSE2002GB2 ,
+.Em TSE2004GB2 ,
+.Em TS3000B3 ,
+.Em TS3000GB0 ,
+.Em TS3000GB2
 and
-.Em TSE3000B3
+.Em TS30001GB2
 .It
 .Tn Maxim
 .Em MAX6604
 .It
 .Tn Microchip Technology
+.Em MCP9804 ,
 .Em MCP9805 ,
 .Em MCP9843 ,
 .Em MCP98242 ,
-and
 .Em MCP98243
+and
+.Em MCP98244
 .It
 .Tn NXP Semiconductors
 .Em SE97
@@ -94,9 +113,12 @@ and
 .Em SE98
 .It
 .Tn STmicroelectronics
-.Em STTS424
+.Em STTS424 ,
+.Em STTS424E ,
+.Em STTS2002 ,
+.Em STTS2004
 and
-.Em STTS424E
+.Em STTS3000
 .El
 .Sh SEE ALSO
 .Xr envsys 4 ,

Index: src/sys/dev/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.23.4.1 src/sys/dev/i2c/sdtemp.c:1.23.4.2
--- src/sys/dev/i2c/sdtemp.c:1.23.4.1	Sat Mar 21 17:11:35 2015
+++ src/sys/dev/i2c/sdtemp.c	Thu Dec  8 07:34:34 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: sdtemp.c,v 1.23.4.1 2015/03/21 17:11:35 snj Exp $*/
+/*  $NetBSD: sdtemp.c,v 1.23.4.2 2016/12/08 07:34:34 snj Exp $*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.23.4.1 2015/03/21 17:11:35 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.23.4.2 2016/12/08 07:34:34 snj Exp $");
 
 #include 
 #include 
@@ -55,6 +55,9 @@ struct sdtemp_softc {
 	sysmon_envsys_lim_t sc_deflims;
 	uint32_t sc_defprops;
 	int sc_resolution;
+	uint16_t sc_mfgid;
+	uint16_t sc_devid;
+	uint16_t sc_devid_masked;
 	uint16_t sc_capability;
 };
 
@@ -79,12 +82,15 @@ static int	sdtemp_write_16(struct sdtemp
 static uint32_t	sdtemp_decode_temp(struct sdtemp_softc *, uint16_t);
 static bool	sdtemp_pmf_suspend(device_t, const pmf_qual_t

CVS commit: [netbsd-7] src/doc

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 00:15:50 UTC 2016

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

Log Message:
1285


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.124 src/doc/CHANGES-7.1:1.1.2.125
--- src/doc/CHANGES-7.1:1.1.2.124	Tue Dec  6 06:58:05 2016
+++ src/doc/CHANGES-7.1	Thu Dec  8 00:15:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.124 2016/12/06 06:58:05 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.125 2016/12/08 00:15:50 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6978,3 +6978,15 @@ sys/arch/dreamcast/dev/pvr.c			1.36
 	a junk function pointer.
 	[tsutsui, ticket #1284]
 
+sys/arch/x86/include/cacheinfo.h		1.22
+sys/arch/x86/include/specialreg.h		1.87 and 1.90
+usr.sbin/cpuctl/arch/i386.c			1.72-1.74
+
+	Changes for x86's cpuctl(8):
+	- Add Quark X1000, Xeon E[57] v4, Core i7-69xx Extreme, 7th gen Core,
+	  Denverton, Xeon Phi [357]200, Future Xeon and Future Xeon Phi.
+	- Add SGX, UMIP, RDPID, SGXLC, AVX512DQ, AVX512BW and AVX512VL bit.
+	- Fix the bit location of CLFLUSHOPT.
+	- Add new TLB descriptor 0x64 and 0xc4.
+	[msaitoh, ticket #1285]
+

CVS commit: [netbsd-7] src

2016-12-07 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Dec  8 00:15:25 UTC 2016

Modified Files:
src/sys/arch/x86/include [netbsd-7]: cacheinfo.h specialreg.h
src/usr.sbin/cpuctl/arch [netbsd-7]: i386.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1285):
sys/arch/x86/include/cacheinfo.h: revision 1.22
sys/arch/x86/include/specialreg.h: revisions 1.87 and 1.90
usr.sbin/cpuctl/arch/i386.c: revisions 1.72-1.74
Changes for x86's cpuctl(8):
- Add Quark X1000, Xeon E[57] v4, Core i7-69xx Extreme, 7th gen Core,
  Denverton, Xeon Phi [357]200, Future Xeon and Future Xeon Phi.
- Add SGX, UMIP, RDPID, SGXLC, AVX512DQ, AVX512BW and AVX512VL bit.
- Fix the bit location of CLFLUSHOPT.
- Add new TLB descriptor 0x64 and 0xc4.


To generate a diff of this commit:
cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/sys/arch/x86/include/cacheinfo.h
cvs rdiff -u -r1.78.4.4 -r1.78.4.5 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.58.2.5 -r1.58.2.6 src/usr.sbin/cpuctl/arch/i386.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/cacheinfo.h
diff -u src/sys/arch/x86/include/cacheinfo.h:1.18.2.2 src/sys/arch/x86/include/cacheinfo.h:1.18.2.3
--- src/sys/arch/x86/include/cacheinfo.h:1.18.2.2	Sun Mar  6 17:49:55 2016
+++ src/sys/arch/x86/include/cacheinfo.h	Thu Dec  8 00:15:25 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cacheinfo.h,v 1.18.2.2 2016/03/06 17:49:55 martin Exp $	*/
+/*	$NetBSD: cacheinfo.h,v 1.18.2.3 2016/12/08 00:15:25 snj Exp $	*/
 
 #ifndef _X86_CACHEINFO_H_
 #define _X86_CACHEINFO_H_
@@ -234,6 +234,7 @@ __CI_TBL(CAI_DTLB, 0x5c, 0xff, 64,  
 __CI_TBL(CAI_DTLB, 0x5d, 0xff, 64,4 * 1024, "4K/4M: 256 entries"),\
 __CI_TBL(CAI_ITLB, 0x61, 0xff, 48,4 * 1024, NULL), \
 __CI_TBL(CAI_L1_1GBDTLB,0x63,   4,  4,1024*1024 * 1024, NULL), \
+__CI_TBL(CAI_DTLB, 0x64,4,512,4 * 1024, NULL), \
 __CI_TBL(CAI_ITLB, 0x6a,8, 64,4 * 1024, NULL), \
 __CI_TBL(CAI_DTLB, 0x6b,8,256,4 * 1024, NULL), \
 __CI_TBL(CAI_L2_DTLB2, 0x6c,8,128,   0, "2M/4M: 128 entries"),\
@@ -252,6 +253,7 @@ __CI_TBL(CAI_DTLB2,0xc0,4,  8,  
 __CI_TBL(CAI_L2_STLB2, 0xc1,8,1024,   4 * 1024, "4K/2M: 1024 entries"), \
 __CI_TBL(CAI_DTLB2,0xc2,4, 16,4 * 1024, "4K/2M: 16 entries"), \
 __CI_TBL(CAI_L2_STLB,  0xc3,6,1536,   4 * 1024, NULL), \
+__CI_TBL(CAI_DTLB2,0xc4,4, 32,4 * 1024, "2M/4M: 32 entries"), \
 __CI_TBL(CAI_L2_STLB,  0xca,4,512,4 * 1024, NULL), \
 __CI_TBL(CAI_ICACHE,   0x06,4,8 * 1024, 32, NULL), \
 __CI_TBL(CAI_ICACHE,   0x08,4,   16 * 1024, 32, NULL), \

Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.78.4.4 src/sys/arch/x86/include/specialreg.h:1.78.4.5
--- src/sys/arch/x86/include/specialreg.h:1.78.4.4	Sun Mar  6 17:49:55 2016
+++ src/sys/arch/x86/include/specialreg.h	Thu Dec  8 00:15:25 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.78.4.4 2016/03/06 17:49:55 martin Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.78.4.5 2016/12/08 00:15:25 snj Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -318,6 +318,7 @@
 /* %ebx */
 #define CPUID_SEF_FSGSBASE	__BIT(0)
 #define CPUID_SEF_TSC_ADJUST	__BIT(1)
+#define CPUID_SEF_SGX		__BIT(2)
 #define CPUID_SEF_BMI1		__BIT(3)
 #define CPUID_SEF_HLE		__BIT(4)
 #define CPUID_SEF_AVX2		__BIT(5)
@@ -332,6 +333,7 @@
 #define CPUID_SEF_MPX		__BIT(14)
 #define CPUID_SEF_PQE		__BIT(15)
 #define CPUID_SEF_AVX512F	__BIT(16)
+#define CPUID_SEF_AVX512DQ	__BIT(17)
 #define CPUID_SEF_RDSEED	__BIT(18)
 #define CPUID_SEF_ADX		__BIT(19)
 #define CPUID_SEF_SMAP		__BIT(20)
@@ -341,25 +343,32 @@
 #define CPUID_SEF_AVX512ER	__BIT(27)
 #define CPUID_SEF_AVX512CD	__BIT(28)
 #define CPUID_SEF_SHA		__BIT(29)
+#define CPUID_SEF_AVX512BW	__BIT(30)
+#define CPUID_SEF_AVX512VL	__BIT(31)
 
 #define CPUID_SEF_FLAGS	"\20" \
-	"\1" "FSGSBASE"	"\2" "TSCADJUST"		"\4" "BMI1"	\
+	"\1" "FSGSBASE"	"\2" "TSCADJUST" "\3" "SGX"	"\4" "BMI1"	\
 	"\5" "HLE"	"\6" "AVX2"	"\7" "FDPEXONLY" "\10" "SMEP"	\
 	"\11" "BMI2"	"\12" "ERMS"	"\13" "INVPCID"	"\14" "RTM"	\
 	"\15" "QM"	"\16" "FPUCSDS"	"\17" "MPX"	"\20" "PQE"	\
-	"\21" "AVX512F"			"\23" "RDSEED"	"\24" "ADX"	\
-	"\25" "SMAP"	"\26" "CLFLUSHOPT"\
-			"\32" "PT"	"\33" "AVX512PF""\34" "AVX512ER" \
-	"\35" "AVX512CD""\36" "SHA"
+	"\21" "AVX512F"	"\22" "AVX512DQ" "\23" "RDSEED"	"\24" "ADX"	\
+	"\25" "SMAP"	"\30" "CLFLUSHOPT" \
+			"\32" "PT"	"\33" "AVX512PF" "\34" "AVX512ER" \
+	"\35" "AVX512CD""\36" "SHA"	"\37" "AVX512BW" "\40" "AVX512VL"
 
 /* %ecx */
 #define CPUID_SEF_PREFETCHWT1	__BIT(0)
+#define CPUID_SEF_UMIP		__BIT(2)
 #define CPUID_SEF_PKU		__BIT(3)
 #define CPUID_SEF_OSPKE		__BIT(4)
+#define CPUID_SEF_RDPID		__BIT(22)
+#define CPUID_SEF_SGXLC		__BIT(30)
 
 #define

CVS commit: [netbsd-7] src/doc

2016-12-05 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Dec  6 06:58:05 UTC 2016

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

Log Message:
1281-1284


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.123 src/doc/CHANGES-7.1:1.1.2.124
--- src/doc/CHANGES-7.1:1.1.2.123	Sat Dec  3 12:35:48 2016
+++ src/doc/CHANGES-7.1	Tue Dec  6 06:58:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.123 2016/12/03 12:35:48 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.124 2016/12/06 06:58:05 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6944,3 +6944,37 @@ sys/net/if_vlan.c1.92
 	assigned.
 	[joerg, ticket #1279]
 
+sys/arch/luna68k/luna68k/locore.s		1.60-1.62
+
+	luna68k:
+	- Make kernel work with 8kB/page (PGSHIFT==13) settings.
+	- Make kernels build without options M68030.
+	- Fix spelling in comments.
+	[tsutsui, ticket #1281]
+
+sys/arch/x68k/x68k/machdep.c			1.194
+
+	Fix crashdump on machines with EXTENDED_MEMORY.
+	PR port-x68k/51663.
+	[tsutsui, ticket #1282]
+
+distrib/sets/lists/comp/md.luna68k		1.21
+etc/etc.luna68k/MAKEDEV.conf			1.9
+sys/arch/luna68k/conf/GENERIC			1.120
+sys/arch/luna68k/conf/files.luna68k		1.25
+sys/arch/luna68k/conf/majors.luna68k		1.21
+sys/arch/luna68k/dev/xp.c			1.1
+sys/arch/luna68k/include/Makefile		1.19
+sys/arch/luna68k/include/xpio.h			1.1
+sys/arch/luna68k/luna68k/mainbus.c		1.14
+
+	Preliminary support for LUNA's HD647180X I/O processor (aka XP).
+	[tsutsui, ticket #1283]
+
+sys/arch/dreamcast/dev/pvr.c			1.36
+
+	Properly zero out struct fb_devconfig, including rasops_info.
+	Fixes panic after wsconscfg(8) from serial console, caused by
+	a junk function pointer.
+	[tsutsui, ticket #1284]
+

CVS commit: [netbsd-7] src/sys/arch/dreamcast/dev

2016-12-05 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Dec  6 06:52:22 UTC 2016

Modified Files:
src/sys/arch/dreamcast/dev [netbsd-7]: pvr.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1284):
sys/arch/dreamcast/dev/pvr.c: revision 1.36
Properly zero out struct fb_devconfig, including rasops_info.
Fix panic after wsconscfg(8) from serial console, caused by
a junk function pointer.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/arch/dreamcast/dev/pvr.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/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.35 src/sys/arch/dreamcast/dev/pvr.c:1.35.4.1
--- src/sys/arch/dreamcast/dev/pvr.c:1.35	Wed Mar 26 16:08:45 2014
+++ src/sys/arch/dreamcast/dev/pvr.c	Tue Dec  6 06:52:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pvr.c,v 1.35 2014/03/26 16:08:45 christos Exp $	*/
+/*	$NetBSD: pvr.c,v 1.35.4.1 2016/12/06 06:52:22 snj Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.35 2014/03/26 16:08:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.35.4.1 2016/12/06 06:52:22 snj Exp $");
 
 #include 
 #include 
@@ -281,7 +281,7 @@ pvr_attach(device_t parent, device_t sel
 		sc->sc_nscreens = 1;
 	} else {
 		sc->sc_dc = malloc(sizeof(struct fb_devconfig), M_DEVBUF,
-		M_WAITOK);
+		M_WAITOK | M_ZERO);
 		pvr_getdevconfig(sc->sc_dc);
 	}
 	printf(": %d x %d, %dbpp, %s, %s\n", sc->sc_dc->dc_wid,

CVS commit: [netbsd-7] src

2016-12-05 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Dec  6 06:50:23 UTC 2016

Modified Files:
src/distrib/sets/lists/comp [netbsd-7]: md.luna68k
src/etc/etc.luna68k [netbsd-7]: MAKEDEV.conf
src/sys/arch/luna68k/conf [netbsd-7]: GENERIC files.luna68k
majors.luna68k
src/sys/arch/luna68k/include [netbsd-7]: Makefile
src/sys/arch/luna68k/luna68k [netbsd-7]: mainbus.c
Added Files:
src/sys/arch/luna68k/dev [netbsd-7]: xp.c
src/sys/arch/luna68k/include [netbsd-7]: xpio.h

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1283):
distrib/sets/lists/comp/md.luna68k: revision 1.21
etc/etc.luna68k/MAKEDEV.conf: revision 1.9
sys/arch/luna68k/conf/GENERIC: revision 1.120
sys/arch/luna68k/conf/files.luna68k: revision 1.25
sys/arch/luna68k/conf/majors.luna68k: revision 1.21
sys/arch/luna68k/dev/xp.c: revision 1.1
sys/arch/luna68k/include/Makefile: revision 1.19
sys/arch/luna68k/include/xpio.h: revision 1.1
sys/arch/luna68k/luna68k/mainbus.c: revision 1.14
Preliminary support for LUNA's HD647180X I/O processor (a.k.a. XP).
Demonstrated as "PSG tunes / PCM wav player on LUNA"
(using Z80 PSG/PCM drivers ported from NEC PC-6001)
at OSC2016 Kyoto and OSC2016 Hiroshima:
 http://mail-index.netbsd.org/netbsd-advocacy/2016/08/01/msg000712.html
 http://mail-index.netbsd.org/netbsd-advocacy/2016/11/29/msg000724.html


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.22.1 src/distrib/sets/lists/comp/md.luna68k
cvs rdiff -u -r1.8 -r1.8.10.1 src/etc/etc.luna68k/MAKEDEV.conf
cvs rdiff -u -r1.113.2.3 -r1.113.2.4 src/sys/arch/luna68k/conf/GENERIC
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/arch/luna68k/conf/files.luna68k
cvs rdiff -u -r1.20 -r1.20.28.1 src/sys/arch/luna68k/conf/majors.luna68k
cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/luna68k/dev/xp.c
cvs rdiff -u -r1.17 -r1.17.28.1 src/sys/arch/luna68k/include/Makefile
cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/luna68k/include/xpio.h
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/arch/luna68k/luna68k/mainbus.c

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

Modified files:

Index: src/distrib/sets/lists/comp/md.luna68k
diff -u src/distrib/sets/lists/comp/md.luna68k:1.19 src/distrib/sets/lists/comp/md.luna68k:1.19.22.1
--- src/distrib/sets/lists/comp/md.luna68k:1.19	Sun Jul 17 20:54:31 2011
+++ src/distrib/sets/lists/comp/md.luna68k	Tue Dec  6 06:50:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.luna68k,v 1.19 2011/07/17 20:54:31 joerg Exp $
+# $NetBSD: md.luna68k,v 1.19.22.1 2016/12/06 06:50:23 snj Exp $
 ./usr/include/ieeefp.hcomp-c-include
 ./usr/include/luna68kcomp-c-include
 ./usr/include/luna68k/_G_config.h		comp-obsolete		obsolete
@@ -51,3 +51,4 @@
 ./usr/include/luna68k/varargs.h			comp-obsolete		obsolete
 ./usr/include/luna68k/vmparam.h			comp-c-include
 ./usr/include/luna68k/wchar_limits.h		comp-c-include
+./usr/include/luna68k/xpio.h			comp-c-include

Index: src/etc/etc.luna68k/MAKEDEV.conf
diff -u src/etc/etc.luna68k/MAKEDEV.conf:1.8 src/etc/etc.luna68k/MAKEDEV.conf:1.8.10.1
--- src/etc/etc.luna68k/MAKEDEV.conf:1.8	Mon Jan 14 09:15:57 2013
+++ src/etc/etc.luna68k/MAKEDEV.conf	Tue Dec  6 06:50:23 2016
@@ -1,9 +1,10 @@
-# $NetBSD: MAKEDEV.conf,v 1.8 2013/01/14 09:15:57 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8.10.1 2016/12/06 06:50:23 snj Exp $
 
 all_md)
 	makedev ttya sd0 sd1 sd2 sd3 cd0 cd1 st0 st1
 	makedev wscons
 	makedev scsibus0 scsibus1
+	makedev xp
 	;;
 
 tty[ab])

Index: src/sys/arch/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.113.2.3 src/sys/arch/luna68k/conf/GENERIC:1.113.2.4
--- src/sys/arch/luna68k/conf/GENERIC:1.113.2.3	Fri May 15 03:44:18 2015
+++ src/sys/arch/luna68k/conf/GENERIC	Tue Dec  6 06:50:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.113.2.3 2015/05/15 03:44:18 snj Exp $
+# $NetBSD: GENERIC,v 1.113.2.4 2016/12/06 06:50:23 snj Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/luna68k/conf/std.luna68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.113.2.3 $"
+#ident 		"GENERIC-$Revision: 1.113.2.4 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -162,6 +162,9 @@ spc1	at mainbus0		# 2nd SCSI on LUNA-II
 # framebuffer
 fb0	at mainbus0		# 16 or 256 pseudo color
 
+# HD647180X I/O processor
+xp0	at mainbus0
+
 # Workstation Console attachments
 wsdisplay*	at fb?
 wskbd*		at ws? console ? mux 1

Index: src/sys/arch/luna68k/conf/files.luna68k
diff -u src/sys/arch/luna68k/conf/files.luna68k:1.24 src/sys/arch/luna68k/conf/files.luna68k:1.24.2.1
--- src/sys/arch/luna68k/conf/files.luna68k:1.24	Sun Jul 20 11:14:56 2014
+++ src/sys/arch/luna68k/conf/files.luna68k	Tue Dec  6 06:50:23 2016
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: files.luna68k,v 1.24 2014/07/20 11:14:56 tsutsui Exp $
+#	$NetBSD:

CVS commit: [netbsd-7] src/sys/arch/x68k/x68k

2016-12-05 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Dec  6 06:46:02 UTC 2016

Modified Files:
src/sys/arch/x68k/x68k [netbsd-7]: machdep.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1282):
sys/arch/x68k/x68k/machdep.c: revision 1.194
Fix crashdump on machines with EXTENDED_MEMORY.
PR port-x68k/51663 from Rin Okuyama.


To generate a diff of this commit:
cvs rdiff -u -r1.191.4.1 -r1.191.4.2 src/sys/arch/x68k/x68k/machdep.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/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.191.4.1 src/sys/arch/x68k/x68k/machdep.c:1.191.4.2
--- src/sys/arch/x68k/x68k/machdep.c:1.191.4.1	Thu Nov  5 20:40:22 2015
+++ src/sys/arch/x68k/x68k/machdep.c	Tue Dec  6 06:46:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.191.4.1 2015/11/05 20:40:22 riz Exp $	*/
+/*	$NetBSD: machdep.c,v 1.191.4.2 2016/12/06 06:46:02 snj Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.191.4.1 2015/11/05 20:40:22 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.191.4.2 2016/12/06 06:46:02 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -553,7 +553,10 @@ cpu_init_kcore_hdr(void)
 {
 	cpu_kcore_hdr_t *h = _kcore_hdr;
 	struct m68k_kcore_hdr *m = >un._m68k;
-	int i;
+	psize_t size;
+#ifdef EXTENDED_MEMORY
+	int i, seg;
+#endif
 
 	memset(_kcore_hdr, 0, sizeof(cpu_kcore_hdr));
 
@@ -602,14 +605,20 @@ cpu_init_kcore_hdr(void)
 	/*
 	 * X68k has multiple RAM segments on some models.
 	 */
-	m->ram_segs[0].start = lowram;
-	m->ram_segs[0].size = mem_size - lowram;
-	for (i = 1; i < vm_nphysseg; i++) {
-		m->ram_segs[i].start =
-		ctob(VM_PHYSMEM_PTR(i)->start);
-		m->ram_segs[i].size  =
-		ctob(VM_PHYSMEM_PTR(i)->end - VM_PHYSMEM_PTR(i)->start);
+	size = phys_basemem_seg.end - phys_basemem_seg.start;
+	m->ram_segs[0].start = phys_basemem_seg.start;
+	m->ram_segs[0].size  = size;
+#ifdef EXTENDED_MEMORY
+	seg = 1;
+	for (i = 0; i < EXTMEM_SEGS; i++) {
+		size = phys_extmem_seg[i].end - phys_extmem_seg[i].start;
+		if (size == 0)
+			continue;
+		m->ram_segs[seg].start = phys_extmem_seg[i].start;
+		m->ram_segs[seg].size  = size;
+		seg++;
 	}
+#endif
 }
 
 /*

CVS commit: [netbsd-7] src/sys/arch/luna68k/luna68k

2016-12-05 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Dec  6 06:44:14 UTC 2016

Modified Files:
src/sys/arch/luna68k/luna68k [netbsd-7]: locore.s

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1281):
sys/arch/luna68k/luna68k/locore.s: revisions 1.60-1.62
Allow NetBSD/luna68k kernel work with 8kB/page (PGSHIFT==13) settings.
Tested on both LUNA (68030) and LUNA-II (68040).
--
Make kernels build without options M68030.
--
Fix spelling in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.4.1 src/sys/arch/luna68k/luna68k/locore.s

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/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.59 src/sys/arch/luna68k/luna68k/locore.s:1.59.4.1
--- src/sys/arch/luna68k/luna68k/locore.s:1.59	Sat Mar 22 16:52:07 2014
+++ src/sys/arch/luna68k/luna68k/locore.s	Tue Dec  6 06:44:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.59 2014/03/22 16:52:07 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.59.4.1 2016/12/06 06:44:14 snj Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -187,12 +187,14 @@ Lstart1:
 	jra	Lstart2
 1:
 #endif
+#if defined(M68030)
 	cmpl	#CPU_68030,%a0@		| 68030?
 	jne	1f			| no, skip
 	movl	#_C_LABEL(busaddrerr2030),%a2@(8)
 	movl	#_C_LABEL(busaddrerr2030),%a2@(12)
 	jra	Lstart2
 1:
+#endif
 	/* Config botch; no hope. */
 	PANIC("Config botch in locore")
 
@@ -287,7 +289,7 @@ Lmotommu1:
 	RELOC(protott1,%a0)		| tt1 range 8000.-.
 	.long	0xf0100c00		| pmove %a0@,mmutt1
 	pflusha
-	RELOC(prototc,%a0)		| %tc: SRP,CRP,4KB page,A=10bit,B=10bit
+	RELOC(prototc,%a0)		| %tc: SRP,CRP,4KB or 8KB page
 	pmove	%a0@,%tc
 /*
  * Should be running mapped from this point on
@@ -909,17 +911,25 @@ GLOBAL(protocrp)
 	.long	0x8002,0	| prototype CPU root pointer
 
 GLOBAL(prototc)
+#if PGSHIFT == 13
+	.long	0x82d08b00	| %tc (SRP,CRP,8KB page, TIA/TIB=8/11bits)
+#else
 	.long	0x82c0aa00	| %tc (SRP,CRP,4KB page, TIA/TIB=10/10bits)
+#endif
 GLOBAL(protott0)		| tt0 0x4000.-0x7fff.
 	.long	0x403f8543	|
 GLOBAL(protott1)		| tt1 0x8000.-0x.
 	.long	0x807f8543	|
 GLOBAL(proto040tc)
+#if PGSHIFT == 13
+	.long	0xc000		| %tc (8KB page)
+#else
 	.long	0x8000		| %tc (4KB page)
+#endif
 GLOBAL(proto040tt0)		| tt0 0x4000.-0x7fff.
-	.long	0x403fa040	| kernel only, cache inhebit, serialized
+	.long	0x403fa040	| kernel only, cache inhibit, serialized
 GLOBAL(proto040tt1)		| tt1 0x8000.-0x.
-	.long	0x807fa040	| kernel only, cache inhebit, serialized
+	.long	0x807fa040	| kernel only, cache inhibit, serialized
 nullrp:
 	.long	0x7fff0001	| do-nothing MMU root pointer

CVS commit: [netbsd-7] src/doc

2016-12-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Dec  3 12:35:48 UTC 2016

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

Log Message:
Tickets #1275, #1276, #1277 and #1279


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.122 -r1.1.2.123 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.122 src/doc/CHANGES-7.1:1.1.2.123
--- src/doc/CHANGES-7.1:1.1.2.122	Mon Nov 21 07:32:13 2016
+++ src/doc/CHANGES-7.1	Sat Dec  3 12:35:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.122 2016/11/21 07:32:13 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.123 2016/12/03 12:35:48 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6913,3 +6913,34 @@ etc/rc.d/rtadvd	1.9
 Don't fail to start if rtadvd's config file doesn't exist.
 	[kre, ticket #1274]
 
+sys/arch/mips/include/vmparam.h			1.57
+
+	1TB is enough UVA for anyone... plus not all MIPS cpus can support
+	more.
+	[mrg, ticket #1275]
+
+sys/uvm/pmap/pmap_segtab.c			1.4 (via patch)
+	Fix the start index generation in pmap_segtab_release() to
+	ensure it fits in the actual array.
+	[mrg, ticket #1275]
+
+sbin/scsictl/scsictl.81.27-1.30
+sbin/scsictl/scsictl.c1.39
+sys/dev/scsipi/scsi_disk.h			1.32
+
+	Add "getrealloc" and "setrealloc" commands to get/set automatic
+	reallocation parameters/enables for error recovery, similar to
+	{get,set}cache.
+	[flxd, ticket #1276]
+
+sys/external/bsd/drm2/drm/drm_vma_manager.c	1.5
+
+	Lock the manager and not just the node for inserting/removing nodes.
+	[maya, ticket #1277]
+
+sys/net/if_vlan.c1.92
+
+	Don't check parent capabilities when a parent interface hasn't been
+	assigned.
+	[joerg, ticket #1279]
+

CVS commit: [netbsd-7] src/sys/net

2016-12-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Dec  3 12:34:23 UTC 2016

Modified Files:
src/sys/net [netbsd-7]: if_vlan.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1279):
sys/net/if_vlan.c: revision 1.92
Don't check parent capabilities when a parent interface hasn't been
assigned.


To generate a diff of this commit:
cvs rdiff -u -r1.70.2.3 -r1.70.2.4 src/sys/net/if_vlan.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/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.70.2.3 src/sys/net/if_vlan.c:1.70.2.4
--- src/sys/net/if_vlan.c:1.70.2.3	Thu Apr 23 19:23:45 2015
+++ src/sys/net/if_vlan.c	Sat Dec  3 12:34:23 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vlan.c,v 1.70.2.3 2015/04/23 19:23:45 snj Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.70.2.4 2016/12/03 12:34:23 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.70.2.3 2015/04/23 19:23:45 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.70.2.4 2016/12/03 12:34:23 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -550,6 +550,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd
 	case SIOCSIFCAP:
 		ifcr = data;
 		/* make sure caps are enabled on parent */
+		if (ifv->ifv_p == NULL) {
+			error = EINVAL;
+			break;
+		}
 		if ((ifv->ifv_p->if_capenable & ifcr->ifcr_capenable) !=
 		ifcr->ifcr_capenable) {
 			error = EINVAL;

CVS commit: [netbsd-7] src/sys/external/bsd/drm2/drm

2016-12-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Dec  3 12:24:50 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/drm [netbsd-7]: drm_vma_manager.c

Log Message:
Pull up following revision(s) (requested by maya in ticket #1277):
sys/external/bsd/drm2/drm/drm_vma_manager.c: revision 1.5
Lock the manager and not just the node for inserting/removing nodes
should fix/help PR kern/50349: radeondrmkms vt-switching crash
ok riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 \
src/sys/external/bsd/drm2/drm/drm_vma_manager.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/drm2/drm/drm_vma_manager.c
diff -u src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.1.4.2 src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.1.4.3
--- src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.1.4.2	Sun Jul  5 21:29:26 2015
+++ src/sys/external/bsd/drm2/drm/drm_vma_manager.c	Sat Dec  3 12:24:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_vma_manager.c,v 1.1.4.2 2015/07/05 21:29:26 snj Exp $	*/
+/*	$NetBSD: drm_vma_manager.c,v 1.1.4.3 2016/12/03 12:24:50 martin Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.1.4.2 2015/07/05 21:29:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.1.4.3 2016/12/03 12:24:50 martin Exp $");
 
 #include 
 #include 
@@ -176,10 +176,10 @@ drm_vma_offset_add(struct drm_vma_offset
 	node->von_startpage = startpage;
 	node->von_npages = npages;
 
-	rw_enter(>von_lock, RW_WRITER);
+	rw_enter(>vom_lock, RW_WRITER);
 	collision = rb_tree_insert_node(>vom_nodes, node);
 	KASSERT(collision == node);
-	rw_exit(>von_lock);
+	rw_exit(>vom_lock);
 
 	return 0;
 }
@@ -192,9 +192,9 @@ drm_vma_offset_remove(struct drm_vma_off
 	if (node->von_npages == 0)
 		return;
 
-	rw_enter(>von_lock, RW_WRITER);
+	rw_enter(>vom_lock, RW_WRITER);
 	rb_tree_remove_node(>vom_nodes, node);
-	rw_exit(>von_lock);
+	rw_exit(>vom_lock);
 
 	vmem_free(mgr->vom_vmem, node->von_startpage, node->von_npages);

CVS commit: [netbsd-7] src

2016-12-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Dec  3 12:20:32 UTC 2016

Modified Files:
src/sbin/scsictl [netbsd-7]: scsictl.8 scsictl.c
src/sys/dev/scsipi [netbsd-7]: scsi_disk.h

Log Message:
Pull up following revision(s) (requested by flxd in ticket #1276):
sys/dev/scsipi/scsi_disk.h: revision 1.32
sbin/scsictl/scsictl.8: revision 1.27-1.30
sbin/scsictl/scsictl.c: revision 1.39
Add "getrealloc" and "setrealloc" commands to get/set automatic reallocation
parameters/enables for error recovery, similar to {get,set}cache.
Many old SCSI disks shipped with reallocation disabled, albeit
supporting it.
Minor (cosmetic) fixup of scsi_disk_pages while there.
Based upon code in PR bin/29165 by Greg A. Woods.
OK christos@
Bump date for previous.
Use more and more appropriate markup while here.
Add crossreference to scsi(4) per note in PR 9627.
Whitespace, sort.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.6.1 src/sbin/scsictl/scsictl.8
cvs rdiff -u -r1.37 -r1.37.8.1 src/sbin/scsictl/scsictl.c
cvs rdiff -u -r1.31 -r1.31.138.1 src/sys/dev/scsipi/scsi_disk.h

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

Modified files:

Index: src/sbin/scsictl/scsictl.8
diff -u src/sbin/scsictl/scsictl.8:1.26 src/sbin/scsictl/scsictl.8:1.26.6.1
--- src/sbin/scsictl/scsictl.8:1.26	Fri Mar 29 21:46:32 2013
+++ src/sbin/scsictl/scsictl.8	Sat Dec  3 12:20:32 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: scsictl.8,v 1.26 2013/03/29 21:46:32 christos Exp $
+.\"	$NetBSD: scsictl.8,v 1.26.6.1 2016/12/03 12:20:32 martin Exp $
 .\"
 .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 29, 2013
+.Dd November 19, 2016
 .Dt SCSICTL 8
 .Os
 .Sh NAME
@@ -60,10 +60,8 @@ will be decoded by
 and displayed to the standard output.
 .Sh DEVICE COMMANDS
 The following commands are supported for SCSI devices:
-.Pp
-.Nm debug
-.Ar level
-.Pp
+.Bl -tag -width flushcacheXX
+.It Cm debug Ar level
 Set the debugging level for the given device; the following flags are
 supported:
 .Pp
@@ -80,24 +78,13 @@ Device specific debugging.
 .Pp
 This option is only supported with kernels compiled with
 .Dv SCSIPI_DEBUG .
-.Pp
-.Nm defects
-.Op primary
-.Op grown
-.Op block|byte|physical
-.Pp
+.It Cm defects Oo primary Oc Oo grown Oc Oo block|byte|physical Oc
 Read the primary and/or grown defect lists from the specified device
 in block, byte from index, or physical sector format.
 The default is to return both the primary and grown defect lists
 in physical sector format.
 This command is only supported on direct access devices.
-.Pp
-.Nm format
-.Oo blocksize
-.Oo immediate
-.Oc
-.Oc
-.Pp
+.It Cm format Oo blocksize Oo immediate Oc Oc
 (Low level) format the named device.
 If the optional
 .Li blocksize
@@ -132,73 +119,47 @@ This associated sense data has a progres
 how far the format is progressing.
 Note well that most SCSI disk drives prior to
 a few years ago do not support this option.
-.Pp
-.Nm identify
-.Pp
+.It Cm identify
 Identify the specified device, displaying the device's SCSI
 bus, target, and lun, as well as the device's vendor, product,
 and revision strings.
-.Pp
-.Nm reassign
-.Ar blkno
-.Oo blkno Oo ...
-.Oc
-.Oc
-.Pp
+.Cm It reassign Ar blkno Oo blkno Oo ... Oc Oc
 Issues a
 .Li REASSIGN BLOCKS
 command to the device, adding the specified blocks to the
 grown defect list.
 This command is only supported on direct access devices.
-.Pp
-.Nm release
-.Pp
+.It Cm release
 Send a
 .Dq RELEASE
 command to the device to release a reservation on it.
-.Pp
-.Nm reserve
-.Pp
+.It Cm reserve
 Send a
 .Dq RESERVE
 command to the device to place a reservation on it.
-.Pp
-.Nm reset
-.Pp
+.It Cm reset
 Reset the device.
 This command is only supported for devices which support the
 .Li SCIOCRESET
 ioctl.
-.Pp
-.Nm start
-.Pp
+.It Cm start
 Send a
 .Dq START
 command to the device.
 This is useful typically only for disk devices.
-.Pp
-.Nm stop
-.Pp
+.It Cm stop
 Send a
 .Dq STOP
 command to the device.
 This is useful typically only for disk devices.
-.Pp
-.Nm tur
-.Pp
+.It Cm tur
 Send a
 .Dq TEST UNIT READY
 command to the device.
 This is useful for generating current device status.
-.Pp
-.Nm getcache
-.Pp
+.It Cm getcache
 Returns basic cache parameters for the device.
-.Pp
-.Nm setcache
-.Ar none|r|w|rw
-.Op Ar save
-.Pp
+.It Cm setcache Ar none|r|w|rw Op Ar save
 Set basic cache parameters for the device.
 The cache may be disabled
 .Pq none ,
@@ -212,32 +173,39 @@ If the drive's cache parameters are sava
 .Ar save
 after the cache enable state will cause the parameters to be saved in
 non-volatile storage.
-.Pp
-.Nm flushcache
-.Pp
+.It Cm flushcache
 Explicitly flushes the write cache.
-.Pp
-.Nm setspeed
-.Ar speed
-.Pp
+.It Cm setspeed Ar speed
 Set

CVS commit: [netbsd-7] src/sys

2016-12-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Dec  3 12:08:36 UTC 2016

Modified Files:
src/sys/arch/mips/include [netbsd-7]: vmparam.h
src/sys/uvm/pmap [netbsd-7]: pmap_segtab.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1275):
sys/arch/mips/include/vmparam.h: revision 1.57
sys/uvm/pmap/pmap_segtab.c: revision 1.4
1TB is enough UVA for anyone... plus not all cpus can support more.
fix the start index generation in pmap_segtab_release() to
ensure it fits in the actual array.  fixes N64 binaries from
triggering later panic.  move the panic check itself into a
common function that is called from a couple of new places too.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.4.1 src/sys/arch/mips/include/vmparam.h
cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/uvm/pmap/pmap_segtab.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/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.52 src/sys/arch/mips/include/vmparam.h:1.52.4.1
--- src/sys/arch/mips/include/vmparam.h:1.52	Sat Jan 25 15:16:50 2014
+++ src/sys/arch/mips/include/vmparam.h	Sat Dec  3 12:08:36 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.52 2014/01/25 15:16:50 christos Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.52.4.1 2016/12/03 12:08:36 martin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -152,7 +152,7 @@
  */
 #define VM_MIN_ADDRESS		((vaddr_t)0x)
 #ifdef _LP64
-#define MIPS_VM_MAXUSER_ADDRESS	((vaddr_t) 1L << (4*PGSHIFT-8))
+#define MIPS_VM_MAXUSER_ADDRESS	((vaddr_t) 1L << 40)
 #ifdef ENABLE_MIPS_16KB_PAGE
 #define VM_MAXUSER_ADDRESS	mips_vm_maxuser_address
 #else

Index: src/sys/uvm/pmap/pmap_segtab.c
diff -u src/sys/uvm/pmap/pmap_segtab.c:1.1 src/sys/uvm/pmap/pmap_segtab.c:1.1.14.1
--- src/sys/uvm/pmap/pmap_segtab.c:1.1	Wed Oct  3 00:51:46 2012
+++ src/sys/uvm/pmap/pmap_segtab.c	Sat Dec  3 12:08:36 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_segtab.c,v 1.1 2012/10/03 00:51:46 christos Exp $	*/
+/*	$NetBSD: pmap_segtab.c,v 1.1.14.1 2016/12/03 12:08:36 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.1 2012/10/03 00:51:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.1.14.1 2016/12/03 12:08:36 martin Exp $");
 
 /*
  *	Manages physical address maps.
@@ -190,7 +190,9 @@ pmap_segtab_release(pmap_t pmap, pmap_se
 {
 	pmap_segtab_t *stp = *stp_p;
 
-	for (size_t i = va / vinc; i < PMAP_SEGTABSIZE; i++, va += vinc) {
+	for (size_t i = (va / vinc) & (PMAP_SEGTABSIZE - 1);
+	 i < PMAP_SEGTABSIZE;
+	 i++, va += vinc) {
 #ifdef _LP64
 		if (vinc > NBSEG) {
 			if (stp->seg_seg[i] != NULL) {

CVS commit: [netbsd-7] src/doc

2016-11-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Nov 21 07:32:13 UTC 2016

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

Log Message:
1274


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.121 src/doc/CHANGES-7.1:1.1.2.122
--- src/doc/CHANGES-7.1:1.1.2.121	Wed Nov 16 18:35:00 2016
+++ src/doc/CHANGES-7.1	Mon Nov 21 07:32:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.121 2016/11/16 18:35:00 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.122 2016/11/21 07:32:13 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6908,3 +6908,8 @@ sys/external/bsd/drm2/dist/drm/drm_gem.c
 	Avoid zero-size uao.
 	[maya, ticket #1272]
 
+etc/rc.d/rtadvd	1.9
+
+Don't fail to start if rtadvd's config file doesn't exist.
+	[kre, ticket #1274]
+

CVS commit: [netbsd-7] src/etc/rc.d

2016-11-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Nov 21 07:29:26 UTC 2016

Modified Files:
src/etc/rc.d [netbsd-7]: rtadvd

Log Message:
Pull up following revision(s) (requested by kre in ticket #1274):
etc/rc.d/rtadvd: revision 1.9
The config file is not required to exist (unless specified via -c).
(reported by rhia...@falu.nl)  Don't fail to start if it doesn't.
Make sure the directory for the config file exists inside the chroot before
attempting to copy into it ("confdir" was calculated, but never used...)
While here, fix getopts usage (obviously only ever previously tested when
the -c arg was the first option...) and don't use test(1)'s -o operator
(especially not when one of the other args is an unknown string).
If -c is given (and we will chroot), require filename to be full path.
Misc minor style cleanups.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.6.1 src/etc/rc.d/rtadvd

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

Modified files:

Index: src/etc/rc.d/rtadvd
diff -u src/etc/rc.d/rtadvd:1.8 src/etc/rc.d/rtadvd:1.8.6.1
--- src/etc/rc.d/rtadvd:1.8	Tue Jul  9 09:34:58 2013
+++ src/etc/rc.d/rtadvd	Mon Nov 21 07:29:25 2016
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rtadvd,v 1.8 2013/07/09 09:34:58 roy Exp $
+# $NetBSD: rtadvd,v 1.8.6.1 2016/11/21 07:29:25 snj Exp $
 #
 
 # PROVIDE: rtadvd
@@ -21,28 +21,47 @@ rtadvd_prereload()
 {
 	local chdir="$(getent passwd _rtadvd | cut -d: -f6)"
 	local conf=/etc/rtadvd.conf myflags o confdir
+	local cflag=false
 	
-	[ -z "$chdir" -o "$chdir" = / ] && return 0
+	[ -z "${chdir}" ] || [ "/${chdir}" = // ] && return 0
 
-	if [ -n "$flags" ]; then
-		myflags=$flags
+	if [ -n "${flags}" ]; then
+		myflags=${flags}
 	else
 		eval myflags=\$${name}_flags
 	fi
 	set -- ${myflags}
 	while getopts c:dDfM:Rs o; do
-		case "$1" in
-		-c)	conf="$OPTARG";;
+		# ignore other args, they are processed by rtadvd itself
+		case "${o}" in
+		c)	conf="${OPTARG}"
+			case "${conf}" in
+			/*)	;;
+			*)	echo "${name}: config file (${conf}) must be" \
+	"full pathname"
+return 1
+;;
+			esac
+			cflag=true;;
 		esac
-		shift
 	done
-	confdir=$(dirname "$conf")
-	
-	echo "$name: copying $conf to $chdir$conf"
-	cp "$conf" "$chdir$conf"
 
-	# Provide a link to the chrooted dump file
-	ln -snf "$chdir/var/run/$name.dump" /var/run
+	${cflag} || test -f "${conf}" && {
+		confdir=$(dirname "${conf}")
+		echo "${name}: copying ${conf} to ${chdir}${conf}"
+		mkdir -p "${chdir}${confdir}"
+		cp "${conf}" "${chdir}${conf}" || return 1
+	}
+
+	# Make sure /var/run exists in the chroot
+	mkdir -p "${chdir}/var/run"
+
+	# Provide links to the chrooted dump & pid files
+	ln -snf "${chdir}/var/run/${name}.dump" /var/run
+
+	# Note: actual chroot is done by rtadvd itself
+
+	return 0
 }
 
 rtadvd_prestart()

CVS commit: [netbsd-7] src/doc

2016-11-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Nov 16 18:35:00 UTC 2016

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

Log Message:
1272


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.120 -r1.1.2.121 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.120 src/doc/CHANGES-7.1:1.1.2.121
--- src/doc/CHANGES-7.1:1.1.2.120	Wed Nov 16 08:37:23 2016
+++ src/doc/CHANGES-7.1	Wed Nov 16 18:35:00 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.120 2016/11/16 08:37:23 bouyer Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.121 2016/11/16 18:35:00 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6903,3 +6903,8 @@ external/bsd/dhcp/dist/common/packet.c		
 	Check correctly the packet length (CVE-2015-8605)
 	[snj, ticket #1273]
 
+sys/external/bsd/drm2/dist/drm/drm_gem.c	1.6
+
+	Avoid zero-size uao.
+	[maya, ticket #1272]
+

CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm

2016-11-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Nov 16 18:32:07 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/dist/drm [netbsd-7]: drm_gem.c

Log Message:
Pull up following revision(s) (requested by maya in ticket #1272):
sys/external/bsd/drm2/dist/drm/drm_gem.c: revision 1.6
Avoid zero-size uao.
Apparently some GEM/TTM objects can be zero-size, as discovered by
Stefan Hertenberger:
https://mail-index.netbsd.org/current-users/2016/08/02/msg029891.html


To generate a diff of this commit:
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/external/bsd/drm2/dist/drm/drm_gem.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/drm2/dist/drm/drm_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.4.2.1 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.4.2.2
--- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.4.2.1	Mon Aug 18 07:49:10 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c	Wed Nov 16 18:32:07 2016
@@ -154,7 +154,11 @@ int drm_gem_object_init(struct drm_devic
 	drm_gem_private_object_init(dev, obj, size);
 
 #ifdef __NetBSD__
-	obj->gemo_shm_uao = uao_create(size, 0);
+	/*
+	 * A uao may not have size 0, but a gem object may.  Allocate a
+	 * spurious page so we needn't teach uao how to have size 0.
+	 */
+	obj->gemo_shm_uao = uao_create(MAX(size, PAGE_SIZE), 0);
 	/*
 	 * XXX This is gross.  We ought to do it the other way around:
 	 * set the uao to have the main uvm object's lock.  However,

CVS commit: [netbsd-7] src/doc

2016-11-16 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Nov 16 08:37:23 UTC 2016

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

Log Message:
ticket 1273


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.119 -r1.1.2.120 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.119 src/doc/CHANGES-7.1:1.1.2.120
--- src/doc/CHANGES-7.1:1.1.2.119	Sun Nov 13 07:29:32 2016
+++ src/doc/CHANGES-7.1	Wed Nov 16 08:37:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.119 2016/11/13 07:29:32 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.120 2016/11/16 08:37:23 bouyer Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6898,3 +6898,8 @@ sys/conf/files	1.1165
 	Update dependencies for COMPAT_LINUX32 to include COMPAT_NETBSD32
 	[pgoyette, ticket #1270]
 
+external/bsd/dhcp/dist/common/packet.c		1.2
+
+	Check correctly the packet length (CVE-2015-8605)
+	[snj, ticket #1273]
+

CVS commit: [netbsd-7] src/external/bsd/dhcp/dist/common

2016-11-16 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Nov 16 08:36:32 UTC 2016

Modified Files:
src/external/bsd/dhcp/dist/common [netbsd-7]: packet.c

Log Message:
Pull up following revision(s) (requested by snj in ticket #1273):
external/bsd/dhcp/dist/common/packet.c: revision 1.2
Check correctly the packet length (CVE-2015-8605)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
src/external/bsd/dhcp/dist/common/packet.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/dhcp/dist/common/packet.c
diff -u src/external/bsd/dhcp/dist/common/packet.c:1.1.1.4 src/external/bsd/dhcp/dist/common/packet.c:1.1.1.4.2.1
--- src/external/bsd/dhcp/dist/common/packet.c:1.1.1.4	Sat Jul 12 11:57:46 2014
+++ src/external/bsd/dhcp/dist/common/packet.c	Wed Nov 16 08:36:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: packet.c,v 1.1.1.4 2014/07/12 11:57:46 spz Exp $	*/
+/*	$NetBSD: packet.c,v 1.1.1.4.2.1 2016/11/16 08:36:31 bouyer Exp $	*/
 /* packet.c
 
Packet assembly code, originally contributed by Archie Cobbs. */
@@ -34,7 +34,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: packet.c,v 1.1.1.4 2014/07/12 11:57:46 spz Exp $");
+__RCSID("$NetBSD: packet.c,v 1.1.1.4.2.1 2016/11/16 08:36:31 bouyer Exp $");
 
 #include "dhcpd.h"
 
@@ -224,7 +224,28 @@ ssize_t decode_hw_header (interface, buf
 	}
 }
 
-/* UDP header and IP header decoded together for convenience. */
+/*!
+ *
+ * \brief UDP header and IP header decoded together for convenience.
+ *
+ * Attempt to decode the UDP and IP headers and, if necessary, checksum
+ * the packet.
+ *
+ * \param inteface - the interface on which the packet was recevied
+ * \param buf - a pointer to the buffer for the received packet
+ * \param bufix - where to start processing the buffer, previous
+ *routines may have processed parts of the buffer already
+ * \param from - space to return the address of the packet sender
+ * \param buflen - remaining length of the buffer, this will have been
+ * decremented by bufix by the caller
+ * \param rbuflen - space to return the length of the payload from the udp
+ *  header
+ * \param csum_ready - indication if the checksum is valid for use
+ * non-zero indicates the checksum should be validated
+ *
+ * \return - the index to the first byte of the udp payload (that is the
+ *   start of the DHCP packet
+ */
 
 ssize_t
 decode_udp_ip_header(struct interface_info *interface,
@@ -235,7 +256,7 @@ decode_udp_ip_header(struct interface_in
   unsigned char *data;
   struct ip ip;
   struct udphdr udp;
-  unsigned char *upp, *endbuf;
+  unsigned char *upp;
   u_int32_t ip_len, ulen, pkt_len;
   u_int32_t sum, usum;
   static int ip_packets_seen;
@@ -246,11 +267,8 @@ decode_udp_ip_header(struct interface_in
   static int udp_packets_length_overflow;
   unsigned len;
 
-  /* Designate the end of the input buffer for bounds checks. */
-  endbuf = buf + bufix + buflen;
-
   /* Assure there is at least an IP header there. */
-  if ((buf + bufix + sizeof(ip)) > endbuf)
+  if (sizeof(ip) > buflen)
 	  return -1;
 
   /* Copy the IP header into a stack aligned structure for inspection.
@@ -262,13 +280,17 @@ decode_udp_ip_header(struct interface_in
   ip_len = (*upp & 0x0f) << 2;
   upp += ip_len;
 
-  /* Check the IP packet length. */
+  /* Check packet lengths are within the buffer:
+   * first the ip header (ip_len)
+   * then the packet length from the ip header (pkt_len)
+   * then the udp header (ip_len + sizeof(udp)
+   * We are liberal in what we accept, the udp payload should fit within
+   * pkt_len, but we only check against the full buffer size.
+   */
   pkt_len = ntohs(ip.ip_len);
-  if (pkt_len > buflen)
-	return -1;
-
-  /* Assure after ip_len bytes that there is enough room for a UDP header. */
-  if ((upp + sizeof(udp)) > endbuf)
+  if ((ip_len > buflen) ||
+  (pkt_len > buflen) ||
+  ((ip_len + sizeof(udp)) > buflen))
 	  return -1;
 
   /* Copy the UDP header into a stack aligned structure for inspection. */
@@ -289,7 +311,8 @@ decode_udp_ip_header(struct interface_in
 	return -1;
 
   udp_packets_length_checked++;
-  if ((upp + ulen) > endbuf) {
+  /* verify that the payload length from the udp packet fits in the buffer */
+  if ((ip_len + ulen) > buflen) {
 	udp_packets_length_overflow++;
 	if ((udp_packets_length_checked > 4) &&
 	((udp_packets_length_checked /
@@ -303,9 +326,6 @@ decode_udp_ip_header(struct interface_in
 	return -1;
   }
 
-  if ((ulen < sizeof(udp)) || ((upp + ulen) > endbuf))
-	return -1;
-
   /* Check the IP header checksum - it should be zero. */
   ++ip_packets_seen;
   if (wrapsum (checksum (buf + bufix, ip_len, 0))) {

CVS commit: [netbsd-7] src/doc

2016-11-12 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Nov 13 07:29:32 UTC 2016

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

Log Message:
1270


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.118 src/doc/CHANGES-7.1:1.1.2.119
--- src/doc/CHANGES-7.1:1.1.2.118	Sat Nov  5 17:55:56 2016
+++ src/doc/CHANGES-7.1	Sun Nov 13 07:29:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.118 2016/11/05 17:55:56 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.119 2016/11/13 07:29:32 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6893,3 +6893,8 @@ external/bsd/bind/lib/libbind9/Makefile 
 	Update BIND to 9.10.4-P4.  Fixes CVE-2016-8864.
 	[snj, ticket #1271]
 
+sys/conf/files	1.1165
+
+	Update dependencies for COMPAT_LINUX32 to include COMPAT_NETBSD32
+	[pgoyette, ticket #1270]
+

CVS commit: [netbsd-7] src/sys/conf

2016-11-12 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Nov 13 07:27:22 UTC 2016

Modified Files:
src/sys/conf [netbsd-7]: files

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #1270):
sys/conf/files: revision 1.1165
Update dependencies for COMPAT_LINUX32 to include COMPAT_NETBSD32
Without this, an attempt to build a kernel with COMPAT_LINUX32 but without
COMPAT_NETBSD32 will fail during the execution of genassym, and the error
messages are not very helpful.
With this change, config(1) will automatically (and silently) select/add
COMPAT_NETBSD32 to the configuration.  It might be better if config(1)
were to issue an appropriate diagnostic, but that is a change for some
future day.


To generate a diff of this commit:
cvs rdiff -u -r1.1096.2.7 -r1.1096.2.8 src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1096.2.7 src/sys/conf/files:1.1096.2.8
--- src/sys/conf/files:1.1096.2.7	Wed Jun 22 08:26:05 2016
+++ src/sys/conf/files	Sun Nov 13 07:27:22 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1096.2.7 2016/06/22 08:26:05 snj Exp $
+#	$NetBSD: files,v 1.1096.2.8 2016/11/13 07:27:22 snj Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -140,12 +140,12 @@ defflagCOMPAT_OSSAUDIO
 defflagCOMPAT_FREEBSD: COMPAT_30
 defflagCOMPAT_IBCS2
 defflagCOMPAT_LINUX: COMPAT_16
-defflagCOMPAT_LINUX32 : COMPAT_LINUX
 defflagCOMPAT_OSF1
 defflagCOMPAT_SUNOS: COMPAT_30
 defflag	opt_compat_svr4.h	COMPAT_SVR4 COMPAT_SVR4_32 SVR4_COMPAT_SOLARIS2
 defflagCOMPAT_ULTRIX: COMPAT_50
 defflagCOMPAT_NETBSD32
+defflagCOMPAT_LINUX32 : COMPAT_LINUX, COMPAT_NETBSD32
 defflagCOMPAT_AOUT_M68K: COMPAT_40
 defflagCOMPAT_M68K4K
 defflagCOMPAT_VAX1K

CVS commit: [netbsd-7] src/doc

2016-11-05 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Nov  5 17:55:56 UTC 2016

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

Log Message:
Note #1271


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.117 -r1.1.2.118 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.117 src/doc/CHANGES-7.1:1.1.2.118
--- src/doc/CHANGES-7.1:1.1.2.117	Tue Nov  1 20:40:14 2016
+++ src/doc/CHANGES-7.1	Sat Nov  5 17:55:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.117 2016/11/01 20:40:14 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.118 2016/11/05 17:55:56 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6823,3 +6823,73 @@ sys/arch/alpha/stand/common/prom.c		1.15
 	wrong host controller SCSI ID for DEC 3000.
 	[flxd, ticket #1269]
 
+doc/3RDPARTY	1.1374 via patch
+external/bsd/bind/Makefile.inc  up to 1.24 via patch
+external/bsd/bind/bin/delv/Makefile up to 1.3
+external/bsd/bind/bin/dig/Makefile  up to 1.2
+external/bsd/bind/bin/dnssec/Makefile.inc   up to 1.2
+external/bsd/bind/bin/host/Makefile up to 1.2
+external/bsd/bind/bin/named/Makefileup to 1.10
+external/bsd/bind/bin/nslookup/Makefile up to 1.3
+external/bsd/bind/bin/nsupdate/Makefile up to 1.3
+external/bsd/bind/bin/rndc/Makefile up to 1.2
+external/bsd/bind/bin/tools/Makefile.incup to 1.2
+external/bsd/bind/dist/CHANGES  up to 1.23
+external/bsd/bind/dist/README   up to 1.11
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html up to 1.1.1.21
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html up to 1.1.1.18
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html up to 1.1.1.23
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html up to 1.11
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html up to 1.1.1.24
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html up to 1.11
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html up to 1.11
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html up to 1.11
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html up to 1.11
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html up to 1.1.1.20
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html up to 1.1.1.9
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html up to 1.1.1.9
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html up to 1.1.1.9
+external/bsd/bind/dist/doc/arm/Bv9ARM.html  up to 1.11
+external/bsd/bind/dist/doc/arm/Bv9ARM.pdf   up to 1.17
+external/bsd/bind/dist/doc/arm/man.arpaname.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.ddns-confgen.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.delv.htmlup to 1.11
+external/bsd/bind/dist/doc/arm/man.dig.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-settime.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.dnssec-verify.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.genrandom.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.host.htmlup to 1.11
+external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.lwresd.html  up to 1.1.1.3
+external/bsd/bind/dist/doc/arm/man.named-checkconf.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.named-checkzone.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.named-journalprint.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.named-rrchecker.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.named.conf.html up to 1.1.1.3
+external/bsd/bind/dist/doc/arm/man.named.html   up to 1.11
+external/bsd/bind/dist/doc/arm/man.nsec3hash.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.nsupdate.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.rndc-confgen.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.rndc.conf.html up to 1.11
+external/bsd/bind/dist/doc/arm/man.rndc.htmlup to 1.11
+external/bsd/bind/dist/doc/arm/notes.html   up to 1.1.1.9
+external/bsd/bind/dist/doc/arm/notes.pdfup to 1.1.1.9
+external/bsd/bind/dist/doc/arm/notes.xmlup to 1.1.1.9
+external/bsd/bind/dist/lib/dns/api  up to 1.11
+external/bsd/bind/dist/lib/dns/resolver.c   up to 1.27
+external/bsd/bind/dist/srcidup to 1.17
+external/bsd/bind/dist/version  up to 1.21

CVS commit: [netbsd-7] src

2016-11-05 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Nov  5 17:54:09 UTC 2016

Modified Files:
src/doc [netbsd-7]: 3RDPARTY
src/external/bsd/bind [netbsd-7]: Makefile.inc
src/external/bsd/bind/bin/delv [netbsd-7]: Makefile
src/external/bsd/bind/bin/dig [netbsd-7]: Makefile
src/external/bsd/bind/bin/dnssec [netbsd-7]: Makefile.inc
src/external/bsd/bind/bin/host [netbsd-7]: Makefile
src/external/bsd/bind/bin/named [netbsd-7]: Makefile
src/external/bsd/bind/bin/nslookup [netbsd-7]: Makefile
src/external/bsd/bind/bin/nsupdate [netbsd-7]: Makefile
src/external/bsd/bind/bin/rndc [netbsd-7]: Makefile
src/external/bsd/bind/bin/tools [netbsd-7]: Makefile.inc
src/external/bsd/bind/dist [netbsd-7]: CHANGES README srcid version
src/external/bsd/bind/dist/doc/arm [netbsd-7]: Bv9ARM.ch01.html
Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html
Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html
Bv9ARM.ch10.html Bv9ARM.ch11.html Bv9ARM.ch12.html Bv9ARM.ch13.html
Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.lwresd.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.conf.html man.named.html
man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html
man.rndc.conf.html man.rndc.html notes.html notes.pdf notes.xml
src/external/bsd/bind/dist/lib/dns [netbsd-7]: api resolver.c
src/external/bsd/bind/lib/libbind9 [netbsd-7]: Makefile

Log Message:
Pull up following revision(s) (requested by snj in ticket #1271):
doc/3RDPARTY: 1.1374 via patch
external/bsd/bind/Makefile.inc: up to 1.24 via patch
external/bsd/bind/bin/delv/Makefile: up to 1.3
external/bsd/bind/bin/dig/Makefile: up to 1.2
external/bsd/bind/bin/dnssec/Makefile.inc: up to 1.2
external/bsd/bind/bin/host/Makefile: up to 1.2
external/bsd/bind/bin/named/Makefile: up to 1.10
external/bsd/bind/bin/nslookup/Makefile: up to 1.3
external/bsd/bind/bin/nsupdate/Makefile: up to 1.3
external/bsd/bind/bin/rndc/Makefile: up to 1.2
external/bsd/bind/bin/tools/Makefile.inc: up to 1.2
external/bsd/bind/dist/CHANGES: up to 1.23
external/bsd/bind/dist/README: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html: up to 1.1.1.21
external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html: up to 1.1.1.18
external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html: up to 1.1.1.23
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html: up to 1.1.1.24
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html: up to 1.1.1.20
external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html: up to 1.1.1.9
external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html: up to 1.1.1.9
external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html: up to 1.1.1.9
external/bsd/bind/dist/doc/arm/Bv9ARM.html: up to 1.11
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf: up to 1.17
external/bsd/bind/dist/doc/arm/man.arpaname.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.delv.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dig.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-settime.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html: up to 1.11
external/bsd/bind/dist/doc/arm/man.dnssec-verify.html: up to 1.11

CVS commit: [netbsd-7] src/sys/arch/alpha

2016-11-01 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Nov  1 20:28:32 UTC 2016

Modified Files:
src/sys/arch/alpha/alpha [netbsd-7]: machdep.c prom.c
src/sys/arch/alpha/stand/common [netbsd-7]: booted_dev.c prom.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1269):
sys/arch/alpha/alpha/prom.c: revision 1.49
sys/arch/alpha/stand/common/prom.c: revision 1.15
sys/arch/alpha/alpha/machdep.c: revision 1.347
sys/arch/alpha/stand/common/booted_dev.c: revision 1.4
Match the two prom_getenv() and fix buffer overflow causing wrong host
controller SCSI ID for DEC 3000.
OK skrll@


To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.345.2.1 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.48 -r1.48.22.1 src/sys/arch/alpha/alpha/prom.c
cvs rdiff -u -r1.3 -r1.3.196.1 src/sys/arch/alpha/stand/common/booted_dev.c
cvs rdiff -u -r1.14 -r1.14.38.1 src/sys/arch/alpha/stand/common/prom.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/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.345 src/sys/arch/alpha/alpha/machdep.c:1.345.2.1
--- src/sys/arch/alpha/alpha/machdep.c:1.345	Fri May 16 19:18:21 2014
+++ src/sys/arch/alpha/alpha/machdep.c	Tue Nov  1 20:28:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.345 2014/05/16 19:18:21 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.345.2.1 2016/11/01 20:28:32 snj Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.345 2014/05/16 19:18:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.345.2.1 2016/11/01 20:28:32 snj Exp $");
 
 #include 
 #include 
@@ -171,7 +171,7 @@ struct bootinfo_kernel bootinfo;
 
 /* For built-in TCDS */
 #if defined(DEC_3000_300) || defined(DEC_3000_500)
-uint8_t	dec_3000_scsiid[2], dec_3000_scsifast[2];
+uint8_t	dec_3000_scsiid[3], dec_3000_scsifast[3];
 #endif
 
 struct platform platform;

Index: src/sys/arch/alpha/alpha/prom.c
diff -u src/sys/arch/alpha/alpha/prom.c:1.48 src/sys/arch/alpha/alpha/prom.c:1.48.22.1
--- src/sys/arch/alpha/alpha/prom.c:1.48	Mon Feb  6 02:14:12 2012
+++ src/sys/arch/alpha/alpha/prom.c	Tue Nov  1 20:28:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.c,v 1.48 2012/02/06 02:14:12 matt Exp $ */
+/* $NetBSD: prom.c,v 1.48.22.1 2016/11/01 20:28:32 snj Exp $ */
 
 /*
  * Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University
@@ -27,7 +27,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.48 2012/02/06 02:14:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.48.22.1 2016/11/01 20:28:32 snj Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -95,7 +95,7 @@ init_bootstrap_console(void)
 
 	init_prom_interface(hwrpb);
 
-	prom_getenv(PROM_E_TTY_DEV, buf, 4);
+	prom_getenv(PROM_E_TTY_DEV, buf, sizeof(buf));
 	alpha_console = buf[0] - '0';
 
 	/* XXX fake out the console routines, for now */
@@ -238,14 +238,14 @@ prom_getenv(int id, char *buf, int len)
 
 	prom_enter();
 	ret.bits = prom_getenv_disp(id, to, len);
-	memcpy(buf, to, len);
-	prom_leave();
-
 	if (ret.u.status & 0x4)
 		ret.u.retval = 0;
-	buf[ret.u.retval] = '\0';
+	len = min(len - 1, ret.u.retval);
+	memcpy(buf, to, len);
+	buf[len] = '\0';
+	prom_leave();
 
-	return (ret.bits);
+	return len;
 }
 
 void

Index: src/sys/arch/alpha/stand/common/booted_dev.c
diff -u src/sys/arch/alpha/stand/common/booted_dev.c:1.3 src/sys/arch/alpha/stand/common/booted_dev.c:1.3.196.1
--- src/sys/arch/alpha/stand/common/booted_dev.c:1.3	Sat Nov 13 21:38:20 1999
+++ src/sys/arch/alpha/stand/common/booted_dev.c	Tue Nov  1 20:28:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: booted_dev.c,v 1.3 1999/11/13 21:38:20 thorpej Exp $ */
+/* $NetBSD: booted_dev.c,v 1.3.196.1 2016/11/01 20:28:32 snj Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -53,9 +53,8 @@ booted_dev_open(void)
 	 * We don't know what device names look like yet,
 	 * so we can't change them.
 	 */
-	ret.bits = prom_getenv(PROM_E_BOOTED_DEV, booted_dev_name,
+	devlen = prom_getenv(PROM_E_BOOTED_DEV, booted_dev_name,
 	sizeof(booted_dev_name));
-	devlen = ret.u.retval;
 
 	ret.bits = prom_open(booted_dev_name, devlen);
 

Index: src/sys/arch/alpha/stand/common/prom.c
diff -u src/sys/arch/alpha/stand/common/prom.c:1.14 src/sys/arch/alpha/stand/common/prom.c:1.14.38.1
--- src/sys/arch/alpha/stand/common/prom.c:1.14	Wed Mar 18 10:22:22 2009
+++ src/sys/arch/alpha/stand/common/prom.c	Tue Nov  1 20:28:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.c,v 1.14 2009/03/18 10:22:22 cegger Exp $ */
+/* $NetBSD: prom.c,v 1.14.38.1 2016/11/01 20:28:32 snj Exp $ */
 
 /*  
  * Mach Operating System
@@ -57,7 +57,7 @@ init_prom_calls(void)
 	prom_dispatch_v.routine = c->crb_v_dispatch->entry_va;
 
 	/* Look for console

CVS commit: [netbsd-7] src/doc

2016-11-01 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Nov  1 20:40:14 UTC 2016

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

Log Message:
tickets 1258, 1265-1269


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.116 -r1.1.2.117 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.116 src/doc/CHANGES-7.1:1.1.2.117
--- src/doc/CHANGES-7.1:1.1.2.116	Fri Oct 14 12:03:37 2016
+++ src/doc/CHANGES-7.1	Tue Nov  1 20:40:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.116 2016/10/14 12:03:37 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.117 2016/11/01 20:40:14 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -6776,3 +6776,50 @@ external/bsd/bind/include/isc/platform.h
 	Update BIND to 9.10.4-P3.
 	[snj, ticket #1264]
 
+sys/arch/amd64/conf/std.xen			1.8
+sys/arch/xen/conf/std.xen			1.8
+
+	Make Xen process and file limits match the native ones.
+	[joerg, ticket #1258]
+
+usr.bin/ftp/fetch.c1.225
+
+	Fix crash in ftp when given an IPv6 URL that's missing a slash.
+	PR bin/51558.
+	[dholland, ticket #1265]
+
+lib/libperfuse/fuse.h1.7
+lib/libperfuse/libperfuse.3			1.4, 1.5
+lib/libperfuse/perfuse.c			1.38-1.40
+lib/libperfuse/perfuse_if.h			1.21, 1.22
+usr.sbin/perfused/msg.c1.23, 1.24
+usr.sbin/perfused/perfused.8			1.12
+
+	Make FUSE socket buffer tunable.
+
+	When dealing with high I/O throughput, we could run out of buffer
+	space if the filesystem was not consuming requests fast enough.
+	Here we slightly raise the buffer size, and we make it tunable
+	through the PERFUSE_BUFSIZE environment variable so that we can
+	cope with higher requirement later.
+	[manu, ticket #1266]
+
+etc/namedb/root.cache1.22
+
+	Update root.cache to 2016102001 (October 20, 2016).
+	[taca, ticket #1267]
+
+sys/kern/uipc_usrreq.c1.181
+
+	Fix a memory leak.
+	[maxv, ticket #1268]
+
+sys/arch/alpha/alpha/machdep.c			1.347
+sys/arch/alpha/alpha/prom.c			1.49
+sys/arch/alpha/stand/common/booted_dev.c	1.4
+sys/arch/alpha/stand/common/prom.c		1.15
+
+	Match the two prom_getenv() and fix buffer overflow causing
+	wrong host controller SCSI ID for DEC 3000.
+	[flxd, ticket #1269]
+

CVS commit: [netbsd-7] src/sys/kern

2016-11-01 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Nov  1 20:08:15 UTC 2016

Modified Files:
src/sys/kern [netbsd-7]: uipc_usrreq.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1268):
sys/kern/uipc_usrreq.c: revision 1.181
Memory leak, found by Mootja. It is easily triggerable from userland.


To generate a diff of this commit:
cvs rdiff -u -r1.169.2.3 -r1.169.2.4 src/sys/kern/uipc_usrreq.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/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.169.2.3 src/sys/kern/uipc_usrreq.c:1.169.2.4
--- src/sys/kern/uipc_usrreq.c:1.169.2.3	Tue Apr 14 04:44:41 2015
+++ src/sys/kern/uipc_usrreq.c	Tue Nov  1 20:08:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_usrreq.c,v 1.169.2.3 2015/04/14 04:44:41 snj Exp $	*/
+/*	$NetBSD: uipc_usrreq.c,v 1.169.2.4 2016/11/01 20:08:15 snj Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.169.2.3 2015/04/14 04:44:41 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.169.2.4 2016/11/01 20:08:15 snj Exp $");
 
 #include 
 #include 
@@ -1173,11 +1173,11 @@ unp_connect(struct socket *so, struct mb
 		goto bad2;
 	}
 	vp = nd.ni_vp;
+	pathbuf_destroy(pb);
 	if (vp->v_type != VSOCK) {
 		error = ENOTSOCK;
 		goto bad;
 	}
-	pathbuf_destroy(pb);
 	if ((error = VOP_ACCESS(vp, VWRITE, l->l_cred)) != 0)
 		goto bad;
 	/* Acquire v_interlock to protect against unp_detach(). */

CVS commit: [netbsd-7] src/etc/namedb

2016-11-01 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Nov  1 19:52:22 UTC 2016

Modified Files:
src/etc/namedb [netbsd-7]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1267):
etc/namedb/root.cache: revision 1.22
Update root.cache to 2016102001 (October 20, 2016).


To generate a diff of this commit:
cvs rdiff -u -r1.18.2.3 -r1.18.2.4 src/etc/namedb/root.cache

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

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.18.2.3 src/etc/namedb/root.cache:1.18.2.4
--- src/etc/namedb/root.cache:1.18.2.3	Sun Sep 18 06:05:16 2016
+++ src/etc/namedb/root.cache	Tue Nov  1 19:52:22 2016
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.18.2.3 2016/09/18 06:05:16 snj Exp $
+;	$NetBSD: root.cache,v 1.18.2.4 2016/11/01 19:52:22 snj Exp $
 ;   This file holds the information on root name servers needed to
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
@@ -10,8 +10,8 @@
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
 ;
-;   last update:August 25, 2016
-;   related version of root zone:   2016082500
+;   last update:October 20, 2016
+;   related version of root zone:   2016102001
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -53,6 +53,7 @@ F.ROOT-SERVERS.NET.  360  AA
 ;
 .360  NSG.ROOT-SERVERS.NET.
 G.ROOT-SERVERS.NET.  360  A 192.112.36.4
+G.ROOT-SERVERS.NET.  360    2001:500:12::d0d
 ;
 ; FORMERLY AOS.ARL.ARMY.MIL
 ;

CVS commit: [netbsd-7] src

2016-11-01 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Nov  1 19:49:04 UTC 2016

Modified Files:
src/lib/libperfuse [netbsd-7]: fuse.h libperfuse.3 perfuse.c
perfuse_if.h
src/usr.sbin/perfused [netbsd-7]: msg.c perfused.8

Log Message:
Pull up following revision(s) (requested by manu in ticket #1266):
lib/libperfuse/fuse.h: revision 1.7
lib/libperfuse/libperfuse.3: revision 1.4, 1.5
lib/libperfuse/perfuse.c: revision 1.38-1.40
lib/libperfuse/perfuse_if.h: revision 1.21, 1.22
usr.sbin/perfused/msg.c: revision 1.23, 1.24
usr.sbin/perfused/perfused.8: revision 1.12
Make FUSE socket buffer tunable
When dealing with high I/O throughput, we could run out of buffer
space if the filesystem was not consuming requests fast enough.
Here we slightly raise the buffer size, and we make it tunable
through the PERFUSE_BUFSIZE environment variable so that we can
cope with higher requirement later.
While there, document PERFUSE_OPTIONS environment variable.
--
make this compile again, and simplify.
--
Sort sections. new sentence, new line. Whitespace.
--
make the env stuff visible.
--
remove dup function


To generate a diff of this commit:
cvs rdiff -u -r1.5.18.1 -r1.5.18.2 src/lib/libperfuse/fuse.h
cvs rdiff -u -r1.3 -r1.3.22.1 src/lib/libperfuse/libperfuse.3
cvs rdiff -u -r1.31.10.5 -r1.31.10.6 src/lib/libperfuse/perfuse.c
cvs rdiff -u -r1.20 -r1.20.10.1 src/lib/libperfuse/perfuse_if.h
cvs rdiff -u -r1.21.10.1 -r1.21.10.2 src/usr.sbin/perfused/msg.c
cvs rdiff -u -r1.11 -r1.11.18.1 src/usr.sbin/perfused/perfused.8

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

Modified files:

Index: src/lib/libperfuse/fuse.h
diff -u src/lib/libperfuse/fuse.h:1.5.18.1 src/lib/libperfuse/fuse.h:1.5.18.2
--- src/lib/libperfuse/fuse.h:1.5.18.1	Wed Nov  5 18:11:30 2014
+++ src/lib/libperfuse/fuse.h	Tue Nov  1 19:49:04 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: fuse.h,v 1.5.18.1 2014/11/05 18:11:30 snj Exp $ */
+/*  $NetBSD: fuse.h,v 1.5.18.2 2016/11/01 19:49:04 snj Exp $ */
 
 /*-
  *  Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -34,8 +34,8 @@
 #define FUSE_UNKNOWN_FH (uint64_t)0
 
 #ifndef FUSE_BUFSIZE
-#define FUSE_MIN_BUFSIZE 0x21000
-#define FUSE_PREF_BUFSIZE (sysconf(_SC_PAGESIZE) + 0x1000)
+#define FUSE_MIN_BUFSIZE ((size_t)0x21000)
+#define FUSE_PREF_BUFSIZE ((size_t)(sysconf(_SC_PAGESIZE) + 0x1000))
 #define FUSE_BUFSIZE MAX(FUSE_PREF_BUFSIZE /* CONSTCOND */, FUSE_MIN_BUFSIZE)
 #endif /* FUSE_BUFSIZE */
 

Index: src/lib/libperfuse/libperfuse.3
diff -u src/lib/libperfuse/libperfuse.3:1.3 src/lib/libperfuse/libperfuse.3:1.3.22.1
--- src/lib/libperfuse/libperfuse.3:1.3	Tue May 10 12:14:37 2011
+++ src/lib/libperfuse/libperfuse.3	Tue Nov  1 19:49:04 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: libperfuse.3,v 1.3 2011/05/10 12:14:37 njoly Exp $
+.\" $NetBSD: libperfuse.3,v 1.3.22.1 2016/11/01 19:49:04 snj Exp $
 .\"
 .\" Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
 .\"
@@ -105,6 +105,22 @@ handles control to the regular
 returns a file descriptor to the
 .Pa /dev/fuse
 socket on success, and causes exit on failure.
+.Sh ENVIRONMENT
+.Bl -tag -width Er
+.It Ev PERFUSE_OPTIONS
+Comma-separated values controlling the usage of some FUSE methods.
+Allowed values are
+.Li enable_access ,
+.Li disable_access ,
+.Li enable_creat ,
+.Li disable_creat .
+.It Ev PERFUSE_BUFSIZE
+Set the socket buffer sizes used for communication with the filesystem.
+This should be raised as operation throughput requires it.
+Default is
+.Li 2162688
+bytes, which is enough to queue 16 FUSE packets of maximum 132 kB length.
+.El
 .\".Sh ERRORS
 .\".Fn perfuse_mount
 .\"will fail when one of the following occurs:

Index: src/lib/libperfuse/perfuse.c
diff -u src/lib/libperfuse/perfuse.c:1.31.10.5 src/lib/libperfuse/perfuse.c:1.31.10.6
--- src/lib/libperfuse/perfuse.c:1.31.10.5	Thu Aug  6 21:52:13 2015
+++ src/lib/libperfuse/perfuse.c	Tue Nov  1 19:49:04 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: perfuse.c,v 1.31.10.5 2015/08/06 21:52:13 snj Exp $ */
+/*  $NetBSD: perfuse.c,v 1.31.10.6 2016/11/01 19:49:04 snj Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -52,7 +53,6 @@ extern char **environ;
 static struct perfuse_state *init_state(void);
 static int get_fd(const char *);
 
-
 static struct perfuse_state *
 init_state(void)
 {
@@ -146,6 +146,25 @@ get_fd(const char *data)
 
 }
 
+uint32_t 
+perfuse_bufvar_from_env(const char *name, uint32_t defval)
+{
+	char valstr[1024];
+	int e;
+	uint32_t retval;
+
+	if (getenv_r(name, valstr, sizeof(valstr)) == -1)
+		return defval;
+
+	retval = (uint32_t)strtoi(valstr, NULL, 0, 0, UINT32_MAX, );
+	if (!e)
+		return retval;
+
+	DWARNC(e, "conversion from `%s' to uint32_t failed, using %u",
+	valstr, defval);
+	return defval;
+}
+
 int

CVS commit: [netbsd-7] src/usr.bin/ftp

2016-11-01 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Nov  1 19:30:44 UTC 2016

Modified Files:
src/usr.bin/ftp [netbsd-7]: fetch.c

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1265):
usr.bin/ftp/fetch.c: revision 1.225
PR/51558: ast@: ftp dumps core after usage message when IPv6 URL lacks a slash.
Initialize variable so that we don't get random behavior on cleanup.


To generate a diff of this commit:
cvs rdiff -u -r1.205.4.4 -r1.205.4.5 src/usr.bin/ftp/fetch.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/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.205.4.4 src/usr.bin/ftp/fetch.c:1.205.4.5
--- src/usr.bin/ftp/fetch.c:1.205.4.4	Fri Apr 29 19:03:44 2016
+++ src/usr.bin/ftp/fetch.c	Tue Nov  1 19:30:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.205.4.4 2016/04/29 19:03:44 snj Exp $	*/
+/*	$NetBSD: fetch.c,v 1.205.4.5 2016/11/01 19:30:44 snj Exp $	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.205.4.4 2016/04/29 19:03:44 snj Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.205.4.5 2016/11/01 19:30:44 snj Exp $");
 #endif /* not lint */
 
 /*
@@ -1295,6 +1295,7 @@ fetch_url(const char *url, const char *p
 	rval = 1;
 
 	initurlinfo();
+	initurlinfo();
 	initauthinfo(, wwwauth);
 	initauthinfo(, proxyauth);

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

2016-11-01 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Nov  1 19:00:11 UTC 2016

Modified Files:
src/sys/arch/amd64/conf [netbsd-7]: std.xen
src/sys/arch/xen/conf [netbsd-7]: std.xen

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1258):
sys/arch/amd64/conf/std.xen: revision 1.8
sys/arch/xen/conf/std.xen: revision 1.8
Use the same process and file limits as normal AND64 for Xen kernels.
Given Xen/i386 the same process and file limit as native i386.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.38.1 src/sys/arch/amd64/conf/std.xen
cvs rdiff -u -r1.7 -r1.7.28.1 src/sys/arch/xen/conf/std.xen

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/amd64/conf/std.xen
diff -u src/sys/arch/amd64/conf/std.xen:1.6 src/sys/arch/amd64/conf/std.xen:1.6.38.1
--- src/sys/arch/amd64/conf/std.xen:1.6	Wed Jul 29 12:02:05 2009
+++ src/sys/arch/amd64/conf/std.xen	Tue Nov  1 19:00:11 2016
@@ -1,4 +1,4 @@
-# $NetBSD: std.xen,v 1.6 2009/07/29 12:02:05 cegger Exp $
+# $NetBSD: std.xen,v 1.6.38.1 2016/11/01 19:00:11 snj Exp $
 # NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp 
 #
 # standard, required NetBSD/i386 'options'
@@ -14,5 +14,8 @@ options 	EXEC_ELF64	# exec ELF binaries
 options 	EXEC_SCRIPT	# exec #! scripts
 options 	MTRR
 
+options 	CHILD_MAX=1024	# 160 is too few
+options 	OPEN_MAX=1024	# 128 is too few
+
 # Atheros HAL options
 include "external/isc/atheros_hal/conf/std.ath_hal"

Index: src/sys/arch/xen/conf/std.xen
diff -u src/sys/arch/xen/conf/std.xen:1.7 src/sys/arch/xen/conf/std.xen:1.7.28.1
--- src/sys/arch/xen/conf/std.xen:1.7	Thu Jun 30 20:09:38 2011
+++ src/sys/arch/xen/conf/std.xen	Tue Nov  1 19:00:11 2016
@@ -1,4 +1,4 @@
-# $NetBSD: std.xen,v 1.7 2011/06/30 20:09:38 wiz Exp $
+# $NetBSD: std.xen,v 1.7.28.1 2016/11/01 19:00:11 snj Exp $
 # NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp 
 #
 # standard, required NetBSD/i386 'options'
@@ -16,5 +16,8 @@ options 	CPU_IN_CKSUM
 #options 	CRYPTO_MD_BF_ENC	# machine-dependent code for BF_encrypt
 #options 	CRYPTO_MD_BF_CBC	# careful: uses bswapl, requires 486
 
+options 	CHILD_MAX=1024	# 160 is too few
+options 	OPEN_MAX=1024	# 128 is too few
+
 # Atheros HAL options
 include "external/isc/atheros_hal/conf/std.ath_hal"

CVS commit: [netbsd-7] src/doc

2016-10-14 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Oct 14 12:03:37 UTC 2016

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

Log Message:
Note ticket #1264


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.115 -r1.1.2.116 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.115 src/doc/CHANGES-7.1:1.1.2.116
--- src/doc/CHANGES-7.1:1.1.2.115	Thu Oct  6 05:53:18 2016
+++ src/doc/CHANGES-7.1	Fri Oct 14 12:03:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.115 2016/10/06 05:53:18 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.116 2016/10/14 12:03:37 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5955,3 +5955,824 @@ doc/3RDPARTY	patch
 	o Certificate message OOB reads (CVE-2016-6306)
 	[spz, ticket #1260]
 
+doc/3RDPARTY	patch
+external/bsd/bind/Makefile.inc  up to 1.23 via patch
+external/bsd/bind/bind2netbsd   up to 1.4
+external/bsd/bind/dist/CHANGES  up to 1.22
+external/bsd/bind/dist/FAQ  up to 1.1.1.8
+external/bsd/bind/dist/FAQ.xml  up to 1.1.1.11
+external/bsd/bind/dist/Makefile.in  up to 1.3
+external/bsd/bind/dist/README   up to 1.10
+external/bsd/bind/dist/acconfig.h   up to 1.9
+external/bsd/bind/dist/bin/check/Makefile.inup to 1.1.1.9
+external/bsd/bind/dist/bin/check/named-checkconf.8 up to 1.7
+external/bsd/bind/dist/bin/check/named-checkconf.c up to 1.13
+external/bsd/bind/dist/bin/check/named-checkconf.docbook up to 1.1.1.8
+external/bsd/bind/dist/bin/check/named-checkconf.html up to 1.1.1.9
+external/bsd/bind/dist/bin/check/named-checkzone.8 up to 1.8
+external/bsd/bind/dist/bin/check/named-checkzone.c up to 1.9
+external/bsd/bind/dist/bin/check/named-checkzone.docbook up to 1.1.1.10
+external/bsd/bind/dist/bin/check/named-checkzone.html up to 1.1.1.10
+external/bsd/bind/dist/bin/check/win32/checkconf.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checktool.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkzone.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/confgen/Makefile.in  up to 1.1.1.8
+external/bsd/bind/dist/bin/confgen/ddns-confgen.8 up to 1.6
+external/bsd/bind/dist/bin/confgen/ddns-confgen.docbook up to 1.1.1.6
+external/bsd/bind/dist/bin/confgen/ddns-confgen.html up to 1.1.1.6
+external/bsd/bind/dist/bin/confgen/rndc-confgen.8 up to 1.7
+external/bsd/bind/dist/bin/confgen/rndc-confgen.docbook up to 1.1.1.6
+external/bsd/bind/dist/bin/confgen/rndc-confgen.html up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/win32/confgentool.vcxproj.in up to 1.1.1.2
+external/bsd/bind/dist/bin/confgen/win32/ddnsconfgen.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/confgen/win32/rndcconfgen.vcxproj.in up to 1.1.1.2
+external/bsd/bind/dist/bin/delv/Makefile.in up to 1.1.1.2
+external/bsd/bind/dist/bin/delv/delv.1  up to 1.1.1.4
+external/bsd/bind/dist/bin/delv/delv.c  up to 1.5
+external/bsd/bind/dist/bin/delv/delv.docbookup to 1.1.1.2
+external/bsd/bind/dist/bin/delv/delv.html   up to 1.1.1.3
+external/bsd/bind/dist/bin/delv/win32/delv.vcxproj.in up to 1.1.1.2
+external/bsd/bind/dist/bin/dig/Makefile.in  up to 1.1.1.10
+external/bsd/bind/dist/bin/dig/dig.1up to 1.12
+external/bsd/bind/dist/bin/dig/dig.cup to 1.12
+external/bsd/bind/dist/bin/dig/dig.docbook  up to 1.1.1.13
+external/bsd/bind/dist/bin/dig/dig.html up to 1.1.1.13
+external/bsd/bind/dist/bin/dig/dighost.cup to 1.18
+external/bsd/bind/dist/bin/dig/host.1   up to 1.6
+external/bsd/bind/dist/bin/dig/host.docbook up to 1.1.1.6
+external/bsd/bind/dist/bin/dig/host.htmlup to 1.1.1.7
+external/bsd/bind/dist/bin/dig/nslookup.1   up to 1.8
+external/bsd/bind/dist/bin/dig/nslookup.docbook up to 1.1.1.8
+external/bsd/bind/dist/bin/dig/nslookup.htmlup to 1.1.1.10
+external/bsd/bind/dist/bin/dig/win32/dig.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/dig/win32/dighost.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/dig/win32/host.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/dig/win32/nslookup.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/dnssec/Makefile.in   up to 1.1.1.10
+external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.8 up to 1.9
+external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.docbook up to 1.1.1.10
+external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.html up to 1.1.1.11
+external/bsd/bind/dist/bin/dnssec/dnssec-importkey.8 up to 1.5
+external/bsd/bind/dist/bin/dnssec/dnssec-importkey.docbook up to 1.1.1.5
+external/bsd/bind/dist/bin/dnssec/dnssec-importkey.html up to 1.1.1.4
+external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 up to 1.10

CVS commit: [netbsd-7] src/doc

2016-10-05 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Oct  6 05:53:18 UTC 2016

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

Log Message:
ticket 1260


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.114 src/doc/CHANGES-7.1:1.1.2.115
--- src/doc/CHANGES-7.1:1.1.2.114	Wed Oct  5 10:52:52 2016
+++ src/doc/CHANGES-7.1	Thu Oct  6 05:53:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.114 2016/10/05 10:52:52 bouyer Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.115 2016/10/06 05:53:18 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5498,3 +5498,460 @@ xsrc/xfree/xc/programs/Xserver/include/d
 		Affected versions: libXvMC <= 1.0.9
 	[mrg, ticket #1263]
 
+crypto/external/bsd/openssl/dist/CHANGES	patch
+crypto/external/bsd/openssl/dist/CONTRIBUTING	patch
+crypto/external/bsd/openssl/dist/Configure	patch
+crypto/external/bsd/openssl/dist/Makefile	patch
+crypto/external/bsd/openssl/dist/NEWS		patch
+crypto/external/bsd/openssl/dist/README		patch
+crypto/external/bsd/openssl/dist/openssl.spec	patch
+crypto/external/bsd/openssl/dist/apps/apps.c	patch
+crypto/external/bsd/openssl/dist/apps/enc.c	patch
+crypto/external/bsd/openssl/dist/apps/passwd.c	patch
+crypto/external/bsd/openssl/dist/apps/s_server.c patch
+crypto/external/bsd/openssl/dist/apps/x509.c	patch
+crypto/external/bsd/openssl/dist/crypto/md32_common.h patch
+crypto/external/bsd/openssl/dist/crypto/opensslv.h patch
+crypto/external/bsd/openssl/dist/crypto/asn1/a_bytes.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/a_object.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/a_set.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/asn1_lib.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/d2i_pr.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/f_enum.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/f_int.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/f_string.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/p5_pbe.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/p5_pbev2.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/tasn_prn.c patch
+crypto/external/bsd/openssl/dist/crypto/asn1/x_name.c patch
+crypto/external/bsd/openssl/dist/crypto/bio/bf_nbio.c patch
+crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c patch
+crypto/external/bsd/openssl/dist/crypto/bn/bn_print.c patch
+crypto/external/bsd/openssl/dist/crypto/bn/bn_rand.c patch
+crypto/external/bsd/openssl/dist/crypto/cms/cms_enc.c patch
+crypto/external/bsd/openssl/dist/crypto/cms/cms_ess.c patch
+crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c patch
+crypto/external/bsd/openssl/dist/crypto/des/des.c patch
+crypto/external/bsd/openssl/dist/crypto/des/enc_writ.c patch
+crypto/external/bsd/openssl/dist/crypto/dsa/dsa_gen.c patch
+crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ossl.c patch
+crypto/external/bsd/openssl/dist/crypto/evp/bio_ok.c patch
+crypto/external/bsd/openssl/dist/crypto/evp/digest.c patch
+crypto/external/bsd/openssl/dist/crypto/evp/e_seed.c patch
+crypto/external/bsd/openssl/dist/crypto/md2/md2_dgst.c patch
+crypto/external/bsd/openssl/dist/crypto/mdc2/mdc2dgst.c patch
+crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_ext.c patch
+crypto/external/bsd/openssl/dist/crypto/pem/pem.h patch
+crypto/external/bsd/openssl/dist/crypto/pem/pem_err.c patch
+crypto/external/bsd/openssl/dist/crypto/pem/pem_lib.c patch
+crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c patch
+crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_mutl.c patch
+crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_npas.c patch
+crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_utl.c patch
+crypto/external/bsd/openssl/dist/crypto/pkcs12/pkcs12.h patch
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c patch
+crypto/external/bsd/openssl/dist/crypto/rand/rand_unix.c patch
+crypto/external/bsd/openssl/dist/crypto/srp/srp_lib.c patch
+crypto/external/bsd/openssl/dist/crypto/srp/srp_vfy.c patch
+crypto/external/bsd/openssl/dist/crypto/ts/ts_lib.c patch
+crypto/external/bsd/openssl/dist/crypto/whrlpool/wp_dgst.c patch
+crypto/external/bsd/openssl/dist/crypto/x509/x509.h patch
+crypto/external/bsd/openssl/dist/crypto/x509/x509_err.c patch
+crypto/external/bsd/openssl/dist/crypto/x509/x509_txt.c patch
+crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c patch
+crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h patch
+crypto/external/bsd/openssl/dist/crypto/x509v3/v3_addr.c patch
+crypto/external/bsd/openssl/dist/doc/apps/cms.pod patch
+crypto/external/bsd/openssl/dist/doc/apps/smime.pod patch

CVS commit: [netbsd-7] src/doc

2016-10-05 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Oct  5 10:52:52 UTC 2016

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

Log Message:
Fix today's ticket entries


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.113 -r1.1.2.114 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.113 src/doc/CHANGES-7.1:1.1.2.114
--- src/doc/CHANGES-7.1:1.1.2.113	Wed Oct  5 09:51:20 2016
+++ src/doc/CHANGES-7.1	Wed Oct  5 10:52:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.113 2016/10/05 09:51:20 bouyer Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.114 2016/10/05 10:52:52 bouyer Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5438,7 +5438,7 @@ xsrc/external/mit/libXvMC/dist/src/XvMC.
 	libXvMC - insufficient validation of data from the X server
 		can cause a one byte buffer read underrun.
 		Affected versions: libXvMC <= 1.0.9
-	[mrg, ticket 1262]
+	[mrg, ticket #1262]
 
 xsrc/xfree/xc/lib/X11/FontNames.c		patch
 xsrc/xfree/xc/lib/X11/GetImage.c		patch
@@ -5496,5 +5496,5 @@ xsrc/xfree/xc/programs/Xserver/include/d
 	libXvMC - insufficient validation of data from the X server
 		can cause a one byte buffer read underrun.
 		Affected versions: libXvMC <= 1.0.9
-	[mrg, ticket 1263]
+	[mrg, ticket #1263]

CVS commit: [netbsd-7] src/doc

2016-10-05 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Oct  5 09:51:20 UTC 2016

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

Log Message:
tickets 1262,1263


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.112 src/doc/CHANGES-7.1:1.1.2.113
--- src/doc/CHANGES-7.1:1.1.2.112	Wed Sep 28 20:24:43 2016
+++ src/doc/CHANGES-7.1	Wed Oct  5 09:51:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.112 2016/09/28 20:24:43 bouyer Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.113 2016/10/05 09:51:20 bouyer Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5375,3 +5375,126 @@ sys/netinet6/raw_ip6.c1.150 via patc
 	Fixes PR kern/51435.
 	[roy, ticket #1243]
 
+xsrc/external/mit/libX11/dist/src/FontNames.c		patch
+xsrc/external/mit/libX11/dist/src/GetImage.c		patch
+xsrc/external/mit/libX11/dist/src/ListExt.c		patch
+xsrc/external/mit/libX11/dist/src/ModMap.c		patch
+xsrc/external/mit/libXfixes/dist/src/Region.c		patch
+xsrc/external/mit/libXi/dist/src/XGMotion.c		patch
+xsrc/external/mit/libXi/dist/src/XGetBMap.c		patch
+xsrc/external/mit/libXi/dist/src/XGetDCtl.c		patch
+xsrc/external/mit/libXi/dist/src/XGetFCtl.c		patch
+xsrc/external/mit/libXi/dist/src/XGetKMap.c		patch
+xsrc/external/mit/libXi/dist/src/XGetMMap.c		patch
+xsrc/external/mit/libXi/dist/src/XIQueryDevice.c	patch
+xsrc/external/mit/libXi/dist/src/XListDev.c		patch
+xsrc/external/mit/libXi/dist/src/XOpenDev.c		patch
+xsrc/external/mit/libXi/dist/src/XQueryDv.c		patch
+xsrc/external/mit/libXrandr/dist/src/XrrConfig.c	patch
+xsrc/external/mit/libXrandr/dist/src/XrrCrtc.c		patch
+xsrc/external/mit/libXrandr/dist/src/XrrOutput.c	patch
+xsrc/external/mit/libXrandr/dist/src/XrrProvider.c	patch
+xsrc/external/mit/libXrandr/dist/src/XrrScreen.c	patch
+xsrc/external/mit/libXrender/dist/src/Filter.c		patch
+xsrc/external/mit/libXrender/dist/src/Xrender.c		patch
+xsrc/external/mit/libXtst/dist/src/XRecord.c		patch
+xsrc/external/mit/libXv/dist/src/Xv.c			patch
+xsrc/external/mit/libXvMC/dist/src/XvMC.c		patch
+
+	Fix (backported from upstream) the following issues in X client
+	libraries:
+	libX11 - insufficient validation of data from the X server
+		 can cause out of boundary memory read (XGetImage())
+		 or write (XListFonts()).
+		 Affected versions libX11 <= 1.6.3
+
+	libXfixes - insufficient validation of data from the X server
+		can cause an integer overflow on 32 bit architectures.
+		Affected versions : libXfixes <= 5.0.2
+
+	libXi - insufficient validation of data from the X server
+		can cause out of boundary memory access or
+		endless loops (Denial of Service).
+		Affected versions libXi <= 1.7.6
+
+	libXrandr - insufficient validation of data from the X server
+		can cause out of boundary memory writes.
+		Affected versions: libXrandr <= 1.5.0
+
+	libXrender - insufficient validation of data from the X server
+		can cause out of boundary memory writes.
+		Affected version: libXrender <= 0.9.9
+
+	XRecord - insufficient validation of data from the X server
+		can cause out of boundary memory access or
+		endless loops (Denial of Service).
+		 Affected version libXtst <= 1.2.2
+
+	libXv - insufficient validation of data from the X server
+		can cause out of boundary memory and memory corruption.
+		CVE-2016-5407
+		affected versions libXv <= 1.0.10
+
+	libXvMC - insufficient validation of data from the X server
+		can cause a one byte buffer read underrun.
+		Affected versions: libXvMC <= 1.0.9
+	[mrg, ticket 1262]
+
+xsrc/xfree/xc/lib/X11/FontNames.c		patch
+xsrc/xfree/xc/lib/X11/GetImage.c		patch
+xsrc/xfree/xc/lib/X11/ListExt.c			patch
+xsrc/xfree/xc/lib/X11/ModMap.c			patch
+xsrc/xfree/xc/lib/X11/Xlibint.h			patch
+xsrc/xfree/xc/lib/Xi/XGMotion.c			patch
+xsrc/xfree/xc/lib/Xi/XGetBMap.c			patch
+xsrc/xfree/xc/lib/Xi/XGetDCtl.c			patch
+xsrc/xfree/xc/lib/Xi/XGetFCtl.c			patch
+xsrc/xfree/xc/lib/Xi/XGetKMap.c			patch
+xsrc/xfree/xc/lib/Xi/XGetMMap.c			patch
+xsrc/xfree/xc/lib/Xi/XOpenDev.c			patch
+xsrc/xfree/xc/lib/Xi/XQueryDv.c			patch
+xsrc/xfree/xc/lib/Xrender/Filter.c		patch
+xsrc/xfree/xc/lib/Xrender/Xrender.c		patch
+xsrc/xfree/xc/lib/Xtst/XRecord.c		patch
+xsrc/xfree/xc/lib/Xv/Xv.c			patch
+xsrc/xfree/xc/programs/Xserver/include/dix.h	patch
+
+	Fix (backported from upstream) the following issues in X client
+	libraries:
+	libX11 - insufficient validation of data from the X server
+		 can cause out of boundary memory read (XGetImage())
+		 or write (XListFonts()).
+		 Affected versions libX11 <= 1.6.3
+
+	libXfixes - insufficient validation of data from the X server
+		can cause an integer overflow on 32 bit architectures.
+		Affected versions : libXfixes <= 5.0.2
+
+	libXi - insufficient validation of data from the X server
+		can cause out of

CVS commit: [netbsd-7] src/doc

2016-09-28 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Sep 28 20:24:43 UTC 2016

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

Log Message:
ticket 1243


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.111 -r1.1.2.112 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.111 src/doc/CHANGES-7.1:1.1.2.112
--- src/doc/CHANGES-7.1:1.1.2.111	Sun Sep 25 12:25:13 2016
+++ src/doc/CHANGES-7.1	Wed Sep 28 20:24:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.111 2016/09/25 12:25:13 bouyer Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.112 2016/09/28 20:24:43 bouyer Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5368,3 +5368,10 @@ sys/arch/sparc64/sparc64/locore.s		1.401
 	Fix RAS for 32-bit kernels.  trapframe is always 64-bit.
 	[nakayama, ticket #1257]
 
+sys/netinet6/in6_pcb.c1.149 via patch
+sys/netinet6/raw_ip6.c1.150 via patch
+
+	Allow explicit binding to detached addresss.
+	Fixes PR kern/51435.
+	[roy, ticket #1243]
+

CVS commit: [netbsd-7] src/sys/netinet6

2016-09-28 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Sep 28 20:24:06 UTC 2016

Modified Files:
src/sys/netinet6 [netbsd-7]: in6_pcb.c raw_ip6.c

Log Message:
Pull up following revision(s) (requested by roy in ticket #1243):
sys/netinet6/raw_ip6.c: revision 1.150 via patch
sys/netinet6/in6_pcb.c: revision 1.149 via patch
Allow explicit binding to detached addresss.
Fixes PR kern/51435.


To generate a diff of this commit:
cvs rdiff -u -r1.128.2.2 -r1.128.2.3 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.136 -r1.136.2.1 src/sys/netinet6/raw_ip6.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/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.128.2.2 src/sys/netinet6/in6_pcb.c:1.128.2.3
--- src/sys/netinet6/in6_pcb.c:1.128.2.2	Sat Jan 17 12:10:54 2015
+++ src/sys/netinet6/in6_pcb.c	Wed Sep 28 20:24:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_pcb.c,v 1.128.2.2 2015/01/17 12:10:54 martin Exp $	*/
+/*	$NetBSD: in6_pcb.c,v 1.128.2.3 2016/09/28 20:24:06 bouyer Exp $	*/
 /*	$KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.128.2.2 2015/01/17 12:10:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.128.2.3 2016/09/28 20:24:06 bouyer Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -253,7 +253,7 @@ in6_pcbbind_addr(struct in6pcb *in6p, st
 		 */
 		if (ia &&
 		((struct in6_ifaddr *)ia)->ia6_flags &
-		(IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|IN6_IFF_DETACHED))
+		(IN6_IFF_ANYCAST|IN6_IFF_NOTREADY))
 			return (EADDRNOTAVAIL);
 	}
 

Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.136 src/sys/netinet6/raw_ip6.c:1.136.2.1
--- src/sys/netinet6/raw_ip6.c:1.136	Sat Aug  9 05:33:01 2014
+++ src/sys/netinet6/raw_ip6.c	Wed Sep 28 20:24:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip6.c,v 1.136 2014/08/09 05:33:01 rtr Exp $	*/
+/*	$NetBSD: raw_ip6.c,v 1.136.2.1 2016/09/28 20:24:06 bouyer Exp $	*/
 /*	$KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.136 2014/08/09 05:33:01 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.136.2.1 2016/09/28 20:24:06 bouyer Exp $");
 
 #include "opt_ipsec.h"
 
@@ -683,8 +683,7 @@ rip6_bind(struct socket *so, struct mbuf
 	(ia = ifa_ifwithaddr((struct sockaddr *)addr)) == 0)
 		return EADDRNOTAVAIL;
 	if (ia && ((struct in6_ifaddr *)ia)->ia6_flags &
-	(IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|
-	 IN6_IFF_DETACHED|IN6_IFF_DEPRECATED))
+	(IN6_IFF_ANYCAST|IN6_IFF_NOTREADY))
 		return EADDRNOTAVAIL;
 	in6p->in6p_laddr = addr->sin6_addr;
 	return 0;

CVS commit: [netbsd-7] src/doc

2016-09-25 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Sep 25 12:25:13 UTC 2016

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

Log Message:
tickets 1255, 1257


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.110 -r1.1.2.111 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.110 src/doc/CHANGES-7.1:1.1.2.111
--- src/doc/CHANGES-7.1:1.1.2.110	Sun Sep 25 11:38:50 2016
+++ src/doc/CHANGES-7.1	Sun Sep 25 12:25:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.110 2016/09/25 11:38:50 bouyer Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.111 2016/09/25 12:25:13 bouyer Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5358,3 +5358,13 @@ sys/net/if_spppsubr.c1.149
 	Useful when using dhcpcd for DHCPv6 PD.
 	[joerg, ticket #1254]
 
+sys/arch/xen/conf/files.xen			1.137
+
+	Include files.sljit as i386/amd64 do.
+	[sborrill, ticket #1255]
+
+sys/arch/sparc64/sparc64/locore.s		1.401
+
+	Fix RAS for 32-bit kernels.  trapframe is always 64-bit.
+	[nakayama, ticket #1257]
+

CVS commit: [netbsd-7] src/sys/arch/sparc64/sparc64

2016-09-25 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Sep 25 12:13:39 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7]: locore.s

Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1257):
sys/arch/sparc64/sparc64/locore.s: revision 1.401
Fix RAS for 32-bit kernels.  trapframe is always 64-bit.


To generate a diff of this commit:
cvs rdiff -u -r1.369.2.3 -r1.369.2.4 src/sys/arch/sparc64/sparc64/locore.s

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/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.369.2.3 src/sys/arch/sparc64/sparc64/locore.s:1.369.2.4
--- src/sys/arch/sparc64/sparc64/locore.s:1.369.2.3	Mon Nov 16 13:33:40 2015
+++ src/sys/arch/sparc64/sparc64/locore.s	Sun Sep 25 12:13:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.369.2.3 2015/11/16 13:33:40 msaitoh Exp $	*/
+/*	$NetBSD: locore.s,v 1.369.2.4 2016/09/25 12:13:39 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -5598,12 +5598,12 @@ ENTRY(cpu_switchto)
 	brz,pt	%o1, Lsw_noras		! no, skip RAS check
 	 LDPTR	[%i1 + L_TF], %l3	! pointer to trap frame
 	call	_C_LABEL(ras_lookup)
-	 LDPTR	[%l3 + TF_PC], %o1
+	 ldx	[%l3 + TF_PC], %o1
 	cmp	%o0, -1
-	be,pt	%xcc, Lsw_noras
+	be,pt	CCCR, Lsw_noras
 	 add	%o0, 4, %o1
-	STPTR	%o0, [%l3 + TF_PC]	! store rewound %pc
-	STPTR	%o1, [%l3 + TF_NPC]	! and %npc
+	stx	%o0, [%l3 + TF_PC]	! store rewound %pc
+	stx	%o1, [%l3 + TF_NPC]	! and %npc
 
 Lsw_noras:

CVS commit: [netbsd-7] src/sys/arch/xen/conf

2016-09-25 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Sep 25 12:11:33 UTC 2016

Modified Files:
src/sys/arch/xen/conf [netbsd-7]: files.xen

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1255):
sys/arch/xen/conf/files.xen: revision 1.137
Include files.sljit as i386/amd64 do.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.133.4.1 src/sys/arch/xen/conf/files.xen

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/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.133 src/sys/arch/xen/conf/files.xen:1.133.4.1
--- src/sys/arch/xen/conf/files.xen:1.133	Wed Feb 12 23:24:09 2014
+++ src/sys/arch/xen/conf/files.xen	Sun Sep 25 12:11:33 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.xen,v 1.133 2014/02/12 23:24:09 dsl Exp $
+#	$NetBSD: files.xen,v 1.133.4.1 2016/09/25 12:11:33 bouyer Exp $
 #	NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 #	NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp 
 
@@ -109,6 +109,12 @@ file	dev/cons.c
 
 
 #
+# Stack-less Just-In-Time compiler
+#
+
+include	"external/bsd/sljit/conf/files.sljit"
+
+#
 # Machine-independent SCSI drivers
 #

CVS commit: [netbsd-7] src/doc

2016-09-25 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Sep 25 11:38:50 UTC 2016

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

Log Message:
tickets 1251, 1241, 1250, 1253, 1254


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.109 -r1.1.2.110 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.109 src/doc/CHANGES-7.1:1.1.2.110
--- src/doc/CHANGES-7.1:1.1.2.109	Sun Sep 18 06:20:12 2016
+++ src/doc/CHANGES-7.1	Sun Sep 25 11:38:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.109 2016/09/18 06:20:12 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.110 2016/09/25 11:38:50 bouyer Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5296,3 +5296,65 @@ external/bsd/kyua-testers/tests/kyua-tes
 	Fix wrong objdir-finding logic.  PR 51389.
 	[dholland, ticket #1249]
 
+external/mit/lua/dist/Makefile			sync to 1.6
+external/mit/lua/dist/README			sync to 1.6
+external/mit/lua/dist/doc/contents.html		sync to 1.5
+external/mit/lua/dist/doc/lua.css		sync to 1.6
+external/mit/lua/dist/doc/manual.html		sync to 1.6
+external/mit/lua/dist/doc/readme.html		sync to 1.5
+external/mit/lua/dist/src/lapi.c		sync to 1.7
+external/mit/lua/dist/src/lauxlib.c		sync to 1.7
+external/mit/lua/dist/src/lbaselib.c		sync to 1.7
+external/mit/lua/dist/src/lcode.c		sync to 1.8
+external/mit/lua/dist/src/lcode.h		sync to 1.5
+external/mit/lua/dist/src/lcorolib.c		sync to 1.4
+external/mit/lua/dist/src/ldebug.c		sync to 1.7
+external/mit/lua/dist/src/ldo.c			sync to 1.6
+external/mit/lua/dist/src/ldo.h			sync to 1.6
+external/mit/lua/dist/src/lgc.c			sync to 1.6
+external/mit/lua/dist/src/lgc.h			sync to 1.5
+external/mit/lua/dist/src/liolib.c		sync to 1.6
+external/mit/lua/dist/src/llex.c		sync to 1.9
+external/mit/lua/dist/src/llex.h		sync to 1.5
+external/mit/lua/dist/src/lobject.c		sync to 1.9
+external/mit/lua/dist/src/loslib.c		sync to 1.8
+external/mit/lua/dist/src/lparser.c		sync to 1.7
+external/mit/lua/dist/src/lparser.h		sync to 1.5
+external/mit/lua/dist/src/lstate.h		sync to 1.6
+external/mit/lua/dist/src/lstrlib.c		sync to 1.15
+external/mit/lua/dist/src/ltablib.c		sync to 1.6
+external/mit/lua/dist/src/ltm.c			sync to 1.6
+external/mit/lua/dist/src/ltm.h			sync to 1.5
+external/mit/lua/dist/src/lua.h			sync to 1.7
+external/mit/lua/dist/src/luaconf.h		sync to 1.19
+external/mit/lua/dist/src/lvm.c			sync to 1.11
+external/mit/lua/dist/src/lvm.h			sync to 1.7
+doc/3RDPARTY	1.1360 via patch
+
+	Update Lua to 5.3.3
+	[salazar, ticket #1251]
+
+tests/lib/libc/net/getaddrinfo/Makefile		1.2
+tests/lib/libc/regex/Makefile			1.10
+
+	Replace MKMAN with NOMAN as suggested by christos@.  Allows
+	userland to build when building man pages.
+	[darcy, ticket #1241]
+
+sys/lib/libsa/checkpasswd.c			1.10
+
+	Check bounds on input. From Michael Plass.
+	[dholland, ticket #1250]
+
+lib/libm/Makefile1.185 via patch
+
+	Actually get fma(3) and friends into ARM libm.
+	[jakllsch, ticket #1253]
+
+sys/net/if_spppsubr.c1.149
+
+	Report link state changes for sppp consumers. The link is considered
+	up, if the current phase is SPPP_PHASE_NETWORK, otherwise it is down.
+	Useful when using dhcpcd for DHCPv6 PD.
+	[joerg, ticket #1254]
+

CVS commit: [netbsd-7] src/sys/net

2016-09-25 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Sep 25 11:35:28 UTC 2016

Modified Files:
src/sys/net [netbsd-7]: if_spppsubr.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1254):
sys/net/if_spppsubr.c: revision 1.149
Report link state changes for sppp consumers. The link is considered up,
if the current phase is SPPP_PHASE_NETWORK, otherwise it is down. Useful
when using dhcpcd for DHCPv6 PD.


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.130.2.1 src/sys/net/if_spppsubr.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/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.130 src/sys/net/if_spppsubr.c:1.130.2.1
--- src/sys/net/if_spppsubr.c:1.130	Fri Jun  6 22:15:32 2014
+++ src/sys/net/if_spppsubr.c	Sun Sep 25 11:35:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_spppsubr.c,v 1.130 2014/06/06 22:15:32 rmind Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.130.2.1 2016/09/25 11:35:27 bouyer Exp $	 */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.130 2014/06/06 22:15:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.130.2.1 2016/09/25 11:35:27 bouyer Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -447,6 +447,27 @@ static const struct cp *cps[IDX_COUNT] =
 	,			/* IDX_CHAP */
 };
 
+static void
+sppp_change_phase(struct sppp *sp, int phase)
+{
+	STDDCL;
+
+	if (sp->pp_phase == phase)
+		return;
+
+	sp->pp_phase = phase;
+
+	if (phase == SPPP_PHASE_NETWORK)
+		if_link_state_change(ifp, LINK_STATE_UP);
+	else
+		if_link_state_change(ifp, LINK_STATE_DOWN);
+
+	if (debug)
+	{
+		log(LOG_INFO, "%s: phase %s\n", ifp->if_xname,
+			sppp_phase_name(sp->pp_phase));
+	}
+}
 
 void spppattach(int);
 void
@@ -2507,7 +2528,7 @@ drop:
 static void
 sppp_lcp_tlu(struct sppp *sp)
 {
-	STDDCL;
+	struct ifnet *ifp = >pp_if;
 	int i;
 	uint32_t mask;
 
@@ -2524,15 +2545,9 @@ sppp_lcp_tlu(struct sppp *sp)
 
 	if ((sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO)) != 0 ||
 	(sp->pp_flags & PP_NEEDAUTH) != 0)
-		sp->pp_phase = SPPP_PHASE_AUTHENTICATE;
+		sppp_change_phase(sp, SPPP_PHASE_AUTHENTICATE);
 	else
-		sp->pp_phase = SPPP_PHASE_NETWORK;
-
-	if (debug)
-	{
-		log(LOG_INFO, "%s: phase %s\n", ifp->if_xname,
-		sppp_phase_name(sp->pp_phase));
-	}
+		sppp_change_phase(sp, SPPP_PHASE_NETWORK);
 
 	/*
 	 * Open all authentication protocols.  This is even required
@@ -2569,17 +2584,10 @@ sppp_lcp_tlu(struct sppp *sp)
 static void
 sppp_lcp_tld(struct sppp *sp)
 {
-	STDDCL;
 	int i;
 	uint32_t mask;
 
-	sp->pp_phase = SPPP_PHASE_TERMINATE;
-
-	if (debug)
-	{
-		log(LOG_INFO, "%s: phase %s\n", ifp->if_xname,
-			sppp_phase_name(sp->pp_phase));
-	}
+	sppp_change_phase(sp, SPPP_PHASE_TERMINATE);
 
 	/*
 	 * Take upper layers down.  We send the Down event first and
@@ -2597,7 +2605,6 @@ sppp_lcp_tld(struct sppp *sp)
 static void
 sppp_lcp_tls(struct sppp *sp)
 {
-	STDDCL;
 
 	if (sp->pp_max_auth_fail != 0 && sp->pp_auth_failures >= sp->pp_max_auth_fail) {
 	printf("%s: authentication failed %d times, not retrying again\n",
@@ -2606,13 +2613,7 @@ sppp_lcp_tls(struct sppp *sp)
 	return;
 	}
 
-	sp->pp_phase = SPPP_PHASE_ESTABLISH;
-
-	if (debug)
-	{
-		log(LOG_INFO, "%s: phase %s\n", ifp->if_xname,
-			sppp_phase_name(sp->pp_phase));
-	}
+	sppp_change_phase(sp, SPPP_PHASE_ESTABLISH);
 
 	/* Notify lower layer if desired. */
 	if (sp->pp_tls)
@@ -2622,15 +2623,8 @@ sppp_lcp_tls(struct sppp *sp)
 static void
 sppp_lcp_tlf(struct sppp *sp)
 {
-	STDDCL;
 
-	sp->pp_phase = SPPP_PHASE_DEAD;
-
-	if (debug)
-	{
-		log(LOG_INFO, "%s: phase %s\n", ifp->if_xname,
-			sppp_phase_name(sp->pp_phase));
-	}
+	sppp_change_phase(sp, SPPP_PHASE_DEAD);
 
 	/* Notify lower layer if desired. */
 	if (sp->pp_tlf)
@@ -5351,17 +5345,10 @@ sppp_params(struct sppp *sp, u_long cmd,
 static void
 sppp_phase_network(struct sppp *sp)
 {
-	STDDCL;
 	int i;
 	uint32_t mask;
 
-	sp->pp_phase = SPPP_PHASE_NETWORK;
-
-	if (debug)
-	{
-		log(LOG_INFO, "%s: phase %s\n", ifp->if_xname,
-			sppp_phase_name(sp->pp_phase));
-	}
+	sppp_change_phase(sp, SPPP_PHASE_NETWORK);
 
 	/* Notify NCPs now. */
 	for (i = 0; i < IDX_COUNT; i++)

CVS commit: [netbsd-7] src/lib/libm

2016-09-25 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Sep 25 11:32:33 UTC 2016

Modified Files:
src/lib/libm [netbsd-7]: Makefile

Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #1253):
lib/libm/Makefile: revision 1.185 via patch
Actually get fma(3) and friends into ARM libm.


To generate a diff of this commit:
cvs rdiff -u -r1.164.2.3 -r1.164.2.4 src/lib/libm/Makefile

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

Modified files:

Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.164.2.3 src/lib/libm/Makefile:1.164.2.4
--- src/lib/libm/Makefile:1.164.2.3	Sun Nov  8 00:24:25 2015
+++ src/lib/libm/Makefile	Sun Sep 25 11:32:33 2016
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.164.2.3 2015/11/08 00:24:25 riz Exp $
+#  $NetBSD: Makefile,v 1.164.2.4 2016/09/25 11:32:33 bouyer Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -71,6 +71,7 @@ COMMON_SRCS+= fenv.c s_nexttowardf.c \
 	s_nearbyint.c s_rintl.c
 COPTS.e_sqrtl.c += -DHAVE_FENV_H
 COPTS.fenv.c+=	-mfpu=vfp
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 .if (${MKSOFTFLOAT} == "no")
 .PATH.S: ${.CURDIR}/arch/arm
 ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S

CVS commit: [netbsd-7] src/sys/lib/libsa

2016-09-25 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Sep 25 11:28:36 UTC 2016

Modified Files:
src/sys/lib/libsa [netbsd-7]: checkpasswd.c

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1250):
sys/lib/libsa/checkpasswd.c: revision 1.10
Check bounds on input. From Michael Plass.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.34.1 src/sys/lib/libsa/checkpasswd.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/lib/libsa/checkpasswd.c
diff -u src/sys/lib/libsa/checkpasswd.c:1.9 src/sys/lib/libsa/checkpasswd.c:1.9.34.1
--- src/sys/lib/libsa/checkpasswd.c:1.9	Thu Jan  6 02:45:13 2011
+++ src/sys/lib/libsa/checkpasswd.c	Sun Sep 25 11:28:36 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: checkpasswd.c,v 1.9 2011/01/06 02:45:13 jakllsch Exp $	*/
+/*	$NetBSD: checkpasswd.c,v 1.9.34.1 2016/09/25 11:28:36 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -84,8 +84,10 @@ getpass(const char *prompt)
 			putchar('\n');
 			break;
 		default:
-			*lp++ = c;
-			putchar('*');
+			if ((size_t)(lp - buf) < sizeof(buf) - 1) {
+*lp++ = c;
+putchar('*');
+			}
 			break;
 		}
 	}

CVS commit: [netbsd-7] src/tests/lib/libc

2016-09-25 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Sep 25 11:24:26 UTC 2016

Modified Files:
src/tests/lib/libc/net/getaddrinfo [netbsd-7]: Makefile
src/tests/lib/libc/regex [netbsd-7]: Makefile

Log Message:
Pull up following revision(s) (requested by darcy in ticket #1241):
tests/lib/libc/net/getaddrinfo/Makefile: revision 1.2
tests/lib/libc/regex/Makefile: revision 1.10
Replace MKMAN with NOMAN as suggested by christos@.  Allows
userland to build when building man pages.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.24.1 src/tests/lib/libc/net/getaddrinfo/Makefile
cvs rdiff -u -r1.9 -r1.9.10.1 src/tests/lib/libc/regex/Makefile

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

Modified files:

Index: src/tests/lib/libc/net/getaddrinfo/Makefile
diff -u src/tests/lib/libc/net/getaddrinfo/Makefile:1.1 src/tests/lib/libc/net/getaddrinfo/Makefile:1.1.24.1
--- src/tests/lib/libc/net/getaddrinfo/Makefile:1.1	Wed Jan 12 02:58:40 2011
+++ src/tests/lib/libc/net/getaddrinfo/Makefile	Sun Sep 25 11:24:26 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2011/01/12 02:58:40 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.24.1 2016/09/25 11:24:26 bouyer Exp $
 
-MKMAN=	no
+NOMAN=
 
 .include 
 

Index: src/tests/lib/libc/regex/Makefile
diff -u src/tests/lib/libc/regex/Makefile:1.9 src/tests/lib/libc/regex/Makefile:1.9.10.1
--- src/tests/lib/libc/regex/Makefile:1.9	Fri Aug 24 20:24:40 2012
+++ src/tests/lib/libc/regex/Makefile	Sun Sep 25 11:24:26 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2012/08/24 20:24:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.9.10.1 2016/09/25 11:24:26 bouyer Exp $
 
-MKMAN=	no
+NOMAN=
 
 .include

CVS commit: [netbsd-7] src/doc

2016-09-18 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:20:12 UTC 2016

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

Log Message:
124[45679]


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-7.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-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.108 src/doc/CHANGES-7.1:1.1.2.109
--- src/doc/CHANGES-7.1:1.1.2.108	Sat Sep 10 06:45:45 2016
+++ src/doc/CHANGES-7.1	Sun Sep 18 06:20:12 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.108 2016/09/10 06:45:45 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.109 2016/09/18 06:20:12 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5265,3 +5265,34 @@ sys/arch/sparc64/sparc64/kobj_machdep.c	
 	Fixes PR kern/51436.
 	[martin, ticket #1248]
 
+sys/dev/pci/if_vioif.c1.25
+
+	Fix initializing wrong queues.  PR kern/51448.
+	[ozaki-r, ticket #1244]
+
+sys/dev/usb/if_axe.c1.73, 1.74
+sys/dev/usb/usbdevs1.716
+sys/dev/usb/usbdevs.hregen
+sys/dev/usb/usbdevs_data.h			regen
+
+	Add flxd's axe(4) variant.
+	[skrll, ticket #1245]
+
+etc/namedb/root.cache1.21
+
+	Update root.cache to 2016/8/25 version.
+	[taca, ticket #1246]
+
+lib/libc/gen/glob.c1.36
+
+	Bump the glob limits to 512KB for total string size and 64K
+	path entries.
+	[joerg, ticket #1247]
+
+external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile 1.2, 1.3
+external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile 1.2, 1.3
+external/bsd/kyua-testers/tests/kyua-testers/Makefile 1.2, 1.3
+
+	Fix wrong objdir-finding logic.  PR 51389.
+	[dholland, ticket #1249]
+

CVS commit: [netbsd-7] src/external/bsd/kyua-testers

2016-09-18 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:14:01 UTC 2016

Modified Files:
src/external/bsd/kyua-testers/libexec/kyua-atf-tester [netbsd-7]:
Makefile
src/external/bsd/kyua-testers/libexec/kyua-plain-tester [netbsd-7]:
Makefile
src/external/bsd/kyua-testers/tests/kyua-testers [netbsd-7]: Makefile

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1249):
external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile: revision 
1.2, 1.3
external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile: revision 
1.2, 1.3
external/bsd/kyua-testers/tests/kyua-testers/Makefile: revision 1.2, 1.3
Fix wrong objdir-finding logic. PR 51389.
--
Fix previous. (Sigh.) PR 51389 again.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/external/bsd/kyua-testers/tests/kyua-testers/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/kyua-testers/libexec/kyua-atf-tester/Makefile
diff -u src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile:1.1 src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile:1.1.14.1
--- src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile:1.1	Tue Feb 19 06:04:43 2013
+++ src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile	Sun Sep 18 06:14:00 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.1.14.1 2016/09/18 06:14:00 snj Exp $
 
 .include 
 
@@ -11,11 +11,12 @@ SRCS=		atf_main.c
 MAN=		kyua-atf-tester.1
 MAN+=		kyua-atf-interface.7
 
-PRIVATELIBDIR!=	cd ${.CURDIR}/../../lib; ${PRINTOBJDIR}
-LDADD+=		${PRIVATELIBDIR}/libatf_tester/libatf_tester.a
-DPADD+=		${PRIVATELIBDIR}/libatf_tester/libatf_tester.a
-LDADD+=		${PRIVATELIBDIR}/libtester/libtester.a
-DPADD+=		${PRIVATELIBDIR}/libtester/libtester.a
+ATFTESTER_LIBDIR!=	cd ${.CURDIR}/../../lib/libatf_tester; ${PRINTOBJDIR}
+TESTER_LIBDIR!=		cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
+LDADD+=		${ATFTESTER_LIBDIR}/libatf_tester.a
+DPADD+=		${ATFTESTER_LIBDIR}/libatf_tester.a
+LDADD+=		${TESTER_LIBDIR}/libtester.a
+DPADD+=		${TESTER_LIBDIR}/libtester.a
 
 CPPFLAGS+=	-DHAVE_CONFIG_H
 CPPFLAGS+=	-I${.CURDIR}/../../lib/libtester

Index: src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile
diff -u src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile:1.1 src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile:1.1.14.1
--- src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile:1.1	Tue Feb 19 06:04:43 2013
+++ src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile	Sun Sep 18 06:14:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.1.14.1 2016/09/18 06:14:01 snj Exp $
 
 .include 
 
@@ -11,9 +11,9 @@ SRCS=		plain_main.c
 MAN=		kyua-plain-tester.1
 MAN+=		kyua-plain-interface.7
 
-PRIVATELIBDIR!=	cd ${.CURDIR}/../../lib; ${PRINTOBJDIR}
-LDADD+=		${PRIVATELIBDIR}/libtester/libtester.a
-DPADD+=		${PRIVATELIBDIR}/libtester/libtester.a
+TESTER_LIBDIR!=		cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
+LDADD+=		${TESTER_LIBDIR}/libtester.a
+DPADD+=		${TESTER_LIBDIR}/libtester.a
 
 CPPFLAGS+=	-DHAVE_CONFIG_H
 CPPFLAGS+=	-I${.CURDIR}/../../lib/libtester

Index: src/external/bsd/kyua-testers/tests/kyua-testers/Makefile
diff -u src/external/bsd/kyua-testers/tests/kyua-testers/Makefile:1.1 src/external/bsd/kyua-testers/tests/kyua-testers/Makefile:1.1.14.1
--- src/external/bsd/kyua-testers/tests/kyua-testers/Makefile:1.1	Tue Feb 19 06:04:44 2013
+++ src/external/bsd/kyua-testers/tests/kyua-testers/Makefile	Sun Sep 18 06:14:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.1.14.1 2016/09/18 06:14:01 snj Exp $
 
 .include 
 
@@ -12,11 +12,12 @@ CPPFLAGS+=	-DTESTERSDIR=\"/usr/libexec\"
 CPPFLAGS+=	-I${.CURDIR}/../../lib/libtester
 CPPFLAGS+=	-I${SRCDIR}
 
-PRIVATELIBDIR!=	cd ${.CURDIR}/../../lib; ${PRINTOBJDIR}
-.for lib in atf_tester tester
-LDADD+=		${PRIVATELIBDIR}/lib${lib}/lib${lib}.a
-DPADD+=		${PRIVATELIBDIR}/lib${lib}/lib${lib}.a
-.endfor
+ATFTESTER_LIBDIR!=	cd ${.CURDIR}/../../lib/libatf_tester; ${PRINTOBJDIR}
+TESTER_LIBDIR!=		cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
+LDADD+=		${ATFTESTER_LIBDIR}/libatf_tester.a
+DPADD+=		${ATFTESTER_LIBDIR}/libatf_tester.a
+LDADD+=		${TESTER_LIBDIR}/libtester.a
+DPADD+=		${TESTER_LIBDIR}/libtester.a
 
 TESTS_C=	atf_list_test
 TESTS_C+=	atf_result_test

< 2 3 4 5 6 7 8 9 10 11 >

601 - 700 of 2376 matches

Mail list logo