CVS commit: src/sys/dev/pci

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 11:07:42 UTC 2016

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

Log Message:
need to set PCI_COMMAND_MASTER_ENABLE flag; fixes the driver under QEMU


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/nvme_pci.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/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.8 src/sys/dev/pci/nvme_pci.c:1.9
--- src/sys/dev/pci/nvme_pci.c:1.8	Sat Sep 17 03:02:03 2016
+++ src/sys/dev/pci/nvme_pci.c	Sat Sep 17 11:07:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.8 2016/09/17 03:02:03 pgoyette Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.9 2016/09/17 11:07:42 jdolecek Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.8 2016/09/17 03:02:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.9 2016/09/17 11:07:42 jdolecek Exp $");
 
 #include 
 #include 
@@ -110,7 +110,7 @@ nvme_pci_attach(device_t parent, device_
 	struct nvme_pci_softc *psc = device_private(self);
 	struct nvme_softc *sc = &psc->psc_nvme;
 	struct pci_attach_args *pa = aux;
-	pcireg_t memtype;
+	pcireg_t memtype, reg;
 	bus_addr_t memaddr;
 	int flags, msixoff;
 	int error;
@@ -124,6 +124,12 @@ nvme_pci_attach(device_t parent, device_
 
 	pci_aprint_devinfo(pa, NULL);
 
+	reg = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+	if ((reg & PCI_COMMAND_MASTER_ENABLE) == 0) {
+		reg |= PCI_COMMAND_MASTER_ENABLE;
+	pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, reg);
+	}
+
 	/* Map registers */
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, NVME_PCI_BAR);
 	if (PCI_MAPREG_TYPE(memtype) != PCI_MAPREG_TYPE_MEM) {

CVS commit: src/sys/kern

2016-09-17 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Sat Sep 17 12:00:35 UTC 2016

Modified Files:
src/sys/kern: kern_proc.c

Log Message:
Use VM_MAXUSER_ADDRESS for proc0, not VM_MAX_ADDRESS. It normally does not
change anything, since kernel processes use the shared kernel map instead
of the one they are given here. For consistency though, it is better to
make sure UVM will not be tempted to access machine-dependent reserved
areas (e.g., the PTE space on x86).


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/sys/kern/kern_proc.c

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

Modified files:

Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.196 src/sys/kern/kern_proc.c:1.197
--- src/sys/kern/kern_proc.c:1.196	Wed May 25 17:43:58 2016
+++ src/sys/kern/kern_proc.c	Sat Sep 17 12:00:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_proc.c,v 1.196 2016/05/25 17:43:58 christos Exp $	*/
+/*	$NetBSD: kern_proc.c,v 1.197 2016/09/17 12:00:34 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.196 2016/05/25 17:43:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.197 2016/09/17 12:00:34 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -480,7 +480,7 @@ proc0_init(void)
 	 * share proc0's vmspace, and thus, the kernel pmap.
 	 */
 	uvmspace_init(&vmspace0, pmap_kernel(), round_page(VM_MIN_ADDRESS),
-	trunc_page(VM_MAX_ADDRESS),
+	trunc_page(VM_MAXUSER_ADDRESS),
 #ifdef __USE_TOPDOWN_VM
 	true
 #else

CVS commit: src/sys/kern

2016-09-17 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Sat Sep 17 12:09:23 UTC 2016

Modified Files:
src/sys/kern: init_main.c

Log Message:
This is just a temporary stack that holds fake arguments, and that gets
remapped as RW in sys_execve. Still, in this small window, it does not need
to be executable.


To generate a diff of this commit:
cvs rdiff -u -r1.482 -r1.483 src/sys/kern/init_main.c

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

Modified files:

Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.482 src/sys/kern/init_main.c:1.483
--- src/sys/kern/init_main.c:1.482	Thu Jul  7 06:55:43 2016
+++ src/sys/kern/init_main.c	Sat Sep 17 12:09:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.482 2016/07/07 06:55:43 msaitoh Exp $	*/
+/*	$NetBSD: init_main.c,v 1.483 2016/09/17 12:09:22 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.482 2016/07/07 06:55:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.483 2016/09/17 12:09:22 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
@@ -931,10 +931,10 @@ start_init(void *arg)
 	 */
 	addr = (vaddr_t)STACK_ALLOC(USRSTACK, PAGE_SIZE);
 	if (uvm_map(&p->p_vmspace->vm_map, &addr, PAGE_SIZE,
-NULL, UVM_UNKNOWN_OFFSET, 0,
-UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, UVM_INH_COPY,
-		UVM_ADV_NORMAL,
-UVM_FLAG_FIXED|UVM_FLAG_OVERLAY|UVM_FLAG_COPYONW)) != 0)
+	NULL, UVM_UNKNOWN_OFFSET, 0,
+	UVM_MAPFLAG(UVM_PROT_RW, UVM_PROT_RW, UVM_INH_COPY,
+	UVM_ADV_NORMAL,
+	UVM_FLAG_FIXED|UVM_FLAG_OVERLAY|UVM_FLAG_COPYONW)) != 0)
 		panic("init: couldn't allocate argument space");
 	p->p_vmspace->vm_maxsaddr = (void *)STACK_MAX(addr, PAGE_SIZE);

CVS commit: src/sys/dev/pci

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 12:58:51 UTC 2016

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

Log Message:
actually detach the ld {b,c}devsw on unload, and fail load if it's already
present


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/nvme_pci.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/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.9 src/sys/dev/pci/nvme_pci.c:1.10
--- src/sys/dev/pci/nvme_pci.c:1.9	Sat Sep 17 11:07:42 2016
+++ src/sys/dev/pci/nvme_pci.c	Sat Sep 17 12:58:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.9 2016/09/17 11:07:42 jdolecek Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.10 2016/09/17 12:58:51 jdolecek Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.9 2016/09/17 11:07:42 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.10 2016/09/17 12:58:51 jdolecek Exp $");
 
 #include 
 #include 
@@ -443,13 +443,13 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 #ifdef _MODULE
-		/* devsw must be done before configuring the pci device,
+		/* devsw must be done before configuring the actual device,
 		 * otherwise ldattach() fails
 		 */
 		bmajor = cmajor = NODEVMAJOR;
 		error = devsw_attach(ld_cd.cd_name, &ld_bdevsw, &bmajor,
 		&ld_cdevsw, &cmajor);
-		if (error && error != EEXIST) {
+		if (error) {
 			aprint_error("%s: unable to register devsw\n",
 			ld_cd.cd_name);
 			return error;
@@ -469,7 +469,7 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 		if (error)
 			return error;
 
-		/* devsw not detached, it's static data and fine to stay */
+		devsw_detach(&ld_bdevsw, &ld_cdevsw);
 #endif
 		return error;
 	default:

CVS commit: src/share/mk

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Sep 17 15:58:21 UTC 2016

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
switch arm to new binutils.


To generate a diff of this commit:
cvs rdiff -u -r1.960 -r1.961 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.960 src/share/mk/bsd.own.mk:1.961
--- src/share/mk/bsd.own.mk:1.960	Sat Sep 17 02:06:15 2016
+++ src/share/mk/bsd.own.mk	Sat Sep 17 11:58:21 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.960 2016/09/17 06:06:15 kre Exp $
+#	$NetBSD: bsd.own.mk,v 1.961 2016/09/17 15:58:21 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -166,6 +166,7 @@ EXTERNAL_GDB_SUBDIR=		gdb
 #
 .if ${MACHINE} == "alpha" || \
 ${MACHINE} == "amd64" || \
+${MACHINE_CPU} == "arm" || \
 ${MACHINE} == "hppa" || \
 ${MACHINE} == "i386" || \
 ${MACHINE} == "ia64" || \

CVS commit: src/sys/arch/amiga/stand/bootblock

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Sep 17 17:09:10 UTC 2016

Modified Files:
src/sys/arch/amiga/stand/bootblock: Makefile.booters
src/sys/arch/amiga/stand/bootblock/boot: Makefile
src/sys/arch/amiga/stand/bootblock/elf2bb: Makefile
src/sys/arch/amiga/stand/bootblock/installboot: Makefile
src/sys/arch/amiga/stand/bootblock/txlt: Makefile

Log Message:
NOPIE


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/stand/bootblock/Makefile.booters
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/amiga/stand/bootblock/boot/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amiga/stand/bootblock/elf2bb/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/sys/arch/amiga/stand/bootblock/installboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/stand/bootblock/txlt/Makefile

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

Modified files:

Index: src/sys/arch/amiga/stand/bootblock/Makefile.booters
diff -u src/sys/arch/amiga/stand/bootblock/Makefile.booters:1.7 src/sys/arch/amiga/stand/bootblock/Makefile.booters:1.8
--- src/sys/arch/amiga/stand/bootblock/Makefile.booters:1.7	Tue Jul  6 01:59:57 2010
+++ src/sys/arch/amiga/stand/bootblock/Makefile.booters	Sat Sep 17 13:09:10 2016
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile.booters,v 1.7 2010/07/06 05:59:57 mrg Exp $
+#	$NetBSD: Makefile.booters,v 1.8 2016/09/17 17:09:10 christos Exp $
 
-.include 
+NOPIE=	# defined
+.include 
 
 RELOC2BB=	${TOOL_AMIGAELF2BB}
 TXLT=		${TOOL_AMIGATXLT}

Index: src/sys/arch/amiga/stand/bootblock/boot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.53 src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.54
--- src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.53	Fri Jan 15 03:27:04 2016
+++ src/sys/arch/amiga/stand/bootblock/boot/Makefile	Sat Sep 17 13:09:10 2016
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.53 2016/01/15 08:27:04 mlelstv Exp $
+#	$NetBSD: Makefile,v 1.54 2016/09/17 17:09:10 christos Exp $
 
-.include 
+.include 
 .include 		# for HOST_SH
 
 ### what we need:

Index: src/sys/arch/amiga/stand/bootblock/elf2bb/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/elf2bb/Makefile:1.3 src/sys/arch/amiga/stand/bootblock/elf2bb/Makefile:1.4
--- src/sys/arch/amiga/stand/bootblock/elf2bb/Makefile:1.3	Sun Dec 11 07:16:36 2005
+++ src/sys/arch/amiga/stand/bootblock/elf2bb/Makefile	Sat Sep 17 13:09:10 2016
@@ -1,5 +1,8 @@
-#	$NetBSD: Makefile,v 1.3 2005/12/11 12:16:36 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2016/09/17 17:09:10 christos Exp $
 #
+
+.include 
+
 CPPFLAGS+= -I.
 PROG=	elf2bb
 MKMAN=	no

Index: src/sys/arch/amiga/stand/bootblock/installboot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/installboot/Makefile:1.7 src/sys/arch/amiga/stand/bootblock/installboot/Makefile:1.8
--- src/sys/arch/amiga/stand/bootblock/installboot/Makefile:1.7	Tue Jul  6 02:09:57 2010
+++ src/sys/arch/amiga/stand/bootblock/installboot/Makefile	Sat Sep 17 13:09:10 2016
@@ -1,4 +1,7 @@
-#	$NetBSD: Makefile,v 1.7 2010/07/06 06:09:57 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2016/09/17 17:09:10 christos Exp $
+
+.include 
+
 PROG=installboot
 SRCS=installboot.c chksum.c
 BINDIR=/usr/mdec

Index: src/sys/arch/amiga/stand/bootblock/txlt/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/txlt/Makefile:1.9 src/sys/arch/amiga/stand/bootblock/txlt/Makefile:1.10
--- src/sys/arch/amiga/stand/bootblock/txlt/Makefile:1.9	Tue Feb  3 14:58:41 2015
+++ src/sys/arch/amiga/stand/bootblock/txlt/Makefile	Sat Sep 17 13:09:10 2016
@@ -1,7 +1,10 @@
-#	$NetBSD: Makefile,v 1.9 2015/02/03 19:58:41 aymeric Exp $
+#	$NetBSD: Makefile,v 1.10 2016/09/17 17:09:10 christos Exp $
 #
-PROG=txlt
+
 NOMAN=	# defined
+.include 
+
+PROG=txlt
 CLEANFILES+=	txlt.c
 
 .ifndef HOSTPROG

CVS commit: src/share/man/man9

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 17:10:21 UTC 2016

Modified Files:
src/share/man/man9: pci_msi.9

Log Message:
add HISTORY and AUTHORS; listed there Kengo Nakahara as he seems to be the
primary author according to commits, feel free to adjust as appropriate


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/share/man/man9/pci_msi.9

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

Modified files:

Index: src/share/man/man9/pci_msi.9
diff -u src/share/man/man9/pci_msi.9:1.13 src/share/man/man9/pci_msi.9:1.14
--- src/share/man/man9/pci_msi.9:1.13	Fri Sep 16 13:56:36 2016
+++ src/share/man/man9/pci_msi.9	Sat Sep 17 17:10:21 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: pci_msi.9,v 1.13 2016/09/16 13:56:36 jdolecek Exp $
+.\" $NetBSD: pci_msi.9,v 1.14 2016/09/17 17:10:21 jdolecek Exp $
 .\"
 .\" Copyright (c) 2015 Internet Initiative Japan Inc.
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 15, 2016
+.Dd September 17, 2016
 .Dt PCI_MSI 9
 .Os
 .Sh NAME
@@ -314,3 +314,17 @@ for MSI, and
 for others.
 .Sh SEE ALSO
 .Xr pci_intr 9
+.Sh HISTORY
+.Nm
+support first appeared in
+.Nx 8.0 .
+Support is present on
+.Em i386
+and
+.Em amd64
+architectures.
+.Sh AUTHORS
+The
+.Nm
+interfaces were designed and implemented by
+.An Kengo Nakahara .

CVS commit: src/share/man/man9

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 17:13:00 UTC 2016

Modified Files:
src/share/man/man9: pci_msi.9

Log Message:
include also @n.o email for Kengo Nakahara


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/share/man/man9/pci_msi.9

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

Modified files:

Index: src/share/man/man9/pci_msi.9
diff -u src/share/man/man9/pci_msi.9:1.14 src/share/man/man9/pci_msi.9:1.15
--- src/share/man/man9/pci_msi.9:1.14	Sat Sep 17 17:10:21 2016
+++ src/share/man/man9/pci_msi.9	Sat Sep 17 17:13:00 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: pci_msi.9,v 1.14 2016/09/17 17:10:21 jdolecek Exp $
+.\" $NetBSD: pci_msi.9,v 1.15 2016/09/17 17:13:00 jdolecek Exp $
 .\"
 .\" Copyright (c) 2015 Internet Initiative Japan Inc.
 .\" All rights reserved.
@@ -327,4 +327,5 @@ architectures.
 The
 .Nm
 interfaces were designed and implemented by
-.An Kengo Nakahara .
+.An Kengo Nakahara
+.Aq knakah...@netbsd.org .

CVS commit: src/sys/arch/x68k/stand

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Sep 17 17:18:14 UTC 2016

Modified Files:
src/sys/arch/x68k/stand: Makefile.booters

Log Message:
Kill the PIE


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x68k/stand/Makefile.booters

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

Modified files:

Index: src/sys/arch/x68k/stand/Makefile.booters
diff -u src/sys/arch/x68k/stand/Makefile.booters:1.8 src/sys/arch/x68k/stand/Makefile.booters:1.9
--- src/sys/arch/x68k/stand/Makefile.booters:1.8	Sun Jan 12 10:26:31 2014
+++ src/sys/arch/x68k/stand/Makefile.booters	Sat Sep 17 13:18:14 2016
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile.booters,v 1.8 2014/01/12 15:26:31 tsutsui Exp $
+#	$NetBSD: Makefile.booters,v 1.9 2016/09/17 17:18:14 christos Exp $
 
+NOPIE=	# defined
 S?=	${.CURDIR}/../../../..
 
 CFLAGS+= -ffreestanding

CVS commit: src/share/man/man9

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 17:38:11 UTC 2016

Modified Files:
src/share/man/man9: pci_intr.9

Log Message:
note that pci_intr_establish_xname() is new in NetBSD 8.0


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/share/man/man9/pci_intr.9

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

Modified files:

Index: src/share/man/man9/pci_intr.9
diff -u src/share/man/man9/pci_intr.9:1.24 src/share/man/man9/pci_intr.9:1.25
--- src/share/man/man9/pci_intr.9:1.24	Tue Jul 12 03:39:55 2016
+++ src/share/man/man9/pci_intr.9	Sat Sep 17 17:38:11 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: pci_intr.9,v 1.24 2016/07/12 03:39:55 knakahara Exp $
+.\" $NetBSD: pci_intr.9,v 1.25 2016/09/17 17:38:11 jdolecek Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 12, 2016
+.Dd September 17, 2016
 .Dt PCI_INTR 9
 .Os
 .Sh NAME
@@ -202,3 +202,8 @@ contains the PCI tag of the uppermost br
 .Xr evcnt 9 ,
 .Xr pci 9 ,
 .Xr pci_msi 9
+.Sh HISTORY
+.Fn pci_intr_establish_xname
+was added in
+.Nx 8.0
+as part of MSI/MSI-X support.

CVS commit: src/sys/arch/amiga/stand/bootblock

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Sep 17 18:08:02 UTC 2016

Modified Files:
src/sys/arch/amiga/stand/bootblock: Makefile.booters

Log Message:
kill ssp


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/stand/bootblock/Makefile.booters

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/stand/bootblock/Makefile.booters
diff -u src/sys/arch/amiga/stand/bootblock/Makefile.booters:1.8 src/sys/arch/amiga/stand/bootblock/Makefile.booters:1.9
--- src/sys/arch/amiga/stand/bootblock/Makefile.booters:1.8	Sat Sep 17 13:09:10 2016
+++ src/sys/arch/amiga/stand/bootblock/Makefile.booters	Sat Sep 17 14:08:02 2016
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile.booters,v 1.8 2016/09/17 17:09:10 christos Exp $
+#	$NetBSD: Makefile.booters,v 1.9 2016/09/17 18:08:02 christos Exp $
 
+NOSSP=	# defined
 NOPIE=	# defined
 .include

CVS commit: src/sys/arch/x68k/stand

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Sep 17 18:08:33 UTC 2016

Modified Files:
src/sys/arch/x68k/stand: Makefile.booters

Log Message:
Kill ssp


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x68k/stand/Makefile.booters

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

Modified files:

Index: src/sys/arch/x68k/stand/Makefile.booters
diff -u src/sys/arch/x68k/stand/Makefile.booters:1.9 src/sys/arch/x68k/stand/Makefile.booters:1.10
--- src/sys/arch/x68k/stand/Makefile.booters:1.9	Sat Sep 17 13:18:14 2016
+++ src/sys/arch/x68k/stand/Makefile.booters	Sat Sep 17 14:08:33 2016
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile.booters,v 1.9 2016/09/17 17:18:14 christos Exp $
+#	$NetBSD: Makefile.booters,v 1.10 2016/09/17 18:08:33 christos Exp $
 
 NOPIE=	# defined
+NOSSP=	# defined
 S?=	${.CURDIR}/../../../..
 
 CFLAGS+= -ffreestanding

CVS commit: src/sys/arch/atari/stand

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Sep 17 18:09:24 UTC 2016

Modified Files:
src/sys/arch/atari/stand: Makefile.booters

Log Message:
kill PIE/SSP


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/atari/stand/Makefile.booters

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/atari/stand/Makefile.booters
diff -u src/sys/arch/atari/stand/Makefile.booters:1.4 src/sys/arch/atari/stand/Makefile.booters:1.5
--- src/sys/arch/atari/stand/Makefile.booters:1.4	Mon Aug 12 12:34:05 2013
+++ src/sys/arch/atari/stand/Makefile.booters	Sat Sep 17 14:09:24 2016
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.booters,v 1.4 2013/08/12 16:34:05 joerg Exp $
+# $NetBSD: Makefile.booters,v 1.5 2016/09/17 18:09:24 christos Exp $
 
+NOPIE=	# defined
+NOSSP=	# defined
 BINDIR=		/usr/mdec/${BTYPE:tl}
 
 DBG=

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

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 18:37:46 UTC 2016

Modified Files:
src/sys/arch/i386/conf: GENERIC

Log Message:
add nvme(4)


To generate a diff of this commit:
cvs rdiff -u -r1.1139 -r1.1140 src/sys/arch/i386/conf/GENERIC

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

Modified files:

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1139 src/sys/arch/i386/conf/GENERIC:1.1140
--- src/sys/arch/i386/conf/GENERIC:1.1139	Sun Aug  7 10:44:05 2016
+++ src/sys/arch/i386/conf/GENERIC	Sat Sep 17 18:37:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1139 2016/08/07 10:44:05 christos Exp $
+# $NetBSD: GENERIC,v 1.1140 2016/09/17 18:37:46 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.1139 $"
+#ident 		"GENERIC-$Revision: 1.1140 $"
 
 maxusers	64		# estimated number of users
 
@@ -835,6 +835,9 @@ ses*	at scsibus? target ? lun ?	# SCSI E
 ss*	at scsibus? target ? lun ?	# SCSI scanners
 uk*	at scsibus? target ? lun ?	# SCSI unknown
 
+# NVM Express controllers and devices
+nvme*   at pci? dev ? function ?
+ld* at nvme? nsid ?
 
 # RAID controllers and devices
 aac*	at pci? dev ? function ?	# Adaptec AAC family

CVS commit: src/sys/dev/scsipi

2016-09-17 Thread Frank Kardel 
Module Name:src
Committed By:   kardel
Date:   Sat Sep 17 18:53:13 UTC 2016

Modified Files:
src/sys/dev/scsipi: scsipi_verbose.c

Log Message:
ASC/ASCQ table updated from http://www.t10.org/lists/asc-num.txt 2016-07-30


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/scsipi/scsipi_verbose.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/scsipi/scsipi_verbose.c
diff -u src/sys/dev/scsipi/scsipi_verbose.c:1.32 src/sys/dev/scsipi/scsipi_verbose.c:1.33
--- src/sys/dev/scsipi/scsipi_verbose.c:1.32	Sun Jul 25 13:49:58 2010
+++ src/sys/dev/scsipi/scsipi_verbose.c	Sat Sep 17 18:53:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsipi_verbose.c,v 1.32 2010/07/25 13:49:58 pgoyette Exp $	*/
+/*	$NetBSD: scsipi_verbose.c,v 1.33 2016/09/17 18:53:13 kardel Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.32 2010/07/25 13:49:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.33 2016/09/17 18:53:13 kardel Exp $");
 
 #include 
 #include 
@@ -87,26 +87,32 @@ static const struct {
 { 0x00, 0x04, "Beginning-Of-Partition/Medium Detected" },
 { 0x00, 0x05, "End-Of-Data Detected" },
 { 0x00, 0x06, "I/O Process Terminated" },
+{ 0x00, 0x07, "Programmable Early Warning Detected" },
 { 0x00, 0x11, "Audio Play Operation In Progress" },
 { 0x00, 0x12, "Audio Play Operation Paused" },
 { 0x00, 0x13, "Audio Play Operation Successfully Completed" },
-{ 0x00, 0x14, "Audio Play Operation Stopped Due to Error" },
+{ 0x00, 0x14, "Audio Play Operation Stopped Due To Error" },
 { 0x00, 0x15, "No Current Audio Status To Return" },
 { 0x00, 0x16, "Operation In Progress" },
 { 0x00, 0x17, "Cleaning Requested" },
 { 0x00, 0x18, "Erase Operation In Progress" },
 { 0x00, 0x19, "Locate Operation In Progress" },
 { 0x00, 0x1A, "Rewind Operation In Progress" },
-{ 0x00, 0x1B, "Set Capacity Operation In Progess" },
+{ 0x00, 0x1B, "Set Capacity Operation In Progress" },
 { 0x00, 0x1C, "Verify Operation In Progress" },
+{ 0x00, 0x1D, "ATA Pass Through Information Available" },
+{ 0x00, 0x1E, "Conflicting SA Creation Request" },
+{ 0x00, 0x1F, "Logical Unit Transitioning To Another Power Condition" },
+{ 0x00, 0x20, "Extended Copy Information Available" },
+{ 0x00, 0x21, "Atomic Command Aborted Due To ACA" },
 { 0x01, 0x00, "No Index/Sector Signal" },
 { 0x02, 0x00, "No Seek Complete" },
 { 0x03, 0x00, "Peripheral Device Write Fault" },
 { 0x03, 0x01, "No Write Current" },
 { 0x03, 0x02, "Excessive Write Errors" },
 { 0x04, 0x00, "Logical Unit Not Ready, Cause Not Reportable" },
-{ 0x04, 0x01, "Logical Unit Is in Process Of Becoming Ready" },
-{ 0x04, 0x02, "Logical Unit Not Ready, Initialization Command Required" },
+{ 0x04, 0x01, "Logical Unit Is In Process Of Becoming Ready" },
+{ 0x04, 0x02, "Logical Unit Not Ready, Initializing Command Required" },
 { 0x04, 0x03, "Logical Unit Not Ready, Manual Intervention Required" },
 { 0x04, 0x04, "Logical Unit Not Ready, Format In Progress" },
 { 0x04, 0x05, "Logical Unit Not Ready, Rebuild In Progress" },
@@ -118,28 +124,64 @@ static const struct {
 "Transition" },
 { 0x04, 0x0B, "Logical Unit Not Accessible, Target Port In Standby State" },
 { 0x04, 0x0C, "Logical Unit Not Accessible, Target Port In Unavailable State" },
+{ 0x04, 0x0D, "Logical Unit Not Ready, Structure Check Required" },
+{ 0x04, 0x0E, "Logical Unit Not Ready, Security Session In Progress" },
 { 0x04, 0x10, "Logical Unit Not Ready, Auxiliary Memory Not Accessible" },
-{ 0x04, 0x11, "Logical Unit Not Ready, Notify (Enable_Spinup) Required" },
+{ 0x04, 0x11, "Logical Unit Not Ready, Notify (Enable Spinup) Required" },
+{ 0x04, 0x12, "Logical Unit Not Ready, Offline" },
+{ 0x04, 0x13, "Logical Unit Not Ready, SA Creation In Progress" },
+{ 0x04, 0x14, "Logical Unit Not Ready, Space Allocation In Progress" },
+{ 0x04, 0x15, "Logical Unit Not Ready, Robotics Disabled" },
+{ 0x04, 0x16, "Logical Unit Not Ready, Configuration Required" },
+{ 0x04, 0x17, "Logical Unit Not Ready, Calibration Required" },
+{ 0x04, 0x18, "Logical Unit Not Ready, A Door Is Open" },
+{ 0x04, 0x19, "Logical Unit Not Ready, Operating In Sequential Mode" },
+{ 0x04, 0x1A, "Logical Unit Not Ready, Start Stop Unit Command In Progress" },
+{ 0x04, 0x1B, "Logical Unit Not Ready, Sanitize In Progress" },
+{ 0x04, 0x1C, "Logical Unit Not Ready, Additional Power Use Not Yet Granted" },
+{ 0x04, 0x1D, "Logical Unit Not Ready, Configuration In Progress" },
+{ 0x04, 0x1E, "Logical Unit Not Ready, Microcode Activation Required" },
+{ 0x04, 0x1F, "Logical Unit Not Ready, Microcode Download Required" },
+{ 0x04, 0x20, "Logical Unit Not Ready, Logical Unit Reset Required" },
+{ 0x04, 0x21, "Logical Unit Not Ready, Hard Reset Required" },
+{ 0x04, 0x22, "Logical Unit Not Ready, Power Cycle Required" },
+{ 0x04, 0x23, "Log

CVS commit: src/usr.sbin/cpuctl

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 19:35:21 UTC 2016

Modified Files:
src/usr.sbin/cpuctl: cpuctl.8

Log Message:
link back to intrctl(8), it xrefs cpuctl(8)


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/cpuctl/cpuctl.8

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

Modified files:

Index: src/usr.sbin/cpuctl/cpuctl.8
diff -u src/usr.sbin/cpuctl/cpuctl.8:1.15 src/usr.sbin/cpuctl/cpuctl.8:1.16
--- src/usr.sbin/cpuctl/cpuctl.8:1.15	Mon Nov 16 03:34:50 2015
+++ src/usr.sbin/cpuctl/cpuctl.8	Sat Sep 17 19:35:21 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cpuctl.8,v 1.15 2015/11/16 03:34:50 mrg Exp $
+.\"	$NetBSD: cpuctl.8,v 1.16 2016/09/17 19:35:21 jdolecek Exp $
 .\"
 .\" Copyright (c) 2007, 2008, 2012, 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 15, 2015
+.Dd September 17, 2016
 .Dt CPUCTL 8
 .Os
 .Sh NAME
@@ -131,7 +131,8 @@ cpu0: UCode version: 0x183
 .Ed
 .Sh SEE ALSO
 .Xr psrset 8 ,
-.Xr schedctl 8
+.Xr schedctl 8 ,
+.Xr intrctl 8
 .Sh HISTORY
 The
 .Nm

CVS commit: src/sys/dev/ic

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 19:52:16 UTC 2016

Modified Files:
src/sys/dev/ic: nvme.c

Log Message:
make nvme_dumpregs() compile on LP64 hosts

sprinkle some delays() and extra checks into attach code, so that it follows
more closely what FreeBSD driver does, and is easier to cross-check


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/nvme.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/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.7 src/sys/dev/ic/nvme.c:1.8
--- src/sys/dev/ic/nvme.c:1.7	Fri Sep 16 12:57:26 2016
+++ src/sys/dev/ic/nvme.c	Sat Sep 17 19:52:16 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme.c,v 1.7 2016/09/16 12:57:26 jdolecek Exp $	*/
+/*	$NetBSD: nvme.c,v 1.8 2016/09/17 19:52:16 jdolecek Exp $	*/
 /*	$OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.7 2016/09/16 12:57:26 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.8 2016/09/17 19:52:16 jdolecek Exp $");
 
 #include 
 #include 
@@ -200,35 +200,47 @@ nvme_dumpregs(struct nvme_softc *sc)
 
 #define	DEVNAME(_sc) device_xname((_sc)->sc_dev)
 	r8 = nvme_read8(sc, NVME_CAP);
-	printf("%s: cap  0x%016llx\n", DEVNAME(sc), nvme_read8(sc, NVME_CAP));
+	printf("%s: cap  0x%016"PRIx64"\n", DEVNAME(sc), nvme_read8(sc, NVME_CAP));
 	printf("%s:  mpsmax %u (%u)\n", DEVNAME(sc),
 	(u_int)NVME_CAP_MPSMAX(r8), (1 << NVME_CAP_MPSMAX(r8)));
 	printf("%s:  mpsmin %u (%u)\n", DEVNAME(sc),
 	(u_int)NVME_CAP_MPSMIN(r8), (1 << NVME_CAP_MPSMIN(r8)));
-	printf("%s:  css %llu\n", DEVNAME(sc), NVME_CAP_CSS(r8));
-	printf("%s:  nssrs %llu\n", DEVNAME(sc), NVME_CAP_NSSRS(r8));
-	printf("%s:  dstrd %llu\n", DEVNAME(sc), NVME_CAP_DSTRD(r8));
-	printf("%s:  to %llu msec\n", DEVNAME(sc), NVME_CAP_TO(r8));
-	printf("%s:  ams %llu\n", DEVNAME(sc), NVME_CAP_AMS(r8));
-	printf("%s:  cqr %llu\n", DEVNAME(sc), NVME_CAP_CQR(r8));
-	printf("%s:  mqes %llu\n", DEVNAME(sc), NVME_CAP_MQES(r8));
+	printf("%s:  css %"PRIu64"\n", DEVNAME(sc), NVME_CAP_CSS(r8));
+	printf("%s:  nssrs %"PRIu64"\n", DEVNAME(sc), NVME_CAP_NSSRS(r8));
+	printf("%s:  dstrd %"PRIu64"\n", DEVNAME(sc), NVME_CAP_DSTRD(r8));
+	printf("%s:  to %"PRIu64" msec\n", DEVNAME(sc), NVME_CAP_TO(r8));
+	printf("%s:  ams %"PRIu64"\n", DEVNAME(sc), NVME_CAP_AMS(r8));
+	printf("%s:  cqr %"PRIu64"\n", DEVNAME(sc), NVME_CAP_CQR(r8));
+	printf("%s:  mqes %"PRIu64"\n", DEVNAME(sc), NVME_CAP_MQES(r8));
 
 	printf("%s: vs   0x%04x\n", DEVNAME(sc), nvme_read4(sc, NVME_VS));
 
 	r4 = nvme_read4(sc, NVME_CC);
 	printf("%s: cc   0x%04x\n", DEVNAME(sc), r4);
-	printf("%s:  iocqes %u\n", DEVNAME(sc), NVME_CC_IOCQES_R(r4));
-	printf("%s:  iosqes %u\n", DEVNAME(sc), NVME_CC_IOSQES_R(r4));
+	printf("%s:  iocqes %u (%u)\n", DEVNAME(sc), NVME_CC_IOCQES_R(r4),
+	(1 << NVME_CC_IOCQES_R(r4)));
+	printf("%s:  iosqes %u (%u)\n", DEVNAME(sc), NVME_CC_IOSQES_R(r4),
+	(1 << NVME_CC_IOSQES_R(r4)));
 	printf("%s:  shn %u\n", DEVNAME(sc), NVME_CC_SHN_R(r4));
 	printf("%s:  ams %u\n", DEVNAME(sc), NVME_CC_AMS_R(r4));
-	printf("%s:  mps %u\n", DEVNAME(sc), NVME_CC_MPS_R(r4));
+	printf("%s:  mps %u (%u)\n", DEVNAME(sc), NVME_CC_MPS_R(r4),
+	(1 << NVME_CC_MPS_R(r4)));
 	printf("%s:  css %u\n", DEVNAME(sc), NVME_CC_CSS_R(r4));
 	printf("%s:  en %u\n", DEVNAME(sc), ISSET(r4, NVME_CC_EN) ? 1 : 0);
 
-	printf("%s: csts 0x%08x\n", DEVNAME(sc), nvme_read4(sc, NVME_CSTS));
-	printf("%s: aqa  0x%08x\n", DEVNAME(sc), nvme_read4(sc, NVME_AQA));
-	printf("%s: asq  0x%016llx\n", DEVNAME(sc), nvme_read8(sc, NVME_ASQ));
-	printf("%s: acq  0x%016llx\n", DEVNAME(sc), nvme_read8(sc, NVME_ACQ));
+	r4 = nvme_read4(sc, NVME_CSTS);
+	printf("%s: csts 0x%08x\n", DEVNAME(sc), r4);
+	printf("%s:  rdy %u\n", DEVNAME(sc), r4 & NVME_CSTS_RDY);
+	printf("%s:  cfs %u\n", DEVNAME(sc), r4 & NVME_CSTS_CFS);
+	printf("%s:  shst %x\n", DEVNAME(sc), r4 & NVME_CSTS_SHST_MASK);
+
+	r4 = nvme_read4(sc, NVME_AQA);
+	printf("%s: aqa  0x%08x\n", DEVNAME(sc), r4);
+	printf("%s:  acqs %u\n", DEVNAME(sc), NVME_AQA_ACQS_R(r4));
+	printf("%s:  asqs %u\n", DEVNAME(sc), NVME_AQA_ASQS_R(r4));
+
+	printf("%s: asq  0x%016"PRIx64"\n", DEVNAME(sc), nvme_read8(sc, NVME_ASQ));
+	printf("%s: acq  0x%016"PRIx64"\n", DEVNAME(sc), nvme_read8(sc, NVME_ACQ));
 #undef	DEVNAME
 }
 #endif	/* NVME_DEBUG */
@@ -237,10 +249,19 @@ static int
 nvme_ready(struct nvme_softc *sc, uint32_t rdy)
 {
 	u_int i = 0;
+	uint32_t cc;
+
+	cc = nvme_read4(sc, NVME_CC);
+	if (((cc & NVME_CC_EN) != 0) != (rdy != 0)) {
+		aprint_error_dev(sc->sc_dev,
+		"controller enabled status expected %d, found to be %d\n",
+		(rdy != 0), ((cc & NVME_CC_EN) != 0));
+		return ENXIO;
+	}
 
 	while ((nvme_read4(sc, NVME_CSTS) & NVME_CSTS_RDY) != rdy) {
 		if (i++ > sc->sc_rdy_to)
-			return 1;
+			return ENXIO;
 
 		delay(1000);
 		nvme_barrier(sc, NVME_CSTS, 4, B

CVS commit: src/sys/dev/pci

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 20:12:53 UTC 2016

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

Log Message:
#ifdef out MSI related code on platforms not supporting MSI, so that it's
possible to load the driver as module on those platforms (the weak symbols
are not found by module load, claiming they don't exist); this makes it possible
to load the driver on e.g. sparc64, which is supposed to be working
under OpenBSD

unfortunately QEMU sparc64 emulator starts causing data access errors
on first device register read in nvme_attach(), so can't confirm the driver
is actually working on sparc64; same happens in QEMU when booting OpenBSD
image, so it seems to be emulator bug


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/nvme_pci.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/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.10 src/sys/dev/pci/nvme_pci.c:1.11
--- src/sys/dev/pci/nvme_pci.c:1.10	Sat Sep 17 12:58:51 2016
+++ src/sys/dev/pci/nvme_pci.c	Sat Sep 17 20:12:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.10 2016/09/17 12:58:51 jdolecek Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.11 2016/09/17 20:12:53 jdolecek Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.10 2016/09/17 12:58:51 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.11 2016/09/17 20:12:53 jdolecek Exp $");
 
 #include 
 #include 
@@ -69,6 +69,13 @@ int nvme_pci_mq = 1;		/* INTx: ioq=1, MS
 
 #define NVME_PCI_BAR		0x10
 
+#ifndef __HAVE_PCI_MSI_MSIX
+#define pci_intr_release(pc, intrs, nintrs) \
+	kmem_free(intrs, sizeof(*intrs) * nintrs)
+#define pci_intr_establish_xname(pc, ih, level, intrhand, intrarg, xname) \
+	pci_intr_establish(pc, ih, level, intrhand, intrarg)
+#endif 
+
 struct nvme_pci_softc {
 	struct nvme_softc	psc_nvme;
 
@@ -112,8 +119,10 @@ nvme_pci_attach(device_t parent, device_
 	struct pci_attach_args *pa = aux;
 	pcireg_t memtype, reg;
 	bus_addr_t memaddr;
-	int flags, msixoff;
-	int error;
+	int flags, error;
+#ifdef __HAVE_PCI_MSI_MSIX
+	int msixoff;
+#endif
 
 	sc->sc_dev = self;
 	psc->psc_pc = pa->pa_pc;
@@ -143,6 +152,8 @@ nvme_pci_attach(device_t parent, device_
 		aprint_error_dev(self, "can't get map info\n");
 		return;
 	}
+
+#ifdef __HAVE_PCI_MSI_MSIX
 	if (pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_MSIX, &msixoff,
 	NULL)) {
 		pcireg_t msixtbl;
@@ -157,6 +168,8 @@ nvme_pci_attach(device_t parent, device_
 			sc->sc_ios = table_offset;
 		}
 	}
+#endif /* __HAVE_PCI_MSI_MSIX */
+
 	error = bus_space_map(sc->sc_iot, memaddr, sc->sc_ios, flags,
 	&sc->sc_ioh);
 	if (error != 0) {
@@ -179,9 +192,16 @@ nvme_pci_attach(device_t parent, device_
 		goto intr_release;
 	}
 
+	sc->sc_softih = kmem_zalloc(sizeof(*sc->sc_softih) * psc->psc_nintrs,
+	KM_SLEEP);
+	if (sc->sc_softih == NULL) {
+		aprint_error_dev(self, "unable to allocate softih memory\n");
+		goto intr_free;
+	}
+
 	if (nvme_attach(sc) != 0) {
 		/* error printed by nvme_attach() */
-		goto intr_free;
+		goto softintr_free;
 	}
 
 	if (!pmf_device_register(self, NULL, NULL))
@@ -190,6 +210,8 @@ nvme_pci_attach(device_t parent, device_
 	SET(sc->sc_flags, NVME_F_ATTACHED);
 	return;
 
+softintr_free:
+	kmem_free(sc->sc_softih, sizeof(*sc->sc_softih) * psc->psc_nintrs);
 intr_free:
 	kmem_free(sc->sc_ih, sizeof(*sc->sc_ih) * psc->psc_nintrs);
 	sc->sc_nq = 0;
@@ -231,26 +253,29 @@ nvme_pci_intr_establish(struct nvme_soft
 	const char *intrstr = NULL;
 	int (*ih_func)(void *);
 	void *ih_arg;
-	kcpuset_t *affinity;
-	cpuid_t affinity_to;
+#ifdef __HAVE_PCI_MSI_MSIX
 	int error;
+#endif
 
-	if (!sc->sc_use_mq && qid > 0)
-		return 0;
-
+	KASSERT(sc->sc_use_mq || qid == NVME_ADMIN_Q);
 	KASSERT(sc->sc_ih[qid] == NULL);
 
 	if (nvme_pci_mpsafe) {
 		pci_intr_setattr(psc->psc_pc, &psc->psc_intrs[qid],
 		PCI_INTR_MPSAFE, true);
 	}
+
+#ifdef __HAVE_PCI_MSI_MSIX
 	if (!sc->sc_use_mq) {
+#endif
 		snprintf(intr_xname, sizeof(intr_xname), "%s",
 		device_xname(sc->sc_dev));
 		ih_arg = sc;
 		ih_func = nvme_intr;
-	} else {
-		if (qid == 0) {
+#ifdef __HAVE_PCI_MSI_MSIX
+	}
+	else {
+		if (qid == NVME_ADMIN_Q) {
 			snprintf(intr_xname, sizeof(intr_xname), "%s adminq",
 			device_xname(sc->sc_dev));
 		} else {
@@ -264,6 +289,7 @@ nvme_pci_intr_establish(struct nvme_soft
 		else
 			ih_func = nvme_mq_msi_intr;
 	}
+#endif /* __HAVE_PCI_MSI_MSIX */
 	sc->sc_ih[qid] = pci_intr_establish_xname(psc->psc_pc,
 	psc->psc_intrs[qid], IPL_BIO, ih_func, ih_arg, intr_xname);
 	if (sc->sc_ih[qid] == NULL) {
@@ -275,13 +301,18 @@ nvme_pci_intr_establish(struct nvme_soft
 	sizeof(intrbuf));
 	if (!sc->sc_use_mq) {
 		aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstr);
-	} else if (qid == NVME_ADMIN_Q) {
+	}
+#ifdef __HAVE_PC

CVS commit: src/sys/dev/pci

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 20:15:09 UTC 2016

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

Log Message:
remove dev code included in previous commit by mistake


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/nvme_pci.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/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.11 src/sys/dev/pci/nvme_pci.c:1.12
--- src/sys/dev/pci/nvme_pci.c:1.11	Sat Sep 17 20:12:53 2016
+++ src/sys/dev/pci/nvme_pci.c	Sat Sep 17 20:15:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.11 2016/09/17 20:12:53 jdolecek Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.12 2016/09/17 20:15:09 jdolecek Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.11 2016/09/17 20:12:53 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.12 2016/09/17 20:15:09 jdolecek Exp $");
 
 #include 
 #include 
@@ -192,16 +192,9 @@ nvme_pci_attach(device_t parent, device_
 		goto intr_release;
 	}
 
-	sc->sc_softih = kmem_zalloc(sizeof(*sc->sc_softih) * psc->psc_nintrs,
-	KM_SLEEP);
-	if (sc->sc_softih == NULL) {
-		aprint_error_dev(self, "unable to allocate softih memory\n");
-		goto intr_free;
-	}
-
 	if (nvme_attach(sc) != 0) {
 		/* error printed by nvme_attach() */
-		goto softintr_free;
+		goto intr_free;
 	}
 
 	if (!pmf_device_register(self, NULL, NULL))
@@ -210,8 +203,6 @@ nvme_pci_attach(device_t parent, device_
 	SET(sc->sc_flags, NVME_F_ATTACHED);
 	return;
 
-softintr_free:
-	kmem_free(sc->sc_softih, sizeof(*sc->sc_softih) * psc->psc_nintrs);
 intr_free:
 	kmem_free(sc->sc_ih, sizeof(*sc->sc_ih) * psc->psc_nintrs);
 	sc->sc_nq = 0;

CVS commit: src/share/man/man9

2016-09-17 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sat Sep 17 20:46:35 UTC 2016

Modified Files:
src/share/man/man9: pci_msi.9

Log Message:
Use Mt for email address.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man9/pci_msi.9

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

Modified files:

Index: src/share/man/man9/pci_msi.9
diff -u src/share/man/man9/pci_msi.9:1.15 src/share/man/man9/pci_msi.9:1.16
--- src/share/man/man9/pci_msi.9:1.15	Sat Sep 17 17:13:00 2016
+++ src/share/man/man9/pci_msi.9	Sat Sep 17 20:46:35 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: pci_msi.9,v 1.15 2016/09/17 17:13:00 jdolecek Exp $
+.\" $NetBSD: pci_msi.9,v 1.16 2016/09/17 20:46:35 wiz Exp $
 .\"
 .\" Copyright (c) 2015 Internet Initiative Japan Inc.
 .\" All rights reserved.
@@ -328,4 +328,4 @@ The
 .Nm
 interfaces were designed and implemented by
 .An Kengo Nakahara
-.Aq knakah...@netbsd.org .
+.Aq Mt knakah...@netbsd.org .

CVS commit: src/usr.sbin/cpuctl

2016-09-17 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sat Sep 17 20:48:05 UTC 2016

Modified Files:
src/usr.sbin/cpuctl: cpuctl.8

Log Message:
Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/cpuctl/cpuctl.8

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

Modified files:

Index: src/usr.sbin/cpuctl/cpuctl.8
diff -u src/usr.sbin/cpuctl/cpuctl.8:1.16 src/usr.sbin/cpuctl/cpuctl.8:1.17
--- src/usr.sbin/cpuctl/cpuctl.8:1.16	Sat Sep 17 19:35:21 2016
+++ src/usr.sbin/cpuctl/cpuctl.8	Sat Sep 17 20:48:04 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cpuctl.8,v 1.16 2016/09/17 19:35:21 jdolecek Exp $
+.\"	$NetBSD: cpuctl.8,v 1.17 2016/09/17 20:48:04 wiz Exp $
 .\"
 .\" Copyright (c) 2007, 2008, 2012, 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -130,9 +130,9 @@ that the patch got applied:
 cpu0: UCode version: 0x183
 .Ed
 .Sh SEE ALSO
+.Xr intrctl 8 ,
 .Xr psrset 8 ,
-.Xr schedctl 8 ,
-.Xr intrctl 8
+.Xr schedctl 8
 .Sh HISTORY
 The
 .Nm

CVS commit: src/sys/dev/ic

2016-09-17 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Sep 17 23:59:30 UTC 2016

Modified Files:
src/sys/dev/ic: nvmereg.h

Log Message:
add macros to read AQA subvalues, is used by nvme_dumpregs()


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/nvmereg.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/ic/nvmereg.h
diff -u src/sys/dev/ic/nvmereg.h:1.4 src/sys/dev/ic/nvmereg.h:1.5
--- src/sys/dev/ic/nvmereg.h:1.4	Fri Sep 16 10:54:45 2016
+++ src/sys/dev/ic/nvmereg.h	Sat Sep 17 23:59:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmereg.h,v 1.4 2016/09/16 10:54:45 jdolecek Exp $	*/
+/*	$NetBSD: nvmereg.h,v 1.5 2016/09/17 23:59:30 jdolecek Exp $	*/
 /*	$OpenBSD: nvmereg.h,v 1.10 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -81,8 +81,10 @@
 #define NVME_AQA	0x0024	/* Admin Queue Attributes */
 /* Admin Completion Queue Size */
 #define  NVME_AQA_ACQS(_v)	(((_v) - 1) << 16)
+#define  NVME_AQA_ACQS_R(_v)	((_v >> 16) & ((1 << 12) - 1))
 /* Admin Submission Queue Size */
 #define  NVME_AQA_ASQS(_v)	(((_v) - 1) << 0)
+#define  NVME_AQA_ASQS_R(_v)	(_v & ((1 << 12) - 1))
 #define NVME_ASQ	0x0028	/* Admin Submission Queue Base Address */
 #define NVME_ACQ	0x0030	/* Admin Completion Queue Base Address */

CVS commit: src/sys/compat/netbsd32

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Sep 18 01:56:42 UTC 2016

Modified Files:
src/sys/compat/netbsd32: netbsd32_signal.c

Log Message:
more ifdef KTRACE
fix wraps


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/compat/netbsd32/netbsd32_signal.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/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.41 src/sys/compat/netbsd32/netbsd32_signal.c:1.42
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.41	Fri Sep 16 22:44:38 2016
+++ src/sys/compat/netbsd32/netbsd32_signal.c	Sat Sep 17 21:56:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_signal.c,v 1.41 2016/09/17 02:44:38 christos Exp $	*/
+/*	$NetBSD: netbsd32_signal.c,v 1.42 2016/09/18 01:56:42 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.41 2016/09/17 02:44:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.42 2016/09/18 01:56:42 christos Exp $");
 
 #if defined(_KERNEL_OPT) 
 #include "opt_ktrace.h"
@@ -199,7 +199,8 @@ netbsd32_ksi32_to_ksi(struct _ksiginfo *
 	case SIGSEGV:
 	case SIGFPE:
 	case SIGTRAP:
-		si->_reason._fault._addr = NETBSD32IPTR64(si32->_reason._fault._addr);
+		si->_reason._fault._addr =
+		NETBSD32IPTR64(si32->_reason._fault._addr);
 		si->_reason._fault._trap = si32->_reason._fault._trap;
 		break;
 	case SIGALRM:
@@ -208,7 +209,8 @@ netbsd32_ksi32_to_ksi(struct _ksiginfo *
 	default:	/* see sigqueue() and kill1() */
 		si->_reason._rt._pid = si32->_reason._rt._pid;
 		si->_reason._rt._uid = si32->_reason._rt._uid;
-		si->_reason._rt._value.sival_int = si32->_reason._rt._value.sival_int;
+		si->_reason._rt._value.sival_int =
+		si32->_reason._rt._value.sival_int;
 		break;
 	case SIGCHLD:
 		si->_reason._child._pid = si32->_reason._child._pid;
@@ -221,9 +223,12 @@ netbsd32_ksi32_to_ksi(struct _ksiginfo *
 		si->_reason._poll._band = si32->_reason._poll._band;
 		si->_reason._poll._fd = si32->_reason._poll._fd;
 		break;
+	default:
+		break;
 	}
 }
 
+#ifdef KTRACE
 static void
 netbsd32_ksi_to_ksi32(struct __ksiginfo32 *si32, const struct _ksiginfo *si)
 {
@@ -248,7 +253,8 @@ netbsd32_ksi_to_ksi32(struct __ksiginfo3
 	default:	/* see sigqueue() and kill1() */
 		si32->_reason._rt._pid = si->_reason._rt._pid;
 		si32->_reason._rt._uid = si->_reason._rt._uid;
-		si32->_reason._rt._value.sival_int = si->_reason._rt._value.sival_int;
+		si32->_reason._rt._value.sival_int =
+		si->_reason._rt._value.sival_int;
 		break;
 	case SIGCHLD:
 		si32->_reason._child._pid = si->_reason._child._pid;
@@ -261,8 +267,11 @@ netbsd32_ksi_to_ksi32(struct __ksiginfo3
 		si32->_reason._poll._band = si->_reason._poll._band;
 		si32->_reason._poll._fd = si->_reason._poll._fd;
 		break;
+	default:
+		break;
 	}
 }
+#endif
 
 void
 netbsd32_si_to_si32(siginfo32_t *si32, const siginfo_t *si)

CVS commit: src/distrib/x68k/floppies/ramdisk

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Sep 18 01:57:24 UTC 2016

Modified Files:
src/distrib/x68k/floppies/ramdisk: Makefile

Log Message:
bump


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/x68k/floppies/ramdisk/Makefile

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

Modified files:

Index: src/distrib/x68k/floppies/ramdisk/Makefile
diff -u src/distrib/x68k/floppies/ramdisk/Makefile:1.46 src/distrib/x68k/floppies/ramdisk/Makefile:1.47
--- src/distrib/x68k/floppies/ramdisk/Makefile:1.46	Sun Aug 10 02:35:56 2014
+++ src/distrib/x68k/floppies/ramdisk/Makefile	Sat Sep 17 21:57:24 2016
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.46 2014/08/10 06:35:56 isaki Exp $
+#	$NetBSD: Makefile,v 1.47 2016/09/18 01:57:24 christos Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 IMAGE=			inst.fs
-IMAGESIZE=		1700k
+IMAGESIZE=		1800k
 # `floppy-root' cannot be used now, due to size issue.
 #IMAGE_RELEASEDIR=	installation/floppy

CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Sep 18 02:03:16 UTC 2016

Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: defs.mk

Log Message:
XXX: manually add uniform_int_dist.h because everyone else has it and
it breaks the build!


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/defs.mk

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

Modified files:

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/defs.mk
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/defs.mk:1.4 src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/defs.mk:1.5
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/defs.mk:1.4	Tue Mar 22 04:15:25 2016
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/defs.mk	Sat Sep 17 22:03:16 2016
@@ -37,7 +37,7 @@ G_pb_headers4=ext/pb_ds/detail/hash_fn/s
 G_pb_headers5=ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp ext/pb_ds/detail/ov_tree_map_/traits.hpp ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp ext/pb_ds/detail/pat_trie_/pat_trie_.hpp ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp ext/pb_ds/detail/pat_trie_/policy_access
 _fn_imps.hpp ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp ext/pb_ds/detail/pat_trie_/traits.hpp ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp ext/pb_ds/detail/priority_queue_base_dispatch.hpp ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
 G_pb_headers6=ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/node.hpp ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/traits.hpp ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp ext/pb_ds/detail/rc_binomial_heap_/rc.hpp ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp ext/pb_ds/detail/resize_p
 olicy/hash_load_check_resize_trigger_imp.hpp ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp ext/pb_ds/detail/resize_policy/sample_size_policy.hpp ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp ext/pb_ds/detail/splay_tree_/node.hpp ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp ext/pb_ds/detail/splay_tree_/splay_tree_.hpp ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp ext/pb_ds/detail/splay_tree_/traits.hpp ext/pb_ds/detail/standard_policies.hpp ext/pb_ds/detail/thi
 n_heap_/constructors_destructor_fn_imps.hpp ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
 G_pb_headers7=ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp ext/pb_ds/detail/thin_heap_/thin_heap_.hpp ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp ext/pb_ds/detail/tree_policy/sample_

CVS commit: xsrc/external/mit/xf86-video-suncg14/dist/src

2016-09-17 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Sun Sep 18 02:05:38 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_driver.c

Log Message:
There is no X_DEBUG


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.13 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.14
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.13	Fri Sep 16 17:16:37 2016
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c	Sat Sep 17 22:05:38 2016
@@ -355,7 +355,7 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags
 	if (len >= 24) {
 	memcpy(reg, ptr, 24);
 	size = reg[5];
-	xf86Msg(X_DEBUG, "memsize from reg: %d MB\n", size >> 20);
+	xf86Msg(X_INFO, "memsize from reg: %d MB\n", size >> 20);
 	if (size > pCg14->memsize)
 		pCg14->memsize = size;
 	}

CVS commit: src/distrib/luna68k/ramdisk

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Sep 18 02:07:07 UTC 2016

Modified Files:
src/distrib/luna68k/ramdisk: Makefile

Log Message:
bump


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/luna68k/ramdisk/Makefile

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

Modified files:

Index: src/distrib/luna68k/ramdisk/Makefile
diff -u src/distrib/luna68k/ramdisk/Makefile:1.3 src/distrib/luna68k/ramdisk/Makefile:1.4
--- src/distrib/luna68k/ramdisk/Makefile:1.3	Tue Aug  5 10:58:01 2014
+++ src/distrib/luna68k/ramdisk/Makefile	Sat Sep 17 22:07:07 2016
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.3 2014/08/05 14:58:01 martin Exp $
+#	$NetBSD: Makefile,v 1.4 2016/09/18 02:07:07 christos Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 IMAGE=		ramdisk.fs
-IMAGESIZE=	1800k
+IMAGESIZE=	1900k
 MAKEFS_FLAGS=	-f 15
 
 WARNS=		1

CVS commit: src/sys/netinet

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Sep 18 02:17:43 UTC 2016

Modified Files:
src/sys/netinet: if_arp.c in_var.h ip_output.c

Log Message:
Dealing with arplog is a bit more complicated...


To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.84 -r1.85 src/sys/netinet/in_var.h
cvs rdiff -u -r1.261 -r1.262 src/sys/netinet/ip_output.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/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.226 src/sys/netinet/if_arp.c:1.227
--- src/sys/netinet/if_arp.c:1.226	Fri Sep 16 09:47:47 2016
+++ src/sys/netinet/if_arp.c	Sat Sep 17 22:17:43 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_arp.c,v 1.226 2016/09/16 13:47:47 roy Exp $	*/
+/*	$NetBSD: if_arp.c,v 1.227 2016/09/18 02:17:43 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.226 2016/09/16 13:47:47 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.227 2016/09/18 02:17:43 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -77,6 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1
 
 #ifdef INET
 
+#include "arp.h"
 #include "bridge.h"
 
 #include 

Index: src/sys/netinet/in_var.h
diff -u src/sys/netinet/in_var.h:1.84 src/sys/netinet/in_var.h:1.85
--- src/sys/netinet/in_var.h:1.84	Fri Sep 16 22:37:59 2016
+++ src/sys/netinet/in_var.h	Sat Sep 17 22:17:43 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_var.h,v 1.84 2016/09/17 02:37:59 christos Exp $	*/
+/*	$NetBSD: in_var.h,v 1.85 2016/09/18 02:17:43 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -378,7 +378,7 @@ struct in_multi {
 extern pktqueue_t *ip_pktq;
 
 extern int ip_dad_count;		/* Duplicate Address Detection probes */
-#ifdef INET
+#if defined(INET) && NARP > 0
 extern int arp_debug;
 #define arplog(level, fmt, args...) \
 	do { if (arp_debug) log(level, "%s: " fmt, __func__, ##args);} while (0)

Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.261 src/sys/netinet/ip_output.c:1.262
--- src/sys/netinet/ip_output.c:1.261	Thu Sep 15 14:25:45 2016
+++ src/sys/netinet/ip_output.c	Sat Sep 17 22:17:43 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_output.c,v 1.261 2016/09/15 18:25:45 roy Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.262 2016/09/18 02:17:43 christos Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.261 2016/09/15 18:25:45 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.262 2016/09/18 02:17:43 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -101,6 +101,8 @@ __KERNEL_RCSID(0, "$NetBSD: ip_output.c,
 #include "opt_mpls.h"
 #endif
 
+#include "arp.h"
+
 #include 
 #include 
 #include

CVS commit: src/sys/compat/netbsd32

2016-09-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Sep 18 05:16:21 UTC 2016

Modified Files:
src/sys/compat/netbsd32: netbsd32_signal.c

Log Message:
remove multiple default.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/compat/netbsd32/netbsd32_signal.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/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.42 src/sys/compat/netbsd32/netbsd32_signal.c:1.43
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.42	Sat Sep 17 21:56:42 2016
+++ src/sys/compat/netbsd32/netbsd32_signal.c	Sun Sep 18 01:16:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_signal.c,v 1.42 2016/09/18 01:56:42 christos Exp $	*/
+/*	$NetBSD: netbsd32_signal.c,v 1.43 2016/09/18 05:16:21 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.42 2016/09/18 01:56:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.43 2016/09/18 05:16:21 christos Exp $");
 
 #if defined(_KERNEL_OPT) 
 #include "opt_ktrace.h"
@@ -223,8 +223,6 @@ netbsd32_ksi32_to_ksi(struct _ksiginfo *
 		si->_reason._poll._band = si32->_reason._poll._band;
 		si->_reason._poll._fd = si32->_reason._poll._fd;
 		break;
-	default:
-		break;
 	}
 }
 
@@ -267,8 +265,6 @@ netbsd32_ksi_to_ksi32(struct __ksiginfo3
 		si32->_reason._poll._band = si->_reason._poll._band;
 		si32->_reason._poll._fd = si->_reason._poll._fd;
 		break;
-	default:
-		break;
 	}
 }
 #endif

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

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 05:57:17 UTC 2016

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

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1244):
sys/dev/pci/if_vioif.c: revision 1.25
Fix initializing wrong queues
Pointed out by Mike Larkin.
PR kern/51448


To generate a diff of this commit:
cvs rdiff -u -r1.7.2.1 -r1.7.2.1.2.1 src/sys/dev/pci/if_vioif.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_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.7.2.1 src/sys/dev/pci/if_vioif.c:1.7.2.1.2.1
--- src/sys/dev/pci/if_vioif.c:1.7.2.1	Mon Dec 29 17:01:01 2014
+++ src/sys/dev/pci/if_vioif.c	Sun Sep 18 05:57:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vioif.c,v 1.7.2.1 2014/12/29 17:01:01 martin Exp $	*/
+/*	$NetBSD: if_vioif.c,v 1.7.2.1.2.1 2016/09/18 05:57:17 snj Exp $	*/
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.7.2.1 2014/12/29 17:01:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.7.2.1.2.1 2016/09/18 05:57:17 snj Exp $");
 
 #include 
 #include 
@@ -394,7 +394,7 @@ vioif_alloc_mems(struct vioif_softc *sc)
 	}
 
 	for (i = 0; i < txqsize; i++) {
-		C_L1(txhdr_dmamaps[i], rx_hdrs[i],
+		C_L1(txhdr_dmamaps[i], tx_hdrs[i],
 		sizeof(struct virtio_net_hdr), 1,
 		WRITE, "tx header");
 		C(tx_dmamaps[i], NULL, ETHER_MAX_LEN, 256 /* XXX */, 0,

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

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 05:57:00 UTC 2016

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

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1244):
sys/dev/pci/if_vioif.c: revision 1.25
Fix initializing wrong queues
Pointed out by Mike Larkin.
PR kern/51448


To generate a diff of this commit:
cvs rdiff -u -r1.7.2.1 -r1.7.2.2 src/sys/dev/pci/if_vioif.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_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.7.2.1 src/sys/dev/pci/if_vioif.c:1.7.2.2
--- src/sys/dev/pci/if_vioif.c:1.7.2.1	Mon Dec 29 17:01:01 2014
+++ src/sys/dev/pci/if_vioif.c	Sun Sep 18 05:57:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vioif.c,v 1.7.2.1 2014/12/29 17:01:01 martin Exp $	*/
+/*	$NetBSD: if_vioif.c,v 1.7.2.2 2016/09/18 05:57:00 snj Exp $	*/
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.7.2.1 2014/12/29 17:01:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.7.2.2 2016/09/18 05:57:00 snj Exp $");
 
 #include 
 #include 
@@ -394,7 +394,7 @@ vioif_alloc_mems(struct vioif_softc *sc)
 	}
 
 	for (i = 0; i < txqsize; i++) {
-		C_L1(txhdr_dmamaps[i], rx_hdrs[i],
+		C_L1(txhdr_dmamaps[i], tx_hdrs[i],
 		sizeof(struct virtio_net_hdr), 1,
 		WRITE, "tx header");
 		C(tx_dmamaps[i], NULL, ETHER_MAX_LEN, 256 /* XXX */, 0,

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

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:00:20 UTC 2016

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

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1245):
sys/dev/usb/if_axe.c: revision 1.73, 1.74
sys/dev/usb/usbdevs: revision 1.716
Add flxd's axe(4)
--
flxd's axe(4) - I think.
--
Fix harmless typo


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.67.2.1 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.680.2.4 -r1.680.2.5 src/sys/dev/usb/usbdevs

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

Modified files:

Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.67 src/sys/dev/usb/if_axe.c:1.67.2.1
--- src/sys/dev/usb/if_axe.c:1.67	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_axe.c	Sun Sep 18 06:00:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axe.c,v 1.67 2014/08/10 16:44:36 tls Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.67.2.1 2016/09/18 06:00:20 snj Exp $	*/
 /*	$OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
 
 /*
@@ -89,7 +89,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67.2.1 2016/09/18 06:00:20 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -155,6 +155,7 @@ static const struct axe_type axe_devs[] 
 	{ { USB_VENDOR_COREGA,		USB_PRODUCT_COREGA_FETHER_USB2_TX }, 0},
 	{ { USB_VENDOR_DLINK,		USB_PRODUCT_DLINK_DUBE100}, 0 },
 	{ { USB_VENDOR_DLINK,		USB_PRODUCT_DLINK_DUBE100B1 }, AX772 },
+	{ { USB_VENDOR_DLINK2,		USB_PRODUCT_DLINK2_DUBE100B1 }, AX772 },
 	{ { USB_VENDOR_DLINK,		USB_PRODUCT_DLINK_DUBE100C1 }, AX772 | AX772B },
 	{ { USB_VENDOR_GOODWAY,		USB_PRODUCT_GOODWAY_GWUSB2E}, 0 },
 	{ { USB_VENDOR_IODATA,		USB_PRODUCT_IODATA_ETGUS2 }, AX178 },

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.680.2.4 src/sys/dev/usb/usbdevs:1.680.2.5
--- src/sys/dev/usb/usbdevs:1.680.2.4	Sun Oct 18 09:01:58 2015
+++ src/sys/dev/usb/usbdevs	Sun Sep 18 06:00:20 2016
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.680.2.4 2015/10/18 09:01:58 martin Exp $
+$NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1357,6 +1357,7 @@ product DLINK2 DWA130D1		0x3a0f	DWA-130 
 product DLINK2 AR9271		0x3a10	AR9271
 product DLINK2 DWLG122C1	0x3c03	DWL-G122 rev C1
 product DLINK2 WUA1340		0x3c04	WUA-1340
+product DLINK2 DUBE100B1	0x3c05	DUB-E100 rev B1
 product DLINK2 DWA111		0x3c06	DWA-111
 product DLINK2 DWA110		0x3c07	DWA-110
 product DLINK2 RT2870_1		0x3c09	RT2870

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

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:01:07 UTC 2016

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

Log Message:
regen for ticket 1245


To generate a diff of this commit:
cvs rdiff -u -r1.672.2.4 -r1.672.2.5 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.673.2.4 -r1.673.2.5 src/sys/dev/usb/usbdevs_data.h

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

Modified files:

Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.672.2.4 src/sys/dev/usb/usbdevs.h:1.672.2.5
--- src/sys/dev/usb/usbdevs.h:1.672.2.4	Sun Oct 18 09:03:22 2015
+++ src/sys/dev/usb/usbdevs.h	Sun Sep 18 06:01:05 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.672.2.4 2015/10/18 09:03:22 martin Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.672.2.5 2016/09/18 06:01:05 snj Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.680.2.4 2015/10/18 09:01:58 martin Exp
+ *	NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp
  */
 
 /*
@@ -1364,6 +1364,7 @@
 #define	USB_PRODUCT_DLINK2_AR9271	0x3a10		/* AR9271 */
 #define	USB_PRODUCT_DLINK2_DWLG122C1	0x3c03		/* DWL-G122 rev C1 */
 #define	USB_PRODUCT_DLINK2_WUA1340	0x3c04		/* WUA-1340 */
+#define	USB_PRODUCT_DLINK2_DUBE100B1	0x3c05		/* DUB-E100 rev B1 */
 #define	USB_PRODUCT_DLINK2_DWA111	0x3c06		/* DWA-111 */
 #define	USB_PRODUCT_DLINK2_DWA110	0x3c07		/* DWA-110 */
 #define	USB_PRODUCT_DLINK2_RT2870_1	0x3c09		/* RT2870 */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.673.2.4 src/sys/dev/usb/usbdevs_data.h:1.673.2.5
--- src/sys/dev/usb/usbdevs_data.h:1.673.2.4	Sun Oct 18 09:03:22 2015
+++ src/sys/dev/usb/usbdevs_data.h	Sun Sep 18 06:01:05 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.673.2.4 2015/10/18 09:03:22 martin Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.673.2.5 2016/09/18 06:01:05 snj Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.680.2.4 2015/10/18 09:01:58 martin Exp
+ *	NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp
  */
 
 /*
@@ -4419,6 +4419,10 @@ const struct usb_product usb_products[] 
 	"WUA-1340",
 	},
 	{
+	USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DUBE100B1,
+	"DUB-E100 rev B1",
+	},
+	{
 	USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA111,
 	"DWA-111",
 	},
@@ -10203,4 +10207,4 @@ const struct usb_product usb_products[] 
 	"Prestige",
 	},
 };
-const int usb_nproducts = 2010;
+const int usb_nproducts = 2011;

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

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:05:16 UTC 2016

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

Log Message:
Pull up following revision(s) (requested by taca in ticket #1246):
etc/namedb/root.cache: revision 1.21
Update root.cache to 2016/8/25 version, l.root-servers.net has  record
now.


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

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

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.18.2.2 src/etc/namedb/root.cache:1.18.2.3
--- src/etc/namedb/root.cache:1.18.2.2	Mon Apr 11 10:02:57 2016
+++ src/etc/namedb/root.cache	Sun Sep 18 06:05:16 2016
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.18.2.2 2016/04/11 10:02:57 snj Exp $
+;	$NetBSD: root.cache,v 1.18.2.3 2016/09/18 06:05:16 snj Exp $
 ;   This file holds the information on root name servers needed to
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
@@ -10,8 +10,8 @@
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
 ;
-;   last update:March 23, 2016
-;   related version of root zone:   2016032301
+;   last update:August 25, 2016
+;   related version of root zone:   2016082500
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -41,6 +41,7 @@ D.ROOT-SERVERS.NET.  360  AA
 ;
 .360  NSE.ROOT-SERVERS.NET.
 E.ROOT-SERVERS.NET.  360  A 192.203.230.10
+E.ROOT-SERVERS.NET.  360    2001:500:a8::e
 ;
 ; FORMERLY NS.ISC.ORG
 ;

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

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:06:13 UTC 2016

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

Log Message:
Pull up following revision(s) (requested by taca in ticket #1246):
etc/namedb/root.cache: revision 1.21
Update root.cache to 2016/8/25 version, l.root-servers.net has  record
now.


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

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

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.18.4.2 src/etc/namedb/root.cache:1.18.4.3
--- src/etc/namedb/root.cache:1.18.4.2	Mon Apr 11 10:03:35 2016
+++ src/etc/namedb/root.cache	Sun Sep 18 06:06:13 2016
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.18.4.2 2016/04/11 10:03:35 snj Exp $
+;	$NetBSD: root.cache,v 1.18.4.3 2016/09/18 06:06:13 snj Exp $
 ;   This file holds the information on root name servers needed to
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
@@ -10,8 +10,8 @@
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
 ;
-;   last update:March 23, 2016
-;   related version of root zone:   2016032301
+;   last update:August 25, 2016
+;   related version of root zone:   2016082500
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -41,6 +41,7 @@ D.ROOT-SERVERS.NET.  360  AA
 ;
 .360  NSE.ROOT-SERVERS.NET.
 E.ROOT-SERVERS.NET.  360  A 192.203.230.10
+E.ROOT-SERVERS.NET.  360    2001:500:a8::e
 ;
 ; FORMERLY NS.ISC.ORG
 ;

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

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:10:31 UTC 2016

Modified Files:
src/lib/libc/gen [netbsd-7]: glob.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1247):
lib/libc/gen/glob.c: revision 1.36
Bump the glob limits to 512KB for total string size and 64K path
entries. The old limits were too small for some important FTP use cases
like a pkgsrc repository.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.8.1 src/lib/libc/gen/glob.c

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

Modified files:

Index: src/lib/libc/gen/glob.c
diff -u src/lib/libc/gen/glob.c:1.35 src/lib/libc/gen/glob.c:1.35.8.1
--- src/lib/libc/gen/glob.c:1.35	Wed Mar 20 23:44:47 2013
+++ src/lib/libc/gen/glob.c	Sun Sep 18 06:10:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: glob.c,v 1.35 2013/03/20 23:44:47 lukem Exp $	*/
+/*	$NetBSD: glob.c,v 1.35.8.1 2016/09/18 06:10:31 snj Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-__RCSID("$NetBSD: glob.c,v 1.35 2013/03/20 23:44:47 lukem Exp $");
+__RCSID("$NetBSD: glob.c,v 1.35.8.1 2016/09/18 06:10:31 snj Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -87,9 +87,9 @@ __RCSID("$NetBSD: glob.c,v 1.35 2013/03/
 #define NO_GETPW_R
 #endif
 
-#define	GLOB_LIMIT_STRING	65536	/* number of readdirs */
+#define	GLOB_LIMIT_STRING	524288	/* number of readdirs */
 #define	GLOB_LIMIT_STAT		128	/* number of stat system calls */
-#define	GLOB_LIMIT_READDIR	16384	/* total buffer size of path strings */
+#define	GLOB_LIMIT_READDIR	65536	/* total buffer size of path strings */
 #define	GLOB_LIMIT_PATH		1024	/* number of path elements */
 #define GLOB_LIMIT_BRACE	128	/* Number of brace calls */

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

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:14:01 UTC 2016

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/external/bsd/kyua-testers/tests/kyua-testers/Makefile

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

Modified files:

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

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

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

CVS commit: [netbsd-7] src/doc

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:20:12 UTC 2016

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

Log Message:
124[45679]


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-7.1

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

Modified files:

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

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

2016-09-17 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:24:11 UTC 2016

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

Log Message:
124[46]


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-7.0.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.0.2
diff -u src/doc/CHANGES-7.0.2:1.1.2.11 src/doc/CHANGES-7.0.2:1.1.2.12
--- src/doc/CHANGES-7.0.2:1.1.2.11	Sat Sep 10 06:43:52 2016
+++ src/doc/CHANGES-7.0.2	Sun Sep 18 06:24:11 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.2,v 1.1.2.11 2016/09/10 06:43:52 snj Exp $
+# $NetBSD: CHANGES-7.0.2,v 1.1.2.12 2016/09/18 06:24:11 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.1 release to the NetBSD 7.0.2
 release:
@@ -253,3 +253,13 @@ sys/arch/sparc64/sparc64/kobj_machdep.c	
 	Fixes PR kern/51436.
 	[martin, ticket #1248]
 
+sys/dev/pci/if_vioif.c1.25
+
+	Fix initializing wrong queues.  PR kern/51448.
+	[ozaki-r, ticket #1244]
+
+etc/namedb/root.cache1.21
+
+	Update root.cache to 2016/8/25 version.
+	[taca, ticket #1246]
+