CVS commit: src/external/bsd/bind/dist/lib/isc/include/isc

2018-02-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Feb 18 23:51:20 UTC 2018

Modified Files:
src/external/bsd/bind/dist/lib/isc/include/isc: util.h

Log Message:
llvm detects infinite recursion, so don't infinitely recurse.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/bsd/bind/dist/lib/isc/include/isc/util.h

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/bind/dist/lib/isc/include/isc/util.h
diff -u src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.12 src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.13
--- src/external/bsd/bind/dist/lib/isc/include/isc/util.h:1.12	Thu May 26 12:50:00 2016
+++ src/external/bsd/bind/dist/lib/isc/include/isc/util.h	Sun Feb 18 18:51:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.h,v 1.12 2016/05/26 16:50:00 christos Exp $	*/
+/*	$NetBSD: util.h,v 1.13 2018/02/18 23:51:20 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2010-2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
@@ -79,7 +79,7 @@
  * Use this in translation units that would otherwise be empty, to
  * suppress compiler warnings.
  */
-#define EMPTY_TRANSLATION_UNIT static void __used isc__empty(void) { isc__empty(); }
+#define EMPTY_TRANSLATION_UNIT static void __used isc__empty(int level) { if (level++ < 100) isc__empty(level); }
 
 /*%
  * We use macros instead of calling the routines directly because

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto

2018-02-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Feb 18 23:41:45 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: ec.inc

Log Message:
Avoid ssp error on sparc64


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc

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

Modified files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.4	Thu Feb  8 16:57:24 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc	Sun Feb 18 18:41:44 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: ec.inc,v 1.4 2018/02/08 21:57:24 christos Exp $
+#	$NetBSD: ec.inc,v 1.5 2018/02/18 23:41:44 christos Exp $
 #
 #	@(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -45,6 +45,8 @@ ecx_meth.c
 
 SRCS += ${EC_SRCS}
 
+COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
+
 .for cryptosrc in ${EC_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ec
 .endfor

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch

2018-02-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Feb 18 23:38:47 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: aes-sparcv9.S
aest4-sparcv9.S bn-sparcv8.S cmllt4-sparcv9.S des_enc-sparc.S
dest4-sparcv9.S ghash-sparcv9.S sparcv9-mont.S sparcv9a-mont.S
vis3-mont.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: Makefile
aes-sparcv9.S aes.inc aest4-sparcv9.S cmllt4-sparcv9.S
des_enc-sparc.S dest4-sparcv9.S ghash-sparcv9.S sha1-sparcv9a.S
sha512-sparcv9.S sparcv9-mont.S sparcv9a-mont.S vis3-mont.S
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc:
aesfx-sparcv9.S ec.inc ecp_nistz256-sparcv9.S poly1305-sparcv9.S
poly1305.inc sparcv9_modes.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64:
aesfx-sparcv9.S ec.inc ecp_nistz256-sparcv9.S poly1305-sparcv9.S
poly1305.inc sparcv9_modes.S

Log Message:
Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/aes-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/aest4-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/bn-sparcv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/cmllt4-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/dest4-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparcv9-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparcv9a-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/vis3-mont.S
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/aesfx-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ecp_nistz256-sparcv9.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305-sparcv9.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparcv9_modes.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/des_enc-sparc.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ghash-sparcv9.S
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des_enc-sparc.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha1-sparcv9a.S
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aesfx-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ecp_nistz256-sparcv9.S
 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/poly1305-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/poly1305.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sparcv9_modes.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aest4-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/cmllt4-sparcv9.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/dest4-sparcv9.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sparcv9-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sparcv9a-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/vis3-mont.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ghash-sparcv9.S

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: src/sys/dist/pf/net

2018-02-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Feb 18 21:51:28 UTC 2018

Modified Files:
src/sys/dist/pf/net: pf.c

Log Message:
PR/53036: Alexander Nasonov: 'block user' in pf's ruleset panics 8.0_BETA
Check for NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dist/pf/net/pf.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/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.78 src/sys/dist/pf/net/pf.c:1.79
--- src/sys/dist/pf/net/pf.c:1.78	Fri Feb  9 16:25:04 2018
+++ src/sys/dist/pf/net/pf.c	Sun Feb 18 16:51:28 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pf.c,v 1.78 2018/02/09 21:25:04 maxv Exp $	*/
+/*	$NetBSD: pf.c,v 1.79 2018/02/18 21:51:28 christos Exp $	*/
 /*	$OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
 
 /*
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.78 2018/02/09 21:25:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.79 2018/02/18 21:51:28 christos Exp $");
 
 #include "pflog.h"
 
@@ -2847,6 +2847,13 @@ pf_socket_lookup(int direction, struct p
 		break;
 #endif /* INET6 */
 	}
+	if (so == NULL)
+		return -1;
+	if (so->so_cred == NULL) {
+		DPFPRINTF(PF_DEBUG_URGENT,
+		("%s: so->so_cred == NULL so=%p\n", __func__, so));
+		return -1;
+	}
 	pd->lookup.uid = kauth_cred_geteuid(so->so_cred);
 	pd->lookup.gid = kauth_cred_getegid(so->so_cred);
 #else

CVS commit: src/share/man/man4

2018-02-18 Thread Paul Goyette 
Module Name:src
Committed By:   pgoyette
Date:   Sun Feb 18 21:31:32 UTC 2018

Modified Files:
src/share/man/man4: gif.4

Log Message:
Add 'tunnel mode ipip' to the cisco configuration as requested in
PR kern/53037

XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/share/man/man4/gif.4

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

Modified files:

Index: src/share/man/man4/gif.4
diff -u src/share/man/man4/gif.4:1.30 src/share/man/man4/gif.4:1.31
--- src/share/man/man4/gif.4:1.30	Fri Jan 15 19:23:38 2010
+++ src/share/man/man4/gif.4	Sun Feb 18 21:31:32 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: gif.4,v 1.30 2010/01/15 19:23:38 joerg Exp $
+.\"	$NetBSD: gif.4,v 1.31 2018/02/18 21:31:32 pgoyette Exp $
 .\"	$KAME: gif.4,v 1.24 2001/02/20 12:54:01 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 15, 2009
+.Dd February 19, 2018
 .Dt GIF 4
 .Os
 .Sh NAME
@@ -185,6 +185,7 @@ On Host D (Cisco):
 ip unnumbered D   ! e.g. address from Ethernet interface
 tunnel source D   ! e.g. address from Ethernet interface
 tunnel destination A
+tunnel mode ipip
ip route C 
ip route A mask C
ip route X mask tunnelX

CVS commit: src/sys/arch/sparc/include

2018-02-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Feb 18 15:29:29 UTC 2018

Modified Files:
src/sys/arch/sparc/include: mcontext.h

Log Message:
Make _UC_MACHINE_FP() compile again and fix it so that it does not add
the offset twice.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/include/mcontext.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/sparc/include/mcontext.h
diff -u src/sys/arch/sparc/include/mcontext.h:1.15 src/sys/arch/sparc/include/mcontext.h:1.16
--- src/sys/arch/sparc/include/mcontext.h:1.15	Sat Feb 17 10:22:22 2018
+++ src/sys/arch/sparc/include/mcontext.h	Sun Feb 18 10:29:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcontext.h,v 1.15 2018/02/17 15:22:22 kamil Exp $	*/
+/*	$NetBSD: mcontext.h,v 1.16 2018/02/18 15:29:29 christos Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -145,33 +145,19 @@ typedef struct {
 
 #ifdef __arch64__
 #define _UC_MACHINE_PAD	8		/* Padding appended to ucontext_t */
-#define	_UC_MACHINE_SP(uc)	(((uc)->uc_mcontext.__gregs[_REG_O6])+0x7ff)
-#define	_UC_MACHINE_FP(uc)	(_uc_machine_fp((uc), 2047))
+#define	_UC_MACHINE_SP(uc)	(((uc)->uc_mcontext.__gregs[_REG_O6]) + 0x7ff)
+#define	_UC_MACHINE_FP(uc)	(((__greg_t *)_UC_MACHINE_SP(uc))[15])
 #define _UC_MACHINE32_PAD	43	/* compat_netbsd32 variant */
 #define	_UC_MACHINE32_SP(uc)	((uc)->uc_mcontext.__gregs[_REG_O6])
-#define	_UC_MACHINE32_FP(uc)	(_uc_machine_fp((uc), 0))
+#define	_UC_MACHINE32_FP(uc)	(((__greg_t *)_UC_MACHINE32_SP(uc))[15])
 #else
 #define _UC_MACHINE_PAD	43		/* Padding appended to ucontext_t */
 #define	_UC_MACHINE_SP(uc)	((uc)->uc_mcontext.__gregs[_REG_O6])
-#define	_UC_MACHINE_FP(uc)	(_uc_machine_fp((uc), 0))
+#define	_UC_MACHINE_FP(uc)	(((__greg_t *)_UC_MACHINE_SP(uc))[15])
 #endif
 #define	_UC_MACHINE_PC(uc)	((uc)->uc_mcontext.__gregs[_REG_PC])
 #define	_UC_MACHINE_INTRV(uc)	((uc)->uc_mcontext.__gregs[_REG_O0])
 
-static inline long
-_uc_machine_fp(ucontext_t *ucontext, long shift)
-{
-	long *sptr;
-	long *sp;
-	long fp;
-
-	sp = (long *)_UC_MACHINE_SP(ucontext);
-	sptr = (long *)(*sp + shift);
-	fp = sptr[15];
-
-	return fp;
-}
-
 #define	_UC_MACHINE_SET_PC(uc, pc)	\
 do {	\
 	(uc)->uc_mcontext.__gregs[_REG_PC] = (pc);			\

CVS commit: src/sys/arch/amd64/amd64

2018-02-18 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Sun Feb 18 14:32:31 UTC 2018

Modified Files:
src/sys/arch/amd64/amd64: amd64_trap.S

Log Message:
Pass the name of the function as argument in SWAPGS_HANDLER.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/amd64/amd64_trap.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/amd64/amd64/amd64_trap.S
diff -u src/sys/arch/amd64/amd64/amd64_trap.S:1.31 src/sys/arch/amd64/amd64/amd64_trap.S:1.32
--- src/sys/arch/amd64/amd64/amd64_trap.S:1.31	Sat Feb 17 21:05:58 2018
+++ src/sys/arch/amd64/amd64/amd64_trap.S	Sun Feb 18 14:32:31 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: amd64_trap.S,v 1.31 2018/02/17 21:05:58 maxv Exp $	*/
+/*	$NetBSD: amd64_trap.S,v 1.32 2018/02/18 14:32:31 maxv Exp $	*/
 
 /*
  * Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc.
@@ -312,8 +312,8 @@ IDTVEC_END(\name)
  * When such traps happen, we have CPL=0 and %gs=userland, and we must perform
  * an additional swapgs to get %gs=kernel.
  */
-.macro	SWAPGS_HANDLER
-NENTRY(check_swapgs)
+.macro	SWAPGS_HANDLER	name
+NENTRY(\name)
 	INTRENTRY_L(3f,1:)
 2:
 	sti
@@ -345,7 +345,7 @@ NENTRY(check_swapgs)
 	cmpw	$0x8e+050*256,%ax	/* Any move to %gs (reg 5) */
 	jne	2b			/* No - normal kernel fault */
 	jmp	1b			/* Yes - restore %gs */
-END(check_swapgs)
+END(\name)
 .endm
 #endif
 
@@ -389,7 +389,7 @@ TRAP_ENTRY_POINT	trap31,T_RESERVED,1
 TRAP_ENTRY_POINT_SPUR	intrspurious,T_ASTFLT,1
 
 #ifndef check_swapgs
-SWAPGS_HANDLER
+SWAPGS_HANDLER		check_swapgs
 #endif
 
 	TEXT_USER_END

CVS commit: src/sys/arch

2018-02-18 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Sun Feb 18 14:07:29 UTC 2018

Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/amd64/include: pmap.h
src/sys/arch/x86/x86: pmap.c svs.c

Log Message:
Add svs_enabled, which defaults to 'true' when SVS is compiled (no dynamic
detection yet).


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amd64/include/pmap.h
cvs rdiff -u -r1.280 -r1.281 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/svs.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/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.150 src/sys/arch/amd64/amd64/locore.S:1.151
--- src/sys/arch/amd64/amd64/locore.S:1.150	Sat Jan 27 17:54:13 2018
+++ src/sys/arch/amd64/amd64/locore.S	Sun Feb 18 14:07:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.150 2018/01/27 17:54:13 maxv Exp $	*/
+/*	$NetBSD: locore.S,v 1.151 2018/02/18 14:07:29 maxv Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -1091,7 +1091,11 @@ ENTRY(cpu_switchto)
 
 #ifdef SVS
 	pushq	%rdx
+	movb	_C_LABEL(svs_enabled),%dl
+	testb	%dl,%dl
+	jz	.Lskip_svs
 	callq	_C_LABEL(svs_lwp_switch)
+.Lskip_svs:
 	popq	%rdx
 #endif
 

Index: src/sys/arch/amd64/include/pmap.h
diff -u src/sys/arch/amd64/include/pmap.h:1.42 src/sys/arch/amd64/include/pmap.h:1.43
--- src/sys/arch/amd64/include/pmap.h:1.42	Sun Jan 21 10:59:21 2018
+++ src/sys/arch/amd64/include/pmap.h	Sun Feb 18 14:07:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.42 2018/01/21 10:59:21 maxv Exp $	*/
+/*	$NetBSD: pmap.h,v 1.43 2018/02/18 14:07:29 maxv Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -221,6 +221,7 @@
 void svs_pmap_sync(struct pmap *, int);
 void svs_lwp_switch(struct lwp *, struct lwp *);
 void svs_pdir_switch(struct pmap *);
+extern bool svs_enabled;
 
 #include 
 

Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.280 src/sys/arch/x86/x86/pmap.c:1.281
--- src/sys/arch/x86/x86/pmap.c:1.280	Sat Feb 17 17:44:09 2018
+++ src/sys/arch/x86/x86/pmap.c	Sun Feb 18 14:07:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.280 2018/02/17 17:44:09 maxv Exp $	*/
+/*	$NetBSD: pmap.c,v 1.281 2018/02/18 14:07:29 maxv Exp $	*/
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.280 2018/02/17 17:44:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.281 2018/02/18 14:07:29 maxv Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -2130,7 +2130,7 @@ pmap_free_ptp(struct pmap *pmap, struct 
 			xen_kpm_sync(pmap, index);
 		}
 #elif defined(SVS)
-		if (level == PTP_LEVELS - 1) {
+		if (svs_enabled && level == PTP_LEVELS - 1) {
 			svs_pmap_sync(pmap, index);
 		}
 #endif
@@ -2235,7 +2235,7 @@ pmap_get_ptp(struct pmap *pmap, vaddr_t 
 			xen_kpm_sync(pmap, index);
 		}
 #elif defined(SVS)
-		if (i == PTP_LEVELS) {
+		if (svs_enabled && i == PTP_LEVELS) {
 			svs_pmap_sync(pmap, index);
 		}
 #endif

Index: src/sys/arch/x86/x86/svs.c
diff -u src/sys/arch/x86/x86/svs.c:1.2 src/sys/arch/x86/x86/svs.c:1.3
--- src/sys/arch/x86/x86/svs.c:1.2	Sat Feb 17 17:44:09 2018
+++ src/sys/arch/x86/x86/svs.c	Sun Feb 18 14:07:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: svs.c,v 1.2 2018/02/17 17:44:09 maxv Exp $	*/
+/*	$NetBSD: svs.c,v 1.3 2018/02/18 14:07:29 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.2 2018/02/17 17:44:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.3 2018/02/18 14:07:29 maxv Exp $");
 
 #include "opt_svs.h"
 
@@ -90,6 +90,8 @@ __KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.2 
  * with USER_LDT.
  */
 
+bool svs_enabled __read_mostly = false;
+
 struct svs_utls {
 	paddr_t kpdirpa;
 	uint64_t scratch;
@@ -503,6 +505,7 @@ void svs_init(void);
 void
 svs_init(void)
 {
+	svs_enabled = true;
 	svs_pgg_update(false);
 }

CVS commit: src/sys/arch/arm/dts

2018-02-18 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Feb 18 12:22:16 UTC 2018

Modified Files:
src/sys/arch/arm/dts: sun50i-a64-pinebook.dts

Log Message:
Pinebook LCD pipeline is mixer0-lcd0


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts

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/dts/sun50i-a64-pinebook.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.2 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.3
--- src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.2	Sun Sep 10 18:40:27 2017
+++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts	Sun Feb 18 12:22:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pinebook.dts,v 1.2 2017/09/10 18:40:27 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pinebook.dts,v 1.3 2018/02/18 12:22:16 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -32,6 +32,12 @@
 / {
 	model = "Pine64 Pinebook";
 	compatible = "pine64,pinebook", "allwinner,sun50i-a64";
+
+	chosen {
+		framebuffer@0 {
+			allwinner,pipeline = "mixer0-lcd0";
+		};
+	};
 };
 
  {

CVS commit: src/sys/arch/arm/dts

2018-02-18 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Feb 18 12:20:25 UTC 2018

Added Files:
src/sys/arch/arm/dts: sun50i-a64-pine64.dts

Log Message:
Add wrapper for Pine64 (non-plus) dts


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/sun50i-a64-pine64.dts

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

Added files:

Index: src/sys/arch/arm/dts/sun50i-a64-pine64.dts
diff -u /dev/null src/sys/arch/arm/dts/sun50i-a64-pine64.dts:1.1
--- /dev/null	Sun Feb 18 12:20:25 2018
+++ src/sys/arch/arm/dts/sun50i-a64-pine64.dts	Sun Feb 18 12:20:25 2018
@@ -0,0 +1,30 @@
+/* $NetBSD: sun50i-a64-pine64.dts,v 1.1 2018/02/18 12:20:25 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2018 Jared McNeill 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts"
+#include "sun50i-a64.dtsi"

CVS commit: src/sys/arch/arm/sunxi

2018-02-18 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Feb 18 10:28:37 UTC 2018

Modified Files:
src/sys/arch/arm/sunxi: files.sunxi sunxi_gpio.h
Added Files:
src/sys/arch/arm/sunxi: sun50i_h6_gpio.c

Log Message:
Add support for Allwinner H6 CPUX and CPUS port controllers.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/sunxi/files.sunxi
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/sunxi/sun50i_h6_gpio.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/sunxi/sunxi_gpio.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/sunxi/files.sunxi
diff -u src/sys/arch/arm/sunxi/files.sunxi:1.41 src/sys/arch/arm/sunxi/files.sunxi:1.42
--- src/sys/arch/arm/sunxi/files.sunxi:1.41	Wed Feb 14 20:10:17 2018
+++ src/sys/arch/arm/sunxi/files.sunxi	Sun Feb 18 10:28:37 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sunxi,v 1.41 2018/02/14 20:10:17 jakllsch Exp $
+#	$NetBSD: files.sunxi,v 1.42 2018/02/18 10:28:37 jmcneill Exp $
 #
 # Configuration info for Allwinner sunxi family SoCs
 #
@@ -105,6 +105,7 @@ file	arch/arm/sunxi/sun8i_a83t_gpio.c	su
 file	arch/arm/sunxi/sun8i_h3_gpio.c		sunxi_gpio & (soc_sun8i_h3 | soc_sun50i_h5)
 file	arch/arm/sunxi/sun9i_a80_gpio.c		sunxi_gpio & soc_sun9i_a80
 file	arch/arm/sunxi/sun50i_a64_gpio.c	sunxi_gpio & soc_sun50i_a64
+file	arch/arm/sunxi/sun50i_h6_gpio.c		sunxi_gpio & soc_sun50i_h6
 
 # UART
 attach	com at fdt with sunxi_com
@@ -253,3 +254,4 @@ defflag	opt_soc.h			SOC_SUN9I_A80: SOC_S
 defflag	opt_soc.h			SOC_SUN50I: SOC_SUNXI
 defflag	opt_soc.h			SOC_SUN50I_A64: SOC_SUN50I
 defflag	opt_soc.h			SOC_SUN50I_H5: SOC_SUN50I
+defflag	opt_soc.h			SOC_SUN50I_H6: SOC_SUN50I

Index: src/sys/arch/arm/sunxi/sunxi_gpio.h
diff -u src/sys/arch/arm/sunxi/sunxi_gpio.h:1.7 src/sys/arch/arm/sunxi/sunxi_gpio.h:1.8
--- src/sys/arch/arm/sunxi/sunxi_gpio.h:1.7	Sun Oct  8 18:00:36 2017
+++ src/sys/arch/arm/sunxi/sunxi_gpio.h	Sun Feb 18 10:28:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gpio.h,v 1.7 2017/10/08 18:00:36 jmcneill Exp $ */
+/* $NetBSD: sunxi_gpio.h,v 1.8 2018/02/18 10:28:37 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -88,4 +88,9 @@ extern const struct sunxi_gpio_padconf s
 extern const struct sunxi_gpio_padconf sun50i_a64_r_padconf;
 #endif
 
+#ifdef SOC_SUN50I_H6
+extern const struct sunxi_gpio_padconf sun50i_h6_padconf;
+extern const struct sunxi_gpio_padconf sun50i_h6_r_padconf;
+#endif
+
 #endif /* _ARM_SUNXI_GPIO_H */

Added files:

Index: src/sys/arch/arm/sunxi/sun50i_h6_gpio.c
diff -u /dev/null src/sys/arch/arm/sunxi/sun50i_h6_gpio.c:1.1
--- /dev/null	Sun Feb 18 10:28:37 2018
+++ src/sys/arch/arm/sunxi/sun50i_h6_gpio.c	Sun Feb 18 10:28:37 2018
@@ -0,0 +1,151 @@
+/* $NetBSD: sun50i_h6_gpio.c,v 1.1 2018/02/18 10:28:37 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2016 Jared McNeill 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__KERNEL_RCSID(0, "$NetBSD: sun50i_h6_gpio.c,v 1.1 2018/02/18 10:28:37 jmcneill Exp $");
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+static const struct sunxi_gpio_pins h6_pins[] = {
+	{ "PC0",  2, 0,   { "gpio_in", "gpio_out", "nand", NULL, "spi0" } },
+	{ "PC1",  2, 1,   { "gpio_in", "gpio_out", "nand", "mmc2" } },
+	{ "PC2",  2, 2,   { "gpio_in", "gpio_out", "nand", NULL, "spi0" } },
+	{ "PC3",  2, 3,   { "gpio_in", "gpio_out", "nand", NULL, "spi0" } },
+	{ "PC4",  2, 4,   { "gpio_in", "gpio_out", "nand", "mmc2" } },
+	{ "PC5",  2, 5,   { "gpio_in", "gpio_out", "nand", "mmc2", "spi0" } },
+	{ "PC6",  2, 6,   { "gpio_in", "gpio_out", "nand", "mmc2", "spi0" } },
+	{ "PC7",  2, 7,   { "gpio_in",