CVS commit: src/sys/net/npf

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Apr 10 04:29:57 UTC 2018

Modified Files:
src/sys/net/npf: npf_sendpkt.c

Log Message:
apply some INET6 so this compiles in INET6-less kernels again.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/net/npf/npf_sendpkt.c

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

CVS commit: src/sys/net/npf

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Apr 10 04:29:57 UTC 2018

Modified Files:
src/sys/net/npf: npf_sendpkt.c

Log Message:
apply some INET6 so this compiles in INET6-less kernels again.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/net/npf/npf_sendpkt.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/npf/npf_sendpkt.c
diff -u src/sys/net/npf/npf_sendpkt.c:1.18 src/sys/net/npf/npf_sendpkt.c:1.19
--- src/sys/net/npf/npf_sendpkt.c:1.18	Sat Mar 17 10:42:23 2018
+++ src/sys/net/npf/npf_sendpkt.c	Tue Apr 10 04:29:57 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_sendpkt.c,v 1.18 2018/03/17 10:42:23 maxv Exp $	*/
+/*	$NetBSD: npf_sendpkt.c,v 1.19 2018/04/10 04:29:57 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2010-2011 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #ifdef _KERNEL
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_sendpkt.c,v 1.18 2018/03/17 10:42:23 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_sendpkt.c,v 1.19 2018/04/10 04:29:57 mrg Exp $");
 
 #include 
 #include 
@@ -176,6 +176,7 @@ npf_return_tcp(npf_cache_t *npc)
 		sizeof(struct tcphdr));
 	}
 
+#if defined(INET6)
 	/* Handle IPv6 scopes */
 	if (npf_iscached(npc, NPC_IP6)) {
 		const struct ifnet *rcvif = npc->npc_nbuf->nb_ifp;
@@ -189,14 +190,17 @@ npf_return_tcp(npf_cache_t *npc)
 			goto bad;
 		}
 	}
+#endif
 
 	/* Pass to IP layer. */
 	if (npf_iscached(npc, NPC_IP4)) {
 		return ip_output(m, NULL, NULL, IP_FORWARDING, NULL, NULL);
 	}
+#if defined(INET6)
 	return ip6_output(m, NULL, NULL, IPV6_FORWARDING, NULL, NULL, NULL);
 
 bad:
+#endif
 	m_freem(m);
 	return EINVAL;
 }
@@ -212,6 +216,7 @@ npf_return_icmp(const npf_cache_t *npc)
 	if (npf_iscached(npc, NPC_IP4)) {
 		icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_ADMIN_PROHIBIT, 0, 0);
 		return 0;
+#if defined(INET6)
 	} else if (npf_iscached(npc, NPC_IP6)) {
 		/* Handle IPv6 scopes */
 		const struct ifnet *rcvif = npc->npc_nbuf->nb_ifp;
@@ -227,6 +232,7 @@ npf_return_icmp(const npf_cache_t *npc)
 
 		icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN, 0);
 		return 0;
+#endif
 	}
 	return EINVAL;
 }

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Tue Apr 10 00:59:55 UTC 2018

Modified Files:
src/sys/arch/arm/sunxi: sun4i_dma.c

Log Message:
Initialize DDMA_PARA_REG with a sane value


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sun4i_dma.c

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

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Tue Apr 10 00:59:55 UTC 2018

Modified Files:
src/sys/arch/arm/sunxi: sun4i_dma.c

Log Message:
Initialize DDMA_PARA_REG with a sane value


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sun4i_dma.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/sunxi/sun4i_dma.c
diff -u src/sys/arch/arm/sunxi/sun4i_dma.c:1.1 src/sys/arch/arm/sunxi/sun4i_dma.c:1.2
--- src/sys/arch/arm/sunxi/sun4i_dma.c:1.1	Sun Aug 27 16:05:26 2017
+++ src/sys/arch/arm/sunxi/sun4i_dma.c	Tue Apr 10 00:59:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_dma.c,v 1.1 2017/08/27 16:05:26 jmcneill Exp $ */
+/* $NetBSD: sun4i_dma.c,v 1.2 2018/04/10 00:59:55 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -29,7 +29,7 @@
 #include "opt_ddb.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sun4i_dma.c,v 1.1 2017/08/27 16:05:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun4i_dma.c,v 1.2 2018/04/10 00:59:55 jmcneill Exp $");
 
 #include 
 #include 
@@ -90,6 +90,11 @@ __KERNEL_RCSID(0, "$NetBSD: sun4i_dma.c,
 #define	 DDMA_PARA_DST_WAIT_CLK_CYC	__BITS(23,16)
 #define	 DDMA_PARA_SRC_DATA_BLK_SIZE	__BITS(15,8)
 #define	 DDMA_PARA_SRC_WAIT_CLK_CYC	__BITS(7,0)
+#define	 DDMA_PARA_VALUE\
+	  (__SHIFTIN(1, DDMA_PARA_DST_DATA_BLK_SIZE) |	\
+	   __SHIFTIN(1, DDMA_PARA_SRC_DATA_BLK_SIZE) |	\
+	   __SHIFTIN(2, DDMA_PARA_DST_WAIT_CLK_CYC) |	\
+	   __SHIFTIN(2, DDMA_PARA_SRC_WAIT_CLK_CYC))
 
 static const struct of_compat_data compat_data[] = {
 	{ "allwinner,sun4i-a10-dma",		1 },
@@ -259,7 +264,7 @@ sun4idma_transfer_ddma(struct sun4idma_s
 	DMA_WRITE(sc, DDMA_SRC_ADDR_REG(ch->ch_index), src);
 	DMA_WRITE(sc, DDMA_DEST_ADDR_REG(ch->ch_index), dst);
 	DMA_WRITE(sc, DDMA_BC_REG(ch->ch_index), req->dreq_segs[0].ds_len);
-	DMA_WRITE(sc, DDMA_PARA_REG(ch->ch_index), 0);
+	DMA_WRITE(sc, DDMA_PARA_REG(ch->ch_index), DDMA_PARA_VALUE);
 	DMA_WRITE(sc, DDMA_CTRL_REG(ch->ch_index), cfg | DDMA_CTRL_LOAD);
 
 	return 0;

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Apr 10 00:40:35 UTC 2018

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
ATF: ptrace: Merge code in fork2 and vfork2 tests with (v)fork1 ones

Reduce code duplication, use the same function body with conditional
switches.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tests/lib/libc/sys/t_ptrace_wait.c

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

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Apr 10 00:40:35 UTC 2018

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
ATF: ptrace: Merge code in fork2 and vfork2 tests with (v)fork1 ones

Reduce code duplication, use the same function body with conditional
switches.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tests/lib/libc/sys/t_ptrace_wait.c

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/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.28 src/tests/lib/libc/sys/t_ptrace_wait.c:1.29
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.28	Tue Apr 10 00:09:31 2018
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Tue Apr 10 00:40:35 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.28 2018/04/10 00:09:31 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.29 2018/04/10 00:40:35 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.28 2018/04/10 00:09:31 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.29 2018/04/10 00:40:35 kamil Exp $");
 
 #include 
 #include 
@@ -1321,9 +1321,8 @@ ATF_TC_BODY(eventmask6, tc)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
 }
 
-#if defined(TWAIT_HAVE_PID)
 static void
-fork_test(bool regular)
+fork_test(bool regular, bool track_event)
 {
 	const int exitval = 5;
 	const int exitval2 = 15;
@@ -1332,12 +1331,14 @@ fork_test(bool regular)
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
+#if defined(TWAIT_HAVE_PID)
 	ptrace_state_t state;
 	const int slen = sizeof(state);
+#endif
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 
-	if (!regular) {
+	if (!regular && track_event) {
 		atf_tc_expect_fail("PR kern/51630");
 	}
 
@@ -1370,64 +1371,76 @@ fork_test(bool regular)
 
 	validate_status_stopped(status, sigval);
 
-	DPRINTF("Enable PTRACE_%sFORK in EVENT_MASK for the child %d\n",
-	regular ? "" : "V", child);
-	event.pe_set_event = regular ? PTRACE_FORK : PTRACE_VFORK;
+	DPRINTF("%s PTRACE_%sFORK in EVENT_MASK for the child %d\n",
+	track_event ? "Enable" : "Disable", regular ? "" : "V", child);
+	event.pe_set_event = track_event ? (regular ? PTRACE_FORK : PTRACE_VFORK) : 0;
 	SYSCALL_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, , elen) != -1);
 
 	DPRINTF("Before resuming the child process where it left off and "
 	"without signal to be sent\n");
-DPRINTF("We expect two SIGTRAP events, for child %d (TRAP_CHLD, "
-   "pe_report_event=PTRACE_%sFORK, state.pe_other_pid=child2) and "
-   "for child2 (TRAP_CHLD, pe_report_event=PTRACE_%sFORK, "
-   "state.pe_other_pid=child)\n", child, regular ? "" : "V",
-	   regular ? "" : "V");
+	if (track_event) {
+	DPRINTF("We expect two SIGTRAP events, for child %d "
+	"(TRAP_CHLD, pe_report_event=PTRACE_%sFORK, "
+		"state.pe_other_pid=child2) and for child2 "
+	"(TRAP_CHLD, pe_report_event=PTRACE_%sFORK, "
+	"state.pe_other_pid=child)\n", child,
+		regular ? "" : "V", regular ? "" : "V");
+	}
 	SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
 
-	DPRINTF("Before calling %s() for the child %d\n", TWAIT_FNAME, child);
-	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
-
-	validate_status_stopped(status, SIGTRAP);
-
-	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, , slen) != -1);
-	ATF_REQUIRE_EQ(state.pe_report_event,
-	   regular ? PTRACE_FORK : PTRACE_VFORK);
-
-	child2 = state.pe_other_pid;
-	DPRINTF("Reported PTRACE_%sFORK event with forkee %d\n",
-	regular ? "" : "V", child2);
-
-	DPRINTF("Before calling %s() for the forkee %d of the child %d\n",
-	TWAIT_FNAME, child2, child);
-	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, , 0),
-	child2);
-
-	validate_status_stopped(status, SIGTRAP);
-
-	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child2, , slen) != -1);
-	ATF_REQUIRE_EQ(state.pe_report_event,
-	   regular ? PTRACE_FORK : PTRACE_VFORK);
-	ATF_REQUIRE_EQ(state.pe_other_pid, child);
-
-	DPRINTF("Before resuming the forkee process where it left off and "
-	"without signal to be sent\n");
-	SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child2, (void *)1, 0) != -1);
+#if defined(TWAIT_HAVE_PID)
+	if (track_event) {
+		DPRINTF("Before calling %s() for the child %d\n", TWAIT_FNAME,
+		child);
+		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0),
+		  child);
 
-	DPRINTF("Before resuming the child process where it left off and "
-	"without signal to be sent\n");
-	SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+		validate_status_stopped(status, SIGTRAP);
 
-	DPRINTF("Before calling %s() for the forkee - expected exited\n",
-	TWAIT_FNAME);
-	

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Apr 10 00:09:31 UTC 2018

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Merge code in tests: fork1 and vfork1 (ATF t_ptrace_wait*)

Marge bodies of two tests into the same function.
Add few checks for regular fork or not (vfork).

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/tests/lib/libc/sys/t_ptrace_wait.c

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

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Apr 10 00:09:31 UTC 2018

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Merge code in tests: fork1 and vfork1 (ATF t_ptrace_wait*)

Marge bodies of two tests into the same function.
Add few checks for regular fork or not (vfork).

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/tests/lib/libc/sys/t_ptrace_wait.c

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/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.27 src/tests/lib/libc/sys/t_ptrace_wait.c:1.28
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.27	Mon Apr  9 15:45:16 2018
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Tue Apr 10 00:09:31 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.27 2018/04/09 15:45:16 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.28 2018/04/10 00:09:31 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.27 2018/04/09 15:45:16 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.28 2018/04/10 00:09:31 kamil Exp $");
 
 #include 
 #include 
@@ -1322,15 +1322,8 @@ ATF_TC_BODY(eventmask6, tc)
 }
 
 #if defined(TWAIT_HAVE_PID)
-ATF_TC(fork1);
-ATF_TC_HEAD(fork1, tc)
-{
-	atf_tc_set_md_var(tc, "descr",
-	"Verify that fork(2) is intercepted by ptrace(2) with EVENT_MASK "
-	"set to PTRACE_FORK");
-}
-
-ATF_TC_BODY(fork1, tc)
+static void
+fork_test(bool regular)
 {
 	const int exitval = 5;
 	const int exitval2 = 15;
@@ -1344,6 +1337,10 @@ ATF_TC_BODY(fork1, tc)
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 
+	if (!regular) {
+		atf_tc_expect_fail("PR kern/51630");
+	}
+
 	DPRINTF("Before forking process PID=%d\n", getpid());
 	SYSCALL_REQUIRE((child = fork()) != -1);
 	if (child == 0) {
@@ -1353,7 +1350,7 @@ ATF_TC_BODY(fork1, tc)
 		DPRINTF("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 
-		FORKEE_ASSERT((child2 = fork()) != -1);
+		FORKEE_ASSERT((child2 = (regular ? fork() : vfork())) != -1);
 
 		if (child2 == 0)
 			_exit(exitval2);
@@ -1373,16 +1370,18 @@ ATF_TC_BODY(fork1, tc)
 
 	validate_status_stopped(status, sigval);
 
-	DPRINTF("Enable PTRACE_FORK in EVENT_MASK for the child %d\n", child);
-	event.pe_set_event = PTRACE_FORK;
+	DPRINTF("Enable PTRACE_%sFORK in EVENT_MASK for the child %d\n",
+	regular ? "" : "V", child);
+	event.pe_set_event = regular ? PTRACE_FORK : PTRACE_VFORK;
 	SYSCALL_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, , elen) != -1);
 
 	DPRINTF("Before resuming the child process where it left off and "
 	"without signal to be sent\n");
 DPRINTF("We expect two SIGTRAP events, for child %d (TRAP_CHLD, "
-   "pe_report_event=PTRACE_FORK, state.pe_other_pid=child2) and "
-   "for child2 (TRAP_CHLD, pe_report_event=PTRACE_FORK, "
-"state.pe_other_pid=child)\n", child);
+   "pe_report_event=PTRACE_%sFORK, state.pe_other_pid=child2) and "
+   "for child2 (TRAP_CHLD, pe_report_event=PTRACE_%sFORK, "
+   "state.pe_other_pid=child)\n", child, regular ? "" : "V",
+	   regular ? "" : "V");
 	SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
 
 	DPRINTF("Before calling %s() for the child %d\n", TWAIT_FNAME, child);
@@ -1391,10 +1390,12 @@ ATF_TC_BODY(fork1, tc)
 	validate_status_stopped(status, SIGTRAP);
 
 	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, , slen) != -1);
-	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_FORK);
+	ATF_REQUIRE_EQ(state.pe_report_event,
+	   regular ? PTRACE_FORK : PTRACE_VFORK);
 
 	child2 = state.pe_other_pid;
-	DPRINTF("Reported PTRACE_FORK event with forkee %d\n", child2);
+	DPRINTF("Reported PTRACE_%sFORK event with forkee %d\n",
+	regular ? "" : "V", child2);
 
 	DPRINTF("Before calling %s() for the forkee %d of the child %d\n",
 	TWAIT_FNAME, child2, child);
@@ -1404,7 +1405,8 @@ ATF_TC_BODY(fork1, tc)
 	validate_status_stopped(status, SIGTRAP);
 
 	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child2, , slen) != -1);
-	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_FORK);
+	ATF_REQUIRE_EQ(state.pe_report_event,
+	   regular ? PTRACE_FORK : PTRACE_VFORK);
 	ATF_REQUIRE_EQ(state.pe_other_pid, child);
 
 	DPRINTF("Before resuming the forkee process where it left off and "
@@ -1447,6 +1449,20 @@ ATF_TC_BODY(fork1, tc)
 	TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
 }
+
+ATF_TC(fork1);
+ATF_TC_HEAD(fork1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	"Verify that fork(2) is intercepted by ptrace(2) with EVENT_MASK "
+	"set to PTRACE_FORK");
+}
+
+ATF_TC_BODY(fork1, tc)
+{
+
+	fork_test(true);
+}
 #endif
 
 ATF_TC(fork2);
@@ -1538,118 +1554,8 @@ ATF_TC_HEAD(vfork1, tc)
 
 

CVS commit: src/sys/arch/aarch64

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Apr  9 22:26:16 UTC 2018

Modified Files:
src/sys/arch/aarch64/aarch64: bus_space.c
src/sys/arch/aarch64/include: pmap.h

Log Message:
Fix encoding of MMAP flags for generic_bs_mmap


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/aarch64/bus_space.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/include/pmap.h

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

CVS commit: src/sys/arch/aarch64

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Apr  9 22:26:16 UTC 2018

Modified Files:
src/sys/arch/aarch64/aarch64: bus_space.c
src/sys/arch/aarch64/include: pmap.h

Log Message:
Fix encoding of MMAP flags for generic_bs_mmap


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/aarch64/bus_space.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/include/pmap.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/aarch64/aarch64/bus_space.c
diff -u src/sys/arch/aarch64/aarch64/bus_space.c:1.2 src/sys/arch/aarch64/aarch64/bus_space.c:1.3
--- src/sys/arch/aarch64/aarch64/bus_space.c:1.2	Sun Apr  1 04:35:03 2018
+++ src/sys/arch/aarch64/aarch64/bus_space.c	Mon Apr  9 22:26:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.2 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: bus_space.c,v 1.3 2018/04/09 22:26:15 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.2 2018/04/01 04:35:03 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.3 2018/04/09 22:26:15 jmcneill Exp $");
 
 #include 
 #include 
@@ -615,8 +615,12 @@ generic_bs_mmap(void *t, bus_addr_t bpa,
 {
 	paddr_t bus_flags = 0;
 
-	if ((flags & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE)) != 0)
-		bus_flags |= AARCH64_MMAP_WRITEBACK;
+	if ((flags & BUS_SPACE_MAP_CACHEABLE) != 0)
+		bus_flags |= (AARCH64_MMAP_WRITEBACK << AARCH64_MMAP_FLAG_SHIFT);
+	else if ((flags & BUS_SPACE_MAP_PREFETCHABLE) != 0)
+		bus_flags |= (AARCH64_MMAP_WRITECOMBINE << AARCH64_MMAP_FLAG_SHIFT);
+	else
+		bus_flags |= (AARCH64_MMAP_DEVICE << AARCH64_MMAP_FLAG_SHIFT);
 
 	return (atop(bpa + (offset << ((struct bus_space *)t)->bs_stride)) |
 	bus_flags);

Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.2 src/sys/arch/aarch64/include/pmap.h:1.3
--- src/sys/arch/aarch64/include/pmap.h:1.2	Sun Apr  1 04:35:03 2018
+++ src/sys/arch/aarch64/include/pmap.h	Mon Apr  9 22:26:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.2 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: pmap.h,v 1.3 2018/04/09 22:26:16 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -150,10 +150,10 @@ paddr_t pmap_devmap_vtophys(paddr_t);
 /* mmap cookie and flags */
 #define AARCH64_MMAP_FLAG_SHIFT		(64 - PGSHIFT)
 #define AARCH64_MMAP_FLAG_MASK		0xf
-#define AARCH64_MMAP_WRITEBACK		0
-#define AARCH64_MMAP_NOCACHE		1
-#define AARCH64_MMAP_WRITECOMBINE	2
-#define AARCH64_MMAP_DEVICE		3
+#define AARCH64_MMAP_WRITEBACK		0UL
+#define AARCH64_MMAP_NOCACHE		1UL
+#define AARCH64_MMAP_WRITECOMBINE	2UL
+#define AARCH64_MMAP_DEVICE		3UL
 
 #define ARM_MMAP_WRITECOMBINE		AARCH64_MMAP_WRITECOMBINE
 #define ARM_MMAP_WRITEBACK		AARCH64_MMAP_WRITEBACK

CVS commit: src/etc/etc.cobalt

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 20:17:33 UTC 2018

Modified Files:
src/etc/etc.cobalt: MAKEDEV.conf

Log Message:
rename ledpanel to lcdpanel


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/etc/etc.cobalt/MAKEDEV.conf

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

CVS commit: src/etc/etc.cobalt

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 20:17:33 UTC 2018

Modified Files:
src/etc/etc.cobalt: MAKEDEV.conf

Log Message:
rename ledpanel to lcdpanel


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/etc/etc.cobalt/MAKEDEV.conf

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

Modified files:

Index: src/etc/etc.cobalt/MAKEDEV.conf
diff -u src/etc/etc.cobalt/MAKEDEV.conf:1.14 src/etc/etc.cobalt/MAKEDEV.conf:1.15
--- src/etc/etc.cobalt/MAKEDEV.conf:1.14	Mon Apr  9 15:06:34 2018
+++ src/etc/etc.cobalt/MAKEDEV.conf	Mon Apr  9 16:17:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.14 2018/04/09 19:06:34 christos Exp $
+# $NetBSD: MAKEDEV.conf,v 1.15 2018/04/09 20:17:33 christos Exp $
 
 all_md)
 	makedev wd0 wd1 sd0 sd1 sd2 sd3
@@ -13,7 +13,7 @@ all_md)
 	makedev ld0 ld1 ld2 ld3
 	makedev usbs
 	makedev pci0
-	makedev ledpanel
+	makedev lcdpanel
 	makedev altq
 	makedev nsmb
 	;;
@@ -26,8 +26,8 @@ minimal)
 	makedev bpf
 	;;
 
-ledpanel)
-mkdev ledpanel0 c %ledpanel_chr% 0 660
+lcdpanel)
+mkdev lcdpanel0 c %lcdpanel_chr% 0 660
 	;;
 
 

CVS commit: src/sys/arch/cobalt

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 20:16:16 UTC 2018

Modified Files:
src/sys/arch/cobalt/conf: GENERIC INSTALL files.cobalt
src/sys/arch/cobalt/include: cpu.h
Added Files:
src/sys/arch/cobalt/dev: lcdpanel.c
Removed Files:
src/sys/arch/cobalt/dev: panel.c

Log Message:
rename panel to lcdpanel.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/cobalt/conf/files.cobalt
cvs rdiff -u -r0 -r1.1 src/sys/arch/cobalt/dev/lcdpanel.c
cvs rdiff -u -r1.24 -r0 src/sys/arch/cobalt/dev/panel.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/cobalt/include/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/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.157 src/sys/arch/cobalt/conf/GENERIC:1.158
--- src/sys/arch/cobalt/conf/GENERIC:1.157	Mon Apr  9 15:05:26 2018
+++ src/sys/arch/cobalt/conf/GENERIC	Mon Apr  9 16:16:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.157 2018/04/09 19:05:26 christos Exp $
+# $NetBSD: GENERIC,v 1.158 2018/04/09 20:16:16 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.157 $"
+#ident 		"GENERIC-$Revision: 1.158 $"
 
 maxusers	32
 
@@ -146,7 +146,7 @@ zsc0		at mainbus? addr 0x1c80 irq 4
 zstty0		at zsc0 channel 0
 zstty1		at zsc0 channel 1
 
-ledpanel0	at mainbus? addr 0x1f00
+lcdpanel0	at mainbus? addr 0x1f00
 
 gt0 		at mainbus? addr 0x1400
 

Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.66 src/sys/arch/cobalt/conf/INSTALL:1.67
--- src/sys/arch/cobalt/conf/INSTALL:1.66	Mon Apr  9 15:05:26 2018
+++ src/sys/arch/cobalt/conf/INSTALL	Mon Apr  9 16:16:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.66 2018/04/09 19:05:26 christos Exp $
+# $NetBSD: INSTALL,v 1.67 2018/04/09 20:16:16 christos Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.66 $"
+#ident 		"INSTALL-$Revision: 1.67 $"
 
 makeoptions COPTS="-Os -mmemcpy"
 makeoptions	CPUFLAGS="-march=vr5000 -mabi=32"
@@ -135,7 +135,7 @@ zsc0		at mainbus? addr 0x1c80 irq 4
 zstty0		at zsc0 channel 0
 #zstty1		at zsc0 channel 1
 
-ledpanel0	at mainbus? addr 0x1f00
+lcdpanel0	at mainbus? addr 0x1f00
 
 gt0 		at mainbus? addr 0x1400
 

Index: src/sys/arch/cobalt/conf/files.cobalt
diff -u src/sys/arch/cobalt/conf/files.cobalt:1.40 src/sys/arch/cobalt/conf/files.cobalt:1.41
--- src/sys/arch/cobalt/conf/files.cobalt:1.40	Mon Apr  9 15:05:26 2018
+++ src/sys/arch/cobalt/conf/files.cobalt	Mon Apr  9 16:16:16 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.cobalt,v 1.40 2018/04/09 19:05:26 christos Exp $
+#	$NetBSD: files.cobalt,v 1.41 2018/04/09 20:16:16 christos Exp $
 
 maxpartitions 16
 
@@ -31,9 +31,9 @@ device mcclock: mc146818
 attach mcclock at mainbus
 file arch/cobalt/dev/mcclock.c		mcclock		needs-flag
 
-device ledpanel: hd44780
-attach ledpanel at mainbus
-file arch/cobalt/dev/panel.c		ledpanel
+device lcdpanel: hd44780
+attach lcdpanel at mainbus
+file arch/cobalt/dev/lcdpanel.c		lcdpanel
 
 device gt: pcibus
 attach gt at mainbus

Index: src/sys/arch/cobalt/include/cpu.h
diff -u src/sys/arch/cobalt/include/cpu.h:1.15 src/sys/arch/cobalt/include/cpu.h:1.16
--- src/sys/arch/cobalt/include/cpu.h:1.15	Tue May  3 05:15:20 2011
+++ src/sys/arch/cobalt/include/cpu.h	Mon Apr  9 16:16:16 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.15 2011/05/03 09:15:20 tsutsui Exp $	*/
+/*	$NetBSD: cpu.h,v 1.16 2018/04/09 20:16:16 christos Exp $	*/
 
 #ifndef _COBALT_CPU_H_
 #define _COBALT_CPU_H_
@@ -25,7 +25,7 @@ extern u_int cobalt_id;
 #define LED_POWEROFF	3
 #define COM_BASE	0x1c80
 #define ZS_BASE		0x1c80
-#define PANEL_BASE	0x1d00
+#define LCDPANEL_BASE	0x1d00
 #define LCD_BASE	0x1f00
 
 #endif /* !_LOCORE */

Added files:

Index: src/sys/arch/cobalt/dev/lcdpanel.c
diff -u /dev/null src/sys/arch/cobalt/dev/lcdpanel.c:1.1
--- /dev/null	Mon Apr  9 16:16:16 2018
+++ src/sys/arch/cobalt/dev/lcdpanel.c	Mon Apr  9 16:16:16 2018
@@ -0,0 +1,334 @@
+/* $NetBSD: lcdpanel.c,v 1.1 2018/04/09 20:16:16 christos Exp $ */
+
+/*
+ * Copyright (c) 2002 Dennis I. Chernoivanov
+ * 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 

CVS commit: src/sys/arch/cobalt

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 20:16:16 UTC 2018

Modified Files:
src/sys/arch/cobalt/conf: GENERIC INSTALL files.cobalt
src/sys/arch/cobalt/include: cpu.h
Added Files:
src/sys/arch/cobalt/dev: lcdpanel.c
Removed Files:
src/sys/arch/cobalt/dev: panel.c

Log Message:
rename panel to lcdpanel.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/cobalt/conf/files.cobalt
cvs rdiff -u -r0 -r1.1 src/sys/arch/cobalt/dev/lcdpanel.c
cvs rdiff -u -r1.24 -r0 src/sys/arch/cobalt/dev/panel.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/cobalt/include/cpu.h

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

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 20:16:53 UTC 2018

Modified Files:
src/sys/dev: DEVNAMES

Log Message:
rename ledpanel lcdpanel


To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/sys/dev/DEVNAMES

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/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.309 src/sys/dev/DEVNAMES:1.310
--- src/sys/dev/DEVNAMES:1.309	Mon Apr  9 15:11:55 2018
+++ src/sys/dev/DEVNAMES	Mon Apr  9 16:16:53 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: DEVNAMES,v 1.309 2018/04/09 19:11:55 christos Exp $
+#	$NetBSD: DEVNAMES,v 1.310 2018/04/09 20:16:53 christos Exp $
 #
 # This file contains all used device names and defined attributes in
 # alphabetical order. New devices added to the system somewhere should first
@@ -746,6 +746,7 @@ kse			MI
 kue			MI
 lc			MI
 lca			alpha
+lcdpanel		cobalt
 ld			MI
 le			MI
 le24			MI		Attribute
@@ -753,7 +754,6 @@ le32			MI		Attribute
 le_dec_subr		MI		Attribute
 lebuffer		MI
 ledma			MI
-ledpanel		cobalt
 leo			atari
 lfmiop			MI
 lii			MI

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 20:16:53 UTC 2018

Modified Files:
src/sys/dev: DEVNAMES

Log Message:
rename ledpanel lcdpanel


To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/sys/dev/DEVNAMES

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

CVS commit: src/sys/arch/sgimips/hpc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 20:07:22 UTC 2018

Modified Files:
src/sys/arch/sgimips/hpc: files.hpc
Added Files:
src/sys/arch/sgimips/hpc: button.c
Removed Files:
src/sys/arch/sgimips/hpc: panel.c

Log Message:
rename panel to button.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/sgimips/hpc/button.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sgimips/hpc/files.hpc
cvs rdiff -u -r1.3 -r0 src/sys/arch/sgimips/hpc/panel.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/sgimips/hpc/files.hpc
diff -u src/sys/arch/sgimips/hpc/files.hpc:1.15 src/sys/arch/sgimips/hpc/files.hpc:1.16
--- src/sys/arch/sgimips/hpc/files.hpc:1.15	Mon Apr  9 15:11:38 2018
+++ src/sys/arch/sgimips/hpc/files.hpc	Mon Apr  9 16:07:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpc,v 1.15 2018/04/09 19:11:38 christos Exp $
+# $NetBSD: files.hpc,v 1.16 2018/04/09 20:07:22 christos Exp $
 
 device	sq: arp, ether, ifnet
 attach	sq at hpc
@@ -27,4 +27,4 @@ file	arch/sgimips/hpc/pi1ppc.c	pi1ppc
 
 device	button : sysmon_power, sysmon_taskq
 attach	button at hpc
-file	arch/sgimips/hpc/panel.c	button
+file	arch/sgimips/hpc/button.c	button

Added files:

Index: src/sys/arch/sgimips/hpc/button.c
diff -u /dev/null src/sys/arch/sgimips/hpc/button.c:1.1
--- /dev/null	Mon Apr  9 16:07:22 2018
+++ src/sys/arch/sgimips/hpc/button.c	Mon Apr  9 16:07:22 2018
@@ -0,0 +1,154 @@
+/*	$NetBSD: button.c,v 1.1 2018/04/09 20:07:22 christos Exp $ */
+
+/*-
+ * Copyright (c) 2009 Michael Lorenz
+ * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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: button.c,v 1.1 2018/04/09 20:07:22 christos Exp $");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+struct button_softc {
+	device_t sc_dev;
+	struct sysmon_pswitch sc_pbutton;
+	bus_space_tag_t sc_tag;
+	bus_space_handle_t sc_hreg;
+	int sc_last, sc_fired;
+};
+
+static int button_match(device_t, cfdata_t, void *);
+static void button_attach(device_t, device_t, void *);
+
+static int button_intr(void *);
+static void button_powerbutton(void *);
+
+CFATTACH_DECL_NEW(button, sizeof(struct button_softc), 
+button_match, 
+button_attach, 
+NULL, 
+NULL);
+
+static int
+button_match(device_t parent, cfdata_t match, void *aux)
+{
+	struct hpc_attach_args *ha = aux;
+
+	if (strcmp(ha->ha_name, match->cf_name) != 0)
+		return 0;
+
+	if (mach_type == MACH_SGI_IP22)
+		return 1;
+
+	return 0;
+}
+
+static void
+button_attach(device_t parent, device_t self, void *aux)
+{
+	struct button_softc *sc;
+	struct hpc_attach_args *haa;
+
+	sc = device_private(self);
+	sc->sc_dev = self;
+	haa = aux;
+	sc->sc_tag = haa->ha_st;
+	sc->sc_fired = 0;
+	
+	aprint_normal("\n");
+	if (bus_space_subregion(haa->ha_st, haa->ha_sh, haa->ha_devoff,
+			0x4, 		/* just a single register */
+			>sc_hreg)) {
+		aprint_error(": unable to map button register\n");
+		return;
+	}
+
+	if ((cpu_intr_establish(haa->ha_irq, IPL_BIO,
+	 button_intr, sc)) == NULL) {
+		printf(": unable to establish interrupt!\n");
+		return;
+	}
+
+	sc->sc_last = 0;
+
+	sysmon_task_queue_init();
+	memset(>sc_pbutton, 0, sizeof(struct sysmon_pswitch));
+	sc->sc_pbutton.smpsw_name = device_xname(sc->sc_dev);
+	sc->sc_pbutton.smpsw_type = PSWITCH_TYPE_POWER;
+	if (sysmon_pswitch_register(>sc_pbutton) != 0)
+		aprint_error_dev(sc->sc_dev,
+		"unable to register power button with sysmon\n");
+	pmf_device_register(self, NULL, NULL);
+}
+

CVS commit: src/sys/arch/sgimips/hpc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 20:07:22 UTC 2018

Modified Files:
src/sys/arch/sgimips/hpc: files.hpc
Added Files:
src/sys/arch/sgimips/hpc: button.c
Removed Files:
src/sys/arch/sgimips/hpc: panel.c

Log Message:
rename panel to button.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/sgimips/hpc/button.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sgimips/hpc/files.hpc
cvs rdiff -u -r1.3 -r0 src/sys/arch/sgimips/hpc/panel.c

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

CVS commit: src/external/bsd/ntp/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:33:14 UTC 2018

Modified Files:
src/external/bsd/ntp/include: config.h

Log Message:
sun2 does not have stdatomic.h


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/ntp/include/config.h

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

CVS commit: src/external/bsd/ntp/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:33:14 UTC 2018

Modified Files:
src/external/bsd/ntp/include: config.h

Log Message:
sun2 does not have stdatomic.h


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/ntp/include/config.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/ntp/include/config.h
diff -u src/external/bsd/ntp/include/config.h:1.20 src/external/bsd/ntp/include/config.h:1.21
--- src/external/bsd/ntp/include/config.h:1.20	Fri Apr  6 20:19:54 2018
+++ src/external/bsd/ntp/include/config.h	Mon Apr  9 15:33:14 2018
@@ -839,8 +839,11 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDARG_H 1
 
+/* sun2 does not have atomics */
+#ifndef __mc68010__
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDATOMIC_H 1
+#endif
 
 /* Define to 1 if stdbool.h conforms to C99. */
 #define HAVE_STDBOOL_H 1

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:11:55 UTC 2018

Modified Files:
src/sys/dev: DEVNAMES

Log Message:
add button use by sgimips


To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/sys/dev/DEVNAMES

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/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.308 src/sys/dev/DEVNAMES:1.309
--- src/sys/dev/DEVNAMES:1.308	Mon Apr  9 15:06:18 2018
+++ src/sys/dev/DEVNAMES	Mon Apr  9 15:11:55 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: DEVNAMES,v 1.308 2018/04/09 19:06:18 christos Exp $
+#	$NetBSD: DEVNAMES,v 1.309 2018/04/09 19:11:55 christos Exp $
 #
 # This file contains all used device names and defined attributes in
 # alphabetical order. New devices added to the system somewhere should first
@@ -203,6 +203,7 @@ btuart			MI
 btvmei			MI
 btvmeii			MI
 button			hpcmips
+button			sgimips
 bwtwo			sparc
 bwtwo			sparc64
 bwtwo			sun2

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:11:55 UTC 2018

Modified Files:
src/sys/dev: DEVNAMES

Log Message:
add button use by sgimips


To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/sys/dev/DEVNAMES

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

CVS commit: src/sys/arch/sgimips

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:11:38 UTC 2018

Modified Files:
src/sys/arch/sgimips/conf: GENERIC32_IP2x
src/sys/arch/sgimips/hpc: files.hpc

Log Message:
rename "panel" to "button" to avoid conflict with fdt


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sgimips/hpc/files.hpc

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/sgimips/conf/GENERIC32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.112 src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.113
--- src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.112	Tue Jan 23 09:47:56 2018
+++ src/sys/arch/sgimips/conf/GENERIC32_IP2x	Mon Apr  9 15:11:38 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP2x,v 1.112 2018/01/23 14:47:56 sevan Exp $
+#	$NetBSD: GENERIC32_IP2x,v 1.113 2018/04/09 19:11:38 christos Exp $
 #
 # GENERIC32_IP2x machine description file
 # 
@@ -29,7 +29,7 @@ makeoptions	TEXTADDR=0x88069000	# entry 
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32-IP2x-$Revision: 1.112 $"
+#ident		"GENERIC32-IP2x-$Revision: 1.113 $"
 
 maxusers	32
 
@@ -238,7 +238,7 @@ tlphy*		at mii? phy ?		 # ThunderLAN PHY
 sq* 		at hpc? offset ?	# On-board ethernet / E++ adapter
 wdsc* 		at hpc? offset ?	# On-board SCSI / GIO32 SCSI adapter
 haltwo* at hpc0 offset ?	# IP22 / 24
-panel*		at hpc0 offset ?	# front panel buttons on Indy
+button*		at hpc0 offset ?	# front panel buttons on Indy
 pckbc*		at hpc0 offset ?
 
 pckbd*  	at pckbc?

Index: src/sys/arch/sgimips/hpc/files.hpc
diff -u src/sys/arch/sgimips/hpc/files.hpc:1.14 src/sys/arch/sgimips/hpc/files.hpc:1.15
--- src/sys/arch/sgimips/hpc/files.hpc:1.14	Wed May 13 21:10:19 2009
+++ src/sys/arch/sgimips/hpc/files.hpc	Mon Apr  9 15:11:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpc,v 1.14 2009/05/14 01:10:19 macallan Exp $
+# $NetBSD: files.hpc,v 1.15 2018/04/09 19:11:38 christos Exp $
 
 device	sq: arp, ether, ifnet
 attach	sq at hpc
@@ -25,6 +25,6 @@ device	pi1ppc: parport 
 attach	pi1ppc at hpc
 file	arch/sgimips/hpc/pi1ppc.c	pi1ppc
 
-device	panel : sysmon_power, sysmon_taskq
-attach	panel at hpc
-file	arch/sgimips/hpc/panel.c	panel
+device	button : sysmon_power, sysmon_taskq
+attach	button at hpc
+file	arch/sgimips/hpc/panel.c	button

CVS commit: src/sys/arch/sgimips

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:11:38 UTC 2018

Modified Files:
src/sys/arch/sgimips/conf: GENERIC32_IP2x
src/sys/arch/sgimips/hpc: files.hpc

Log Message:
rename "panel" to "button" to avoid conflict with fdt


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sgimips/hpc/files.hpc

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

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:06:18 UTC 2018

Modified Files:
src/sys/dev: DEVNAMES

Log Message:
rename cobalt panel to ledpanel


To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/sys/dev/DEVNAMES

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

CVS commit: src/etc/etc.cobalt

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:06:34 UTC 2018

Modified Files:
src/etc/etc.cobalt: MAKEDEV.conf

Log Message:
rename panel to ledpanel


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/etc/etc.cobalt/MAKEDEV.conf

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

CVS commit: src/sys/arch/cobalt/conf

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:05:26 UTC 2018

Modified Files:
src/sys/arch/cobalt/conf: GENERIC INSTALL files.cobalt

Log Message:
rename the cobalt panel to ledpanel to avoid conflict with fdt.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/cobalt/conf/files.cobalt

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/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.156 src/sys/arch/cobalt/conf/GENERIC:1.157
--- src/sys/arch/cobalt/conf/GENERIC:1.156	Tue Jan 23 09:47:54 2018
+++ src/sys/arch/cobalt/conf/GENERIC	Mon Apr  9 15:05:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.156 2018/01/23 14:47:54 sevan Exp $
+# $NetBSD: GENERIC,v 1.157 2018/04/09 19:05:26 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.156 $"
+#ident 		"GENERIC-$Revision: 1.157 $"
 
 maxusers	32
 
@@ -146,7 +146,7 @@ zsc0		at mainbus? addr 0x1c80 irq 4
 zstty0		at zsc0 channel 0
 zstty1		at zsc0 channel 1
 
-panel0 		at mainbus? addr 0x1f00
+ledpanel0	at mainbus? addr 0x1f00
 
 gt0 		at mainbus? addr 0x1400
 

Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.65 src/sys/arch/cobalt/conf/INSTALL:1.66
--- src/sys/arch/cobalt/conf/INSTALL:1.65	Tue Jan 23 09:47:54 2018
+++ src/sys/arch/cobalt/conf/INSTALL	Mon Apr  9 15:05:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.65 2018/01/23 14:47:54 sevan Exp $
+# $NetBSD: INSTALL,v 1.66 2018/04/09 19:05:26 christos Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.65 $"
+#ident 		"INSTALL-$Revision: 1.66 $"
 
 makeoptions COPTS="-Os -mmemcpy"
 makeoptions	CPUFLAGS="-march=vr5000 -mabi=32"
@@ -135,7 +135,7 @@ zsc0		at mainbus? addr 0x1c80 irq 4
 zstty0		at zsc0 channel 0
 #zstty1		at zsc0 channel 1
 
-panel0 		at mainbus? addr 0x1f00
+ledpanel0	at mainbus? addr 0x1f00
 
 gt0 		at mainbus? addr 0x1400
 

Index: src/sys/arch/cobalt/conf/files.cobalt
diff -u src/sys/arch/cobalt/conf/files.cobalt:1.39 src/sys/arch/cobalt/conf/files.cobalt:1.40
--- src/sys/arch/cobalt/conf/files.cobalt:1.39	Sat Jan 20 08:56:09 2018
+++ src/sys/arch/cobalt/conf/files.cobalt	Mon Apr  9 15:05:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.cobalt,v 1.39 2018/01/20 13:56:09 skrll Exp $
+#	$NetBSD: files.cobalt,v 1.40 2018/04/09 19:05:26 christos Exp $
 
 maxpartitions 16
 
@@ -31,9 +31,9 @@ device mcclock: mc146818
 attach mcclock at mainbus
 file arch/cobalt/dev/mcclock.c		mcclock		needs-flag
 
-device panel: hd44780
-attach panel at mainbus
-file arch/cobalt/dev/panel.c		panel
+device ledpanel: hd44780
+attach ledpanel at mainbus
+file arch/cobalt/dev/panel.c		ledpanel
 
 device gt: pcibus
 attach gt at mainbus

CVS commit: src/etc/etc.cobalt

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:06:34 UTC 2018

Modified Files:
src/etc/etc.cobalt: MAKEDEV.conf

Log Message:
rename panel to ledpanel


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/etc/etc.cobalt/MAKEDEV.conf

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

Modified files:

Index: src/etc/etc.cobalt/MAKEDEV.conf
diff -u src/etc/etc.cobalt/MAKEDEV.conf:1.13 src/etc/etc.cobalt/MAKEDEV.conf:1.14
--- src/etc/etc.cobalt/MAKEDEV.conf:1.13	Thu Dec  8 06:31:13 2016
+++ src/etc/etc.cobalt/MAKEDEV.conf	Mon Apr  9 15:06:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.13 2016/12/08 11:31:13 nat Exp $
+# $NetBSD: MAKEDEV.conf,v 1.14 2018/04/09 19:06:34 christos Exp $
 
 all_md)
 	makedev wd0 wd1 sd0 sd1 sd2 sd3
@@ -13,7 +13,7 @@ all_md)
 	makedev ld0 ld1 ld2 ld3
 	makedev usbs
 	makedev pci0
-	makedev panel
+	makedev ledpanel
 	makedev altq
 	makedev nsmb
 	;;
@@ -26,6 +26,11 @@ minimal)
 	makedev bpf
 	;;
 
+ledpanel)
+mkdev ledpanel0 c %ledpanel_chr% 0 660
+	;;
+
+
 tty[0-9]|tty0[0-9])
 	# MI MAKEDEV.tmpl will create ttyZ? node and compat symlink
 	# tty0? -> ttyZ? for these targets if we have zstty.

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:06:18 UTC 2018

Modified Files:
src/sys/dev: DEVNAMES

Log Message:
rename cobalt panel to ledpanel


To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/sys/dev/DEVNAMES

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/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.307 src/sys/dev/DEVNAMES:1.308
--- src/sys/dev/DEVNAMES:1.307	Fri Mar  2 01:04:16 2018
+++ src/sys/dev/DEVNAMES	Mon Apr  9 15:06:18 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: DEVNAMES,v 1.307 2018/03/02 06:04:16 pgoyette Exp $
+#	$NetBSD: DEVNAMES,v 1.308 2018/04/09 19:06:18 christos Exp $
 #
 # This file contains all used device names and defined attributes in
 # alphabetical order. New devices added to the system somewhere should first
@@ -752,6 +752,7 @@ le32			MI		Attribute
 le_dec_subr		MI		Attribute
 lebuffer		MI
 ledma			MI
+ledpanel		cobalt
 leo			atari
 lfmiop			MI
 lii			MI
@@ -1021,7 +1022,7 @@ p5membar		amiga
 p5membar		amigappc
 p5pb			amiga
 p5pb			amigappc
-panel			cobalt
+panel			MI
 pad			MI
 par			amiga
 par			amigappc

CVS commit: src/sys/arch/cobalt/conf

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 19:05:26 UTC 2018

Modified Files:
src/sys/arch/cobalt/conf: GENERIC INSTALL files.cobalt

Log Message:
rename the cobalt panel to ledpanel to avoid conflict with fdt.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/cobalt/conf/files.cobalt

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

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:23:33 UTC 2018

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

Log Message:
Tickets #709, #707, #714, #715, #716, #717, #723


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.172 -r1.1.2.173 src/doc/CHANGES-8.0

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.172 src/doc/CHANGES-8.0:1.1.2.173
--- src/doc/CHANGES-8.0:1.1.2.172	Mon Apr  9 16:41:35 2018
+++ src/doc/CHANGES-8.0	Mon Apr  9 18:23:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.172 2018/04/09 16:41:35 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.173 2018/04/09 18:23:33 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -11080,3 +11080,113 @@ sys/dev/iscsi/iscsi_send.c			1.37 via pa
 	sanity check and iscsi improve error handling
 	[mlelstv, ticket #709]
 
+external/bsd/dhcpcd/dist/configure  up to 1.1.1.7
+external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant up to 1.1.1.2
+external/bsd/dhcpcd/dist/hooks/15-timezone  up to 1.1.1.2
+external/bsd/dhcpcd/dist/hooks/20-resolv.conf   up to 1.1.1.2
+external/bsd/dhcpcd/dist/hooks/29-lookup-hostname up to 1.1.1.2
+external/bsd/dhcpcd/dist/hooks/30-hostname  up to 1.1.1.2
+external/bsd/dhcpcd/dist/hooks/50-ntp.conf  up to 1.1.1.2
+external/bsd/dhcpcd/dist/hooks/50-yp.conf   up to 1.1.1.2
+external/bsd/dhcpcd/dist/hooks/50-ypbind.in up to 1.1.1.2
+external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in up to 1.1.1.4
+external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in up to 1.1.1.4
+external/bsd/dhcpcd/dist/src/arp.c  up to 1.1.1.6
+external/bsd/dhcpcd/dist/src/common.h   up to 1.1.1.4
+external/bsd/dhcpcd/dist/src/defs.h up to 1.1.1.11
+external/bsd/dhcpcd/dist/src/dhcp.c up to 1.9
+external/bsd/dhcpcd/dist/src/dhcp.h up to 1.1.1.5
+external/bsd/dhcpcd/dist/src/dhcp6.cup to 1.1.1.10
+external/bsd/dhcpcd/dist/src/dhcp6.hup to 1.1.1.4
+external/bsd/dhcpcd/dist/src/dhcpcd.8.inup to 1.1.1.8
+external/bsd/dhcpcd/dist/src/dhcpcd.c   up to 1.10
+external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in   up to 1.1.1.7
+external/bsd/dhcpcd/dist/src/dhcpcd.h   up to 1.1.1.5
+external/bsd/dhcpcd/dist/src/if-bsd.c   up to 1.1.1.7
+external/bsd/dhcpcd/dist/src/if-linux.c up to 1.1.1.8
+external/bsd/dhcpcd/dist/src/if-options.c   up to 1.8
+external/bsd/dhcpcd/dist/src/if-options.h   up to 1.1.1.7
+external/bsd/dhcpcd/dist/src/if-sun.c   up to 1.1.1.4
+external/bsd/dhcpcd/dist/src/if.c   up to 1.1.1.8
+external/bsd/dhcpcd/dist/src/if.h   up to 1.1.1.5
+external/bsd/dhcpcd/dist/src/ipv4.c up to 1.1.1.9
+external/bsd/dhcpcd/dist/src/ipv4.h up to 1.1.1.4
+external/bsd/dhcpcd/dist/src/ipv6.c up to 1.1.1.8
+external/bsd/dhcpcd/dist/src/ipv6.h up to 1.1.1.6
+external/bsd/dhcpcd/dist/src/ipv6nd.c   up to 1.1.1.7
+external/bsd/dhcpcd/dist/src/ipv6nd.h   up to 1.1.1.5
+external/bsd/dhcpcd/dist/src/logerr.h   up to 1.1.1.3
+external/bsd/dhcpcd/dist/src/route.cup to 1.1.1.6
+external/bsd/dhcpcd/dist/src/route.hup to 1.1.1.4
+external/bsd/dhcpcd/dist/src/dev/udev.c up to 1.1.1.2
+external/bsd/dhcpcd/dist/tests/eloop-bench/eloop-bench.c up to 1.1.1.3
+external/bsd/dhcpcd/include/config.hup to 1.3
+external/bsd/dhcpcd/sbin/dhcpcd/Makefileup to 1.43
+
+	Import dhcpcd-7.0.3
+	[roy, ticket #707]
+
+sys/net/if_ipsec.c1.8-1.11
+sys/netipsec/ipsecif.c1.6,1.7
+sys/netipsec/ipsecif.h1.2
+
+	- Fix ipsecif(4) enacap_lock leak.
+	- Fix ipsecif(4) unmatched curlwp_bind.
+	- Fix ipsecif(4) stack overflow.
+	- Add IPv4 ID when the ipsecif(4) packet can be fragmented.
+	- Support ipsecif(4) over IPv6 is changed port number only.
+	[knakahara, ticket #714]
+
+sys/arch/x86/include/cacheinfo.h		1.24-1.26
+usr.sbin/cpuctl/arch/i386.c			1.81-1.84
+
+	- Parse the TLB info from `cpuid leaf 18H' on Intel processor.
+	- Use aprint_error_dev() for error output.
+	- Add yet another Shared L2 TLB (2M/4M pages).
+	- Add 3way and 6way of L2 cache or TLB on AMD CPU.
+	- AMD L3 cache association bitfield is not 8bit but 4bit like others
+	  association bitfields.
+	- Add Xeon Phi 7215, 7285 and 7295
+	- Add Coffee Lake
+	[msaitoh, ticket #715]
+
+sys/dev/DEVNAMES1.300
+
+	Add ixg and ixv.
+	[msaitoh, ticket #716]
+
+sys/arch/x86/x86/cpu_topology.c			1.11-1.13
+
+	Check for undefined behaviour when doing right-shift.
+	CPUID tells the ApicIdCoreIdSize in bits.
+	Compute Core/SMT-IDs for AMD family 17h (Ryzen).
+	[msaitoh, ticket #717]
+
+sys/dev/pci/pcidevs1.1302-1.1307,1.1309-1.1322,
+		1.1324-1.1326
+sys/dev/pci/pcidevs.h(regen)

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:23:33 UTC 2018

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

Log Message:
Tickets #709, #707, #714, #715, #716, #717, #723


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.172 -r1.1.2.173 src/doc/CHANGES-8.0

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

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:20:18 UTC 2018

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

Log Message:
Regen (ticket #723)


To generate a diff of this commit:
cvs rdiff -u -r1.1281.2.3 -r1.1281.2.4 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1280.2.3 -r1.1280.2.4 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.

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:20:18 UTC 2018

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

Log Message:
Regen (ticket #723)


To generate a diff of this commit:
cvs rdiff -u -r1.1281.2.3 -r1.1281.2.4 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1280.2.3 -r1.1280.2.4 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-8] src/sys/dev/pci

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:18:49 UTC 2018

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

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #723):
sys/dev/pci/pcidevs: revision 1.1314
sys/dev/pci/pcidevs: revision 1.1315
sys/dev/pci/pcidevs: revision 1.1316
sys/dev/pci/pcidevs: revision 1.1317
sys/dev/pci/pcidevs: revision 1.1318
sys/dev/pci/pcidevs: revision 1.1302
sys/dev/pci/pcidevs: revision 1.1303
sys/dev/pci/pcidevs: revision 1.1304
sys/dev/pci/pcidevs: revision 1.1305
sys/dev/pci/pcidevs: revision 1.1306
sys/dev/pci/pcidevs: revision 1.1307
sys/dev/pci/pcidevs: revision 1.1309
sys/dev/pci/pcidevs: revision 1.1320
sys/dev/pci/pcidevs: revision 1.1321
sys/dev/pci/pcidevs: revision 1.1322
sys/dev/pci/pcidevs: revision 1.1324
sys/dev/pci/pcidevs: revision 1.1325
sys/dev/pci/pcidevs: revision 1.1326
sys/dev/pci/pcidevs: revision 1.1310
sys/dev/pci/pcidevs: revision 1.1311
sys/dev/pci/pcidevs: revision 1.1312
sys/dev/pci/pcidevs: revision 1.1313

 Add some Chelsio devices.
- s/MMC/eMMC/ for Intel 0x0f14 (Bay Trail)
- Add Atom E3800 (Bay Trail) eMMC 4.5

 Add Intel Apollo Lake devices.

Add the GeForce4 MX440 Go, as found on the 17" flat panel G4 iMac (PowerMac4,5).
Thanks to Jasper Wallace  for the loan of the 
hardware.

Add Nvidia GeForce FX Go5200, as found in the PowerBook6,4

Add Marvell Yukon 88E8040T

grammar

 Add some ServerEngines (Emulex) products from OpenBSD.
 Add some Intel Ethernet devices.
 Add C620 devices.
 Fix C62x9 sSATA Controller (RAID) device ID.

s/C62x9/C62x/

 Add some Xeon E5 (v1) and E5 v2 devices.

Add AMD KERNCZ chipset for Zen processors.

 Add Intel Gemini Lake devices.
apply some updates and recommended corrections to pcidevs descriptions
PR kern/45733 by Greg A.Woods

 Intel 0x15c4 is SFI based and 0x15ce is KR based.

Add Intel Wireless AC 9260.

 Add two VIA xHCI devices from OpenBSD.

 Add Intel X299 and Z370 LPC.

 Add Intel Coffee Lake internal graphics devices. From ark.intel.com.

 Add Intel 300 series devices.


To generate a diff of this commit:
cvs rdiff -u -r1.1289.2.3 -r1.1289.2.4 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.1289.2.3 src/sys/dev/pci/pcidevs:1.1289.2.4
--- src/sys/dev/pci/pcidevs:1.1289.2.3	Thu Mar  8 14:31:18 2018
+++ src/sys/dev/pci/pcidevs	Mon Apr  9 18:18:49 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1289.2.3 2018/03/08 14:31:18 martin Exp $
+$NetBSD: pcidevs,v 1.1289.2.4 2018/04/09 18:18:49 martin Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -449,7 +449,7 @@ vendor MINDSHARE	0x119a	Mind Share
 vendor OMEGA		0x119b	Omega Micro
 vendor ITI		0x119c	Information Technology Institute
 vendor BUG		0x119d	Bug Sapporo
-vendor FUJITSU3		0x119e	Fujitsu (3th PCI Vendor ID)
+vendor FUJITSU3		0x119e	Fujitsu (3rd PCI Vendor ID)
 vendor BULL		0x119f	Bull Hn Information Systems
 vendor CONVEX		0x11a0	Convex Computer
 vendor HAMAMATSU	0x11a1	Hamamatsu Photonics
@@ -632,6 +632,7 @@ vendor RENESAS		0x1912	Renesas Technolog
 vendor FREESCALE	0x1957	Freescale Semiconductor
 vendor ATTANSIC		0x1969	Attansic Technologies
 vendor JMICRON		0x197b	JMicron Technology
+vendor SERVERENGINES	0x19a2	ServerEngines
 vendor HUAWEI		0x19e5	Huaewi Technology
 vendor ASPEED		0x1a03	ASPEED Technology
 vendor AWT		0x1a3b	AWT
@@ -1114,6 +1115,7 @@ product AMD HUDSON_PCI		0x780f	Hudson PC
 product AMD HUDSON_XHCI		0x7812	Hudson USB xHCI Controller
 product AMD FCH_SDHC		0x7813	FCH SD Flash Controller
 product AMD FCH_XHCI		0x7814	FCH USB xHCI Controller
+product AMD KERNCZ_SMB		0x790b	X370/X399 SMBus Controller
 product AMD RS780_HB		0x9600	RS780 Host Bridge
 product AMD RS880_HB		0x9601	RS785/RS880 Host Bridge
 product AMD RS780_PPB_GFX	0x9602	RS780/RS880 PCI-PCI Bridge (int gfx)
@@ -1920,6 +1922,7 @@ product C4T GPPCI		0x6773	GPPCI
 product CAVIUM NITROX		0x0001	Nitrox XL
 
 /* Chelsio products */
+product CHELSIO PE9000		0x0020	PE9000 10GbE
 product CHELSIO T302E		0x0021	T302e
 product CHELSIO	T310E		0x0022	T310e
 product CHELSIO	T320X		0x0023	T320x
@@ -1929,6 +1932,57 @@ product CHELSIO	T310X		0x0026	T310x
 product CHELSIO	T3B10		0x0030	T3B10
 product CHELSIO	T3B20		0x0031	T3B20
 product CHELSIO	T3B02		0x0032	T3B02
+product CHELSIO	T3B04		0x0033	T3B04
+product CHELSIO	T3C10		0x0035	T3C10
+product CHELSIO	S320E_CR	0x0036	S320E-CR
+product CHELSIO	N320E_G2	0x0037	N320E-G2
+product CHELSIO	T440_DBG	0x4400	T440-dbg
+product CHELSIO	T420_CR		0x4401	T420-CR
+product CHELSIO	T422_CR		0x4402	T422-CR
+product CHELSIO	T440_CR		0x4403	T440-CR
+product CHELSIO	T420_BCH	0x4404	T420-BCH
+product CHELSIO	T440_BCH	0x4405	T440-BCH
+product 

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:18:49 UTC 2018

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

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #723):
sys/dev/pci/pcidevs: revision 1.1314
sys/dev/pci/pcidevs: revision 1.1315
sys/dev/pci/pcidevs: revision 1.1316
sys/dev/pci/pcidevs: revision 1.1317
sys/dev/pci/pcidevs: revision 1.1318
sys/dev/pci/pcidevs: revision 1.1302
sys/dev/pci/pcidevs: revision 1.1303
sys/dev/pci/pcidevs: revision 1.1304
sys/dev/pci/pcidevs: revision 1.1305
sys/dev/pci/pcidevs: revision 1.1306
sys/dev/pci/pcidevs: revision 1.1307
sys/dev/pci/pcidevs: revision 1.1309
sys/dev/pci/pcidevs: revision 1.1320
sys/dev/pci/pcidevs: revision 1.1321
sys/dev/pci/pcidevs: revision 1.1322
sys/dev/pci/pcidevs: revision 1.1324
sys/dev/pci/pcidevs: revision 1.1325
sys/dev/pci/pcidevs: revision 1.1326
sys/dev/pci/pcidevs: revision 1.1310
sys/dev/pci/pcidevs: revision 1.1311
sys/dev/pci/pcidevs: revision 1.1312
sys/dev/pci/pcidevs: revision 1.1313

 Add some Chelsio devices.
- s/MMC/eMMC/ for Intel 0x0f14 (Bay Trail)
- Add Atom E3800 (Bay Trail) eMMC 4.5

 Add Intel Apollo Lake devices.

Add the GeForce4 MX440 Go, as found on the 17" flat panel G4 iMac (PowerMac4,5).
Thanks to Jasper Wallace  for the loan of the 
hardware.

Add Nvidia GeForce FX Go5200, as found in the PowerBook6,4

Add Marvell Yukon 88E8040T

grammar

 Add some ServerEngines (Emulex) products from OpenBSD.
 Add some Intel Ethernet devices.
 Add C620 devices.
 Fix C62x9 sSATA Controller (RAID) device ID.

s/C62x9/C62x/

 Add some Xeon E5 (v1) and E5 v2 devices.

Add AMD KERNCZ chipset for Zen processors.

 Add Intel Gemini Lake devices.
apply some updates and recommended corrections to pcidevs descriptions
PR kern/45733 by Greg A.Woods

 Intel 0x15c4 is SFI based and 0x15ce is KR based.

Add Intel Wireless AC 9260.

 Add two VIA xHCI devices from OpenBSD.

 Add Intel X299 and Z370 LPC.

 Add Intel Coffee Lake internal graphics devices. From ark.intel.com.

 Add Intel 300 series devices.


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

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

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:12:50 UTC 2018

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

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

sys/arch/x86/x86/cpu_topology.c: revision 1.11-1.13

Check for undefined behaviour when doing right-shift.

CPUID tells the ApicIdCoreIdSize in bits.

Compute Core/SMT-IDs for AMD family 17h (Ryzen).


To generate a diff of this commit:
cvs rdiff -u -r1.9.22.1 -r1.9.22.2 src/sys/arch/x86/x86/cpu_topology.c

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

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:12:50 UTC 2018

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

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

sys/arch/x86/x86/cpu_topology.c: revision 1.11-1.13

Check for undefined behaviour when doing right-shift.

CPUID tells the ApicIdCoreIdSize in bits.

Compute Core/SMT-IDs for AMD family 17h (Ryzen).


To generate a diff of this commit:
cvs rdiff -u -r1.9.22.1 -r1.9.22.2 src/sys/arch/x86/x86/cpu_topology.c

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

Modified files:

Index: src/sys/arch/x86/x86/cpu_topology.c
diff -u src/sys/arch/x86/x86/cpu_topology.c:1.9.22.1 src/sys/arch/x86/x86/cpu_topology.c:1.9.22.2
--- src/sys/arch/x86/x86/cpu_topology.c:1.9.22.1	Tue Nov 21 15:03:20 2017
+++ src/sys/arch/x86/x86/cpu_topology.c	Mon Apr  9 18:12:50 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_topology.c,v 1.9.22.1 2017/11/21 15:03:20 martin Exp $	*/
+/*	$NetBSD: cpu_topology.c,v 1.9.22.2 2018/04/09 18:12:50 martin Exp $	*/
 
 /*-
  * Copyright (c) 2009 Mindaugas Rasiukevicius ,
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.9.22.1 2017/11/21 15:03:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.9.22.2 2018/04/09 18:12:50 martin Exp $");
 
 #include 
 #include 
@@ -108,6 +108,7 @@ x86_cpu_topology(struct cpu_info *ci)
 			core_max = lp_max;
 			break;
 		}
+
 		/* Number of Cores (NC) per package (ecx[7:0]). */
 		x86_cpuid(0x8008, descs);
 		core_max = (descs[2] & 0xff) + 1;
@@ -116,9 +117,9 @@ x86_cpu_topology(struct cpu_info *ci)
 		if (n != 0) {
 			/*
 			 * Extended Method.
-			 * core_bits = 2 ^ n (power of two)
+			 * core_max = 2 ^ n (power of two)
 			 */
-			core_bits = 1 << n;
+			core_bits = n;
 		}
 		break;
 	default:
@@ -150,8 +151,21 @@ x86_cpu_topology(struct cpu_info *ci)
 		}
 	}
 
+	/* Family 0x17 supports SMT */
+	if (cpu_vendor == CPUVENDOR_AMD && cpu_family == 0x17) { /* XXX */
+		x86_cpuid(0x801e, descs);
+		const u_int threads = ((descs[1] >> 8) & 0xff) + 1;
+
+		KASSERT(smt_bits == 0 && smt_bits <= core_bits);
+		smt_bits = ilog2(threads);
+		core_bits -= smt_bits;
+	}
+
 	if (smt_bits + core_bits) {
-		ci->ci_package_id = apic_id >> (smt_bits + core_bits);
+		if (smt_bits + core_bits < sizeof(apic_id) * NBBY)
+			ci->ci_package_id = apic_id >> (smt_bits + core_bits);
+		else
+			ci->ci_package_id = 0;
 	}
 	if (core_bits) {
 		u_int core_mask = __BITS(smt_bits, smt_bits + core_bits - 1);

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:10:49 UTC 2018

Modified Files:
src/sys/dev [netbsd-8]: DEVNAMES

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

sys/dev/DEVNAMES: revision 1.300

Add ixg and ixv.


To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.299.8.1 src/sys/dev/DEVNAMES

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/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.299 src/sys/dev/DEVNAMES:1.299.8.1
--- src/sys/dev/DEVNAMES:1.299	Sat Oct  1 15:24:35 2016
+++ src/sys/dev/DEVNAMES	Mon Apr  9 18:10:49 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: DEVNAMES,v 1.299 2016/10/01 15:24:35 flxd Exp $
+#	$NetBSD: DEVNAMES,v 1.299.8.1 2018/04/09 18:10:49 martin Exp $
 #
 # This file contains all used device names and defined attributes in
 # alphabetical order. New devices added to the system somewhere should first
@@ -714,10 +714,12 @@ iwi			MI
 iwic			MI
 iwm			mac68k
 ix			MI
+ixg			MI
 ixpclk			evbarm
 ixpide			MI
 ixpio			evbarm
 ixpsip			evbarm
+ixv			MI
 iy			MI
 j6x0lcd			hpcsh
 j6x0pwr			hpcsh

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:10:49 UTC 2018

Modified Files:
src/sys/dev [netbsd-8]: DEVNAMES

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

sys/dev/DEVNAMES: revision 1.300

Add ixg and ixv.


To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.299.8.1 src/sys/dev/DEVNAMES

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

CVS commit: [netbsd-8] src

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:04:32 UTC 2018

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

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

sys/arch/x86/include/cacheinfo.h: revision 1.24-1.26
usr.sbin/cpuctl/arch/i386.c: revision 1.81-1.84

- Parse the TLB info from `cpuid leaf 18H' on Intel processor. Currently,
  this change doesn't decode perfectly.  Tested with Gemini Lake. It has
  two L2 Shared TLB. One is 4MB and another is 2MB/4MB but former isn't
  printed yet:
cpu0: ITLB 1 4KB entries 48-way
cpu0: DTLB 1 4KB entries 32-way
cpu0: L2 STLB 8 4MB entries 4-way
  Need some rework for struct x86_cache_info.
- Use aprint_error_dev() for error output.
 Calculate way and number of entries correctly from CPUID leaf 18H.
 Add yet another Shared L2 TLB (2M/4M pages).
XXX need redesign.

 Add 3way and 6way of L2 cache or TLB on AMD CPU.
 AMD L3 cache association bitfield is not 8bit but 4bit like others association
bitfields.

>From the latest Intel SDM:
- Add Xeon Phi 7215, 7285 and 7295
- Add Coffee Lake


To generate a diff of this commit:
cvs rdiff -u -r1.22.10.1 -r1.22.10.2 src/sys/arch/x86/include/cacheinfo.h
cvs rdiff -u -r1.74.6.2 -r1.74.6.3 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.

CVS commit: [netbsd-8] src

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 18:04:32 UTC 2018

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

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

sys/arch/x86/include/cacheinfo.h: revision 1.24-1.26
usr.sbin/cpuctl/arch/i386.c: revision 1.81-1.84

- Parse the TLB info from `cpuid leaf 18H' on Intel processor. Currently,
  this change doesn't decode perfectly.  Tested with Gemini Lake. It has
  two L2 Shared TLB. One is 4MB and another is 2MB/4MB but former isn't
  printed yet:
cpu0: ITLB 1 4KB entries 48-way
cpu0: DTLB 1 4KB entries 32-way
cpu0: L2 STLB 8 4MB entries 4-way
  Need some rework for struct x86_cache_info.
- Use aprint_error_dev() for error output.
 Calculate way and number of entries correctly from CPUID leaf 18H.
 Add yet another Shared L2 TLB (2M/4M pages).
XXX need redesign.

 Add 3way and 6way of L2 cache or TLB on AMD CPU.
 AMD L3 cache association bitfield is not 8bit but 4bit like others association
bitfields.

>From the latest Intel SDM:
- Add Xeon Phi 7215, 7285 and 7295
- Add Coffee Lake


To generate a diff of this commit:
cvs rdiff -u -r1.22.10.1 -r1.22.10.2 src/sys/arch/x86/include/cacheinfo.h
cvs rdiff -u -r1.74.6.2 -r1.74.6.3 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.22.10.1 src/sys/arch/x86/include/cacheinfo.h:1.22.10.2
--- src/sys/arch/x86/include/cacheinfo.h:1.22.10.1	Fri Mar 16 13:05:31 2018
+++ src/sys/arch/x86/include/cacheinfo.h	Mon Apr  9 18:04:32 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cacheinfo.h,v 1.22.10.1 2018/03/16 13:05:31 martin Exp $	*/
+/*	$NetBSD: cacheinfo.h,v 1.22.10.2 2018/04/09 18:04:32 martin Exp $	*/
 
 #ifndef _X86_CACHEINFO_H_
 #define _X86_CACHEINFO_H_
@@ -35,9 +35,10 @@ struct x86_cache_info {
 #define CAI_L2_DTLB2	15		/* L2 Data TLB (2/4M pages) */
 #define CAI_L2_STLB	16		/* Shared L2 TLB (4K pages) */
 #define CAI_L2_STLB2	17		/* Shared L2 TLB (4K/2M pages) */
-#define CAI_PREFETCH	18		/* Prefetch */
+#define CAI_L2_STLB3	18		/* Shared L2 TLB (2M/4M pages) */
+#define CAI_PREFETCH	19		/* Prefetch */
 
-#define	CAI_COUNT	19
+#define	CAI_COUNT	20
 
 /*
  * AMD Cache Info:
@@ -139,7 +140,7 @@ struct x86_cache_info {
 
 /* L3 Cache */
 #define AMD_L3_EDX_C_SIZE(x)		x) >> 18) & 0x) * 1024 * 512)
-#define AMD_L3_EDX_C_ASSOC(x)		 (((x) >> 12) & 0xff)
+#define AMD_L3_EDX_C_ASSOC(x)		 (((x) >> 12) & 0xf)
 #define AMD_L3_EDX_C_LPT(x)		 (((x) >> 8)  & 0xf)
 #define AMD_L3_EDX_C_LS(x)		 ( (x)& 0xff)
 
@@ -341,7 +342,9 @@ __CI_TBL(0,   0,0,  
 #define AMD_L2CACHE_INFO { \
 __CI_TBL(0, 0x01,1, 0, 0, NULL), \
 __CI_TBL(0, 0x02,2, 0, 0, NULL), \
+__CI_TBL(0, 0x03,3, 0, 0, NULL), \
 __CI_TBL(0, 0x04,4, 0, 0, NULL), \
+__CI_TBL(0, 0x05,6, 0, 0, NULL), \
 __CI_TBL(0, 0x06,8, 0, 0, NULL), \
 __CI_TBL(0, 0x08,   16, 0, 0, NULL), \
 __CI_TBL(0, 0x0a,   32, 0, 0, NULL), \

Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.74.6.2 src/usr.sbin/cpuctl/arch/i386.c:1.74.6.3
--- src/usr.sbin/cpuctl/arch/i386.c:1.74.6.2	Fri Mar 16 13:05:32 2018
+++ src/usr.sbin/cpuctl/arch/i386.c	Mon Apr  9 18:04:32 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386.c,v 1.74.6.2 2018/03/16 13:05:32 martin Exp $	*/
+/*	$NetBSD: i386.c,v 1.74.6.3 2018/04/09 18:04:32 martin Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.74.6.2 2018/03/16 13:05:32 martin Exp $");
+__RCSID("$NetBSD: i386.c,v 1.74.6.3 2018/04/09 18:04:32 martin Exp $");
 #endif /* not lint */
 
 #include 
@@ -381,9 +381,9 @@ const struct cpu_cpuid_nameclass i386_cp
 [0x5f] = "Atom (Goldmont, Denverton)",
 [0x66] = "Future Core (Cannon Lake)",
 [0x7a] = "Atom (Goldmont Plus)",
-[0x85] = "Future Xeon Phi (Knights Mill)",
-[0x8e] = "7th gen Core (Kaby Lake)",
-[0x9e] = "7th gen Core (Kaby Lake)",
+[0x85] = "Xeon Phi 7215, 7285, 7295 (Knights Mill)",
+[0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake)",
+[0x9e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake)",
 			},
 			"Pentium Pro, II or III",	/* Default */
 			NULL,
@@ -1025,8 +1025,10 @@ intel_cpu_cacheinfo(struct cpu_info *ci)
 desc);
 if (cai != NULL)
 	ci->ci_cinfo[cai->cai_index] = *cai;
-else if ((verbose != 0) && (desc != 0xff))
-	printf("Unknown cacheinfo desc %02x\n",
+else if ((verbose != 0) && (desc != 0xff)
+&& (desc != 0xfe))
+	aprint_error_dev(ci->ci_dev, "error:"
+	" Unknown cacheinfo desc %02x\n",
 	desc);
 			}
 		}
@@ -1069,7 +1071,8 @@ intel_cpu_cacheinfo(struct cpu_info *ci)
 			

CVS commit: src/usr.bin/config

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 17:46:57 UTC 2018

Modified Files:
src/usr.bin/config: defs.h sem.c

Log Message:
Keep previous location of device definitions so we can print them in error
messages.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/config/defs.h
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/config/sem.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/config/defs.h
diff -u src/usr.bin/config/defs.h:1.102 src/usr.bin/config/defs.h:1.103
--- src/usr.bin/config/defs.h:1.102	Sun Nov 26 19:25:46 2017
+++ src/usr.bin/config/defs.h	Mon Apr  9 13:46:56 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.102 2017/11/27 00:25:46 christos Exp $	*/
+/*	$NetBSD: defs.h,v 1.103 2018/04/09 17:46:56 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -277,6 +277,8 @@ struct devbase {
 	struct	deva *d_ahead;		/* first attachment, if any */
 	struct	deva **d_app;		/* used for tacking on attachments */
 	struct	attr *d_classattr;	/* device class attribute (if any) */
+	const char *d_srcfile;		/* file name where we are defined */
+	u_short	d_srcline;		/* line number where we are defined */
 };
 
 struct deva {
@@ -289,6 +291,8 @@ struct deva {
 	struct	attrlist *d_attrs;	/* attributes, if any */
 	struct	devi *d_ihead;		/* first instance, if any */
 	struct	devi **d_ipp;		/* used for tacking on more instances */
+	const char *d_srcfile;		/* file name where we are defined */
+	u_short	d_srcline;		/* line number where we are defined */
 };
 
 /*

Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.82 src/usr.bin/config/sem.c:1.83
--- src/usr.bin/config/sem.c:1.82	Sun Nov 26 19:25:46 2017
+++ src/usr.bin/config/sem.c	Mon Apr  9 13:46:56 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.82 2017/11/27 00:25:46 christos Exp $	*/
+/*	$NetBSD: sem.c,v 1.83 2018/04/09 17:46:56 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: sem.c,v 1.82 2017/11/27 00:25:46 christos Exp $");
+__RCSID("$NetBSD: sem.c,v 1.83 2018/04/09 17:46:56 christos Exp $");
 
 #include 
 #include 
@@ -509,7 +509,8 @@ defdev(struct devbase *dev, struct locli
 	if (dev == )
 		goto bad;
 	if (dev->d_isdef) {
-		cfgerror("redefinition of `%s'", dev->d_name);
+		cfgerror("redefinition of `%s' (previously defined at %s:%d)",
+		dev->d_name, dev->d_srcfile, dev->d_srcline);
 		goto bad;
 	}
 
@@ -624,6 +625,8 @@ getdevbase(const char *name)
 		dev->d_ahead = NULL;
 		dev->d_app = >d_ahead;
 		dev->d_umax = 0;
+		dev->d_srcfile = yyfile;
+		dev->d_srcline = currentline();
 		TAILQ_INSERT_TAIL(, dev, d_next);
 		if (ht_insert(devbasetab, name, dev))
 			panic("%s: Can't insert %s", __func__, name);
@@ -655,7 +658,8 @@ defdevattach(struct deva *deva, struct d
 		goto bad;
 	}
 	if (deva->d_isdef) {
-		cfgerror("redefinition of `%s'", deva->d_name);
+		cfgerror("redefinition of `%s' (previously defined at %s:%d)",
+		deva->d_name, deva->d_srcfile, deva->d_srcline);
 		goto bad;
 	}
 	if (dev->d_ispseudo) {
@@ -764,6 +768,8 @@ getdevattach(const char *name)
 		deva->d_attrs = NULL;
 		deva->d_ihead = NULL;
 		deva->d_ipp = >d_ihead;
+		deva->d_srcfile = yyfile;
+		deva->d_srcline = currentline();
 		TAILQ_INSERT_TAIL(, deva, d_next);
 		if (ht_insert(devatab, name, deva))
 			panic("%s: Can't insert %s", __func__, name);

CVS commit: src/usr.bin/config

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 17:46:57 UTC 2018

Modified Files:
src/usr.bin/config: defs.h sem.c

Log Message:
Keep previous location of device definitions so we can print them in error
messages.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/config/defs.h
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/config/sem.c

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

CVS commit: src/sys/arch/evbarm/conf

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 17:27:11 UTC 2018

Modified Files:
src/sys/arch/evbarm/conf: RPI_INSTALL

Log Message:
bump...


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/RPI_INSTALL

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/evbarm/conf/RPI_INSTALL
diff -u src/sys/arch/evbarm/conf/RPI_INSTALL:1.9 src/sys/arch/evbarm/conf/RPI_INSTALL:1.10
--- src/sys/arch/evbarm/conf/RPI_INSTALL:1.9	Thu Dec 29 15:51:26 2016
+++ src/sys/arch/evbarm/conf/RPI_INSTALL	Mon Apr  9 13:27:11 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: RPI_INSTALL,v 1.9 2016/12/29 20:51:26 skrll Exp $
+#	$NetBSD: RPI_INSTALL,v 1.10 2018/04/09 17:27:11 christos Exp $
 #
 #	RPI_INSTALL -- RPI kernel with installation-sized
 #	ramdisk
@@ -8,7 +8,7 @@ include "arch/evbarm/conf/RPI"
 include "arch/evbarm/conf/INSTALL"
 
 no options	MEMORY_DISK_ROOT_SIZE
-options 	MEMORY_DISK_ROOT_SIZE=49152
+options 	MEMORY_DISK_ROOT_SIZE=56000
 
 makeoptions	RAMDISKNAME=sshramdisk
 no makeoptions	DEBUG

CVS commit: src/sys/arch/evbarm/conf

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 17:27:11 UTC 2018

Modified Files:
src/sys/arch/evbarm/conf: RPI_INSTALL

Log Message:
bump...


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/RPI_INSTALL

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

CVS commit: [netbsd-8] src/sys

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 17:01:20 UTC 2018

Modified Files:
src/sys/net [netbsd-8]: if_ipsec.c
src/sys/netipsec [netbsd-8]: ipsecif.c ipsecif.h

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #714):

sys/net/if_ipsec.c: revision 1.8 - 1.11
sys/netipsec/ipsecif.h: revision 1.2
sys/netipsec/ipsecif.c: revision 1.6,1.7

fix ipsec(4) encap_lock leak.

fix ipsecif(4) unmatch curlwp_bind.

fix ipsecif(4) stack overflow.

Add IPv4 ID when the ipsecif(4) packet can be fragmented. Implemented by 
hsuenaga@IIJ and ohishi@IIJ, thanks.
This modification reduces packet loss of fragmented packets on a
network where reordering occurs.

Alghough this modification has been applied, IPv4 ID is not set for
the packet smaller then IP_MINFRAGSIZE. According to RFC 6864, that
must not cause problems.

Fix unexpected failure when ipsecif(4) over IPv6 is changed port number only.
Here is an example of the operation which causes this problem.
# ifconfig ipsec0 create link0
# ifconfig ipsec0 tunnel fc00:1001::2,4500 fc00:1001::1,4501
# ifconfig ipsec0 tunnel fc00:1001::2,4500 fc00:1001::1,4502


To generate a diff of this commit:
cvs rdiff -u -r1.3.2.4 -r1.3.2.5 src/sys/net/if_ipsec.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/netipsec/ipsecif.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/netipsec/ipsecif.h

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

CVS commit: [netbsd-8] src/sys

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 17:01:20 UTC 2018

Modified Files:
src/sys/net [netbsd-8]: if_ipsec.c
src/sys/netipsec [netbsd-8]: ipsecif.c ipsecif.h

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #714):

sys/net/if_ipsec.c: revision 1.8 - 1.11
sys/netipsec/ipsecif.h: revision 1.2
sys/netipsec/ipsecif.c: revision 1.6,1.7

fix ipsec(4) encap_lock leak.

fix ipsecif(4) unmatch curlwp_bind.

fix ipsecif(4) stack overflow.

Add IPv4 ID when the ipsecif(4) packet can be fragmented. Implemented by 
hsuenaga@IIJ and ohishi@IIJ, thanks.
This modification reduces packet loss of fragmented packets on a
network where reordering occurs.

Alghough this modification has been applied, IPv4 ID is not set for
the packet smaller then IP_MINFRAGSIZE. According to RFC 6864, that
must not cause problems.

Fix unexpected failure when ipsecif(4) over IPv6 is changed port number only.
Here is an example of the operation which causes this problem.
# ifconfig ipsec0 create link0
# ifconfig ipsec0 tunnel fc00:1001::2,4500 fc00:1001::1,4501
# ifconfig ipsec0 tunnel fc00:1001::2,4500 fc00:1001::1,4502


To generate a diff of this commit:
cvs rdiff -u -r1.3.2.4 -r1.3.2.5 src/sys/net/if_ipsec.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/netipsec/ipsecif.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/netipsec/ipsecif.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/net/if_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.3.2.4 src/sys/net/if_ipsec.c:1.3.2.5
--- src/sys/net/if_ipsec.c:1.3.2.4	Tue Mar 13 15:34:33 2018
+++ src/sys/net/if_ipsec.c	Mon Apr  9 17:01:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ipsec.c,v 1.3.2.4 2018/03/13 15:34:33 martin Exp $  */
+/*	$NetBSD: if_ipsec.c,v 1.3.2.5 2018/04/09 17:01:20 martin Exp $  */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.3.2.4 2018/03/13 15:34:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.3.2.5 2018/04/09 17:01:20 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -76,6 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v
 #include 
 
 #include 
+#include  /* for union sockaddr_union */
 #include 
 #include 
 
@@ -279,7 +280,7 @@ if_ipsec_fwd_ipv6(struct ipsec_softc *sc
 int
 if_ipsec_encap_func(struct mbuf *m, int off, int proto, void *arg)
 {
-	struct ip ip;
+	uint8_t v;
 	struct ipsec_softc *sc;
 	struct ipsec_variant *var = NULL;
 	struct psref psref;
@@ -303,18 +304,39 @@ if_ipsec_encap_func(struct mbuf *m, int 
 		goto out;
 	}
 
-	if (m->m_pkthdr.len < sizeof(ip))
-		goto out;
+	m_copydata(m, 0, sizeof(v), );
+	v = (v >> 4) & 0xff;  /* Get the IP version number. */
 
-	m_copydata(m, 0, sizeof(ip), );
-	switch (ip.ip_v) {
+	switch (v) {
 #ifdef INET
-	case IPVERSION:
+	case IPVERSION: {
+		struct ip ip;
+
+		if (m->m_pkthdr.len < sizeof(ip))
+			goto out;
+
+		m_copydata(m, 0, sizeof(ip), );
 		if (var->iv_psrc->sa_family != AF_INET ||
 		var->iv_pdst->sa_family != AF_INET)
 			goto out;
 		ret = ipsecif4_encap_func(m, , var);
 		break;
+	}
+#endif
+#ifdef INET6
+	case (IPV6_VERSION >> 4): {
+		struct ip6_hdr ip6;
+
+		if (m->m_pkthdr.len < sizeof(ip6))
+			goto out;
+
+		m_copydata(m, 0, sizeof(ip6), );
+		if (var->iv_psrc->sa_family != AF_INET6 ||
+		var->iv_pdst->sa_family != AF_INET6)
+			goto out;
+		ret = ipsecif6_encap_func(m, , var);
+		break;
+	}
 #endif
 	default:
 		goto out;
@@ -637,6 +659,7 @@ if_ipsec_ioctl(struct ifnet *ifp, u_long
 		error = if_ipsec_set_tunnel(>ipsec_if, src, dst);
 		if (error)
 			goto bad;
+		curlwp_bindx(bound);
 		break;
 
 	case SIOCDIFPHYADDR:
@@ -769,6 +792,7 @@ if_ipsec_ioctl(struct ifnet *ifp, u_long
 			error = if_ipsec_ensure_flags(>ipsec_if, oflags);
 			if (error)
 goto bad;
+			curlwp_bindx(bound);
 		}
 		break;
 	}
@@ -1166,6 +1190,7 @@ if_ipsec_ensure_flags(struct ifnet *ifp,
 	if (if_ipsec_variant_is_unconfigured(ovar)) {
 		/* nothing to do */
 		mutex_exit(>ipsec_lock);
+		encap_lock_exit();
 		return 0;
 	}
 
@@ -1337,10 +1362,11 @@ if_ipsec_add_mbuf_addr_port(struct mbuf 
 	if (port == 0) {
 		if_ipsec_add_mbuf_optalign(m0, addr, addr->sa_len, align);
 	} else {
-		struct sockaddr addrport;
+		union sockaddr_union addrport_u;
+		struct sockaddr *addrport = _u.sa;
 
-		if_ipsec_set_addr_port(, addr, port);
-		if_ipsec_add_mbuf_optalign(m0, , addrport.sa_len, align);
+		if_ipsec_set_addr_port(addrport, addr, port);
+		if_ipsec_add_mbuf_optalign(m0, addrport, addrport->sa_len, align);
 	}
 }
 

Index: src/sys/netipsec/ipsecif.c
diff -u src/sys/netipsec/ipsecif.c:1.1.2.5 src/sys/netipsec/ipsecif.c:1.1.2.6
--- src/sys/netipsec/ipsecif.c:1.1.2.5	Tue Mar 13 15:34:33 2018
+++ src/sys/netipsec/ipsecif.c	Mon Apr  9 17:01:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsecif.c,v 1.1.2.5 2018/03/13 15:34:33 martin Exp 

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 16:46:34 UTC 2018

Modified Files:
src/external/bsd/dhcpcd/dist [netbsd-8]: configure
src/external/bsd/dhcpcd/dist/hooks [netbsd-8]: 10-wpa_supplicant
15-timezone 20-resolv.conf 29-lookup-hostname 30-hostname
50-ntp.conf 50-yp.conf 50-ypbind.in dhcpcd-run-hooks.8.in
dhcpcd-run-hooks.in
src/external/bsd/dhcpcd/dist/src [netbsd-8]: arp.c common.h defs.h
dhcp.c dhcp.h dhcp6.c dhcp6.h dhcpcd.8.in dhcpcd.c dhcpcd.conf.5.in
dhcpcd.h if-bsd.c if-linux.c if-options.c if-options.h if-sun.c
if.c if.h ipv4.c ipv4.h ipv6.c ipv6.h ipv6nd.c ipv6nd.h logerr.h
route.c route.h
src/external/bsd/dhcpcd/dist/src/dev [netbsd-8]: udev.c
src/external/bsd/dhcpcd/dist/tests/eloop-bench [netbsd-8]:
eloop-bench.c
src/external/bsd/dhcpcd/include [netbsd-8]: config.h
src/external/bsd/dhcpcd/sbin/dhcpcd [netbsd-8]: Makefile

Log Message:
Catch up to current in external/bsd/dhcpcd/, requested by roy in ticket #707:

external/bsd/dhcpcd/dist/configure  up to 1.1.1.7
external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/15-timezone  up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/20-resolv.conf   up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/29-lookup-hostname up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/30-hostname  up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/50-ntp.conf  up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/50-yp.conf   up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/50-ypbind.in up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in up to 1.1.1.4
external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in up to 1.1.1.4
external/bsd/dhcpcd/dist/src/arp.c  up to 1.1.1.6
external/bsd/dhcpcd/dist/src/common.h   up to 1.1.1.4
external/bsd/dhcpcd/dist/src/defs.h up to 1.1.1.11
external/bsd/dhcpcd/dist/src/dhcp.c up to 1.9
external/bsd/dhcpcd/dist/src/dhcp.h up to 1.1.1.5
external/bsd/dhcpcd/dist/src/dhcp6.cup to 1.1.1.10
external/bsd/dhcpcd/dist/src/dhcp6.hup to 1.1.1.4
external/bsd/dhcpcd/dist/src/dhcpcd.8.inup to 1.1.1.8
external/bsd/dhcpcd/dist/src/dhcpcd.c   up to 1.10
external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in   up to 1.1.1.7
external/bsd/dhcpcd/dist/src/dhcpcd.h   up to 1.1.1.5
external/bsd/dhcpcd/dist/src/if-bsd.c   up to 1.1.1.7
external/bsd/dhcpcd/dist/src/if-linux.c up to 1.1.1.8
external/bsd/dhcpcd/dist/src/if-options.c   up to 1.8
external/bsd/dhcpcd/dist/src/if-options.h   up to 1.1.1.7
external/bsd/dhcpcd/dist/src/if-sun.c   up to 1.1.1.4
external/bsd/dhcpcd/dist/src/if.c   up to 1.1.1.8
external/bsd/dhcpcd/dist/src/if.h   up to 1.1.1.5
external/bsd/dhcpcd/dist/src/ipv4.c up to 1.1.1.9
external/bsd/dhcpcd/dist/src/ipv4.h up to 1.1.1.4
external/bsd/dhcpcd/dist/src/ipv6.c up to 1.1.1.8
external/bsd/dhcpcd/dist/src/ipv6.h up to 1.1.1.6
external/bsd/dhcpcd/dist/src/ipv6nd.c   up to 1.1.1.7
external/bsd/dhcpcd/dist/src/ipv6nd.h   up to 1.1.1.5
external/bsd/dhcpcd/dist/src/logerr.h   up to 1.1.1.3
external/bsd/dhcpcd/dist/src/route.cup to 1.1.1.6
external/bsd/dhcpcd/dist/src/route.hup to 1.1.1.4
external/bsd/dhcpcd/dist/src/dev/udev.c up to 1.1.1.2
external/bsd/dhcpcd/dist/tests/eloop-bench/eloop-bench.c up to 1.1.1.3
external/bsd/dhcpcd/include/config.hup to 1.3
external/bsd/dhcpcd/sbin/dhcpcd/Makefileup to 1.43

Import dhcpcd-7.0.1 with the following changes:

  *  hooks: remove use of local builtin for better portability
  *  dhcpcd: don't log errors working out carrier for departed interfaces
  *  ipv4: allow configuration of static broadcast address
  *  if: don't set MTU during interface discovery
  *  if: don't activate non matching interfaces to commandline ones
  *  eloop-bench: fix hangs when using a large number of cycles
  *  dhcp: don't bind when we've just probed an address to inform

Import dhcpcd-7.0.2 with the following changes:

  *  Added support for setproctitle(3)
  *  Kernel RA is no longer disabled when IPv6 is disabled in dhcpcd
  *  DHCPv6 PD is no longer stopped if no Routers are found
  *  If the DHCP leased address is deleted, enter the reboot state
  *  DHCPv6 unicast is no longer performed when not in master mode
  *  dhcpcd will now detect netlink/route socket overflows ad re-sync

Import dhcpcd-7.0.3 with the following changes:

  *  dhcp6: fix a null termination overflow on status messages
  *  options: static routes can be setup in global context again
  *  routes: dhcpcd added host routes are now reported correctly


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.2.1 -r1.1.1.3.2.2 \

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 16:46:34 UTC 2018

Modified Files:
src/external/bsd/dhcpcd/dist [netbsd-8]: configure
src/external/bsd/dhcpcd/dist/hooks [netbsd-8]: 10-wpa_supplicant
15-timezone 20-resolv.conf 29-lookup-hostname 30-hostname
50-ntp.conf 50-yp.conf 50-ypbind.in dhcpcd-run-hooks.8.in
dhcpcd-run-hooks.in
src/external/bsd/dhcpcd/dist/src [netbsd-8]: arp.c common.h defs.h
dhcp.c dhcp.h dhcp6.c dhcp6.h dhcpcd.8.in dhcpcd.c dhcpcd.conf.5.in
dhcpcd.h if-bsd.c if-linux.c if-options.c if-options.h if-sun.c
if.c if.h ipv4.c ipv4.h ipv6.c ipv6.h ipv6nd.c ipv6nd.h logerr.h
route.c route.h
src/external/bsd/dhcpcd/dist/src/dev [netbsd-8]: udev.c
src/external/bsd/dhcpcd/dist/tests/eloop-bench [netbsd-8]:
eloop-bench.c
src/external/bsd/dhcpcd/include [netbsd-8]: config.h
src/external/bsd/dhcpcd/sbin/dhcpcd [netbsd-8]: Makefile

Log Message:
Catch up to current in external/bsd/dhcpcd/, requested by roy in ticket #707:

external/bsd/dhcpcd/dist/configure  up to 1.1.1.7
external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/15-timezone  up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/20-resolv.conf   up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/29-lookup-hostname up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/30-hostname  up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/50-ntp.conf  up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/50-yp.conf   up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/50-ypbind.in up to 1.1.1.2
external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in up to 1.1.1.4
external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in up to 1.1.1.4
external/bsd/dhcpcd/dist/src/arp.c  up to 1.1.1.6
external/bsd/dhcpcd/dist/src/common.h   up to 1.1.1.4
external/bsd/dhcpcd/dist/src/defs.h up to 1.1.1.11
external/bsd/dhcpcd/dist/src/dhcp.c up to 1.9
external/bsd/dhcpcd/dist/src/dhcp.h up to 1.1.1.5
external/bsd/dhcpcd/dist/src/dhcp6.cup to 1.1.1.10
external/bsd/dhcpcd/dist/src/dhcp6.hup to 1.1.1.4
external/bsd/dhcpcd/dist/src/dhcpcd.8.inup to 1.1.1.8
external/bsd/dhcpcd/dist/src/dhcpcd.c   up to 1.10
external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in   up to 1.1.1.7
external/bsd/dhcpcd/dist/src/dhcpcd.h   up to 1.1.1.5
external/bsd/dhcpcd/dist/src/if-bsd.c   up to 1.1.1.7
external/bsd/dhcpcd/dist/src/if-linux.c up to 1.1.1.8
external/bsd/dhcpcd/dist/src/if-options.c   up to 1.8
external/bsd/dhcpcd/dist/src/if-options.h   up to 1.1.1.7
external/bsd/dhcpcd/dist/src/if-sun.c   up to 1.1.1.4
external/bsd/dhcpcd/dist/src/if.c   up to 1.1.1.8
external/bsd/dhcpcd/dist/src/if.h   up to 1.1.1.5
external/bsd/dhcpcd/dist/src/ipv4.c up to 1.1.1.9
external/bsd/dhcpcd/dist/src/ipv4.h up to 1.1.1.4
external/bsd/dhcpcd/dist/src/ipv6.c up to 1.1.1.8
external/bsd/dhcpcd/dist/src/ipv6.h up to 1.1.1.6
external/bsd/dhcpcd/dist/src/ipv6nd.c   up to 1.1.1.7
external/bsd/dhcpcd/dist/src/ipv6nd.h   up to 1.1.1.5
external/bsd/dhcpcd/dist/src/logerr.h   up to 1.1.1.3
external/bsd/dhcpcd/dist/src/route.cup to 1.1.1.6
external/bsd/dhcpcd/dist/src/route.hup to 1.1.1.4
external/bsd/dhcpcd/dist/src/dev/udev.c up to 1.1.1.2
external/bsd/dhcpcd/dist/tests/eloop-bench/eloop-bench.c up to 1.1.1.3
external/bsd/dhcpcd/include/config.hup to 1.3
external/bsd/dhcpcd/sbin/dhcpcd/Makefileup to 1.43

Import dhcpcd-7.0.1 with the following changes:

  *  hooks: remove use of local builtin for better portability
  *  dhcpcd: don't log errors working out carrier for departed interfaces
  *  ipv4: allow configuration of static broadcast address
  *  if: don't set MTU during interface discovery
  *  if: don't activate non matching interfaces to commandline ones
  *  eloop-bench: fix hangs when using a large number of cycles
  *  dhcp: don't bind when we've just probed an address to inform

Import dhcpcd-7.0.2 with the following changes:

  *  Added support for setproctitle(3)
  *  Kernel RA is no longer disabled when IPv6 is disabled in dhcpcd
  *  DHCPv6 PD is no longer stopped if no Routers are found
  *  If the DHCP leased address is deleted, enter the reboot state
  *  DHCPv6 unicast is no longer performed when not in master mode
  *  dhcpcd will now detect netlink/route socket overflows ad re-sync

Import dhcpcd-7.0.3 with the following changes:

  *  dhcp6: fix a null termination overflow on status messages
  *  options: static routes can be setup in global context again
  *  routes: dhcpcd added host routes are now reported correctly


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.2.1 -r1.1.1.3.2.2 \

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 16:41:35 UTC 2018

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

Log Message:
Ammed ticket #668


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.171 -r1.1.2.172 src/doc/CHANGES-8.0

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.171 src/doc/CHANGES-8.0:1.1.2.172
--- src/doc/CHANGES-8.0:1.1.2.171	Mon Apr  9 15:59:58 2018
+++ src/doc/CHANGES-8.0	Mon Apr  9 16:41:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.171 2018/04/09 15:59:58 bouyer Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.172 2018/04/09 16:41:35 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -10651,7 +10651,7 @@ sys/netipsec/ipsec_input.c			1.54
 	Fix (harmless) use-after-free.
 	[maxv, ticket #667]
 
-sys/netinet/ip_reass.c1.12
+sys/netinet/ip_reass.c1.12,1.13
 
 	ip_reass_packet(): make sure that the end of each fragment does
 	not exceed IP_MAXPACKET.

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 16:41:35 UTC 2018

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

Log Message:
Ammed ticket #668


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.171 -r1.1.2.172 src/doc/CHANGES-8.0

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

CVS commit: [netbsd-8] src/sys/netinet

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 16:40:07 UTC 2018

Modified Files:
src/sys/netinet [netbsd-8]: ip_reass.c

Log Message:
Additionally pull up the following revision for ticket #668,
requested by ozaki-r:

sys/netinet/ip_reass.c 1.13

Change the error stat from IP_STAT_BADFRAGS to IP_STAT_TOOLONG. The
ping_of_death ATF test expects this counter to get increased.


To generate a diff of this commit:
cvs rdiff -u -r1.11.8.2 -r1.11.8.3 src/sys/netinet/ip_reass.c

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

CVS commit: [netbsd-8] src/sys/netinet

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 16:40:07 UTC 2018

Modified Files:
src/sys/netinet [netbsd-8]: ip_reass.c

Log Message:
Additionally pull up the following revision for ticket #668,
requested by ozaki-r:

sys/netinet/ip_reass.c 1.13

Change the error stat from IP_STAT_BADFRAGS to IP_STAT_TOOLONG. The
ping_of_death ATF test expects this counter to get increased.


To generate a diff of this commit:
cvs rdiff -u -r1.11.8.2 -r1.11.8.3 src/sys/netinet/ip_reass.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/netinet/ip_reass.c
diff -u src/sys/netinet/ip_reass.c:1.11.8.2 src/sys/netinet/ip_reass.c:1.11.8.3
--- src/sys/netinet/ip_reass.c:1.11.8.2	Thu Apr  5 14:33:41 2018
+++ src/sys/netinet/ip_reass.c	Mon Apr  9 16:40:07 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_reass.c,v 1.11.8.2 2018/04/05 14:33:41 martin Exp $	*/
+/*	$NetBSD: ip_reass.c,v 1.11.8.3 2018/04/09 16:40:07 martin Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1993
@@ -46,7 +46,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.11.8.2 2018/04/05 14:33:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.11.8.3 2018/04/09 16:40:07 martin Exp $");
 
 #include 
 #include 
@@ -632,7 +632,7 @@ ip_reass_packet(struct mbuf **m0, struct
 	}
 
 	if (off + len > IP_MAXPACKET) {
-		IP_STATINC(IP_STAT_BADFRAGS);
+		IP_STATINC(IP_STAT_TOOLONG);
 		return EINVAL;
 	}
 

CVS commit: src/sys

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Mon Apr  9 16:21:11 UTC 2018

Modified Files:
src/sys/arch/arm/at91: at91ohci.c
src/sys/arch/arm/broadcom: bcm53xx_usb.c
src/sys/arch/arm/ep93xx: epohci.c
src/sys/arch/arm/gemini: obio_ehci.c
src/sys/arch/arm/imx: imxusb.c
src/sys/arch/arm/nvidia: tegra_ehci.c
src/sys/arch/arm/omap: obio_ohci.c omap3_ehci.c omapl1x_ohci.c
src/sys/arch/arm/s3c2xx0: ohci_s3c24x0.c
src/sys/arch/arm/samsung: exynos_ehci.c
src/sys/arch/arm/sunxi: sunxi_musb.c
src/sys/arch/arm/xscale: pxa2x0_ohci.c
src/sys/arch/arm/zynq: zynq_usb.c
src/sys/arch/i386/pci: gcscehci.c
src/sys/arch/mips/adm5120/dev: ahci.c
src/sys/arch/mips/cavium/dev: octeon_usbcvar.h
src/sys/arch/mips/ingenic: ingenic_ehci.c ingenic_ohci.c
src/sys/arch/mips/ralink: ralink_ehci.c ralink_ohci.c
src/sys/dev/cardbus: ehci_cardbus.c ohci_cardbus.c uhci_cardbus.c
src/sys/dev/fdt: ehci_fdt.c ohci_fdt.c
src/sys/dev/ic: sl811hs.c
src/sys/dev/marvell: ehci_mv.c
src/sys/dev/pci: ehci_pci.c ohci_pci.c uhci_pci.c xhci_pci.c
src/sys/dev/usb: ehci.c ehcivar.h motg.c motgvar.h ohci.c ohcivar.h
uhci.c uhcivar.h xhci.c xhcivar.h
src/sys/external/bsd/dwc2: dwc2.c

Log Message:
Stop potential misuse of vendor names and USB vendor IDs in root hub
device and string descriptors.

Firstly: Few vendors have identical PCI-SIG vendor IDs and USB-IF vendor
IDs.  As such, using the PCI vendor ID as a USB vendor ID may trample
on whomever is allocated that USB vendor ID.

Secondly: The vendor of the host controller hardware implementation has
little to nothing to do with our usbroothub implementation.  Thus we
should not potentially associate any problems therewith to such third
party.

This change will result in root hubs being identified by USB Vendor ID
0x.  Root hub vendor string will now be "NetBSD" (or, specifically:
ostype). Product ID (0x) and product strings remain unchanged.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/at91/at91ohci.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/broadcom/bcm53xx_usb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ep93xx/epohci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/gemini/obio_ehci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/imx/imxusb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/nvidia/tegra_ehci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/obio_ohci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/omap/omap3_ehci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omapl1x_ohci.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/samsung/exynos_ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_musb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/pxa2x0_ohci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/zynq/zynq_usb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/pci/gcscehci.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/cavium/dev/octeon_usbcvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/ingenic/ingenic_ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/ingenic/ingenic_ohci.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/ralink/ralink_ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/ralink/ralink_ohci.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cardbus/ohci_cardbus.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/ehci_fdt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/ohci_fdt.c
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/ehci_mv.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/uhci_pci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/xhci_pci.c
cvs rdiff -u -r1.257 -r1.258 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/ehcivar.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/motgvar.h
cvs rdiff -u -r1.279 -r1.280 src/sys/dev/usb/ohci.c src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/usb/ohcivar.h
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/usb/uhcivar.h
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/xhcivar.h
cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/dwc2/dwc2.c

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

Modified files:

Index: src/sys/arch/arm/at91/at91ohci.c
diff -u src/sys/arch/arm/at91/at91ohci.c:1.6 src/sys/arch/arm/at91/at91ohci.c:1.7
--- src/sys/arch/arm/at91/at91ohci.c:1.6	Sat Apr 23 10:15:27 2016
+++ src/sys/arch/arm/at91/at91ohci.c	Mon Apr  9 16:21:09 2018

CVS commit: src/tests/usr.bin/shmif_dumpbus

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 16:21:05 UTC 2018

Modified Files:
src/tests/usr.bin/shmif_dumpbus: d_pcap.out.bz2.uue t_basic.sh

Log Message:
Use tcpdump -n to avoid reverse DNS lookup. There is no point in having
different results from running this test in a networked vs. a non-networked
environment.
Adjust golden output accordingly.
Fixes PR 53150.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/shmif_dumpbus/t_basic.sh

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

CVS commit: src/sys

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Mon Apr  9 16:21:11 UTC 2018

Modified Files:
src/sys/arch/arm/at91: at91ohci.c
src/sys/arch/arm/broadcom: bcm53xx_usb.c
src/sys/arch/arm/ep93xx: epohci.c
src/sys/arch/arm/gemini: obio_ehci.c
src/sys/arch/arm/imx: imxusb.c
src/sys/arch/arm/nvidia: tegra_ehci.c
src/sys/arch/arm/omap: obio_ohci.c omap3_ehci.c omapl1x_ohci.c
src/sys/arch/arm/s3c2xx0: ohci_s3c24x0.c
src/sys/arch/arm/samsung: exynos_ehci.c
src/sys/arch/arm/sunxi: sunxi_musb.c
src/sys/arch/arm/xscale: pxa2x0_ohci.c
src/sys/arch/arm/zynq: zynq_usb.c
src/sys/arch/i386/pci: gcscehci.c
src/sys/arch/mips/adm5120/dev: ahci.c
src/sys/arch/mips/cavium/dev: octeon_usbcvar.h
src/sys/arch/mips/ingenic: ingenic_ehci.c ingenic_ohci.c
src/sys/arch/mips/ralink: ralink_ehci.c ralink_ohci.c
src/sys/dev/cardbus: ehci_cardbus.c ohci_cardbus.c uhci_cardbus.c
src/sys/dev/fdt: ehci_fdt.c ohci_fdt.c
src/sys/dev/ic: sl811hs.c
src/sys/dev/marvell: ehci_mv.c
src/sys/dev/pci: ehci_pci.c ohci_pci.c uhci_pci.c xhci_pci.c
src/sys/dev/usb: ehci.c ehcivar.h motg.c motgvar.h ohci.c ohcivar.h
uhci.c uhcivar.h xhci.c xhcivar.h
src/sys/external/bsd/dwc2: dwc2.c

Log Message:
Stop potential misuse of vendor names and USB vendor IDs in root hub
device and string descriptors.

Firstly: Few vendors have identical PCI-SIG vendor IDs and USB-IF vendor
IDs.  As such, using the PCI vendor ID as a USB vendor ID may trample
on whomever is allocated that USB vendor ID.

Secondly: The vendor of the host controller hardware implementation has
little to nothing to do with our usbroothub implementation.  Thus we
should not potentially associate any problems therewith to such third
party.

This change will result in root hubs being identified by USB Vendor ID
0x.  Root hub vendor string will now be "NetBSD" (or, specifically:
ostype). Product ID (0x) and product strings remain unchanged.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/at91/at91ohci.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/broadcom/bcm53xx_usb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ep93xx/epohci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/gemini/obio_ehci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/imx/imxusb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/nvidia/tegra_ehci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/obio_ohci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/omap/omap3_ehci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omapl1x_ohci.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/samsung/exynos_ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_musb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/pxa2x0_ohci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/zynq/zynq_usb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/pci/gcscehci.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/cavium/dev/octeon_usbcvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/ingenic/ingenic_ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/ingenic/ingenic_ohci.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/ralink/ralink_ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/ralink/ralink_ohci.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cardbus/ohci_cardbus.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/ehci_fdt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/ohci_fdt.c
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/ehci_mv.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/uhci_pci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/xhci_pci.c
cvs rdiff -u -r1.257 -r1.258 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/ehcivar.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/motgvar.h
cvs rdiff -u -r1.279 -r1.280 src/sys/dev/usb/ohci.c src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/usb/ohcivar.h
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/usb/uhcivar.h
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/xhcivar.h
cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/dwc2/dwc2.c

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

CVS commit: src/tests/usr.bin/shmif_dumpbus

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 16:21:05 UTC 2018

Modified Files:
src/tests/usr.bin/shmif_dumpbus: d_pcap.out.bz2.uue t_basic.sh

Log Message:
Use tcpdump -n to avoid reverse DNS lookup. There is no point in having
different results from running this test in a networked vs. a non-networked
environment.
Adjust golden output accordingly.
Fixes PR 53150.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/shmif_dumpbus/t_basic.sh

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

Modified files:

Index: src/tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue
diff -u src/tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue:1.2 src/tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue:1.3
--- src/tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue:1.2	Sun Mar 13 15:40:01 2011
+++ src/tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue	Mon Apr  9 16:21:05 2018
@@ -1,104 +1,104 @@
 begin 644 d_pcap.out.bz2
-M0EIH.3%!62936=O8'&4!%NW?@$`00`5_\0@B0``.Y_X@8"=^\@0```!P
-M```![XY0O$\'N'"@P'!M=O2E=5*>#>[0M50X0`Q@V@,$-!@@$%T!A:`P
-MNATWD`,83$T&",0R,)AE/4?O1O52E*@P`$`820U`]4JH-#(#0-`)/5*JFU,:
-MAIDQ--,`("DJ$*>E@!B:9'J>H%0J0>BI0``:`#P[E![R+ZY%2,<
-M46V)*F;;EK75-K*+/K6_NM*C]*2HP@P@TB)E$3A/FJ+(T01D
-MEE3)*^*HLJRIC"2U2*M!2L$O=47PI1'PJ+)#2".()^T@)^44*>9`3@D/Q2`G
-MVD!-(%K\?\`!`DD`
-M`)"```2$
-M0```
+M0EIH.3%!629366U$3Z$!&(O?@$`00`=_\0@B0``.Y?X@8">^\@0X
+M^&4<'SPFY'D+@IX.TN4HJA<%E%4J&$`.,`P65!@N@8+0,%T#!`
+MT[R`#&$Q-!@C$,C"8=3'[T;U2JBJ&``3`!)#4FGM4J4`!HT``D]5*D#]2`!B
+M```I*II,]4*&@`9`::!4*FI--ZJHT`-#30`X\E!]A%ZY%2,=C56U+;$E
+M3-MQ:URIM8V-HU*590V@VBQ9^:W=6E1^%)48080:1$RB)V3XJBR-$$9)94R2
+MOV5%E65,826J15H*5@ERHOA2B.5%DAI!':"?E("?=%"GK("?"0$Z)#2`G]2`
+MTUJJM?S_``0))```
+M```"0@``$A``
+M``$`
 M
 M
 M
 M
-M\]_U>^N]_A_'^7[OYZ?8#!^`0.`X
-M-W=&9F```]]`-/L!@_`)))``*?;[]```
-M#P``!0```'./'CQX\]]/ODW8-=SN^=SF_;]WWM/UWKN][\SQTV<,++9E55"JRD964C
-M*RD964C*RD964C*RD964C*RD969F4C*RF5F:222ZZZ22ZZZ2
-M22215569E5ZA"1F835JZZ222_2ZZ22ZZZ22Z
-MZZ22ZZZ557)NPDA8BUYY[\["YG,W,XZ
-M0ZI3(:35+77/7,ERN5RNJ#J*U!J646HJIJB32D)4$%2$(L$/23K?/G?/O?.[
-MWWI()MWWSN]]Z$D?"0.)(_CSGOG+V]`#ODDD@``!(+:M@MX%L@MX%L%M
-M@MX%L@MX%L%M@MX%L@MX%L%M@MX%L%M@;NZ```=MMJ2#I))T=_.][WO3=W=U
-MX\[[50XD`D),$@##G.6\;VXXX\MC-"@U#LAV@]U!V@Z0Z0\J.DV39-DV39-9
-M-O,<9-DV39-DV3:>9QDT'.R;)LFR;)LFDT','*'=!\0?$'U!V@X@X@X@X@X@
-MX@X@X@X@X@X@X@X@X@Y(.0.(Q$TEJ+46HM1]?9/LT,I35%FD1K8&)PC7A-DV
-M3:U59-DV39%1*@^H/D#X@^H.(/J#B#B#B#B#B#B#B#B#B#B#B#B#B#D#B#B#
-MB#D]/4GJ:,EB*DDTDQ@S1:AW$@(KX(2E50B555WWWO>-Z?'Q^>6QB11WO;[C
-M>GU]?7EL8?S`2H!B2*$>]Z_9QZ?GQ^>6QAY)(H0;0D`"/>]>9MZ?GY^>6QF@
-M$"H$=[VWFGI]?7UY;&)'>]ON:>GU]?7EL9HH\D(H0>]Z]9MZ?GY^>6QFBCP)
-M*A!:$@6"0`520``'O>MXWI^?GYY;&:*/"%0@][UZS;T_/S\\MC#P@*$%`EY]
-M?7UYY\_/S,SY\^?*`/GDDDG0``$@MJV"W@6P6V"W@6R"W@6P6V"W@6R"W@6P
-M6V"W@6R"W@6P6V!N[H``!O;;62#I))T=[WO>]'.
-M$O,X]N../+]JJHT40$`6644]1,S$9F(S,1F8C,Q%
-M$DN9U\@``2"VK8+>!;!;8+>!;(+>!;!=XMW>6EL@MX%L%M@MX%L7=WEMI!;8&[N@`
-M`&[VVLP=&9F7IWO>][WI;;:\[YTAPPYSE\SC\OVJJC11A\D`8(#NAWH>
-M!7B#I#J#B%W1R\,1F8C,Q&9B,S$9F(666"+++!%EE@BB27W./CZ_/SR_:MKV
-MKIX05#ITQ&4BJ15(JD52*I%4BJ16>>>;SKGKKSKSOK;GJVNW3P@J&4BJ15(J
-MD52*I%4BJ15(Z>>>;SKKXXX_/+]JJT80$!0@LH$44"**$S$S$S$S$S$S$Z>G
-MIZ7,Z^../SR_:JM&$!`4(+."2+!%F)F)F)F)F)F)F)F!\\OVJK
-M1A`0%""R@3,3,3,3.1)<$X8F8110!0R27,X]N./SR_:JM$!`4(,));W
-MOWN^][WO>UK6M:^=[T``$@MJT6V`06V"W@6P6V"W@6R"W@6P6V"W@6R"
-MW@6P6V"W@6R!N[H``!N[VUF#O3-[WWL]/=[WO>^)"F)<$N4`@54(21AQ
-M\OF<<7[55H@(
-M"A!A)+F<>W'''E^U5:(D`4(,))7[55H@("A!A)+F<>W'''E^U5<0`D);(A!0@

CVS commit: src/sys/net

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Apr  9 16:14:11 UTC 2018

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

Log Message:
Replace KASSERTMSG by a real check. L2 encapsulation protocols (at least
L2TP) don't ensure the LLC is there, and in !DIAGNOSTIC configurations
m_copydata will crash. Tested with L2TP.


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/sys/net/if_ethersubr.c

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

CVS commit: src/sys/net

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Apr  9 16:14:11 UTC 2018

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

Log Message:
Replace KASSERTMSG by a real check. L2 encapsulation protocols (at least
L2TP) don't ensure the LLC is there, and in !DIAGNOSTIC configurations
m_copydata will crash. Tested with L2TP.


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/sys/net/if_ethersubr.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_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.262 src/sys/net/if_ethersubr.c:1.263
--- src/sys/net/if_ethersubr.c:1.262	Mon Apr  9 11:35:22 2018
+++ src/sys/net/if_ethersubr.c	Mon Apr  9 16:14:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.262 2018/04/09 11:35:22 maxv Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.263 2018/04/09 16:14:11 maxv Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.262 2018/04/09 11:35:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.263 2018/04/09 16:14:11 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -759,8 +759,10 @@ ether_input(struct ifnet *ifp, struct mb
 	case ETHERTYPE_SLOWPROTOCOLS: {
 		uint8_t subtype;
 
-		KASSERTMSG((m->m_pkthdr.len >= sizeof(*eh) + sizeof(subtype)),
-		"too short slow protocol packet");
+		if (m->m_pkthdr.len < sizeof(*eh) + sizeof(subtype)) {
+			m_freem(m);
+			return;
+		}
 
 		m_copydata(m, sizeof(*eh), sizeof(subtype), );
 		switch (subtype) {

CVS commit: [netbsd-8] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 15:59:59 UTC 2018

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

Log Message:
ticket #709


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.170 -r1.1.2.171 src/doc/CHANGES-8.0

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.170 src/doc/CHANGES-8.0:1.1.2.171
--- src/doc/CHANGES-8.0:1.1.2.170	Mon Apr  9 13:40:46 2018
+++ src/doc/CHANGES-8.0	Mon Apr  9 15:59:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.170 2018/04/09 13:40:46 bouyer Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.171 2018/04/09 15:59:58 bouyer Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -11074,3 +11074,9 @@ sys/net/if_l2tp.c1.21
 	Fix l2tp(4) alignment check. Pointed out and reviewed by k-goda@IIJ.
 	[knakahara, ticket #725]
 
+sys/dev/iscsi/iscsi_rcv.c			1.25 via patch
+sys/dev/iscsi/iscsi_send.c			1.37 via patch
+
+	sanity check and iscsi improve error handling
+	[mlelstv, ticket #709]
+

CVS commit: [netbsd-8] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 15:59:59 UTC 2018

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

Log Message:
ticket #709


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.170 -r1.1.2.171 src/doc/CHANGES-8.0

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

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 15:58:52 UTC 2018

Modified Files:
src/sys/dev/iscsi [netbsd-8]: iscsi_rcv.c iscsi_send.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #709):
sys/dev/iscsi/iscsi_send.c: revision 1.37 via patch
sys/dev/iscsi/iscsi_rcv.c: revision 1.25 via patch
Return temporary errors when the session is trying to recover the last
connection. The scsipi layer will retry.
Add sanity check.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/iscsi/iscsi_rcv.c
cvs rdiff -u -r1.34.6.1 -r1.34.6.2 src/sys/dev/iscsi/iscsi_send.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/iscsi/iscsi_rcv.c
diff -u src/sys/dev/iscsi/iscsi_rcv.c:1.23 src/sys/dev/iscsi/iscsi_rcv.c:1.23.8.1
--- src/sys/dev/iscsi/iscsi_rcv.c:1.23	Sun Dec 25 06:55:28 2016
+++ src/sys/dev/iscsi/iscsi_rcv.c	Mon Apr  9 15:58:52 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: iscsi_rcv.c,v 1.23 2016/12/25 06:55:28 mlelstv Exp $	*/
+/*	$NetBSD: iscsi_rcv.c,v 1.23.8.1 2018/04/09 15:58:52 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -737,6 +737,11 @@ receive_command_response_pdu(connection_
 		return -1;
 	}
 
+	if (req_ccb->flags & CCBF_COMPLETE) {
+		DEBOUT(("Possibly duplicate command response (tagged as COMPLETE)\n"));
+		return -1;
+	}
+
 	if (req_ccb->pdu_waiting != NULL) {
 		ccb_timeout_start(req_ccb, COMMAND_TIMEOUT);
 		req_ccb->num_timeouts = 0;

Index: src/sys/dev/iscsi/iscsi_send.c
diff -u src/sys/dev/iscsi/iscsi_send.c:1.34.6.1 src/sys/dev/iscsi/iscsi_send.c:1.34.6.2
--- src/sys/dev/iscsi/iscsi_send.c:1.34.6.1	Thu Dec 21 19:17:43 2017
+++ src/sys/dev/iscsi/iscsi_send.c	Mon Apr  9 15:58:52 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: iscsi_send.c,v 1.34.6.1 2017/12/21 19:17:43 snj Exp $	*/
+/*	$NetBSD: iscsi_send.c,v 1.34.6.2 2018/04/09 15:58:52 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -1485,7 +1485,10 @@ send_run_xfer(session_t *session, struct
 	conn = assign_connection(session, waitok);
 
 	if (conn == NULL || conn->terminating || conn->state != ST_FULL_FEATURE) {
-		xs->error = XS_SELTIMEOUT;
+		if (session->terminating)
+			xs->error = XS_SELTIMEOUT;
+		else
+			xs->error = XS_BUSY;
 		DEBC(conn, 10, ("run_xfer on dead connection\n"));
 		scsipi_done(xs);
 		unref_session(session);

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 15:58:52 UTC 2018

Modified Files:
src/sys/dev/iscsi [netbsd-8]: iscsi_rcv.c iscsi_send.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #709):
sys/dev/iscsi/iscsi_send.c: revision 1.37 via patch
sys/dev/iscsi/iscsi_rcv.c: revision 1.25 via patch
Return temporary errors when the session is trying to recover the last
connection. The scsipi layer will retry.
Add sanity check.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/iscsi/iscsi_rcv.c
cvs rdiff -u -r1.34.6.1 -r1.34.6.2 src/sys/dev/iscsi/iscsi_send.c

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

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Mon Apr  9 15:45:16 UTC 2018

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Improve documentation of the ATF test t_ptrace_wait*: traceme2

Set the description to:

  Verify that a signal emitted by a tracer to a child is caught by
  a signal handler.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/tests/lib/libc/sys/t_ptrace_wait.c

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/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.26 src/tests/lib/libc/sys/t_ptrace_wait.c:1.27
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.26	Tue Mar 13 14:54:13 2018
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Mon Apr  9 15:45:16 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.26 2018/03/13 14:54:13 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.27 2018/04/09 15:45:16 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.26 2018/03/13 14:54:13 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.27 2018/04/09 15:45:16 kamil Exp $");
 
 #include 
 #include 
@@ -134,7 +134,8 @@ ATF_TC(traceme2);
 ATF_TC_HEAD(traceme2, tc)
 {
 	atf_tc_set_md_var(tc, "descr",
-	"Verify SIGSTOP followed by _exit(2) in a child");
+	"Verify that a signal emitted by a tracer to a child is caught by "
+	"a signal handler");
 }
 
 static int traceme2_caught = 0;

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Mon Apr  9 15:45:16 UTC 2018

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Improve documentation of the ATF test t_ptrace_wait*: traceme2

Set the description to:

  Verify that a signal emitted by a tracer to a child is caught by
  a signal handler.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/tests/lib/libc/sys/t_ptrace_wait.c

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

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Apr  9 15:36:00 UTC 2018

Modified Files:
src/sys/dev/pci: ichsmb.c

Log Message:
 Add 300 series chipset support.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 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.56 src/sys/dev/pci/ichsmb.c:1.57
--- src/sys/dev/pci/ichsmb.c:1.56	Fri Mar  2 08:25:53 2018
+++ src/sys/dev/pci/ichsmb.c	Mon Apr  9 15:36:00 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichsmb.c,v 1.56 2018/03/02 08:25:53 msaitoh Exp $	*/
+/*	$NetBSD: ichsmb.c,v 1.57 2018/04/09 15:36:00 msaitoh 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.56 2018/03/02 08:25:53 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.57 2018/04/09 15:36:00 msaitoh Exp $");
 
 #include 
 #include 
@@ -123,6 +123,7 @@ ichsmb_match(device_t parent, cfdata_t m
 		case PCI_PRODUCT_INTEL_100SERIES_SMB:
 		case PCI_PRODUCT_INTEL_100SERIES_LP_SMB:
 		case PCI_PRODUCT_INTEL_2HS_SMB:
+		case PCI_PRODUCT_INTEL_3HS_SMB:
 		case PCI_PRODUCT_INTEL_CORE4G_M_SMB:
 		case PCI_PRODUCT_INTEL_CORE5G_M_SMB:
 		case PCI_PRODUCT_INTEL_BAYTRAIL_PCU_SMB:

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Apr  9 15:36:00 UTC 2018

Modified Files:
src/sys/dev/pci: ichsmb.c

Log Message:
 Add 300 series chipset support.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 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.

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Apr  9 15:34:17 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
 Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1318 -r1.1319 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1317 -r1.1318 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.1318 src/sys/dev/pci/pcidevs.h:1.1319
--- src/sys/dev/pci/pcidevs.h:1.1318	Mon Apr  9 07:22:03 2018
+++ src/sys/dev/pci/pcidevs.h	Mon Apr  9 15:34:16 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1318 2018/04/09 07:22:03 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1319 2018/04/09 15:34:16 msaitoh Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1326 2018/04/09 07:21:35 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1327 2018/04/09 15:33:54 msaitoh Exp
  */
 
 /*
@@ -3309,6 +3309,10 @@
 #define	PCI_PRODUCT_INTEL_I219_LM2	0x15b7		/* I219-LM Ethernet Connection */
 #define	PCI_PRODUCT_INTEL_I219_V2	0x15b8		/* I219-V Ethernet Connection */
 #define	PCI_PRODUCT_INTEL_I219_LM3	0x15b9		/* I219-LM Ethernet Connection */
+#define	PCI_PRODUCT_INTEL_I219_LM7	0x15bb		/* I219-LM Ethernet Connection */
+#define	PCI_PRODUCT_INTEL_I219_V7	0x15bc		/* I219-V Ethernet Connection */
+#define	PCI_PRODUCT_INTEL_I219_LM6	0x15bd		/* I219-LM Ethernet Connection */
+#define	PCI_PRODUCT_INTEL_I219_V6	0x15be		/* I219-V Ethernet Connection */
 #define	PCI_PRODUCT_INTEL_C3K_X553_KRKX	0x15c2		/* C3000 X553 Backplane (KR/KX 10G SKU) */
 #define	PCI_PRODUCT_INTEL_C3K_X553_KX_25G	0x15c3		/* C3000 X553 Backplane (KX 2.5G) */
 #define	PCI_PRODUCT_INTEL_C3K_X553_SFI_SFP	0x15c4		/* C3000 X553 10G SFP+ (SFI) */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1317 src/sys/dev/pci/pcidevs_data.h:1.1318
--- src/sys/dev/pci/pcidevs_data.h:1.1317	Mon Apr  9 07:22:03 2018
+++ src/sys/dev/pci/pcidevs_data.h	Mon Apr  9 15:34:16 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1317 2018/04/09 07:22:03 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1318 2018/04/09 15:34:16 msaitoh Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1326 2018/04/09 07:21:35 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1327 2018/04/09 15:33:54 msaitoh Exp
  */
 
 /*
@@ -5348,6 +5348,14 @@ static const uint16_t pci_products[] = {
 	20730, 5571, 19544, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3, 
 	20722, 5571, 19544, 0,
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM7, 
+	20722, 5571, 19544, 0,
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V7, 
+	20730, 5571, 19544, 0,
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM6, 
+	20722, 5571, 19544, 0,
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V6, 
+	20730, 5571, 19544, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C3K_X553_KRKX, 
 	20407, 20413, 20553, 20845, 19748, 20852, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C3K_X553_KX_25G, 
@@ -13665,7 +13673,7 @@ static const char pci_words[] = { "." 
 	"ID\0" /* 1 refs @ 5554 */
 	"3c985\0" /* 1 refs @ 5557 */
 	"Gigabit\0" /* 119 refs @ 5563 */
-	"Ethernet\0" /* 468 refs @ 5571 */
+	"Ethernet\0" /* 472 refs @ 5571 */
 	"3c996\0" /* 1 refs @ 5580 */
 	"10/100/1000\0" /* 48 refs @ 5586 */
 	"3c556\0" /* 2 refs @ 5598 */
@@ -15623,7 +15631,7 @@ static const char pci_words[] = { "." 
 	"(AMT)\0" /* 3 refs @ 19521 */
 	"(IFE)\0" /* 1 refs @ 19527 */
 	"82801EB/ER\0" /* 10 refs @ 19533 */
-	"Connection\0" /* 37 refs @ 19544 */
+	"Connection\0" /* 41 refs @ 19544 */
 	"M\0" /* 1 refs @ 19555 */
 	"i82571EB\0" /* 7 refs @ 19557 */
 	"82801FB\0" /* 4 refs @ 19566 */
@@ -15776,8 +15784,8 @@ static const char pci_words[] = { "." 
 	"I218-V\0" /* 3 refs @ 20700 */
 	"I218-LM\0" /* 3 refs @ 20707 */
 	"Bypass\0" /* 2 refs @ 20715 */
-	"I219-LM\0" /* 5 refs @ 20722 */
-	"I219-V\0" /* 4 refs @ 20730 */
+	"I219-LM\0" /* 7 refs @ 20722 */
+	"I219-V\0" /* 6 refs @ 20730 */
 	"SFP+\0" /* 6 refs @ 20737 */
 	"KX\0" /* 3 refs @ 20742 */
 	"40GbE\0" /* 3 refs @ 20745 */

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Apr  9 15:34:17 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
 Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1318 -r1.1319 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1317 -r1.1318 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.

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Apr  9 15:33:54 UTC 2018

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

Log Message:
 Add new I219 devices (using with 300 series chipset).


To generate a diff of this commit:
cvs rdiff -u -r1.1326 -r1.1327 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.1326 src/sys/dev/pci/pcidevs:1.1327
--- src/sys/dev/pci/pcidevs:1.1326	Mon Apr  9 07:21:35 2018
+++ src/sys/dev/pci/pcidevs	Mon Apr  9 15:33:54 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1326 2018/04/09 07:21:35 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1327 2018/04/09 15:33:54 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3302,6 +3302,10 @@ product INTEL C3K_X553_VF_HYPV	0x15b4	C3
 product INTEL I219_LM2		0x15b7	I219-LM Ethernet Connection
 product INTEL I219_V2		0x15b8	I219-V Ethernet Connection
 product INTEL I219_LM3		0x15b9	I219-LM Ethernet Connection
+product INTEL I219_LM7		0x15bb	I219-LM Ethernet Connection
+product INTEL I219_V7		0x15bc	I219-V Ethernet Connection
+product INTEL I219_LM6		0x15bd	I219-LM Ethernet Connection
+product INTEL I219_V6		0x15be	I219-V Ethernet Connection
 product INTEL C3K_X553_KRKX	0x15c2	C3000 X553 Backplane (KR/KX 10G SKU)
 product INTEL C3K_X553_KX_25G	0x15c3	C3000 X553 Backplane (KX 2.5G)
 product INTEL C3K_X553_SFI_SFP	0x15c4	C3000 X553 10G SFP+ (SFI)

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Apr  9 15:33:54 UTC 2018

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

Log Message:
 Add new I219 devices (using with 300 series chipset).


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

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

CVS commit: src/sys/dev/usb

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Mon Apr  9 15:26:29 UTC 2018

Modified Files:
src/sys/dev/usb: usbroothub.c

Log Message:
Use ostype from  instead of a literal "NetBSD" for the
default root hub vendor string.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/usbroothub.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/usbroothub.c
diff -u src/sys/dev/usb/usbroothub.c:1.4 src/sys/dev/usb/usbroothub.c:1.5
--- src/sys/dev/usb/usbroothub.c:1.4	Tue Nov 28 07:36:08 2017
+++ src/sys/dev/usb/usbroothub.c	Mon Apr  9 15:26:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: usbroothub.c,v 1.4 2017/11/28 07:36:08 skrll Exp $ */
+/* $NetBSD: usbroothub.c,v 1.5 2018/04/09 15:26:29 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -62,6 +62,7 @@
 #include 
 #include 
 #include 
+#include 		/* for ostype */
 
 extern int usbdebug;
 
@@ -468,7 +469,7 @@ roothub_ctrl_start(struct usbd_xfer *xfe
 			break;
 		case C(1, UDESC_STRING):
 			/* Vendor */
-			buflen = usb_makestrdesc(sd, len, "NetBSD");
+			buflen = usb_makestrdesc(sd, len, ostype);
 			break;
 		case C(2, UDESC_STRING):
 			/* Product */

CVS commit: src/sys/dev/usb

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Mon Apr  9 15:26:29 UTC 2018

Modified Files:
src/sys/dev/usb: usbroothub.c

Log Message:
Use ostype from  instead of a literal "NetBSD" for the
default root hub vendor string.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/usbroothub.c

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

CVS commit: src/etc/rc.d

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 15:02:39 UTC 2018

Modified Files:
src/etc/rc.d: sshd

Log Message:
Simplify so we don't have to hard-code the key filenames in two places.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/etc/rc.d/sshd

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/sshd
diff -u src/etc/rc.d/sshd:1.26 src/etc/rc.d/sshd:1.27
--- src/etc/rc.d/sshd:1.26	Fri Apr  6 20:41:16 2018
+++ src/etc/rc.d/sshd	Mon Apr  9 11:02:39 2018
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: sshd,v 1.26 2018/04/07 00:41:16 christos Exp $
+# $NetBSD: sshd,v 1.27 2018/04/09 15:02:39 christos Exp $
 #
 
 # PROVIDE: sshd
@@ -23,17 +23,14 @@ sshd_keygen()
 	while read type bits filename version name;  do
 		f="/etc/ssh/$filename"
 		if [ -f "$f" ]; then
-			echo "You already have an $name host key in $f"
-			echo "Skipping protocol version $version $name" \
-			"Key Generation"
-		else
-			case "${bits}" in
-			-1)	bitarg=;;
-			0)	bitarg="${ssh_keygen_flags}";;
-			*)	bitarg="-b ${bits}";;
-			esac
-			"${keygen}" -t "${type}" ${bitarg} -f "${f}" -N ''
+			continue
 		fi
+		case "${bits}" in
+		-1)	bitarg=;;
+		0)	bitarg="${ssh_keygen_flags}";;
+		*)	bitarg="-b ${bits}";;
+		esac
+		"${keygen}" -t "${type}" ${bitarg} -f "${f}" -N ''
 	done << _EOF
 dsa	1024	ssh_host_dsa_key	2	DSA
 ecdsa	521	ssh_host_ecdsa_key	1	ECDSA
@@ -46,12 +43,7 @@ _EOF
 
 sshd_precmd()
 {
-	if ! [ -f /etc/ssh/ssh_host_dsa_key ]	  ||
-	   ! [ -f /etc/ssh/ssh_host_ecdsa_key ]	  ||
-	   ! [ -f /etc/ssh/ssh_host_ed25519_key ] ||
-	   ! [ -f /etc/ssh/ssh_host_rsa_key ];	then
-		run_rc_command keygen
-	fi
+	run_rc_command keygen
 }
 
 keygen_cmd=sshd_keygen

CVS commit: src/etc/rc.d

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr  9 15:02:39 UTC 2018

Modified Files:
src/etc/rc.d: sshd

Log Message:
Simplify so we don't have to hard-code the key filenames in two places.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/etc/rc.d/sshd

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

CVS commit: [netbsd-8] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:40:46 UTC 2018

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

Log Message:
ticket 725


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.169 -r1.1.2.170 src/doc/CHANGES-8.0

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

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:40:21 UTC 2018

Modified Files:
src/sys/net [netbsd-8]: if_l2tp.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #725):
sys/net/if_l2tp.c: revision 1.21
Fix l2tp(4) alignment check. Pointed out and reviewed by k-goda@IIJ.
The alignment check should be done for the address of m_data instead of
the value of m_data.
XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.11.2.5 -r1.11.2.6 src/sys/net/if_l2tp.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_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.11.2.5 src/sys/net/if_l2tp.c:1.11.2.6
--- src/sys/net/if_l2tp.c:1.11.2.5	Thu Mar  8 13:41:40 2018
+++ src/sys/net/if_l2tp.c	Mon Apr  9 13:40:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_l2tp.c,v 1.11.2.5 2018/03/08 13:41:40 martin Exp $	*/
+/*	$NetBSD: if_l2tp.c,v 1.11.2.6 2018/04/09 13:40:20 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.11.2.5 2018/03/08 13:41:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.11.2.6 2018/04/09 13:40:20 bouyer Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -465,18 +465,20 @@ l2tpintr(struct l2tp_variant *var)
 void
 l2tp_input(struct mbuf *m, struct ifnet *ifp)
 {
-	u_long val;
+	vaddr_t addr;
 
 	KASSERT(ifp != NULL);
 
-	if (m->m_pkthdr.len < sizeof(val)) {
+	/*
+	 * Currently, l2tp(4) supports only ethernet as inner protocol.
+	 */
+	if (m->m_pkthdr.len < sizeof(struct ether_header)) {
 		m_freem(m);
 		return;
 	}
 
-	m_copydata(m, 0, sizeof(val), );
-
-	if ((val & 0x03) == 0) {
+	addr = mtod(m, vaddr_t);
+	if ((addr & 0x03) == 0) {
 		/* copy and align head of payload */
 		struct mbuf *m_head;
 		int copy_length;

CVS commit: [netbsd-8] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:40:46 UTC 2018

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

Log Message:
ticket 725


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.169 -r1.1.2.170 src/doc/CHANGES-8.0

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.169 src/doc/CHANGES-8.0:1.1.2.170
--- src/doc/CHANGES-8.0:1.1.2.169	Mon Apr  9 13:36:36 2018
+++ src/doc/CHANGES-8.0	Mon Apr  9 13:40:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.169 2018/04/09 13:36:36 bouyer Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.170 2018/04/09 13:40:46 bouyer Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -11069,3 +11069,8 @@ tests/net/icmp/t_ping.c1.18 - 1.20, 
 
 	[roy, ticket #724]
 
+sys/net/if_l2tp.c1.21
+
+	Fix l2tp(4) alignment check. Pointed out and reviewed by k-goda@IIJ.
+	[knakahara, ticket #725]
+

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:40:21 UTC 2018

Modified Files:
src/sys/net [netbsd-8]: if_l2tp.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #725):
sys/net/if_l2tp.c: revision 1.21
Fix l2tp(4) alignment check. Pointed out and reviewed by k-goda@IIJ.
The alignment check should be done for the address of m_data instead of
the value of m_data.
XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.11.2.5 -r1.11.2.6 src/sys/net/if_l2tp.c

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

CVS commit: [netbsd-8] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:36:36 UTC 2018

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

Log Message:
Tickets 718 719 721 722 724


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.168 -r1.1.2.169 src/doc/CHANGES-8.0

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

CVS commit: [netbsd-8] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:36:36 UTC 2018

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

Log Message:
Tickets 718 719 721 722 724


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.168 -r1.1.2.169 src/doc/CHANGES-8.0

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.168 src/doc/CHANGES-8.0:1.1.2.169
--- src/doc/CHANGES-8.0:1.1.2.168	Mon Apr  9 12:54:34 2018
+++ src/doc/CHANGES-8.0	Mon Apr  9 13:36:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.168 2018/04/09 12:54:34 bouyer Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.169 2018/04/09 13:36:36 bouyer Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -11012,3 +11012,60 @@ sbin/gpt/unset.c1.14
 	Augment synopsis for -l option.
 	[mlelstv, ticket #710]
 
+sys/dev/ic/nvme.c1.32
+
+	don't leak ccb on alloc failure.
+	[msaitoh, ticket #718]
+
+sys/dev/pci/if_rtwn.c1.15
+
+	rtwn: fix attach function 
+	[msaitoh, ticket #719]
+
+sys/arch/amiga/amiga/cc.c			1.27
+
+	fix spl leak, found by mootja
+	[msaitoh, ticket #721]
+
+sys/arch/mips/mips/cpu_subr.c			1.33
+
+	fix spl leak, found by mootja
+	[msaitoh, ticket #722]
+
+lib/libc/sys/recv.21.38
+sbin/route/route.c1.159
+sys/kern/uipc_socket.c1.260, 1.261
+sys/kern/uipc_socket2.c1.128
+sys/kern/uipc_usrreq.c1.184
+sys/net/raw_usrreq.c1.59
+sys/net/rtsock.c1.239
+sys/netatalk/ddp_input.c			1.31
+sys/netcan/can.c1.3
+sys/netinet/ip_mroute.c1.155
+sys/netinet/raw_ip.c1.172
+sys/netinet/udp_usrreq.c			1.246
+sys/netinet6/icmp6.c1.224
+sys/netinet6/ip6_input.c			1.195
+sys/netinet6/ip6_mroute.c			1.123
+sys/netinet6/raw_ip6.c1.166
+sys/netinet6/udp6_usrreq.c			1.138
+sys/netipsec/keysock.c1.63
+sys/sys/socketvar.h1.151
+tests/lib/libc/sys/t_recvmmsg.c			1.2
+tests/net/icmp/t_ping.c1.18 - 1.20, 1.22, 1.23
+
+	socket: report receive buffer overflows
+
+	Add soroverflow() which increments the overflow counter, sets so_error
+	to ENOBUFS and wakes the receive socket up.
+	Replace all code that manually increments this counter with
+	soroverflow().
+	Add soroverflow() to raw_input().
+
+	This allows userland to detect route(4) overflows so it can re-sync
+	with the current state.
+
+	rtsock: log dropped messages that we cannot report to userland
+
+	[roy, ticket #724]
+

CVS commit: [netbsd-8] src

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:34:11 UTC 2018

Modified Files:
src/lib/libc/sys [netbsd-8]: recv.2
src/sbin/route [netbsd-8]: route.c
src/sys/kern [netbsd-8]: uipc_socket.c uipc_socket2.c uipc_usrreq.c
src/sys/net [netbsd-8]: raw_usrreq.c rtsock.c
src/sys/netatalk [netbsd-8]: ddp_input.c
src/sys/netcan [netbsd-8]: can.c
src/sys/netinet [netbsd-8]: ip_mroute.c raw_ip.c udp_usrreq.c
src/sys/netinet6 [netbsd-8]: icmp6.c ip6_input.c ip6_mroute.c raw_ip6.c
udp6_usrreq.c
src/sys/netipsec [netbsd-8]: keysock.c
src/sys/sys [netbsd-8]: socketvar.h
src/tests/lib/libc/sys [netbsd-8]: t_recvmmsg.c
src/tests/net/icmp [netbsd-8]: t_ping.c

Log Message:
Pull up following revision(s) (requested by roy in ticket #724):
tests/net/icmp/t_ping.c: revision 1.19
sys/netinet6/raw_ip6.c: revision 1.166
sys/netinet6/ip6_input.c: revision 1.195
sys/net/raw_usrreq.c: revision 1.59
sys/sys/socketvar.h: revision 1.151
sys/kern/uipc_socket2.c: revision 1.128
tests/lib/libc/sys/t_recvmmsg.c: revision 1.2
lib/libc/sys/recv.2: revision 1.38
sys/net/rtsock.c: revision 1.239
sys/netinet/udp_usrreq.c: revision 1.246
sys/netinet6/icmp6.c: revision 1.224
tests/net/icmp/t_ping.c: revision 1.20
sys/netipsec/keysock.c: revision 1.63
sys/netinet/raw_ip.c: revision 1.172
sys/kern/uipc_socket.c: revision 1.260
tests/net/icmp/t_ping.c: revision 1.22
sys/kern/uipc_socket.c: revision 1.261
tests/net/icmp/t_ping.c: revision 1.23
sys/netinet/ip_mroute.c: revision 1.155
sbin/route/route.c: revision 1.159
sys/netinet6/ip6_mroute.c: revision 1.123
sys/netatalk/ddp_input.c: revision 1.31
sys/netcan/can.c: revision 1.3
sys/kern/uipc_usrreq.c: revision 1.184
sys/netinet6/udp6_usrreq.c: revision 1.138
tests/net/icmp/t_ping.c: revision 1.18
socket: report receive buffer overflows
Add soroverflow() which increments the overflow counter, sets so_error
to ENOBUFS and wakes the receive socket up.
Replace all code that manually increments this counter with soroverflow().
Add soroverflow() to raw_input().
This allows userland to detect route(4) overflows so it can re-sync
with the current state.
socket: clear error even when peeking
The error has already been reported and it's pointless requiring another
recv(2) call just to clear it.
socket: remove now incorrect comment that so_error is only udp
As it can be affected by route(4) sockets which are raw.
rtsock: log dropped messages that we cannot report to userland
Handle ENOBUFS when receiving messages.
Don't send messages if the receiver has died.
Sprinkle more soroverflow().
Handle ENOBUFS in recv
Handle ENOBUFS in sendto
Note value received. Harden another sendto for ENOBUFS.
Handle the routing socket overflowing gracefully.
Allow a valid sendto  duh
Handle errors better.
Fix test for checking we sent all the data we asked to.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.20.1 src/lib/libc/sys/recv.2
cvs rdiff -u -r1.155.4.2 -r1.155.4.3 src/sbin/route/route.c
cvs rdiff -u -r1.255.2.1 -r1.255.2.2 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.124 -r1.124.8.1 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.181 -r1.181.8.1 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.56.4.1 -r1.56.4.2 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.213.2.7 -r1.213.2.8 src/sys/net/rtsock.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/netatalk/ddp_input.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/netcan/can.c
cvs rdiff -u -r1.146.6.2 -r1.146.6.3 src/sys/netinet/ip_mroute.c
cvs rdiff -u -r1.164.4.1 -r1.164.4.2 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.233.4.1 -r1.233.4.2 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.211.6.4 -r1.211.6.5 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.178.2.6 -r1.178.2.7 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.119.6.1 -r1.119.6.2 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.157.2.3 -r1.157.2.4 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.129 -r1.129.4.1 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.58.2.1 -r1.58.2.2 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.144.6.1 -r1.144.6.2 src/sys/sys/socketvar.h
cvs rdiff -u -r1.1 -r1.1.26.1 src/tests/lib/libc/sys/t_recvmmsg.c
cvs rdiff -u -r1.17 -r1.17.6.1 src/tests/net/icmp/t_ping.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/sys/recv.2
diff -u src/lib/libc/sys/recv.2:1.36 src/lib/libc/sys/recv.2:1.36.20.1
--- src/lib/libc/sys/recv.2:1.36	Sun Jul 14 14:29:09 2013
+++ src/lib/libc/sys/recv.2	Mon Apr  9 13:34:10 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: recv.2,v 1.36 2013/07/14 14:29:09 njoly Exp $
+.\"	$NetBSD: recv.2,v 1.36.20.1 2018/04/09 13:34:10 bouyer Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
 .\"	

CVS commit: [netbsd-8] src

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:34:11 UTC 2018

Modified Files:
src/lib/libc/sys [netbsd-8]: recv.2
src/sbin/route [netbsd-8]: route.c
src/sys/kern [netbsd-8]: uipc_socket.c uipc_socket2.c uipc_usrreq.c
src/sys/net [netbsd-8]: raw_usrreq.c rtsock.c
src/sys/netatalk [netbsd-8]: ddp_input.c
src/sys/netcan [netbsd-8]: can.c
src/sys/netinet [netbsd-8]: ip_mroute.c raw_ip.c udp_usrreq.c
src/sys/netinet6 [netbsd-8]: icmp6.c ip6_input.c ip6_mroute.c raw_ip6.c
udp6_usrreq.c
src/sys/netipsec [netbsd-8]: keysock.c
src/sys/sys [netbsd-8]: socketvar.h
src/tests/lib/libc/sys [netbsd-8]: t_recvmmsg.c
src/tests/net/icmp [netbsd-8]: t_ping.c

Log Message:
Pull up following revision(s) (requested by roy in ticket #724):
tests/net/icmp/t_ping.c: revision 1.19
sys/netinet6/raw_ip6.c: revision 1.166
sys/netinet6/ip6_input.c: revision 1.195
sys/net/raw_usrreq.c: revision 1.59
sys/sys/socketvar.h: revision 1.151
sys/kern/uipc_socket2.c: revision 1.128
tests/lib/libc/sys/t_recvmmsg.c: revision 1.2
lib/libc/sys/recv.2: revision 1.38
sys/net/rtsock.c: revision 1.239
sys/netinet/udp_usrreq.c: revision 1.246
sys/netinet6/icmp6.c: revision 1.224
tests/net/icmp/t_ping.c: revision 1.20
sys/netipsec/keysock.c: revision 1.63
sys/netinet/raw_ip.c: revision 1.172
sys/kern/uipc_socket.c: revision 1.260
tests/net/icmp/t_ping.c: revision 1.22
sys/kern/uipc_socket.c: revision 1.261
tests/net/icmp/t_ping.c: revision 1.23
sys/netinet/ip_mroute.c: revision 1.155
sbin/route/route.c: revision 1.159
sys/netinet6/ip6_mroute.c: revision 1.123
sys/netatalk/ddp_input.c: revision 1.31
sys/netcan/can.c: revision 1.3
sys/kern/uipc_usrreq.c: revision 1.184
sys/netinet6/udp6_usrreq.c: revision 1.138
tests/net/icmp/t_ping.c: revision 1.18
socket: report receive buffer overflows
Add soroverflow() which increments the overflow counter, sets so_error
to ENOBUFS and wakes the receive socket up.
Replace all code that manually increments this counter with soroverflow().
Add soroverflow() to raw_input().
This allows userland to detect route(4) overflows so it can re-sync
with the current state.
socket: clear error even when peeking
The error has already been reported and it's pointless requiring another
recv(2) call just to clear it.
socket: remove now incorrect comment that so_error is only udp
As it can be affected by route(4) sockets which are raw.
rtsock: log dropped messages that we cannot report to userland
Handle ENOBUFS when receiving messages.
Don't send messages if the receiver has died.
Sprinkle more soroverflow().
Handle ENOBUFS in recv
Handle ENOBUFS in sendto
Note value received. Harden another sendto for ENOBUFS.
Handle the routing socket overflowing gracefully.
Allow a valid sendto  duh
Handle errors better.
Fix test for checking we sent all the data we asked to.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.20.1 src/lib/libc/sys/recv.2
cvs rdiff -u -r1.155.4.2 -r1.155.4.3 src/sbin/route/route.c
cvs rdiff -u -r1.255.2.1 -r1.255.2.2 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.124 -r1.124.8.1 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.181 -r1.181.8.1 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.56.4.1 -r1.56.4.2 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.213.2.7 -r1.213.2.8 src/sys/net/rtsock.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/netatalk/ddp_input.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/netcan/can.c
cvs rdiff -u -r1.146.6.2 -r1.146.6.3 src/sys/netinet/ip_mroute.c
cvs rdiff -u -r1.164.4.1 -r1.164.4.2 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.233.4.1 -r1.233.4.2 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.211.6.4 -r1.211.6.5 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.178.2.6 -r1.178.2.7 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.119.6.1 -r1.119.6.2 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.157.2.3 -r1.157.2.4 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.129 -r1.129.4.1 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.58.2.1 -r1.58.2.2 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.144.6.1 -r1.144.6.2 src/sys/sys/socketvar.h
cvs rdiff -u -r1.1 -r1.1.26.1 src/tests/lib/libc/sys/t_recvmmsg.c
cvs rdiff -u -r1.17 -r1.17.6.1 src/tests/net/icmp/t_ping.c

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

CVS commit: [netbsd-7-0] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:32:42 UTC 2018

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

Log Message:
Tickets #1595, #1596, #1597


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

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

CVS commit: [netbsd-7-0] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:32:42 UTC 2018

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

Log Message:
Tickets #1595, #1596, #1597


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

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.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.99 src/doc/CHANGES-7.0.3:1.1.2.100
--- src/doc/CHANGES-7.0.3:1.1.2.99	Thu Apr  5 11:54:36 2018
+++ src/doc/CHANGES-7.0.3	Mon Apr  9 13:32:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.99 2018/04/05 11:54:36 martin Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.100 2018/04/09 13:32:42 martin Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -5381,3 +5381,23 @@ sys/sys/mbuf.h	1.179
 	Remove M_PKTHDR from secondary mbufs when reassembling packets.
 	[maxv, ticket #1594]
 
+external/gpl3/binutils/dist/bfd/elflink.c	1.14
+
+	When trying to decide the status of a weak symbol, resolve any
+	indirectness first.
+	[joerg, ticket #1595]
+
+bin/ed/ed.1	1.32
+bin/ed/main.c	1.29
+usr.bin/patch/pch.c1.29
+
+	patch: Pass -S to ed(1) so that patches containing ! commands
+	don't run commands.
+	ed: add -S to disable ! commands.
+	[christos, ticket #1596]
+
+sys/arch/amiga/amiga/cc.c			1.27
+
+	Fix a spl(9) leak.
+	[msaitoh, ticket #1597]
+

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:31:26 UTC 2018

Modified Files:
src/sys/arch/amiga/amiga [netbsd-7-0]: cc.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1597):
sys/arch/amiga/amiga/cc.c: revision 1.27
spl leak, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/arch/amiga/amiga/cc.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/amiga/amiga/cc.c
diff -u src/sys/arch/amiga/amiga/cc.c:1.26 src/sys/arch/amiga/amiga/cc.c:1.26.8.1
--- src/sys/arch/amiga/amiga/cc.c:1.26	Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/amiga/cc.c	Mon Apr  9 13:31:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $	*/
+/*	$NetBSD: cc.c,v 1.26.8.1 2018/04/09 13:31:26 martin Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26.8.1 2018/04/09 13:31:26 martin Exp $");
 
 #include 
 #include 
@@ -503,8 +503,10 @@ alloc_chipmem(u_long size)
 		if (size <= mn->size)
 			break;
 
-	if (mn == NULL)
+	if (mn == NULL) {
+		splx(s);
 		return NULL;
+	}
 
 	if ((mn->size - size) <= sizeof (*mn)) {
 		/*

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:31:26 UTC 2018

Modified Files:
src/sys/arch/amiga/amiga [netbsd-7-0]: cc.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1597):
sys/arch/amiga/amiga/cc.c: revision 1.27
spl leak, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/arch/amiga/amiga/cc.c

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

CVS commit: [netbsd-7-1] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:30:08 UTC 2018

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

Log Message:
Tickets #1595, #1596, #1597


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

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

CVS commit: [netbsd-7-1] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:30:08 UTC 2018

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

Log Message:
Tickets #1595, #1596, #1597


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

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.3
diff -u src/doc/CHANGES-7.1.3:1.1.2.6 src/doc/CHANGES-7.1.3:1.1.2.7
--- src/doc/CHANGES-7.1.3:1.1.2.6	Thu Apr  5 11:52:21 2018
+++ src/doc/CHANGES-7.1.3	Mon Apr  9 13:30:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.3,v 1.1.2.6 2018/04/05 11:52:21 martin Exp $
+# $NetBSD: CHANGES-7.1.3,v 1.1.2.7 2018/04/09 13:30:08 martin Exp $
 
 A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3
 release:
@@ -73,3 +73,23 @@ sys/sys/mbuf.h	1.179
 	Remove M_PKTHDR from secondary mbufs when reassembling packets.
 	[maxv, ticket #1594]
 
+external/gpl3/binutils/dist/bfd/elflink.c	1.14
+
+	When trying to decide the status of a weak symbol, resolve any
+	indirectness first.
+	[joerg, ticket #1595]
+
+bin/ed/ed.1	1.32
+bin/ed/main.c	1.29
+usr.bin/patch/pch.c1.29
+
+	patch: Pass -S to ed(1) so that patches containing ! commands
+	don't run commands.
+	ed: add -S to disable ! commands.
+	[christos, ticket #1596]
+
+sys/arch/amiga/amiga/cc.c			1.27
+
+	Fix a spl(9) leak.
+	[msaitoh, ticket #1597]
+

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:28:56 UTC 2018

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

Log Message:
Tickets #1595, #1596, #1597


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

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

Modified files:

Index: src/doc/CHANGES-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.83 src/doc/CHANGES-7.2:1.1.2.84
--- src/doc/CHANGES-7.2:1.1.2.83	Thu Apr  5 11:49:19 2018
+++ src/doc/CHANGES-7.2	Mon Apr  9 13:28:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.83 2018/04/05 11:49:19 martin Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.84 2018/04/09 13:28:56 martin Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -5413,3 +5413,23 @@ sys/sys/mbuf.h	1.179
 	Remove M_PKTHDR from secondary mbufs when reassembling packets.
 	[maxv, ticket #1594]
 
+external/gpl3/binutils/dist/bfd/elflink.c	1.14
+
+	When trying to decide the status of a weak symbol, resolve any
+	indirectness first.
+	[joerg, ticket #1595]
+
+bin/ed/ed.1	1.32
+bin/ed/main.c	1.29
+usr.bin/patch/pch.c1.29
+
+	patch: Pass -S to ed(1) so that patches containing ! commands
+	don't run commands.
+	ed: add -S to disable ! commands.
+	[christos, ticket #1596]
+
+sys/arch/amiga/amiga/cc.c			1.27
+
+	Fix a spl(9) leak.
+	[msaitoh, ticket #1597]
+

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:29:01 UTC 2018

Modified Files:
src/sys/arch/mips/mips [netbsd-8]: cpu_subr.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #722):
sys/arch/mips/mips/cpu_subr.c: revision 1.33
spl leak, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/arch/mips/mips/cpu_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/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.32 src/sys/arch/mips/mips/cpu_subr.c:1.32.2.1
--- src/sys/arch/mips/mips/cpu_subr.c:1.32	Sun May  7 04:14:20 2017
+++ src/sys/arch/mips/mips/cpu_subr.c	Mon Apr  9 13:29:01 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_subr.c,v 1.32 2017/05/07 04:14:20 skrll Exp $	*/
+/*	$NetBSD: cpu_subr.c,v 1.32.2.1 2018/04/09 13:29:01 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.32 2017/05/07 04:14:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.32.2.1 2018/04/09 13:29:01 bouyer Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -771,8 +771,10 @@ cpu_pause(struct reg *regsp)
 	int s = splhigh();
 	cpuid_t cii = cpu_index(curcpu());
 
-	if (__predict_false(cold))
+	if (__predict_false(cold)) {
+		splx(s);
 		return;
+	}
 
 	do {
 		kcpuset_atomic_set(cpus_paused, cii);

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:29:01 UTC 2018

Modified Files:
src/sys/arch/mips/mips [netbsd-8]: cpu_subr.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #722):
sys/arch/mips/mips/cpu_subr.c: revision 1.33
spl leak, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/arch/mips/mips/cpu_subr.c

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

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:28:56 UTC 2018

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

Log Message:
Tickets #1595, #1596, #1597


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

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

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:27:42 UTC 2018

Modified Files:
src/sys/arch/amiga/amiga [netbsd-8]: cc.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #721):
sys/arch/amiga/amiga/cc.c: revision 1.27
spl leak, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.22.1 src/sys/arch/amiga/amiga/cc.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/amiga/amiga/cc.c
diff -u src/sys/arch/amiga/amiga/cc.c:1.26 src/sys/arch/amiga/amiga/cc.c:1.26.22.1
--- src/sys/arch/amiga/amiga/cc.c:1.26	Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/amiga/cc.c	Mon Apr  9 13:27:42 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $	*/
+/*	$NetBSD: cc.c,v 1.26.22.1 2018/04/09 13:27:42 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26.22.1 2018/04/09 13:27:42 bouyer Exp $");
 
 #include 
 #include 
@@ -503,8 +503,10 @@ alloc_chipmem(u_long size)
 		if (size <= mn->size)
 			break;
 
-	if (mn == NULL)
+	if (mn == NULL) {
+		splx(s);
 		return NULL;
+	}
 
 	if ((mn->size - size) <= sizeof (*mn)) {
 		/*

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:27:42 UTC 2018

Modified Files:
src/sys/arch/amiga/amiga [netbsd-8]: cc.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #721):
sys/arch/amiga/amiga/cc.c: revision 1.27
spl leak, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.22.1 src/sys/arch/amiga/amiga/cc.c

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

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:27:41 UTC 2018

Modified Files:
src/sys/arch/amiga/amiga [netbsd-7]: cc.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1597):
sys/arch/amiga/amiga/cc.c: revision 1.27
spl leak, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/arch/amiga/amiga/cc.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/amiga/amiga/cc.c
diff -u src/sys/arch/amiga/amiga/cc.c:1.26 src/sys/arch/amiga/amiga/cc.c:1.26.4.1
--- src/sys/arch/amiga/amiga/cc.c:1.26	Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/amiga/cc.c	Mon Apr  9 13:27:41 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $	*/
+/*	$NetBSD: cc.c,v 1.26.4.1 2018/04/09 13:27:41 martin Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26.4.1 2018/04/09 13:27:41 martin Exp $");
 
 #include 
 #include 
@@ -503,8 +503,10 @@ alloc_chipmem(u_long size)
 		if (size <= mn->size)
 			break;
 
-	if (mn == NULL)
+	if (mn == NULL) {
+		splx(s);
 		return NULL;
+	}
 
 	if ((mn->size - size) <= sizeof (*mn)) {
 		/*

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:27:41 UTC 2018

Modified Files:
src/sys/arch/amiga/amiga [netbsd-7]: cc.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1597):
sys/arch/amiga/amiga/cc.c: revision 1.27
spl leak, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/arch/amiga/amiga/cc.c

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

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:25:36 UTC 2018

Modified Files:
src/sys/dev/pci [netbsd-8]: if_rtwn.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #719):
sys/dev/pci/if_rtwn.c: revision 1.15
in rtwn_attach(): return; before unconditionally running into fail:


To generate a diff of this commit:
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/sys/dev/pci/if_rtwn.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/if_rtwn.c
diff -u src/sys/dev/pci/if_rtwn.c:1.12.2.1 src/sys/dev/pci/if_rtwn.c:1.12.2.2
--- src/sys/dev/pci/if_rtwn.c:1.12.2.1	Sun Dec 10 10:10:24 2017
+++ src/sys/dev/pci/if_rtwn.c	Mon Apr  9 13:25:36 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_rtwn.c,v 1.12.2.1 2017/12/10 10:10:24 snj Exp $	*/
+/*	$NetBSD: if_rtwn.c,v 1.12.2.2 2018/04/09 13:25:36 bouyer Exp $	*/
 /*	$OpenBSD: if_rtwn.c,v 1.5 2015/06/14 08:02:47 stsp Exp $	*/
 #define	IEEE80211_NO_HT
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.12.2.1 2017/12/10 10:10:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.12.2.2 2018/04/09 13:25:36 bouyer Exp $");
 
 #include 
 #include 
@@ -396,6 +396,8 @@ rtwn_attach(device_t parent, device_t se
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 
+	return;
+
 fail:
 	rtwn_detach(self, 0);
 }

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Apr  9 13:25:36 UTC 2018

Modified Files:
src/sys/dev/pci [netbsd-8]: if_rtwn.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #719):
sys/dev/pci/if_rtwn.c: revision 1.15
in rtwn_attach(): return; before unconditionally running into fail:


To generate a diff of this commit:
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/sys/dev/pci/if_rtwn.c

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