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

[Sean Cole]

Module Name:src
Committed By:   scole
Date:   Mon Aug  8 17:44:24 UTC 2016

Modified Files:
src/sys/arch/ia64/include: atomic.h

Log Message:
Import later FreeBSD version, add note about atomic.S which contains similar 
functions.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/atomic.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/ia64/include/atomic.h
diff -u src/sys/arch/ia64/include/atomic.h:1.1 src/sys/arch/ia64/include/atomic.h:1.2
--- src/sys/arch/ia64/include/atomic.h:1.1	Fri Apr  7 14:21:18 2006
+++ src/sys/arch/ia64/include/atomic.h	Mon Aug  8 17:44:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic.h,v 1.1 2006/04/07 14:21:18 cherry Exp $	*/
+/*	$NetBSD: atomic.h,v 1.2 2016/08/08 17:44:24 scole Exp $	*/
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -25,12 +25,18 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/ia64/include/atomic.h,v 1.10 2005/09/27 17:39:10 jhb Exp $
+ * $FreeBSD: releng/10.1/sys/ia64/include/atomic.h 262004 2014-02-16 23:08:21Z marcel $
  */
 
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
 
+/* XXX need these?
+#define	mb()	__asm __volatile("mf")
+#define	wmb()	mb()
+#define	rmb()	mb()
+*/
+
 /*
  * Various simple arithmetic on memory which is atomic in the presence
  * of interrupts and SMP safe.
@@ -44,7 +50,7 @@
 		"mov ar.ccv=%2;;\n\t"	\
 		"cmpxchg" #sz "." #sem " %0=%4,%3,ar.ccv\n\t"		\
 		: "=r" (ret), "=m" (*p)	\
-		: "r" (cmpval), "r" (newval), "m" (*p)			\
+		: "r" ((uint64_t)cmpval), "r" (newval), "m" (*p)	\
 		: "memory")
 
 /*
@@ -140,8 +146,11 @@ ATOMIC_STORE_LOAD(long,	 64, "8")
 
 #undef ATOMIC_STORE_LOAD
 
-#define	atomic_load_acq_ptr	atomic_load_acq_64
-#define	atomic_store_rel_ptr	atomic_store_rel_64
+#define	atomic_load_acq_ptr(p)		\
+((void *)atomic_load_acq_64((volatile uint64_t *)p))
+
+#define	atomic_store_rel_ptr(p, v)	\
+atomic_store_rel_64((volatile uint64_t *)p, (uint64_t)v)
 
 #define	IA64_ATOMIC(sz, type, name, width, op)\
 	static __inline type		\
@@ -260,6 +269,7 @@ IA64_ATOMIC(8, uint64_t, subtract, 64, -
 #define	atomic_add_rel_long		atomic_add_rel_64
 #define	atomic_subtract_rel_long	atomic_subtract_rel_64
 
+/* XXX Needs casting. */
 #define	atomic_set_ptr			atomic_set_64
 #define	atomic_clear_ptr		atomic_clear_64
 #define	atomic_add_ptr			atomic_add_64
@@ -313,13 +323,18 @@ atomic_cmpset_rel_64(volatile uint64_t* 
 #define	atomic_cmpset_64		atomic_cmpset_acq_64
 #define	atomic_cmpset_int		atomic_cmpset_32
 #define	atomic_cmpset_long		atomic_cmpset_64
-#define	atomic_cmpset_ptr		atomic_cmpset_64
 #define	atomic_cmpset_acq_int		atomic_cmpset_acq_32
 #define	atomic_cmpset_rel_int		atomic_cmpset_rel_32
 #define	atomic_cmpset_acq_long		atomic_cmpset_acq_64
 #define	atomic_cmpset_rel_long		atomic_cmpset_rel_64
-#define	atomic_cmpset_acq_ptr		atomic_cmpset_acq_64
-#define	atomic_cmpset_rel_ptr		atomic_cmpset_rel_64
+
+#define	atomic_cmpset_acq_ptr(p, o, n)	\
+(atomic_cmpset_acq_64((volatile uint64_t *)p, (uint64_t)o, (uint64_t)n))
+
+#define	atomic_cmpset_ptr		atomic_cmpset_acq_ptr
+
+#define	atomic_cmpset_rel_ptr(p, o, n)	\
+(atomic_cmpset_rel_64((volatile uint64_t *)p, (uint64_t)o, (uint64_t)n))
 
 static __inline uint32_t
 atomic_readandclear_32(volatile uint32_t* p)
@@ -343,6 +358,7 @@ atomic_readandclear_64(volatile uint64_t
 
 #define	atomic_readandclear_int		atomic_readandclear_32
 #define	atomic_readandclear_long	atomic_readandclear_64
+#define	atomic_readandclear_ptr		atomic_readandclear_64
 
 /*
  * Atomically add the value of v to the integer pointed to by p and return
@@ -363,4 +379,53 @@ atomic_fetchadd_32(volatile uint32_t *p,
 
 #define	atomic_fetchadd_int		atomic_fetchadd_32
 
+static __inline u_long
+atomic_fetchadd_long(volatile u_long *p, u_long v)
+{
+	u_long value;
+
+	do {
+		value = *p;
+	} while (!atomic_cmpset_64(p, value, value + v));
+	return (value);
+}
+
+/*
+ * XXX already defined in
+ * src/common/lib/libc/arch/ia64/atomic/atomic.S.  Need to sort out
+ * what to do with this file and atomic.S.  atomic.S version comments
+ * (from 2008) say it is not tested at all, but if it works we may not
+ * need anything in this file?
+ */
+#if 0
+
+/*
+ *  atomic_swap_(volatile  *p,  v);
+ */
+
+static __inline uint32_t
+atomic_swap_32(volatile uint32_t *p, uint32_t v)
+{
+	uint32_t r;
+
+	__asm __volatile ("xchg4 %0 = %3, %2;;" : "=r"(r), "=m"(*p) :
+	"r"(v), "m"(*p) : "memory");
+	return (r);
+}
+
+static __inline uint64_t
+atomic_swap_64(volatile uint64_t *p, uint64_t v)
+{
+	uint64_t r;
+
+	__asm __volatile ("xchg8 %0 = %3, %2;;" : "=r"(r), "=m"(*p) :
+	"r"(v), "m"(*p) : "memory");
+	return (r);
+}
+#endif
+
+#define	atomic_swap_int		atomic_swap_32
+#define	atomic_swap_long	atomic_swap_64
+#define	atomic_swap_ptr		atomic_swap_64
+
 #endif /* ! 

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

[Sean Cole]

Module Name:src
Committed By:   scole
Date:   Mon Aug  8 17:20:17 UTC 2016

Modified Files:
src/sys/arch/ia64/include: pte.h

Log Message:
Remove unused functions pte_atomic_clear() and pte_atomic_set()


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/pte.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/ia64/include/pte.h
diff -u src/sys/arch/ia64/include/pte.h:1.3 src/sys/arch/ia64/include/pte.h:1.4
--- src/sys/arch/ia64/include/pte.h:1.3	Fri Aug  5 17:02:59 2016
+++ src/sys/arch/ia64/include/pte.h	Mon Aug  8 17:20:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pte.h,v 1.3 2016/08/05 17:02:59 scole Exp $	*/
+/*	$NetBSD: pte.h,v 1.4 2016/08/08 17:20:17 scole Exp $	*/
 
 /*-
  * Copyright (c) 2001 Doug Rabson
@@ -70,28 +70,14 @@
 
 typedef uint64_t pt_entry_t;
 
-#ifdef _KERNEL
-static __inline pt_entry_t
-pte_atomic_clear(pt_entry_t *ptep, uint64_t val)
-{
-	return (atomic_clear_64(ptep, val));
-}
-
-static __inline pt_entry_t
-pte_atomic_set(pt_entry_t *ptep, uint64_t val)
-{
-	return (atomic_set_64(ptep, val));
-}
-#endif
-
 /*
  * A long-format VHPT entry.
  */
 struct ia64_lpte {
-pt_entry_t  pte;
-uint64_titir;
-uint64_ttag;/* includes ti */
-uint64_tchain;  /* pa of collision chain */
+	pt_entry_t	pte;
+	uint64_t	itir;
+	uint64_t	tag;		/* includes ti */
+	uint64_t	chain;		/* pa of collision chain */
 };
 
 /*

CVS commit: src/sys/net

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Aug  8 16:40:40 UTC 2016

Modified Files:
src/sys/net: if_tap.c

Log Message:
create++, destroy--


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.89 src/sys/net/if_tap.c:1.90
--- src/sys/net/if_tap.c:1.89	Mon Aug  8 09:51:39 2016
+++ src/sys/net/if_tap.c	Mon Aug  8 16:40:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.89 2016/08/08 09:51:39 pgoyette Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.90 2016/08/08 16:40:39 kre Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.89 2016/08/08 09:51:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.90 2016/08/08 16:40:39 kre Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -707,7 +707,7 @@ tap_clone_destroy(struct ifnet *ifp)
 	int error = tap_clone_destroyer(sc->sc_dev);
 
 	if (error == 0)
-		atomic_inc_uint(_count);
+		atomic_dec_uint(_count);
 	return error;
 }
 

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

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Aug  8 16:31:53 UTC 2016

Modified Files:
src/usr.sbin/npf/npftest: Makefile

Log Message:
Yet another -lrumpdev


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/npf/npftest/Makefile

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

Modified files:

Index: src/usr.sbin/npf/npftest/Makefile
diff -u src/usr.sbin/npf/npftest/Makefile:1.9 src/usr.sbin/npf/npftest/Makefile:1.10
--- src/usr.sbin/npf/npftest/Makefile:1.9	Sun May 29 02:28:07 2016
+++ src/usr.sbin/npf/npftest/Makefile	Mon Aug  8 16:31:53 2016
@@ -19,6 +19,7 @@ LDADD+=		-L${LIBNPFTEST} -lnpftest
 
 LDADD+=		-lrump -lrumpvfs -lrumpuser -lrumpnet -lrumpnet_net
 LDADD+=		-lrumpdev_bpf
+LDADD+=		-lrumpdev
 
 .include 
 

CVS commit: src/tests/net/bpfjit

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 15:01:59 UTC 2016

Modified Files:
src/tests/net/bpfjit: Makefile

Log Message:
This now needs librumpdev and librumpvfs to work.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/net/bpfjit/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/net/bpfjit/Makefile
diff -u src/tests/net/bpfjit/Makefile:1.5 src/tests/net/bpfjit/Makefile:1.6
--- src/tests/net/bpfjit/Makefile:1.5	Tue May 24 10:16:34 2016
+++ src/tests/net/bpfjit/Makefile	Mon Aug  8 15:01:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/05/24 10:16:34 hannken Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/08 15:01:59 pgoyette Exp $
 #
 
 .include 
@@ -14,6 +14,6 @@ PAXCTL_FLAGS=	+m
 
 LDADD+=		-lrumpnet_bpfjit -lrumpkern_sljit
 LDADD+=		-lrumpdev_bpf -lrumpnet_net -lrumpnet
-LDADD+=		-lrump -lrumpuser -lpthread
+LDADD+=		-lrump -lrumpuser -lpthread -lrumpdev -lrumpvfs
 
 .include 

CVS commit: src/tests/net/if_loop

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 14:58:40 UTC 2016

Modified Files:
src/tests/net/if_loop: Makefile

Log Message:
Need librumpdev and librumpvfs


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/if_loop/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/net/if_loop/Makefile
diff -u src/tests/net/if_loop/Makefile:1.2 src/tests/net/if_loop/Makefile:1.3
--- src/tests/net/if_loop/Makefile:1.2	Tue Jun 10 04:28:40 2014
+++ src/tests/net/if_loop/Makefile	Mon Aug  8 14:58:40 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2014/06/10 04:28:40 he Exp $
+#	$NetBSD: Makefile,v 1.3 2016/08/08 14:58:40 pgoyette Exp $
 #
 
 .include 
@@ -8,6 +8,6 @@ TESTSDIR=	${TESTSBASE}/net/if_loop
 TESTS_C=	t_pr
 
 LDADD+=		-lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=		-lrump -lrumpuser -lrump -lpthread
+LDADD+=		-lrump -lrumpuser -lrump -lpthread -lrumpdev -lrumpvfs
 
 .include 

CVS commit: src/tests/net/if

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 14:54:28 UTC 2016

Modified Files:
src/tests/net/if: Makefile

Log Message:
This one needs librump dev (and librumpvfs) too


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/net/if/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/net/if/Makefile
diff -u src/tests/net/if/Makefile:1.5 src/tests/net/if/Makefile:1.6
--- src/tests/net/if/Makefile:1.5	Wed Jul  1 08:33:31 2015
+++ src/tests/net/if/Makefile	Mon Aug  8 14:54:27 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/07/01 08:33:31 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/08 14:54:27 pgoyette Exp $
 #
 
 .include 
@@ -14,6 +14,6 @@ MAN.ifconf=	# empty
 BINDIR.ifconf=	${TESTSDIR}
 
 LDADD.t_compat=		-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump
-LDADD.t_compat+=	-lrumpuser -lrump -lpthread
+LDADD.t_compat+=	-lrumpuser -lrump -lpthread -lrumpdev -lrumpvfs
 
 .include 

CVS commit: src/tests/net/icmp

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 14:49:35 UTC 2016

Modified Files:
src/tests/net/icmp: Makefile

Log Message:
And this one also needs librumpvfs


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/net/icmp/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/net/icmp/Makefile
diff -u src/tests/net/icmp/Makefile:1.7 src/tests/net/icmp/Makefile:1.8
--- src/tests/net/icmp/Makefile:1.7	Mon Aug  8 14:46:35 2016
+++ src/tests/net/icmp/Makefile	Mon Aug  8 14:49:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/08 14:46:35 pgoyette Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/08 14:49:35 pgoyette Exp $
 #
 
 .include 
@@ -11,6 +11,6 @@ TESTS_C+=	t_ping
 TESTS_SH=	t_ping2 t_icmp_redirect t_icmp6_redirect
 
 LDADD+=		-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=		-lrump -lrumpuser -lrump -lpthread -lrumpdev
+LDADD+=		-lrump -lrumpuser -lrump -lpthread -lrumpdev -lrumpvfs
 
 .include 

CVS commit: src/tests/net/icmp

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 14:46:35 UTC 2016

Modified Files:
src/tests/net/icmp: Makefile

Log Message:
More need for librumpdev


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/net/icmp/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/net/icmp/Makefile
diff -u src/tests/net/icmp/Makefile:1.6 src/tests/net/icmp/Makefile:1.7
--- src/tests/net/icmp/Makefile:1.6	Mon Sep 14 05:22:56 2015
+++ src/tests/net/icmp/Makefile	Mon Aug  8 14:46:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/09/14 05:22:56 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/08 14:46:35 pgoyette Exp $
 #
 
 .include 
@@ -11,6 +11,6 @@ TESTS_C+=	t_ping
 TESTS_SH=	t_ping2 t_icmp_redirect t_icmp6_redirect
 
 LDADD+=		-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=		-lrump -lrumpuser -lrump -lpthread
+LDADD+=		-lrump -lrumpuser -lrump -lpthread -lrumpdev
 
 .include 

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

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Mon Aug  8 14:40:57 UTC 2016

Modified Files:
src/sys/arch/arm/nvidia: tegra_i2c.c

Log Message:
Send repeated start after command phase if there is any data phase
transfer, not just if the data phase a read operation.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/nvidia/tegra_i2c.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/arm/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.14 src/sys/arch/arm/nvidia/tegra_i2c.c:1.15
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.14	Mon Aug  8 14:36:56 2016
+++ src/sys/arch/arm/nvidia/tegra_i2c.c	Mon Aug  8 14:40:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.14 2016/08/08 14:36:56 jakllsch Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.15 2016/08/08 14:40:57 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.14 2016/08/08 14:36:56 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.15 2016/08/08 14:40:57 jakllsch Exp $");
 
 #include 
 #include 
@@ -314,7 +314,7 @@ tegra_i2c_exec(void *priv, i2c_op_t op, 
 
 	if (cmdlen > 0) {
 		error = tegra_i2c_write(sc, addr, cmdbuf, cmdlen, flags,
-		I2C_OP_READ_P(op) ? true : false);
+		buflen > 0 ? true : false);
 		if (error) {
 			goto done;
 		}

CVS commit: src/tests/net/carp

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 14:40:19 UTC 2016

Modified Files:
src/tests/net/carp: Makefile

Log Message:
No underscore needed


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/net/carp/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/net/carp/Makefile
diff -u src/tests/net/carp/Makefile:1.4 src/tests/net/carp/Makefile:1.5
--- src/tests/net/carp/Makefile:1.4	Mon Aug  8 14:34:02 2016
+++ src/tests/net/carp/Makefile	Mon Aug  8 14:40:19 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2016/08/08 14:34:02 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.5 2016/08/08 14:40:19 pgoyette Exp $
 #
 
 .include 
@@ -8,6 +8,6 @@ TESTSDIR=	${TESTSBASE}/net/carp
 TESTS_C=	t_basic
 
 LDADD+=		-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpdev
-LDADD+=		-lrumpnet -lrump -lrumpuser -lrump_vfs -lpthread
+LDADD+=		-lrumpnet -lrump -lrumpuser -lrumpvfs -lpthread
 
 .include 

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

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Mon Aug  8 14:36:56 UTC 2016

Modified Files:
src/sys/arch/arm/nvidia: tegra_i2c.c

Log Message:
Adjust data pointer using current, rather than upcoming, transfer length.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_i2c.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/arm/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.13 src/sys/arch/arm/nvidia/tegra_i2c.c:1.14
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.13	Sun Feb 14 19:54:20 2016
+++ src/sys/arch/arm/nvidia/tegra_i2c.c	Mon Aug  8 14:36:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.13 2016/02/14 19:54:20 chs Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.14 2016/08/08 14:36:56 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.13 2016/02/14 19:54:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.14 2016/08/08 14:36:56 jakllsch Exp $");
 
 #include 
 #include 
@@ -432,8 +432,8 @@ tegra_i2c_write(struct tegra_i2c_softc *
 			data |= (uint32_t)p[n] << (n * 8);
 		}
 		I2C_WRITE(sc, I2C_TX_PACKET_FIFO_REG, data);
-		resid -= min(resid, 4);
 		p += min(resid, 4);
+		resid -= min(resid, 4);
 	}
 
 	return tegra_i2c_wait(sc, flags);
@@ -488,8 +488,8 @@ tegra_i2c_read(struct tegra_i2c_softc *s
 		for (n = 0; n < min(resid, 4); n++) {
 			p[n] = (data >> (n * 8)) & 0xff;
 		}
-		resid -= min(resid, 4);
 		p += min(resid, 4);
+		resid -= min(resid, 4);
 	}
 
 	return tegra_i2c_wait(sc, flags);

CVS commit: src/tests/net/net

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 14:16:32 UTC 2016

Modified Files:
src/tests/net/net: Makefile

Log Message:
Another place where we need librumpdev


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/net/net/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/net/net/Makefile
diff -u src/tests/net/net/Makefile:1.14 src/tests/net/net/Makefile:1.15
--- src/tests/net/net/Makefile:1.14	Thu Nov 12 05:05:25 2015
+++ src/tests/net/net/Makefile	Mon Aug  8 14:16:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/11/12 05:05:25 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/08 14:16:32 pgoyette Exp $
 #
 
 .include 
@@ -17,7 +17,7 @@ TESTS_SH+=	t_ipv6address
 TESTS_SH+=	t_ipv6_lifetime
 .endif
 
-LDADD.t_raw+=	-lrumpnet_local -lrumpnet_netinet -lrumpnet_net
+LDADD.t_raw+=	-lrumpnet_local -lrumpnet_netinet -lrumpnet_net -lrumpdev
 LDADD.t_raw+=	-lrumpnet -lrumpvfs -lrump -lrumpuser -lrump -lpthread
 
 .include 

CVS commit: src/tests/net/carp

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 14:22:43 UTC 2016

Modified Files:
src/tests/net/carp: Makefile

Log Message:
And yet another one


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/carp/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/net/carp/Makefile
diff -u src/tests/net/carp/Makefile:1.2 src/tests/net/carp/Makefile:1.3
--- src/tests/net/carp/Makefile:1.2	Tue Jun 10 04:28:40 2014
+++ src/tests/net/carp/Makefile	Mon Aug  8 14:22:43 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2014/06/10 04:28:40 he Exp $
+#	$NetBSD: Makefile,v 1.3 2016/08/08 14:22:43 pgoyette Exp $
 #
 
 .include 
@@ -7,7 +7,7 @@ TESTSDIR=	${TESTSBASE}/net/carp
 
 TESTS_C=	t_basic
 
-LDADD+=		-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net
+LDADD+=		-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpdev
 LDADD+=		-lrumpnet -lrump -lrumpuser -lrump -lpthread
 
 .include 

CVS commit: src/tests/include/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 14:11:08 UTC 2016

Modified Files:
src/tests/include/sys: Makefile

Log Message:
We now need librumpdev to resolve rumpns_config_cfdriver_attach which
is now used in a bunch of network modules/components


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/include/sys/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/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.11 src/tests/include/sys/Makefile:1.12
--- src/tests/include/sys/Makefile:1.11	Sat Apr  9 04:39:47 2016
+++ src/tests/include/sys/Makefile	Mon Aug  8 14:11:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/04/09 04:39:47 riastradh Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/08 14:11:08 pgoyette Exp $
 
 NOMAN=		# defined
 
@@ -20,7 +20,7 @@ LDADD.t_bitops+=	-lm
 TESTS_C+= t_socket
 CPPFLAGS.t_socket.c+=	-D_KERNTYPES
 LDADD.t_socket+=	-lrumpnet_local -lrumpnet_net -lrumpnet
-LDADD.t_socket+=	-lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_socket+=	-lrumpvfs -lrump -lrumpuser -lpthread -lrumpdev
 .endif
 
 .include 

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

[Sean Cole]

Module Name:src
Committed By:   scole
Date:   Mon Aug  8 12:25:35 UTC 2016

Modified Files:
src/sys/arch/ia64/include: ia64_cpu.h

Log Message:
Import FreeBSD update


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/ia64_cpu.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/ia64/include/ia64_cpu.h
diff -u src/sys/arch/ia64/include/ia64_cpu.h:1.2 src/sys/arch/ia64/include/ia64_cpu.h:1.3
--- src/sys/arch/ia64/include/ia64_cpu.h:1.2	Mon Jul 20 04:41:37 2009
+++ src/sys/arch/ia64/include/ia64_cpu.h	Mon Aug  8 12:25:35 2016
@@ -1,6 +1,7 @@
-/*	$NetBSD: ia64_cpu.h,v 1.2 2009/07/20 04:41:37 kiyohara Exp $	*/
+/*	$NetBSD: ia64_cpu.h,v 1.3 2016/08/08 12:25:35 scole Exp $	*/
 
 /*-
+ * Copyright (c) 2007 Marcel Moolenaar
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
  *
@@ -25,13 +26,37 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ * $FreeBSD: releng/10.1/sys/ia64/include/ia64_cpu.h 223170 2011-06-17 04:26:03Z marcel $
  */
 
 #ifndef _MACHINE_IA64_CPU_H_
 #define _MACHINE_IA64_CPU_H_
 
 /*
+ * Local Interrupt ID.
+ */
+#define	IA64_LID_GET_SAPIC_ID(x)	((u_int)((x) >> 16) & 0x)
+#define	IA64_LID_SET_SAPIC_ID(x)	((u_int)((x) & 0x) << 16)
+
+/*
+ * Definition of DCR bits.
+ */
+#define	IA64_DCR_PP		0x0001
+#define	IA64_DCR_BE		0x0002
+#define	IA64_DCR_LC		0x0004
+#define	IA64_DCR_DM		0x0100
+#define	IA64_DCR_DP		0x0200
+#define	IA64_DCR_DK		0x0400
+#define	IA64_DCR_DX		0x0800
+#define	IA64_DCR_DR		0x1000
+#define	IA64_DCR_DA		0x2000
+#define	IA64_DCR_DD		0x4000
+
+#define	IA64_DCR_DEFAULT	\
+(IA64_DCR_DM | IA64_DCR_DP | IA64_DCR_DK | IA64_DCR_DX |	\
+ IA64_DCR_DR | IA64_DCR_DA | IA64_DCR_DD)
+
+/*
  * Definition of PSR and IPSR bits.
  */
 #define IA64_PSR_BE		0x0002
@@ -180,10 +205,6 @@ ia64_fc(uint64_t va)
 	__asm __volatile("fc %0" :: "r"(va));
 }
 
-/*
- * Flush Instruction Cache
- */
-
 static __inline void
 ia64_fc_i(uint64_t va)
 {
@@ -238,7 +259,7 @@ ia64_tpa(uint64_t va)
 static __inline void
 ia64_ptc_e(uint64_t v)
 {
-	__asm __volatile("ptc.e %0;; srlz.d;;" :: "r"(v));
+	__asm __volatile("ptc.e %0;; srlz.i;;" :: "r"(v));
 }
 
 /*
@@ -247,7 +268,7 @@ ia64_ptc_e(uint64_t v)
 static __inline void
 ia64_ptc_g(uint64_t va, uint64_t log2size)
 {
-	__asm __volatile("ptc.g %0,%1;; srlz.d;;" :: "r"(va), "r"(log2size));
+	__asm __volatile("ptc.g %0,%1;;" :: "r"(va), "r"(log2size));
 }
 
 /*
@@ -256,7 +277,7 @@ ia64_ptc_g(uint64_t va, uint64_t log2siz
 static __inline void
 ia64_ptc_ga(uint64_t va, uint64_t log2size)
 {
-	__asm __volatile("ptc.ga %0,%1;; srlz.d;;" :: "r"(va), "r"(log2size));
+	__asm __volatile("ptc.ga %0,%1;;" :: "r"(va), "r"(log2size));
 }
 
 /*
@@ -265,7 +286,84 @@ ia64_ptc_ga(uint64_t va, uint64_t log2si
 static __inline void
 ia64_ptc_l(uint64_t va, uint64_t log2size)
 {
-	__asm __volatile("ptc.l %0,%1;; srlz.d;;" :: "r"(va), "r"(log2size));
+	__asm __volatile("ptc.l %0,%1;; srlz.i;;" :: "r"(va), "r"(log2size));
+}
+
+/*
+ * Invalidate the ALAT on the local processor.
+ */
+static __inline void
+ia64_invala(void)
+{
+	__asm __volatile("invala;;");
+}
+
+/*
+ * Unordered memory load.
+ */
+
+static __inline uint8_t
+ia64_ld1(uint8_t *p)
+{
+	uint8_t v;
+
+	__asm __volatile("ld1 %0=[%1];;" : "=r"(v) : "r"(p));
+	return (v);
+}
+
+static __inline uint16_t
+ia64_ld2(uint16_t *p)
+{
+	uint16_t v;
+
+	__asm __volatile("ld2 %0=[%1];;" : "=r"(v) : "r"(p));
+	return (v);
+}
+
+static __inline uint32_t
+ia64_ld4(uint32_t *p)
+{
+	uint32_t v;
+
+	__asm __volatile("ld4 %0=[%1];;" : "=r"(v) : "r"(p));
+	return (v);
+}
+
+static __inline uint64_t
+ia64_ld8(uint64_t *p)
+{
+	uint64_t v;
+
+	__asm __volatile("ld8 %0=[%1];;" : "=r"(v) : "r"(p));
+	return (v);
+}
+
+/*
+ * Unordered memory store.
+ */
+
+static __inline void
+ia64_st1(uint8_t *p, uint8_t v)
+{
+	__asm __volatile("st1 [%0]=%1;;" :: "r"(p), "r"(v));
+}
+
+static __inline void
+ia64_st2(uint16_t *p, uint16_t v)
+{
+	__asm __volatile("st2 [%0]=%1;;" :: "r"(p), "r"(v));
+}
+
+static __inline void
+ia64_st4(uint32_t *p, uint32_t v)
+{
+	__asm __volatile("st4 [%0]=%1;;" :: "r"(p), "r"(v));
+}
+
+static __inline void
+ia64_st8(uint64_t *p, uint64_t v)
+{
+	__asm __volatile("st8 [%0]=%1;;" :: "r"(p), "r"(v));
 }
 
 /*
@@ -393,7 +491,7 @@ IA64_CR(lrr1)
 static __inline void
 ia64_set_rr(uint64_t rrbase, uint64_t v)
 {
-	__asm __volatile("mov rr[%0]=%1;; srlz.d;;"
+	__asm __volatile("mov rr[%0]=%1"
 			 :: "r"(rrbase), "r"(v) : "memory");
 }
 
@@ -421,17 +519,14 @@ ia64_enable_highfp(void)
 	__asm __volatile("rsm psr.dfh;; srlz.d");
 }
 
-static __inline void
-ia64_srlz_d(void)
-{
-	__asm __volatile("srlz.d");
-}
-
-static __inline void

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Aug  8 10:21:34 UTC 2016

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Use MFC0_HAZARD - no functional change


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/mips/mips/mipsX_subr.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/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.83 src/sys/arch/mips/mips/mipsX_subr.S:1.84
--- src/sys/arch/mips/mips/mipsX_subr.S:1.83	Sun Aug  7 07:13:57 2016
+++ src/sys/arch/mips/mips/mipsX_subr.S	Mon Aug  8 10:21:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mipsX_subr.S,v 1.83 2016/08/07 07:13:57 skrll Exp $	*/
+/*	$NetBSD: mipsX_subr.S,v 1.84 2016/08/08 10:21:34 skrll Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -2755,9 +2755,7 @@ MIPSX(entry0):
 	tlbp	# probe VPN
 	COP0_SYNC
 	mfc0	t0, MIPS_COP_0_TLB_INDEX
-#ifdef MIPS3
-	nop
-#endif
+	MFC0_HAZARD
 	bltz	t0, MIPSX(entry0set)
 	 sll	t0, t0, PGSHIFT | 1		# PAGE_SHIFT | 1
 	PTR_LA	t0, MIPS_KSEG0_START(t0)

CVS commit: src/sys/net

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 09:51:39 UTC 2016

Modified Files:
src/sys/net: if_tap.c

Log Message:
Typo (missing ampersand)


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.88 src/sys/net/if_tap.c:1.89
--- src/sys/net/if_tap.c:1.88	Mon Aug  8 09:42:33 2016
+++ src/sys/net/if_tap.c	Mon Aug  8 09:51:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.88 2016/08/08 09:42:33 pgoyette Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.89 2016/08/08 09:51:39 pgoyette Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.88 2016/08/08 09:42:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.89 2016/08/08 09:51:39 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -262,7 +262,7 @@ tapinit(void)
 	if_clone_attach(_cloners);
 #ifdef _MODULE
 	sysctl_tap_setup(_sysctl_clog);
-	devsw_attach("tap", NULL, _bmajor, tap_cdevsw, _cmajor);
+	devsw_attach("tap", NULL, _bmajor, _cdevsw, _cmajor);
 #endif
 }
 

CVS commit: src/sys/net

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 09:42:33 UTC 2016

Modified Files:
src/sys/net: if_tap.c

Log Message:
Final part of fixing if_tap.  The module needs to attach its cdevsw (and
detach it later).


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.87 src/sys/net/if_tap.c:1.88
--- src/sys/net/if_tap.c:1.87	Mon Aug  8 09:23:13 2016
+++ src/sys/net/if_tap.c	Mon Aug  8 09:42:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.87 2016/08/08 09:23:13 pgoyette Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.88 2016/08/08 09:42:33 pgoyette Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.87 2016/08/08 09:23:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.88 2016/08/08 09:42:33 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -272,17 +272,16 @@ tapdetach(void)
 	int error = 0;
 
 	if (tap_count != 0)
-		error = EBUSY;
+		return EBUSY;
 
+#ifdef _MODULE
+	error = devsw_detach(NULL, _cdevsw);
 	if (error == 0)
-		devsw_detach(NULL, _cdevsw);
-
+		sysctl_teardown(_sysctl_clog);
+#endif
 	if (error == 0)
 		if_clone_detach(_cloners);
 
-#ifdef _MODULE
-	sysctl_teardown(_sysctl_clog);
-#endif
 	return error;
 }
 

CVS commit: src/sys/arch/x86/x86

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Aug  8 09:39:06 UTC 2016

Modified Files:
src/sys/arch/x86/x86: procfs_machdep.c

Log Message:
- Update VIA/Cyrix/Centaur-defined bits. Part of PR#39950
- Fix comment. x86_features[4] is not 0x8001 but 0x0001
- Update comment


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 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.12 src/sys/arch/x86/x86/procfs_machdep.c:1.13
--- src/sys/arch/x86/x86/procfs_machdep.c:1.12	Wed Apr 27 08:45:22 2016
+++ src/sys/arch/x86/x86/procfs_machdep.c	Mon Aug  8 09:39:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_machdep.c,v 1.12 2016/04/27 08:45:22 msaitoh Exp $ */
+/*	$NetBSD: procfs_machdep.c,v 1.13 2016/08/08 09:39:06 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.12 2016/04/27 08:45:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.13 2016/08/08 09:39:06 msaitoh 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},
 

CVS commit: src/sys/rump/net/lib/libtap

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 09:29:45 UTC 2016

Modified Files:
src/sys/rump/net/lib/libtap: tap_component.c

Log Message:
Part 2 of fixing if_tap module.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/lib/libtap/tap_component.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/rump/net/lib/libtap/tap_component.c
diff -u src/sys/rump/net/lib/libtap/tap_component.c:1.3 src/sys/rump/net/lib/libtap/tap_component.c:1.4
--- src/sys/rump/net/lib/libtap/tap_component.c:1.3	Tue Jan 26 23:12:19 2016
+++ src/sys/rump/net/lib/libtap/tap_component.c	Mon Aug  8 09:29:45 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: tap_component.c,v 1.3 2016/01/26 23:12:19 pooka Exp $	*/
+/*	$NetBSD: tap_component.c,v 1.4 2016/08/08 09:29:45 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2015 Wei Liu.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tap_component.c,v 1.3 2016/01/26 23:12:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tap_component.c,v 1.4 2016/08/08 09:29:45 pgoyette Exp $");
 
 #include 
 #include 
@@ -37,27 +37,26 @@ __KERNEL_RCSID(0, "$NetBSD: tap_componen
 
 #include "ioconf.h"
 
-CFDRIVER_DECL(tap, DV_IFNET, NULL);
-
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
 {
 	extern const struct cdevsw tap_cdevsw;
-	devmajor_t bmaj, cmaj;
+	extern devmajor_t tap_bmajor, tap_cmajor;
 	int error;
 
-	config_cfdriver_attach(_cd);
-	tapattach(0);
-
-	bmaj = cmaj = NODEVMAJOR;
-	error = devsw_attach("tap", NULL, , _cdevsw, );
+	error = devsw_attach("tap", NULL, _bmajor,
+	_cdevsw, _cmajor);
 	if (error != 0)
 		panic("tap devsw attach failed: %d", error);
 
-	error = rump_vfs_makeonedevnode(S_IFCHR, "/dev/tap", cmaj, 0xf);
+	error = rump_vfs_makeonedevnode(S_IFCHR, "/dev/tap", tap_cmajor,
+	0xf);
 	if (error != 0)
 		panic("cannot create tap device node: %d", error);
 
-	error = rump_vfs_makedevnodes(S_IFCHR, "/dev/tap", '0', cmaj, 0, 4);
+	error = rump_vfs_makedevnodes(S_IFCHR, "/dev/tap", '0', tap_cmajor,
+	0, 4);
 	if (error != 0)
 		panic("cannot create tap[0-4] device node: %d", error);
+
+	devsw_detach(NULL, _cdevsw);
 }

CVS commit: src/sys/net

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 09:23:13 UTC 2016

Modified Files:
src/sys/net: if_tap.c

Log Message:
Add the devsw_attach stuff, since the tap device can be accessed via
/dev/tap

This is a partial fix for the build.  The rump tap component will be
fixed shortly.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.86 src/sys/net/if_tap.c:1.87
--- src/sys/net/if_tap.c:1.86	Mon Aug  8 07:35:12 2016
+++ src/sys/net/if_tap.c	Mon Aug  8 09:23:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.86 2016/08/08 07:35:12 pgoyette Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.87 2016/08/08 09:23:13 pgoyette Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.86 2016/08/08 07:35:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.87 2016/08/08 09:23:13 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -239,6 +239,9 @@ int	tap_clone_destroyer(device_t);
 
 #ifdef _MODULE
 static struct sysctllog *tap_sysctl_clog;
+
+devmajor_t tap_bmajor = -1, tap_cmajor = -1;
+
 #endif
 
 static u_int tap_count;
@@ -259,6 +262,7 @@ tapinit(void)
 	if_clone_attach(_cloners);
 #ifdef _MODULE
 	sysctl_tap_setup(_sysctl_clog);
+	devsw_attach("tap", NULL, _bmajor, tap_cdevsw, _cmajor);
 #endif
 }
 
@@ -271,6 +275,9 @@ tapdetach(void)
 		error = EBUSY;
 
 	if (error == 0)
+		devsw_detach(NULL, _cdevsw);
+
+	if (error == 0)
 		if_clone_detach(_cloners);
 
 #ifdef _MODULE

CVS commit: src/sys/net

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Aug  8 07:35:12 UTC 2016

Modified Files:
src/sys/net: if_tap.c

Log Message:
Partial fix - restore creation of our sysctl subtree for _MODULE
builds (it's already handled for built-in builds via registration
in a link-set).

XXX The build is still broken in rump...


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.85 src/sys/net/if_tap.c:1.86
--- src/sys/net/if_tap.c:1.85	Sun Aug  7 17:38:34 2016
+++ src/sys/net/if_tap.c	Mon Aug  8 07:35:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.85 2016/08/07 17:38:34 christos Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.86 2016/08/08 07:35:12 pgoyette Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.85 2016/08/07 17:38:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.86 2016/08/08 07:35:12 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -237,6 +237,10 @@ struct if_clone tap_cloners = IF_CLONE_I
 static struct tap_softc *	tap_clone_creator(int);
 int	tap_clone_destroyer(device_t);
 
+#ifdef _MODULE
+static struct sysctllog *tap_sysctl_clog;
+#endif
+
 static u_int tap_count;
 
 void
@@ -253,6 +257,9 @@ static void
 tapinit(void)
 {
 	if_clone_attach(_cloners);
+#ifdef _MODULE
+	sysctl_tap_setup(_sysctl_clog);
+#endif
 }
 
 static int
@@ -266,6 +273,9 @@ tapdetach(void)
 	if (error == 0)
 		if_clone_detach(_cloners);
 
+#ifdef _MODULE
+	sysctl_teardown(_sysctl_clog);
+#endif
 	return error;
 }
 

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Aug  8 07:28:55 UTC 2016

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

Log Message:
More markup.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/share/man/man4/pppoe.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/pppoe.4
diff -u src/share/man/man4/pppoe.4:1.37 src/share/man/man4/pppoe.4:1.38
--- src/share/man/man4/pppoe.4:1.37	Sun Aug  7 01:59:43 2016
+++ src/share/man/man4/pppoe.4	Mon Aug  8 07:28:54 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pppoe.4,v 1.37 2016/08/07 01:59:43 pgoyette Exp $
+.\"	$NetBSD: pppoe.4,v 1.38 2016/08/08 07:28:54 wiz Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -265,7 +265,9 @@ To do this, add the following to your ke
 .Pp
 and set the value of
 .Xr sysctl 7
-variable net.pppoe.term_unknown to true.
+variable
+.Dv net.pppoe.term_unknown
+to true.
 .Pp
 Note that this will break all userland
 .Nm PPPoE

CVS commit: src/sys/net

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Aug  8 07:23:27 UTC 2016

Modified Files:
src/sys/net: if_pppoe.c

Log Message:
Fix compile without modules.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/net/if_pppoe.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_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.115 src/sys/net/if_pppoe.c:1.116
--- src/sys/net/if_pppoe.c:1.115	Mon Aug  8 02:50:05 2016
+++ src/sys/net/if_pppoe.c	Mon Aug  8 07:23:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.115 2016/08/08 02:50:05 pgoyette Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.116 2016/08/08 07:23:27 roy Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.115 2016/08/08 02:50:05 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.116 2016/08/08 07:23:27 roy Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
@@ -255,7 +255,9 @@ pppoedetach(void)
 		if_clone_detach(_cloner);
 		softint_disestablish(pppoe_softintr);
 		/* Remove our sysctl sub-tree */
+#ifdef _MODULE
 		sysctl_teardown(_sysctl_clog);
+#endif
 	}
 
 	return error;

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Aug  8 07:10:28 UTC 2016

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add some Xeon E5 v3 devices.


To generate a diff of this commit:
cvs rdiff -u -r1.1256 -r1.1257 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.1256 src/sys/dev/pci/pcidevs:1.1257
--- src/sys/dev/pci/pcidevs:1.1256	Fri Jul 29 07:28:19 2016
+++ src/sys/dev/pci/pcidevs	Mon Aug  8 07:10:28 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1256 2016/07/29 07:28:19 nonaka Exp $
+$NetBSD: pcidevs,v 1.1257 2016/08/08 07:10:28 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3661,7 +3661,8 @@ product INTEL 82G41_IGD		0x2e32	82G41 In
 product INTEL 82B43_HB		0x2e40	82B43 Host Bridge
 product INTEL 82B43_IGD		0x2e42	82B43 Integrated Graphics Device
 product INTEL XE5_V3_DMI2	0x2f00	Xeon E5 v3 DMI2
-product INTEL XE5_V3_PCIE_1	0x2f01	Xeon E5 v3 PCIe Root Port in DMI2 Mode
+product INTEL XE5_V3_PCIE_1_1	0x2f01	Xeon E5 v3 PCIe Root Port in DMI2 Mode
+product INTEL XE5_V3_PCIE_1_2	0x2f02	Xeon E5 v3 PCIe Root Port
 product INTEL XE5_V3_PCIE_2_1	0x2f04	Xeon E5 v3 PCIe Root Port
 product INTEL XE5_V3_PCIE_2_2	0x2f05	Xeon E5 v3 PCIe Root Port
 product INTEL XE5_V3_PCIE_2_3	0x2f06	Xeon E5 v3 PCIe Root Port
@@ -3682,8 +3683,12 @@ product INTEL XE5_V3_QDT_CH5	0x2f25	Xeon
 product INTEL XE5_V3_QDT_CH6	0x2f26	Xeon E5 v3 QDT DMA Channel 6
 product INTEL XE5_V3_QDT_CH7	0x2f27	Xeon E5 v3 QDT DMA Channel 7
 product INTEL XE5_V3_IIO_AM	0x2f28	Xeon E5 v3 Address Map, VTd, SMM
+product INTEL XE5_V3_HOTPLUG	0x2f29	Xeon E5 v3 Hot Plug
 product INTEL XE5_V3_IIO_RAM	0x2f2a	Xeon E5 v3 RAS, CS, Global Errors
 product INTEL XE5_V3_IIO_IOAPIC	0x2f2c	Xeon E5 v3 I/O APIC
+product INTEL XE5_V3_HA		0x2f30	Xeon E5 v3 Home Agent
+product INTEL XE5_V3_QPI_LINK2	0x2f32	Xeon E5 v3 QPI Link 0
+product INTEL XE5_V3_QPI_LINK3	0x2f33	Xeon E5 v3 QPI Link 1
 product INTEL XE5_V3_R2PCIE_2	0x2f34	Xeon E5 v3 PCIe Ring Performance Monitoring
 product INTEL XE5_V3_RQPI_PM_1	0x2f36	Xeon E5 v3 QPI Ring Performance Monitoring
 product INTEL XE5_V3_RQPI_PM_2	0x2f37	Xeon E5 v3 QPI Ring Interface Monitoring
@@ -3695,6 +3700,7 @@ product INTEL XE5_V3_IMC1_RAS	0x2f79	Xeo
 product INTEL XE5_V3_UBOX_2	0x2f7d	Xeon E5 v3 Scratchpad and Semaphores
 product INTEL XE5_V3_QPI_LINK0	0x2f80	Xeon E5 v3 QPI Link 0
 product INTEL XE5_V3_RQPI_RING	0x2f81	Xeon E5 v3 QPI Ring Interface
+product INTEL XE5_V3_QPI_LINK4	0x2f83	Xeon E5 v3 QPI Link 0
 product INTEL XE5_V3_QPI_LINK1	0x2f90	Xeon E5 v3 QPI Link 1
 product INTEL XE5_V3_PCU_1	0x2f98	Xeon E5 v3 Power Control Unit
 product INTEL XE5_V3_PCU_2	0x2f99	Xeon E5 v3 Power Control Unit