CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:59:45 UTC 2015

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

Log Message:
Change macro name of Braswell PCU SMBus.


To generate a diff of this commit:
cvs rdiff -u -r1.1241 -r1.1242 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/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:19:39 UTC 2015

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

Log Message:
 Add Braswell devices from "Table 23-4 PCI Devices and Functions,
N-Series Intel Pentium Processorts and Intel Celeron Processors Datasheet
(Document Number: 332093-001)"


To generate a diff of this commit:
cvs rdiff -u -r1.1240 -r1.1241 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.1240 src/sys/dev/pci/pcidevs:1.1241
--- src/sys/dev/pci/pcidevs:1.1240	Fri Nov  6 12:05:18 2015
+++ src/sys/dev/pci/pcidevs	Mon Nov 16 14:19:39 2015
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1240 2015/11/06 12:05:18 nonaka Exp $
+$NetBSD: pcidevs,v 1.1241 2015/11/16 14:19:39 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3188,6 +3188,38 @@ product INTEL C2000_1000KX	0x1f40	C2000 
 product INTEL C2000_SGMII	0x1f41	C2000 Ethernet(SGMII)
 product INTEL C2000_DUMMYGBE	0x1f42	C2000 Ethernet(Dummy function)
 product INTEL C2000_25GBE	0x1f45	C2000 Ethernet(2.5Gbe)
+product INTEL BSW_HB		0x2280	Braswell Soc Transaction Router
+product INTEL BSW_HDA		0x2284	Braswell HD Audio
+product INTEL BSW_SIO_DMA_2	0x2286	Braswell SIO DMA
+product INTEL BSW_SIO_HSUART_1	0x228a	Braswell Serial
+product INTEL BSW_SIO_HSUART_2	0x228c	Braswell Serial
+product INTEL BSW_SMB		0x2292	Braswell PCU SMBus
+product INTEL BSW_SSC_MMC	0x2294	Braswell SCC MMC Port
+product INTEL BSW_SSC_SDIO	0x2295	Braswell SCC SDIO Port
+product INTEL BSW_SSC_SD	0x2296	Braswell SCC SD Port
+product INTEL BSW_TXE		0x2298	Braswell TXE
+product INTEL BSW_PCU_LPC	0x229c	Braswell PCU LPC
+product INTEL BSW_AHCI		0x22a3	Braswell AHCI
+product INTEL BSW_LPE_AUDIO	0x22a8	Braswell Low Power Engine Audio
+product INTEL CHV_IGD_1		0x22b0	HD Graphics
+product INTEL CHV_IGD_2		0x22b1	HD Graphics
+product INTEL CHV_IGD_3		0x22b2	HD Graphics
+product INTEL CHV_IGD_4		0x22b3	HD Graphics
+product INTEL BSW_XHCI		0x22b5	Braswell xHCI
+product INTEL BSW_ISP_CAMERA	0x22b8	Braswell ISP Camera
+product INTEL BSW_SIO_DMA_1	0x22c0	Braswell SIO DMA
+product INTEL BSW_SIO_I2C_1	0x22c1	Braswell SIO I2C
+product INTEL BSW_SIO_I2C_2	0x22c2	Braswell SIO I2C
+product INTEL BSW_SIO_I2C_3	0x22c3	Braswell SIO I2C
+product INTEL BSW_SIO_I2C_4	0x22c4	Braswell SIO I2C
+product INTEL BSW_SIO_I2C_5	0x22c5	Braswell SIO I2C
+product INTEL BSW_SIO_I2C_6	0x22c6	Braswell SIO I2C
+product INTEL BSW_SIO_I2C_7	0x22c7	Braswell SIO I2C
+product INTEL BSW_PCIE_1	0x22c8	Braswell PCIe
+product INTEL BSW_PCIE_2	0x22ca	Braswell PCIe
+product INTEL BSW_PCIE_3	0x22cc	Braswell PCIe
+product INTEL BSW_PCIE_4	0x22ce	Braswell PCIe
+product INTEL BSW_PUINT		0x22dc	Braswell Power Management
 product INTEL DH89XXCC_LPC	0x2310	DH89xxCC LPC Controller
 product INTEL DH89XXCC_SATA_1	0x2323	DH89xxCC SATA Controller
 product INTEL DH89XXCC_SATA_2	0x2326	DH89xxCC SATA Controller

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:19:39 UTC 2015

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

Log Message:
 Add Braswell devices from "Table 23-4 PCI Devices and Functions,
N-Series Intel Pentium Processorts and Intel Celeron Processors Datasheet
(Document Number: 332093-001)"


To generate a diff of this commit:
cvs rdiff -u -r1.1240 -r1.1241 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/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 15:01:22 UTC 2015

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

Log Message:
 Add Braswell PCU SMBus.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 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 Nov 16 15:00:14 UTC 2015

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.1234 -r1.1235 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1233 -r1.1234 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.1234 src/sys/dev/pci/pcidevs.h:1.1235
--- src/sys/dev/pci/pcidevs.h:1.1234	Mon Nov 16 14:20:00 2015
+++ src/sys/dev/pci/pcidevs.h	Mon Nov 16 15:00:13 2015
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1234 2015/11/16 14:20:00 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1235 2015/11/16 15:00:13 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1241 2015/11/16 14:19:39 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1242 2015/11/16 14:59:45 msaitoh Exp
  */
 
 /*
@@ -3200,7 +3200,7 @@
 #define	PCI_PRODUCT_INTEL_BSW_SIO_DMA_2	0x2286		/* Braswell SIO DMA */
 #define	PCI_PRODUCT_INTEL_BSW_SIO_HSUART_1	0x228a		/* Braswell Serial */
 #define	PCI_PRODUCT_INTEL_BSW_SIO_HSUART_2	0x228c		/* Braswell Serial */
-#define	PCI_PRODUCT_INTEL_BSW_SMB	0x2292		/* Braswell PCU SMBus */
+#define	PCI_PRODUCT_INTEL_BSW_PCU_SMB	0x2292		/* Braswell PCU SMBus */
 #define	PCI_PRODUCT_INTEL_BSW_SSC_MMC	0x2294		/* Braswell SCC MMC Port */
 #define	PCI_PRODUCT_INTEL_BSW_SSC_SDIO	0x2295		/* Braswell SCC SDIO Port */
 #define	PCI_PRODUCT_INTEL_BSW_SSC_SD	0x2296		/* Braswell SCC SD Port */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1233 src/sys/dev/pci/pcidevs_data.h:1.1234
--- src/sys/dev/pci/pcidevs_data.h:1.1233	Mon Nov 16 14:20:00 2015
+++ src/sys/dev/pci/pcidevs_data.h	Mon Nov 16 15:00:13 2015
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1233 2015/11/16 14:20:00 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1234 2015/11/16 15:00:13 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1241 2015/11/16 14:19:39 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1242 2015/11/16 14:59:45 msaitoh Exp
  */
 
 /*
@@ -5153,7 +5153,7 @@ static const uint16_t pci_products[] = {
 	19998, 10684, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_BSW_SIO_HSUART_2, 
 	19998, 10684, 0,
-	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_BSW_SMB, 
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_BSW_PCU_SMB, 
 	19998, 17979, 8294, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_BSW_SSC_MMC, 
 	19998, 16999, 20015, 7955, 0,

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 13:33:40 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by martin in ticket #1028):
sys/arch/sparc64/sparc64/locore.s: revision 1.386
sys/arch/sparc64/sparc64/vm_machdep.c: revision 1.101
sys/arch/sparc64/sparc64/netbsd32_machdep.c: revision 1.105
sys/arch/sparc64/sparc64/netbsd32_machdep.c: revision 1.106
- Basically revert r1.246 of locore.s and r1.73 of vm_machdep.c:
Remove special case handling for userland lwps from cpu_lwp_fork,
instead do it in lwp_trampoline when we first return to userland.
  which was a stupid idea - since we did now set all fork child's %tstate
  (and thus %pstate when back in userland) to the current kernel's userland
  default. This meant we lost the address mask bit for 32bit processes and
  all memory model details for 64bit ones.
  Move it back to cpu_lwp_fork and fix the condition to only do it once when
  forking init.
- Fix kmem_free() size mismatch
- Convert siginfo to 32bit version before copying it out to 32bit userland.


To generate a diff of this commit:
cvs rdiff -u -r1.369.2.2 -r1.369.2.3 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.103 -r1.103.4.1 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.100 -r1.100.4.1 src/sys/arch/sparc64/sparc64/vm_machdep.c

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.369.2.2 src/sys/arch/sparc64/sparc64/locore.s:1.369.2.3
--- src/sys/arch/sparc64/sparc64/locore.s:1.369.2.2	Mon Mar  9 07:54:12 2015
+++ src/sys/arch/sparc64/sparc64/locore.s	Mon Nov 16 13:33:40 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.369.2.2 2015/03/09 07:54:12 snj Exp $	*/
+/*	$NetBSD: locore.s,v 1.369.2.3 2015/11/16 13:33:40 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -5764,12 +5764,6 @@ ENTRY(lwp_trampoline)
 	 mov	%l1, %o0
 
 	/*
-	 * Going to userland - set proper tstate in trap frame
-	 */
-	set	(ASI_PRIMARY_NO_FAULT<ksi_signo;
 	ucontext32_t uc;
 	struct sparc32_sigframe_siginfo *fp;
+	siginfo32_t si32;	
 	netbsd32_intptr_t catcher;
 	struct trapframe64 *tf = l->l_md.md_tf;
 	struct rwindow32 *oldsp, *newsp;
@@ -339,15 +340,16 @@ netbsd32_sendsig_siginfo(const ksiginfo_
 	else
 		fp = (struct sparc32_sigframe_siginfo *)oldsp;
 	fp = (struct sparc32_sigframe_siginfo*)((u_long)(fp - 1) & ~7);
+
 	/*
 	 * Build the signal context to be used by sigreturn.
 	 */
+	memset(, 0, sizeof uc);
 	uc.uc_flags = _UC_SIGMASK |
 		((l->l_sigstk.ss_flags & SS_ONSTACK)
 			? _UC_SETSTACK : _UC_CLRSTACK);
 	uc.uc_sigmask = *mask;
 	uc.uc_link = (uint32_t)(uintptr_t)l->l_ctxlink;
-	memset(_stack, 0, sizeof(uc.uc_stack));
 
 	sendsig_reset(l, sig);
 
@@ -362,9 +364,10 @@ netbsd32_sendsig_siginfo(const ksiginfo_
 	 */
 	mutex_exit(p->p_lock);
 	cpu_getmcontext32(l, _mcontext, _flags);
+	netbsd32_si_to_si32(, (const siginfo_t *)>ksi_info);
 	ucsz = (int)(intptr_t)__uc_pad - (int)(intptr_t)
 	newsp = (struct rwindow32*)((intptr_t)fp - sizeof(struct frame32));
-	error = (copyout(>ksi_info, >sf_si, sizeof ksi->ksi_info) ||
+	error = (copyout(, >sf_si, sizeof si32) ||
 	copyout(, >sf_uc, ucsz) ||
 	suword(>rw_in[6], (intptr_t)oldsp));
 	mutex_enter(p->p_lock);
@@ -1327,7 +1330,8 @@ startlwp32(void *arg)
 	error = cpu_setmcontext32(l, >uc_mcontext, uc->uc_flags);
 	KASSERT(error == 0);
 
-	kmem_free(uc, sizeof(ucontext32_t));
+	/* Note: we are freeing ucontext_t, not ucontext32_t. */
+	kmem_free(arg, sizeof(ucontext_t));
 	userret(l, 0, 0);
 }
 

Index: 

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 13:33:40 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by martin in ticket #1028):
sys/arch/sparc64/sparc64/locore.s: revision 1.386
sys/arch/sparc64/sparc64/vm_machdep.c: revision 1.101
sys/arch/sparc64/sparc64/netbsd32_machdep.c: revision 1.105
sys/arch/sparc64/sparc64/netbsd32_machdep.c: revision 1.106
- Basically revert r1.246 of locore.s and r1.73 of vm_machdep.c:
Remove special case handling for userland lwps from cpu_lwp_fork,
instead do it in lwp_trampoline when we first return to userland.
  which was a stupid idea - since we did now set all fork child's %tstate
  (and thus %pstate when back in userland) to the current kernel's userland
  default. This meant we lost the address mask bit for 32bit processes and
  all memory model details for 64bit ones.
  Move it back to cpu_lwp_fork and fix the condition to only do it once when
  forking init.
- Fix kmem_free() size mismatch
- Convert siginfo to 32bit version before copying it out to 32bit userland.


To generate a diff of this commit:
cvs rdiff -u -r1.369.2.2 -r1.369.2.3 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.103 -r1.103.4.1 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.100 -r1.100.4.1 src/sys/arch/sparc64/sparc64/vm_machdep.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/dev/usb

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:45:03 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1032):
sys/dev/usb/usb_subr.c: revision 1.204
Attach serial number as property to all USB devices having one.


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.196.4.1 src/sys/dev/usb/usb_subr.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 Nov 16 15:01:22 UTC 2015

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

Log Message:
 Add Braswell PCU SMBus.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 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.42 src/sys/dev/pci/ichsmb.c:1.43
--- src/sys/dev/pci/ichsmb.c:1.42	Sun May  3 22:51:11 2015
+++ src/sys/dev/pci/ichsmb.c	Mon Nov 16 15:01:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichsmb.c,v 1.42 2015/05/03 22:51:11 pgoyette Exp $	*/
+/*	$NetBSD: ichsmb.c,v 1.43 2015/11/16 15:01:22 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.42 2015/05/03 22:51:11 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.43 2015/11/16 15:01:22 msaitoh Exp $");
 
 #include 
 #include 
@@ -117,6 +117,7 @@ ichsmb_match(device_t parent, cfdata_t m
 		case PCI_PRODUCT_INTEL_CORE4G_M_SMB:
 		case PCI_PRODUCT_INTEL_CORE5G_M_SMB:
 		case PCI_PRODUCT_INTEL_BAYTRAIL_PCU_SMB:
+		case PCI_PRODUCT_INTEL_BSW_PCU_SMB:
 		case PCI_PRODUCT_INTEL_C600_SMBUS:
 		case PCI_PRODUCT_INTEL_C600_SMB_0:
 		case PCI_PRODUCT_INTEL_C600_SMB_1:

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 13:04:42 UTC 2015

Modified Files:
src/lib/libm/man [netbsd-7]: erf.3

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1009):

lib/libm/man/erf.3: revision 1.14

Fix typo in erfl synopsis.


To generate a diff of this commit:
cvs rdiff -u -r1.12.74.1 -r1.12.74.2 src/lib/libm/man/erf.3

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

Modified files:

Index: src/lib/libm/man/erf.3
diff -u src/lib/libm/man/erf.3:1.12.74.1 src/lib/libm/man/erf.3:1.12.74.2
--- src/lib/libm/man/erf.3:1.12.74.1	Sun Nov  8 00:24:25 2015
+++ src/lib/libm/man/erf.3	Mon Nov 16 13:04:42 2015
@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" from: @(#)erf.3	6.4 (Berkeley) 4/20/91
-.\"	$NetBSD: erf.3,v 1.12.74.1 2015/11/08 00:24:25 riz Exp $
+.\"	$NetBSD: erf.3,v 1.12.74.2 2015/11/16 13:04:42 msaitoh Exp $
 .\"
-.Dd November 17, 2014
+.Dd November 7, 2015
 .Dt ERF 3
 .Os
 .Sh NAME
@@ -48,7 +48,7 @@
 .Ft float
 .Fn erff "float x"
 .Ft long double
-.Fn erff "long double x"
+.Fn erfl "long double x"
 .Ft double
 .Fn erfc "double x"
 .Ft float

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 13:04:42 UTC 2015

Modified Files:
src/lib/libm/man [netbsd-7]: erf.3

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1009):

lib/libm/man/erf.3: revision 1.14

Fix typo in erfl synopsis.


To generate a diff of this commit:
cvs rdiff -u -r1.12.74.1 -r1.12.74.2 src/lib/libm/man/erf.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/sys/arch/sparc64/sparc64

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 13:39:47 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by martin in ticket #1028):
sys/arch/sparc64/sparc64/locore.s: revision 1.386
sys/arch/sparc64/sparc64/vm_machdep.c: revision 1.101
sys/arch/sparc64/sparc64/netbsd32_machdep.c: revision 1.105
sys/arch/sparc64/sparc64/netbsd32_machdep.c: revision 1.106
- Basically revert r1.246 of locore.s and r1.73 of vm_machdep.c:
Remove special case handling for userland lwps from cpu_lwp_fork,
instead do it in lwp_trampoline when we first return to userland.
  which was a stupid idea - since we did now set all fork child's %tstate
  (and thus %pstate when back in userland) to the current kernel's userland
  default. This meant we lost the address mask bit for 32bit processes and
  all memory model details for 64bit ones.
  Move it back to cpu_lwp_fork and fix the condition to only do it once when
  forking init.
- Fix kmem_free() size mismatch
- Convert siginfo to 32bit version before copying it out to 32bit userland.


To generate a diff of this commit:
cvs rdiff -u -r1.369.2.2 -r1.369.2.2.2.1 \
src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.103 -r1.103.8.1 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.100 -r1.100.8.1 src/sys/arch/sparc64/sparc64/vm_machdep.c

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.369.2.2 src/sys/arch/sparc64/sparc64/locore.s:1.369.2.2.2.1
--- src/sys/arch/sparc64/sparc64/locore.s:1.369.2.2	Mon Mar  9 07:54:12 2015
+++ src/sys/arch/sparc64/sparc64/locore.s	Mon Nov 16 13:39:47 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.369.2.2 2015/03/09 07:54:12 snj Exp $	*/
+/*	$NetBSD: locore.s,v 1.369.2.2.2.1 2015/11/16 13:39:47 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -5764,12 +5764,6 @@ ENTRY(lwp_trampoline)
 	 mov	%l1, %o0
 
 	/*
-	 * Going to userland - set proper tstate in trap frame
-	 */
-	set	(ASI_PRIMARY_NO_FAULT<ksi_signo;
 	ucontext32_t uc;
 	struct sparc32_sigframe_siginfo *fp;
+	siginfo32_t si32;	
 	netbsd32_intptr_t catcher;
 	struct trapframe64 *tf = l->l_md.md_tf;
 	struct rwindow32 *oldsp, *newsp;
@@ -339,15 +340,16 @@ netbsd32_sendsig_siginfo(const ksiginfo_
 	else
 		fp = (struct sparc32_sigframe_siginfo *)oldsp;
 	fp = (struct sparc32_sigframe_siginfo*)((u_long)(fp - 1) & ~7);
+
 	/*
 	 * Build the signal context to be used by sigreturn.
 	 */
+	memset(, 0, sizeof uc);
 	uc.uc_flags = _UC_SIGMASK |
 		((l->l_sigstk.ss_flags & SS_ONSTACK)
 			? _UC_SETSTACK : _UC_CLRSTACK);
 	uc.uc_sigmask = *mask;
 	uc.uc_link = (uint32_t)(uintptr_t)l->l_ctxlink;
-	memset(_stack, 0, sizeof(uc.uc_stack));
 
 	sendsig_reset(l, sig);
 
@@ -362,9 +364,10 @@ netbsd32_sendsig_siginfo(const ksiginfo_
 	 */
 	mutex_exit(p->p_lock);
 	cpu_getmcontext32(l, _mcontext, _flags);
+	netbsd32_si_to_si32(, (const siginfo_t *)>ksi_info);
 	ucsz = (int)(intptr_t)__uc_pad - (int)(intptr_t)
 	newsp = (struct rwindow32*)((intptr_t)fp - sizeof(struct frame32));
-	error = (copyout(>ksi_info, >sf_si, sizeof ksi->ksi_info) ||
+	error = (copyout(, >sf_si, sizeof si32) ||
 	copyout(, >sf_uc, ucsz) ||
 	suword(>rw_in[6], (intptr_t)oldsp));
 	mutex_enter(p->p_lock);
@@ -1327,7 +1330,8 @@ startlwp32(void *arg)
 	error = cpu_setmcontext32(l, >uc_mcontext, uc->uc_flags);
 	KASSERT(error == 0);
 
-	kmem_free(uc, sizeof(ucontext32_t));
+	/* Note: we are freeing ucontext_t, not ucontext32_t. */
+	kmem_free(arg, sizeof(ucontext_t));
 	userret(l, 0, 0);
 }
 

Index: 

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 13:39:47 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by martin in ticket #1028):
sys/arch/sparc64/sparc64/locore.s: revision 1.386
sys/arch/sparc64/sparc64/vm_machdep.c: revision 1.101
sys/arch/sparc64/sparc64/netbsd32_machdep.c: revision 1.105
sys/arch/sparc64/sparc64/netbsd32_machdep.c: revision 1.106
- Basically revert r1.246 of locore.s and r1.73 of vm_machdep.c:
Remove special case handling for userland lwps from cpu_lwp_fork,
instead do it in lwp_trampoline when we first return to userland.
  which was a stupid idea - since we did now set all fork child's %tstate
  (and thus %pstate when back in userland) to the current kernel's userland
  default. This meant we lost the address mask bit for 32bit processes and
  all memory model details for 64bit ones.
  Move it back to cpu_lwp_fork and fix the condition to only do it once when
  forking init.
- Fix kmem_free() size mismatch
- Convert siginfo to 32bit version before copying it out to 32bit userland.


To generate a diff of this commit:
cvs rdiff -u -r1.369.2.2 -r1.369.2.2.2.1 \
src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.103 -r1.103.8.1 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.100 -r1.100.8.1 src/sys/arch/sparc64/sparc64/vm_machdep.c

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

CVS commit: src/sbin/gpt

[John Nemeth]

Module Name:src
Committed By:   jnemeth
Date:   Mon Nov 16 12:24:13 UTC 2015

Modified Files:
src/sbin/gpt: header.c

Log Message:
correctly print the gpt header revision as a "float"


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/gpt/header.c

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

Modified files:

Index: src/sbin/gpt/header.c
diff -u src/sbin/gpt/header.c:1.1 src/sbin/gpt/header.c:1.2
--- src/sbin/gpt/header.c:1.1	Tue Nov  3 02:19:24 2015
+++ src/sbin/gpt/header.c	Mon Nov 16 12:24:13 2015
@@ -33,7 +33,7 @@
 
 #include 
 #ifdef __RCSID
-__RCSID("$NetBSD: header.c,v 1.1 2015/11/03 02:19:24 jnemeth Exp $");
+__RCSID("$NetBSD: header.c,v 1.2 2015/11/16 12:24:13 jnemeth Exp $");
 #endif
 
 #include 
@@ -62,6 +62,7 @@ usage_header(void)
 static void
 header(void)
 {
+	unsigned int revision;
 	map_t *gpt;
 	struct gpt_hdr *hdr;
 	char buf[128];
@@ -103,7 +104,9 @@ header(void)
 	}
 
 	hdr = gpt->map_data;
-	printf("- GPT Revision: %u\n", hdr->hdr_revision);
+	revision = le32toh(hdr->hdr_revision);
+	printf("- GPT Header Revision: %u.%u\n", revision >> 16,
+	 revision & 0x);
 	printf("- First Data Sector: %llu\n",
 	(long long unsigned)hdr->hdr_lba_start);
 #ifdef HN_AUTOSCALE

CVS commit: src/sbin/gpt

[John Nemeth]

Module Name:src
Committed By:   jnemeth
Date:   Mon Nov 16 12:24:13 UTC 2015

Modified Files:
src/sbin/gpt: header.c

Log Message:
correctly print the gpt header revision as a "float"


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/gpt/header.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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Nov 16 12:35:55 UTC 2015

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

Log Message:
Remove USB HID entries, they're already in usbdevices.config


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/CUBIEBOARD

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/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.43 src/sys/arch/evbarm/conf/CUBIEBOARD:1.44
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.43	Sun Nov 15 21:31:29 2015
+++ src/sys/arch/evbarm/conf/CUBIEBOARD	Mon Nov 16 12:35:54 2015
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: CUBIEBOARD,v 1.43 2015/11/15 21:31:29 bouyer Exp $
+#	$NetBSD: CUBIEBOARD,v 1.44 2015/11/16 12:35:54 bouyer Exp $
 #
 #	CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
 #
@@ -164,21 +164,6 @@ ehci*		at awinusb?
 usb*		at ohci?
 usb*		at ehci?
 
-# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
-
-# USB Mice
-ums*	at uhidev? reportid ?
-wsmouse* at ums? mux 0
-
-# USB generic touchscreen
-uts*	at uhidev? reportid ?
-wsmouse* at uts? mux 0
-
-# USB Keyboards
-ukbd*	at uhidev? reportid ?
-wskbd*	at ukbd? console ? mux 1
-
 # USB OTG
 motg0		at awinio0
 usb*		at motg?

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Nov 16 12:35:55 UTC 2015

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

Log Message:
Remove USB HID entries, they're already in usbdevices.config


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/CUBIEBOARD

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

CVS commit: [netbsd-7] src/etc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:38:03 UTC 2015

Modified Files:
src/etc [netbsd-7]: MAKEDEV.tmpl

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1029):
etc/MAKEDEV.tmpl: revision 1.176
Translate requests for ucom into ttyU.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.172.4.1 src/etc/MAKEDEV.tmpl

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

Modified files:

Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.172 src/etc/MAKEDEV.tmpl:1.172.4.1
--- src/etc/MAKEDEV.tmpl:1.172	Mon Oct 28 18:33:20 2013
+++ src/etc/MAKEDEV.tmpl	Mon Nov 16 14:38:03 2015
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV.tmpl,v 1.172 2013/10/28 18:33:20 mbalmer Exp $
+#	$NetBSD: MAKEDEV.tmpl,v 1.172.4.1 2015/11/16 14:38:03 msaitoh Exp $
 #
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -986,6 +986,10 @@ ttyY[0-9]*)
 	mkdev ctyY$unit c %ucycom_chr% $(($unit + $callunit)) "" "" $u_uucp
 	;;
 
+ucom[0-9]*)
+	makedev ttyU${i#ucom}
+	;;
+
 ttyU[0-9]*)
 	unit=${i#ttyU}
 	mkdev ttyU$unit c %ucom_chr% $(($unit + $dialin	 )) "" "" $u_uucp

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:41:44 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1031):
sys/dev/usb/ucom.c: revision 1.110
Add the port number to the device properties to make it easier to relate
a specific ucom instance with the physical port of multi-port devices
like the FTDI 4232.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.107.2.1 src/sys/dev/usb/ucom.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/dev/usb

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:41:44 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1031):
sys/dev/usb/ucom.c: revision 1.110
Add the port number to the device properties to make it easier to relate
a specific ucom instance with the physical port of multi-port devices
like the FTDI 4232.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.107.2.1 src/sys/dev/usb/ucom.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/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.107 src/sys/dev/usb/ucom.c:1.107.2.1
--- src/sys/dev/usb/ucom.c:1.107	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/ucom.c	Mon Nov 16 14:41:44 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ucom.c,v 1.107 2014/08/10 16:44:36 tls Exp $	*/
+/*	$NetBSD: ucom.c,v 1.107.2.1 2015/11/16 14:41:44 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.107 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.107.2.1 2015/11/16 14:41:44 msaitoh Exp $");
 
 #include 
 #include 
@@ -219,6 +219,8 @@ ucom_attach(device_t parent, device_t se
 		aprint_normal(": %s", uca->info);
 	aprint_normal("\n");
 
+	prop_dictionary_set_int32(device_properties(self), "port", uca->portno);
+
 	sc->sc_dev = self;
 	sc->sc_udev = uca->device;
 	sc->sc_iface = uca->iface;

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:40:41 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1030):
sys/kern/subr_autoconf.c: revision 1.236
Add the parent device (if present) to the device properties, making it
easier to identify devices in the tree with drvctl(8).


To generate a diff of this commit:
cvs rdiff -u -r1.231.2.1 -r1.231.2.2 src/sys/kern/subr_autoconf.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/dev/usb

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:45:03 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1032):
sys/dev/usb/usb_subr.c: revision 1.204
Attach serial number as property to all USB devices having one.


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.196.4.1 src/sys/dev/usb/usb_subr.c

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

Modified files:

Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.196 src/sys/dev/usb/usb_subr.c:1.196.4.1
--- src/sys/dev/usb/usb_subr.c:1.196	Mon Feb 17 07:34:21 2014
+++ src/sys/dev/usb/usb_subr.c	Mon Nov 16 14:45:03 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.196 2014/02/17 07:34:21 skrll Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.196.4.1 2015/11/16 14:45:03 msaitoh Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.196 2014/02/17 07:34:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.196.4.1 2015/11/16 14:45:03 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -828,6 +828,24 @@ usbd_attach_roothub(device_t parent, usb
 	return (USBD_NORMAL_COMPLETION);
 }
 
+static void
+usbd_serialnumber(device_t dv, usbd_device_handle dev)
+{
+	usb_device_descriptor_t *dd = >ddesc;
+	char *serialnumber;
+
+	serialnumber = malloc(USB_MAX_ENCODED_STRING_LEN, M_USB, M_NOWAIT);
+	if (serialnumber == NULL)
+		return;
+	serialnumber[0] = '\0';
+	(void)usbd_get_string(dev, dd->iSerialNumber, serialnumber);
+	if (serialnumber[0]) {
+		prop_dictionary_set_cstring(device_properties(dv),
+		"serialnumber", serialnumber);
+	}
+	free(serialnumber, M_USB);
+}
+
 static usbd_status
 usbd_attachwholedevice(device_t parent, usbd_device_handle dev, int port,
 	int usegeneric)
@@ -864,6 +882,7 @@ usbd_attachwholedevice(device_t parent, 
 		dev->subdevs[0] = dv;
 		dev->subdevlen = 1;
 		dev->nifaces_claimed = 1; /* XXX */
+		usbd_serialnumber(dv, dev);
 	}
 	return (USBD_NORMAL_COMPLETION);
 }
@@ -924,6 +943,9 @@ usbd_attachinterfaces(device_t parent, u
 	 usbd_ifprint, config_stdsubmatch);
 		if (!dv)
 			continue;
+
+		usbd_serialnumber(dv, dev);
+
 		ifaces[i] = 0; /* claim */
 		/* account for ifaces claimed by the driver behind our back */
 		for (j = 0; j < nifaces; j++) {

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:40:41 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1030):
sys/kern/subr_autoconf.c: revision 1.236
Add the parent device (if present) to the device properties, making it
easier to identify devices in the tree with drvctl(8).


To generate a diff of this commit:
cvs rdiff -u -r1.231.2.1 -r1.231.2.2 src/sys/kern/subr_autoconf.c

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

Modified files:

Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.231.2.1 src/sys/kern/subr_autoconf.c:1.231.2.2
--- src/sys/kern/subr_autoconf.c:1.231.2.1	Mon Mar  9 08:56:01 2015
+++ src/sys/kern/subr_autoconf.c	Mon Nov 16 14:40:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.231.2.1 2015/03/09 08:56:01 snj Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.231.2.2 2015/11/16 14:40:41 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.231.2.1 2015/03/09 08:56:01 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.231.2.2 2015/11/16 14:40:41 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -1434,6 +1434,10 @@ config_devalloc(const device_t parent, c
 	"device-driver", dev->dv_cfdriver->cd_name);
 	prop_dictionary_set_uint16(dev->dv_properties,
 	"device-unit", dev->dv_unit);
+	if (parent != NULL) {
+		prop_dictionary_set_cstring(dev->dv_properties,
+		"device-parent", device_xname(parent));
+	}
 
 	if (dev->dv_cfdriver->cd_attrs != NULL)
 		config_add_attrib_dict(dev);

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:47:16 UTC 2015

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

Log Message:
Ticket 1028.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-7.0.1

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:46:54 UTC 2015

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

Log Message:
Ticket 1028-1032.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.31 -r1.1.2.32 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.31 src/doc/CHANGES-7.1:1.1.2.32
--- src/doc/CHANGES-7.1:1.1.2.31	Mon Nov 16 11:16:20 2015
+++ src/doc/CHANGES-7.1	Mon Nov 16 14:46:54 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.31 2015/11/16 11:16:20 msaitoh Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.32 2015/11/16 14:46:54 msaitoh Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -787,7 +787,7 @@ usr.sbin/sysinst/target.c			1.3
 
 distrib/sets/lists/comp/mi			1.1921
 lib/libm/Makefile1.167
-lib/libm/man/erf.31.13
+lib/libm/man/erf.31.13-1.14
 
 	PR/49399: Henning Petersen: Add man pages for erfl(3) and erfcl(3).
 	[dholland, ticket #1009]
@@ -1555,3 +1555,33 @@ doc/3RDPARTY		  			1.1259
 
 	Updated to Lua 5.3.1
 	[mbalmer, ticket #993]
+
+sys/arch/sparc64/sparc64/locore.s		1.386
+sys/arch/sparc64/sparc64/netbsd32_machdep.c	1.105-1.106
+sys/arch/sparc64/sparc64/vm_machdep.c		1.101
+
+	Fix various sparc64 compat_netbsd32 issues.
+	[martin, ticket #1028]
+
+etc/MAKEDEV.tmpl1.176
+
+	Translate requests for ucom into ttyU.
+	[joerg, ticket #1029]
+
+sys/kern/subr_autoconf.c			1.236
+
+	Add the parent device (if present) to the device properties, making it
+	easier to identify devices in the tree with drvctl(8).
+	[joerg, ticket #1030]
+
+sys/dev/usb/ucom.c1.110
+
+	Add the port number to the device properties to make it easier to
+	relate a specific ucom instance with the physical port of multi-port
+	devices like the FTDI 4232.
+	[joerg, ticket #1031]
+
+sys/dev/usb/usb_subr.c1.204
+
+	Attach serial number as property to all USB devices having one.
+	[joerg, ticket #1032]

CVS commit: [netbsd-7] src/doc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:46:54 UTC 2015

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

Log Message:
Ticket 1028-1032.


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

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:47:16 UTC 2015

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

Log Message:
Ticket 1028.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-7.0.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.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.14 src/doc/CHANGES-7.0.1:1.1.2.15
--- src/doc/CHANGES-7.0.1:1.1.2.14	Mon Nov 16 07:38:15 2015
+++ src/doc/CHANGES-7.0.1	Mon Nov 16 14:47:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.14 2015/11/16 07:38:15 msaitoh Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.15 2015/11/16 14:47:16 msaitoh Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -754,3 +754,10 @@ sys/arch/xen/xen/xbdback_xenbus.c		1.61
 	when a userland process could use all CPU.
 	Should fix the problem reported by Torbj?rn Granlund on port-xen@
 	[bouyer, ticket #1040]
+
+sys/arch/sparc64/sparc64/locore.s		1.386
+sys/arch/sparc64/sparc64/netbsd32_machdep.c	1.105-1.106
+sys/arch/sparc64/sparc64/vm_machdep.c		1.101
+
+	Fix various sparc64 compat_netbsd32 issues.
+	[martin, ticket #1028]

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:59:45 UTC 2015

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

Log Message:
Change macro name of Braswell PCU SMBus.


To generate a diff of this commit:
cvs rdiff -u -r1.1241 -r1.1242 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.1241 src/sys/dev/pci/pcidevs:1.1242
--- src/sys/dev/pci/pcidevs:1.1241	Mon Nov 16 14:19:39 2015
+++ src/sys/dev/pci/pcidevs	Mon Nov 16 14:59:45 2015
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1241 2015/11/16 14:19:39 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1242 2015/11/16 14:59:45 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3193,7 +3193,7 @@ product INTEL BSW_HDA		0x2284	Braswell H
 product INTEL BSW_SIO_DMA_2	0x2286	Braswell SIO DMA
 product INTEL BSW_SIO_HSUART_1	0x228a	Braswell Serial
 product INTEL BSW_SIO_HSUART_2	0x228c	Braswell Serial
-product INTEL BSW_SMB		0x2292	Braswell PCU SMBus
+product INTEL BSW_PCU_SMB	0x2292	Braswell PCU SMBus
 product INTEL BSW_SSC_MMC	0x2294	Braswell SCC MMC Port
 product INTEL BSW_SSC_SDIO	0x2295	Braswell SCC SDIO Port
 product INTEL BSW_SSC_SD	0x2296	Braswell SCC SD Port

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 15:00:14 UTC 2015

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.1234 -r1.1235 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1233 -r1.1234 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 Nov 16 14:20:01 UTC 2015

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.1233 -r1.1234 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1232 -r1.1233 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-7] src/etc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 14:38:03 UTC 2015

Modified Files:
src/etc [netbsd-7]: MAKEDEV.tmpl

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1029):
etc/MAKEDEV.tmpl: revision 1.176
Translate requests for ucom into ttyU.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.172.4.1 src/etc/MAKEDEV.tmpl

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

CVS commit: src/include/protocols

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Nov 16 17:09:56 UTC 2015

Modified Files:
src/include/protocols: dumprestore.h

Log Message:
PR/50434: Louis Guillaume: Bump the in and out formats to 511 (NAME_MAX)


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/include/protocols/dumprestore.h

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

CVS commit: src/sbin/dump

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Nov 16 17:06:47 UTC 2015

Modified Files:
src/sbin/dump: dump.h

Log Message:
- update NAME_MAX to match the kernel.
- add a comment about where the constant is used.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sbin/dump/dump.h

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

Modified files:

Index: src/sbin/dump/dump.h
diff -u src/sbin/dump/dump.h:1.53 src/sbin/dump/dump.h:1.54
--- src/sbin/dump/dump.h:1.53	Wed Aug 12 14:28:00 2015
+++ src/sbin/dump/dump.h	Mon Nov 16 12:06:47 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: dump.h,v 1.53 2015/08/12 18:28:00 dholland Exp $	*/
+/*	$NetBSD: dump.h,v 1.54 2015/11/16 17:06:47 christos Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -267,7 +267,7 @@ struct	fstab *fstabsearch(const char *);
 struct	statvfs *mntinfosearch(const char *key);
 
 #ifndef NAME_MAX
-#define NAME_MAX 255
+#define NAME_MAX 511
 #endif
 
 /*
@@ -275,6 +275,7 @@ struct	statvfs *mntinfosearch(const char
  *	a linked list, and then (eventually) arrayified.
  */
 struct dumpdates {
+	/* see DUMP{IN,OUT}FMT in  */
 	char	dd_name[NAME_MAX+3];
 	char	dd_level;
 	time_t	dd_ddate;

CVS commit: src/include/protocols

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Nov 16 17:09:56 UTC 2015

Modified Files:
src/include/protocols: dumprestore.h

Log Message:
PR/50434: Louis Guillaume: Bump the in and out formats to 511 (NAME_MAX)


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/include/protocols/dumprestore.h

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

Modified files:

Index: src/include/protocols/dumprestore.h
diff -u src/include/protocols/dumprestore.h:1.16 src/include/protocols/dumprestore.h:1.17
--- src/include/protocols/dumprestore.h:1.16	Sat Jan 10 22:04:12 2009
+++ src/include/protocols/dumprestore.h	Mon Nov 16 12:09:56 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumprestore.h,v 1.16 2009/01/11 03:04:12 christos Exp $	*/
+/*	$NetBSD: dumprestore.h,v 1.17 2015/11/16 17:09:56 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -152,8 +152,9 @@ union u_spcl {
 #define DR_NEWINODEFMT	0x0002	/* new format inodes on tape */
 #define DR_EXTATTRIBUTES 0x8000	/* linux: extended attributes */
 
-#define	DUMPOUTFMT	"%-16s %c %s"		/* for printf */
+/* 511 == NAME_MAX */
+#define	DUMPOUTFMT	"%-511s %c %s"		/* for printf */
 		/* name, level, ctime(date) */
-#define	DUMPINFMT	"%16s %c %[^\n]\n"	/* inverse for scanf */
+#define	DUMPINFMT	"%511s %c %[^\n]\n"	/* inverse for scanf */
 
 #endif /* !_PROTOCOLS_DUMPRESTORE_H_ */

CVS commit: src/sbin/dump

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Nov 16 17:06:47 UTC 2015

Modified Files:
src/sbin/dump: dump.h

Log Message:
- update NAME_MAX to match the kernel.
- add a comment about where the constant is used.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sbin/dump/dump.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/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Nov 16 21:24:06 UTC 2015

Modified Files:
src/sys/arch/amiga/dev: grf_cv.c grf_cv3d.c

Log Message:
Fixed bug in wsdisplay copyrows textop.
Fixed WSDISPLAYIO_SVIDEO, which had inverted functionality.
Improved FBINFO setup. 15 and 16 bits depth both have 16bpp now.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/amiga/dev/grf_cv.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amiga/dev/grf_cv3d.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/dev/grf_cv.c
diff -u src/sys/arch/amiga/dev/grf_cv.c:1.58 src/sys/arch/amiga/dev/grf_cv.c:1.59
--- src/sys/arch/amiga/dev/grf_cv.c:1.58	Thu Nov 12 12:01:53 2015
+++ src/sys/arch/amiga/dev/grf_cv.c	Mon Nov 16 21:24:06 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cv.c,v 1.58 2015/11/12 12:01:53 phx Exp $ */
+/*	$NetBSD: grf_cv.c,v 1.59 2015/11/16 21:24:06 phx Exp $ */
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.58 2015/11/12 12:01:53 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.59 2015/11/16 21:24:06 phx Exp $");
 
 #include "grfcv.h"
 #include "ite.h"
@@ -543,8 +543,10 @@ grfcvattach(device_t parent, device_t se
 		gp->g_defaultscr = _defaultscreen;
 		gp->g_scrlist = _screenlist;
 #else
+#if NITE > 0
 		grfcv_iteinit(gp);
 #endif
+#endif /* NWSDISPLAY > 0 */
 		(void)cv_load_mon(gp, _mode);
 #endif
 	}
@@ -2387,7 +2389,7 @@ cv_wscopyrows(void *c, int srcrow, int d
 	gp = scr->scr_cookie;
 	src = dst = gp->g_fbkva;
 	n = ri->ri_cols * nrows;
-	if (src < dst) {
+	if (srcrow < dstrow) {
 		/* need to copy backwards */
 		src += gp->g_rowoffset[srcrow + nrows] << 1;
 		dst += gp->g_rowoffset[dstrow + nrows] << 1;
@@ -2485,7 +2487,7 @@ cv_wsioctl(void *v, void *vs, u_long cmd
 		return 0;
 
 	case WSDISPLAYIO_SVIDEO:
-		return cv_blank(gp, *(u_int *)data == WSDISPLAYIO_VIDEO_OFF);
+		return cv_blank(gp, *(u_int *)data == WSDISPLAYIO_VIDEO_ON);
 
 	case WSDISPLAYIO_SMODE:
 		if ((*(int *)data) != gp->g_wsmode) {
@@ -2525,34 +2527,34 @@ cv_get_fbinfo(struct grf_softc *gp, stru
 	md = monitor_current;
 	abits = 0;
 
-	fbi->fbi_width = md->disp_width;
-	fbi->fbi_height = md->disp_height;
-	fbi->fbi_bitsperpixel = md->depth;
-
 	switch (md->depth) {
 	case 8:
-		fbi->fbi_stride = md->disp_width;
+		fbi->fbi_bitsperpixel = 8;
 		rbits = gbits = bbits = 6;  /* keep gcc happy */
 		break;
 	case 15:
-		fbi->fbi_stride = md->disp_width * 2;
+		fbi->fbi_bitsperpixel = 16;
 		rbits = gbits = bbits = 5;
 		break;
 	case 16:
-		fbi->fbi_stride = md->disp_width * 2;
+		fbi->fbi_bitsperpixel = 16;
 		rbits = bbits = 5;
 		gbits = 6;
 		break;
 	case 32:
 		abits = 8;
 	case 24:
-		fbi->fbi_stride = md->disp_width * 4;
+		fbi->fbi_bitsperpixel = 32;
 		rbits = gbits = bbits = 8;
 		break;
 	default:
 		return EINVAL;
 	}
 
+	fbi->fbi_stride = (fbi->fbi_bitsperpixel / 8) * md->disp_width;
+	fbi->fbi_width = md->disp_width;
+	fbi->fbi_height = md->disp_height;
+
 	if (md->depth > 8) {
 		fbi->fbi_pixeltype = WSFB_RGB;
 		fbi->fbi_subtype.fbi_rgbmasks.red_offset = bbits + gbits;

Index: src/sys/arch/amiga/dev/grf_cv3d.c
diff -u src/sys/arch/amiga/dev/grf_cv3d.c:1.32 src/sys/arch/amiga/dev/grf_cv3d.c:1.33
--- src/sys/arch/amiga/dev/grf_cv3d.c:1.32	Thu Nov 12 12:01:53 2015
+++ src/sys/arch/amiga/dev/grf_cv3d.c	Mon Nov 16 21:24:06 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cv3d.c,v 1.32 2015/11/12 12:01:53 phx Exp $ */
+/*	$NetBSD: grf_cv3d.c,v 1.33 2015/11/16 21:24:06 phx Exp $ */
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -33,11 +33,11 @@
 #include "opt_amigacons.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.32 2015/11/12 12:01:53 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.33 2015/11/16 21:24:06 phx Exp $");
 
+#include "grfcv3d.h"
 #include "ite.h"
 #include "wsdisplay.h"
-#include "grfcv3d.h"
 #if NGRFCV3D > 0
 
 /*
@@ -493,7 +493,9 @@ grfcv3dattach(device_t parent, device_t 
 		gp->g_defaultscr = _defaultscreen;
 		gp->g_scrlist = _screenlist;
 #else
+#if NITE > 0
 		grfcv3d_iteinit(gp);
+#endif
 #endif /* NWSDISPLAY > 0 */
 		(void)cv3d_load_mon(gp, _mode);		
 #endif
@@ -2242,7 +2244,7 @@ cv3d_wscopyrows(void *c, int srcrow, int
 	gp = scr->scr_cookie;
 	src = dst = gp->g_fbkva;
 	n = ri->ri_cols * nrows;
-	if (src < dst) {
+	if (srcrow < dstrow) {
 		/* need to copy backwards */
 		src += gp->g_rowoffset[srcrow + nrows] << 1;
 		dst += gp->g_rowoffset[dstrow + nrows] << 1;
@@ -2340,7 +2342,7 @@ cv3d_wsioctl(void *v, void *vs, u_long c
 		return 0;
 
 	case WSDISPLAYIO_SVIDEO:
-		return cv3d_blank(gp, *(u_int *)data == WSDISPLAYIO_VIDEO_OFF);
+		return cv3d_blank(gp, *(u_int *)data == WSDISPLAYIO_VIDEO_ON);
 
 	case WSDISPLAYIO_SMODE:
 		if ((*(int *)data) != gp->g_wsmode) {
@@ -2380,34 +2382,34 @@ cv3d_get_fbinfo(struct grf_softc *gp, st
 	md = monitor_current;
 	

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Nov 16 21:41:29 UTC 2015

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

Log Message:
initialize allocated gem object memory to 0


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

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

Modified files:

Index: src/sys/arch/arm/nvidia/tegra_drm_gem.c
diff -u src/sys/arch/arm/nvidia/tegra_drm_gem.c:1.1 src/sys/arch/arm/nvidia/tegra_drm_gem.c:1.2
--- src/sys/arch/arm/nvidia/tegra_drm_gem.c:1.1	Thu Nov 12 00:43:52 2015
+++ src/sys/arch/arm/nvidia/tegra_drm_gem.c	Mon Nov 16 21:41:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_gem.c,v 1.1 2015/11/12 00:43:52 jmcneill Exp $ */
+/* $NetBSD: tegra_drm_gem.c,v 1.2 2015/11/16 21:41:29 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_gem.c,v 1.1 2015/11/12 00:43:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_gem.c,v 1.2 2015/11/16 21:41:29 jmcneill Exp $");
 
 #include 
 #include 
@@ -65,6 +65,8 @@ tegra_drm_obj_alloc(struct drm_device *d
 	if (error)
 		goto destroy;
 
+	memset(obj->dmap, 0, obj->dmasize);
+
 	drm_gem_private_object_init(ddev, >base, size);
 
 	return obj;

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Nov 16 21:41:29 UTC 2015

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

Log Message:
initialize allocated gem object memory to 0


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_drm_gem.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/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Nov 16 21:24:06 UTC 2015

Modified Files:
src/sys/arch/amiga/dev: grf_cv.c grf_cv3d.c

Log Message:
Fixed bug in wsdisplay copyrows textop.
Fixed WSDISPLAYIO_SVIDEO, which had inverted functionality.
Improved FBINFO setup. 15 and 16 bits depth both have 16bpp now.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/amiga/dev/grf_cv.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amiga/dev/grf_cv3d.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/amiga

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Nov 16 21:25:34 UTC 2015

Modified Files:
src/sys/arch/amiga/conf: WSCONS
src/sys/arch/amiga/dev: grf_cl.c

Log Message:
wscons and Xorg support for CirrusLogic GD542x based boards (grf3).


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amiga/conf/WSCONS
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amiga/dev/grf_cl.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/conf/WSCONS
diff -u src/sys/arch/amiga/conf/WSCONS:1.68 src/sys/arch/amiga/conf/WSCONS:1.69
--- src/sys/arch/amiga/conf/WSCONS:1.68	Fri Nov 13 16:04:07 2015
+++ src/sys/arch/amiga/conf/WSCONS	Mon Nov 16 21:25:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.68 2015/11/13 16:04:07 phx Exp $
+# $NetBSD: WSCONS,v 1.69 2015/11/16 21:25:34 phx Exp $
 
 # GENERIC with wscons(4)
 #
@@ -27,13 +27,11 @@ amidisplaycc0	at mainbus0		# wscons inte
 no grfcc0	at mainbus0
 no grfrt0	at zbus0
 no grfrh0	at zbus0
-no grfcl*	at zbus0
 no grful0	at zbus0
 no grfet*	at zbus0
 no grf0		at grfcc0
 no grf1		at grfrt0
 no grf2		at grfrh0
-no grf3		at grfcl?
 no grf4		at grful0
 no grf6		at grfet?
 

Index: src/sys/arch/amiga/dev/grf_cl.c
diff -u src/sys/arch/amiga/dev/grf_cl.c:1.49 src/sys/arch/amiga/dev/grf_cl.c:1.50
--- src/sys/arch/amiga/dev/grf_cl.c:1.49	Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/dev/grf_cl.c	Mon Nov 16 21:25:34 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cl.c,v 1.49 2014/01/22 00:25:16 christos Exp $ */
+/*	$NetBSD: grf_cl.c,v 1.50 2015/11/16 21:25:34 phx Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -36,10 +36,11 @@
 #include "opt_amigacons.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.49 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.50 2015/11/16 21:25:34 phx Exp $");
 
 #include "grfcl.h"
 #include "ite.h"
+#include "wsdisplay.h"
 #if NGRFCL > 0
 
 /*
@@ -81,6 +82,12 @@ __KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1
 
 #include 
 #include 
+#if NWSDISPLAY > 0
+#include 
+#include 
+#include 
+#include 
+#endif
 #include 
 #include 
 #include 
@@ -106,7 +113,8 @@ int	cl_setmousepos(struct grf_softc *, s
 static int cl_setspriteinfo(struct grf_softc *, struct grf_spriteinfo *);
 int	cl_getspriteinfo(struct grf_softc *, struct grf_spriteinfo *);
 static int cl_getspritemax(struct grf_softc *, struct grf_position *);
-int	cl_blank(struct grf_softc *, int *);
+int	cl_blank(struct grf_softc *, int);
+int	cl_isblank(struct grf_softc *);
 int	cl_setmonitor(struct grf_softc *, struct grfvideo_mode *);
 void	cl_writesprpos(volatile char *, short, short);
 void	writeshifted(volatile char *, signed char, signed char);
@@ -120,6 +128,21 @@ int	grfclprint(void *, const char *);
 int	grfclmatch(device_t, cfdata_t, void *);
 void	cl_memset(unsigned char *, unsigned char, int);
 
+#if NWSDISPLAY > 0
+/* wsdisplay acessops, emulops */
+static int	cl_wsioctl(void *, void *, u_long, void *, int, struct lwp *);
+static int	cl_get_fbinfo(struct grf_softc *, struct wsdisplayio_fbinfo *);
+
+static void	cl_wscursor(void *, int, int, int);
+static void	cl_wsputchar(void *, int, int, u_int, long);
+static void	cl_wscopycols(void *, int, int, int, int);
+static void	cl_wserasecols(void *, int, int, int, long);
+static void	cl_wscopyrows(void *, int, int, int);
+static void	cl_wseraserows(void *, int, int, long);
+static int	cl_wsallocattr(void *, int, int, int, long *);
+static int	cl_wsmapchar(void *, int, unsigned int *);
+#endif  /* NWSDISPLAY > 0 */
+
 /* Graphics display definitions.
  * These are filled by 'grfconfig' using GRFIOCSETMON.
  */
@@ -162,6 +185,7 @@ unsigned char clconscolors[3][3] = {	/* 
 int	cltype = 0;		/* Picasso, Spectrum or Piccolo */
 int	cl_64bit = 0;		/* PiccoloSD64 or PicassoIV */
 unsigned char cl_pass_toggle;	/* passthru status tracker */
+static int cl_blanked;		/* true when video is currently blanked out */
 
 /*
  * because all 542x-boards have 2 configdev entries, one for
@@ -188,6 +212,41 @@ struct grf_spriteinfo cl_cursprite;
 static unsigned char cl_imageptr[8 * 64], cl_maskptr[8 * 64];
 static unsigned char cl_sprred[2], cl_sprgreen[2], cl_sprblue[2];
 
+#if NWSDISPLAY > 0
+static struct wsdisplay_accessops cl_accessops = {
+	.ioctl		= cl_wsioctl,
+	.mmap		= grf_wsmmap
+};
+
+static struct wsdisplay_emulops cl_textops = {
+	.cursor		= cl_wscursor,
+	.mapchar	= cl_wsmapchar,
+	.putchar	= cl_wsputchar,
+	.copycols	= cl_wscopycols,
+	.erasecols	= cl_wserasecols,
+	.copyrows	= cl_wscopyrows,
+	.eraserows	= cl_wseraserows,
+	.allocattr	= cl_wsallocattr
+};
+
+static struct wsscreen_descr cl_defaultscreen = {
+	.name		= "default",
+	.textops	= _textops,
+	.fontwidth	= 8,
+	.fontheight	= CIRRUSFONTY,
+	.capabilities	= WSSCREEN_HILIT | WSSCREEN_BLINK |
+			  WSSCREEN_REVERSE | WSSCREEN_UNDERLINE
+};
+
+static const struct wsscreen_descr *cl_screens[] = {
+	_defaultscreen,
+};
+
+static 

CVS commit: src/sys/arch/amiga

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Nov 16 21:25:34 UTC 2015

Modified Files:
src/sys/arch/amiga/conf: WSCONS
src/sys/arch/amiga/dev: grf_cl.c

Log Message:
wscons and Xorg support for CirrusLogic GD542x based boards (grf3).


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amiga/conf/WSCONS
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amiga/dev/grf_cl.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/nvidia

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Nov 16 21:14:51 UTC 2015

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

Log Message:
commit window changes when updating base


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_drm_mode.c

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

Modified files:

Index: src/sys/arch/arm/nvidia/tegra_drm_mode.c
diff -u src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.8 src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.9
--- src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.8	Sun Nov 15 14:39:12 2015
+++ src/sys/arch/arm/nvidia/tegra_drm_mode.c	Mon Nov 16 21:14:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_mode.c,v 1.8 2015/11/15 14:39:12 jmcneill Exp $ */
+/* $NetBSD: tegra_drm_mode.c,v 1.9 2015/11/16 21:14:51 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.8 2015/11/15 14:39:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.9 2015/11/16 21:14:51 jmcneill Exp $");
 
 #include 
 #include 
@@ -659,14 +659,34 @@ static int
 tegra_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
 struct drm_framebuffer *old_fb)
 {
-	return tegra_crtc_do_set_base(crtc, old_fb, x, y, 0);
+	struct tegra_crtc *tegra_crtc = to_tegra_crtc(crtc);
+	
+	tegra_crtc_do_set_base(crtc, old_fb, x, y, 0);
+
+	/* Commit settings */
+	DC_WRITE(tegra_crtc, DC_CMD_STATE_CONTROL_REG,
+	DC_CMD_STATE_CONTROL_WIN_A_UPDATE);
+	DC_WRITE(tegra_crtc, DC_CMD_STATE_CONTROL_REG,
+	DC_CMD_STATE_CONTROL_WIN_A_ACT_REQ);
+
+	return 0;
 }
 
 static int
 tegra_crtc_mode_set_base_atomic(struct drm_crtc *crtc,
 struct drm_framebuffer *fb, int x, int y, enum mode_set_atomic state)
 {
-	return tegra_crtc_do_set_base(crtc, fb, x, y, 1);
+	struct tegra_crtc *tegra_crtc = to_tegra_crtc(crtc);
+
+	tegra_crtc_do_set_base(crtc, fb, x, y, 1);
+
+	/* Commit settings */
+	DC_WRITE(tegra_crtc, DC_CMD_STATE_CONTROL_REG,
+	DC_CMD_STATE_CONTROL_WIN_A_UPDATE);
+	DC_WRITE(tegra_crtc, DC_CMD_STATE_CONTROL_REG,
+	DC_CMD_STATE_CONTROL_WIN_A_ACT_REQ);
+
+	return 0;
 }
 
 static void

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Nov 16 21:14:33 UTC 2015

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

Log Message:
use XRGB for framebuffer


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_drm_fb.c

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

Modified files:

Index: src/sys/arch/arm/nvidia/tegra_drm_fb.c
diff -u src/sys/arch/arm/nvidia/tegra_drm_fb.c:1.2 src/sys/arch/arm/nvidia/tegra_drm_fb.c:1.3
--- src/sys/arch/arm/nvidia/tegra_drm_fb.c:1.2	Thu Nov 12 00:43:52 2015
+++ src/sys/arch/arm/nvidia/tegra_drm_fb.c	Mon Nov 16 21:14:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_fb.c,v 1.2 2015/11/12 00:43:52 jmcneill Exp $ */
+/* $NetBSD: tegra_drm_fb.c,v 1.3 2015/11/16 21:14:33 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_fb.c,v 1.2 2015/11/12 00:43:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_fb.c,v 1.3 2015/11/16 21:14:33 jmcneill Exp $");
 
 #include 
 #include 
@@ -137,7 +137,7 @@ tegra_fb_init(struct drm_device *ddev, s
 fb->offsets[0] = 0;
 fb->width = width;
 fb->height = height;
-fb->pixel_format = DRM_FORMAT_ARGB;
+fb->pixel_format = DRM_FORMAT_XRGB;
 drm_fb_get_bpp_depth(fb->pixel_format, >depth,
 >bits_per_pixel);
 	tegra_drm_framebuffer_init(ddev, tegra_fb);

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Nov 16 21:14:33 UTC 2015

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

Log Message:
use XRGB for framebuffer


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_drm_fb.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/nvidia

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Nov 16 21:14:51 UTC 2015

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

Log Message:
commit window changes when updating base


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_drm_mode.c

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

CVS commit: src/sys/rump/dev

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Mon Nov 16 23:27:08 UTC 2015

Modified Files:
src/sys/rump/dev: files.rump
src/sys/rump/dev/lib: Makefile.inc component_simple.c
src/sys/rump/dev/lib/libmiiphy: Makefile
src/sys/rump/dev/lib/libpci_auich: Makefile
src/sys/rump/dev/lib/libpci_eap: Makefile
src/sys/rump/dev/lib/libpci_if_iwn: Makefile
src/sys/rump/dev/lib/libpci_if_pcn: Makefile
src/sys/rump/dev/lib/libpci_if_wm: Makefile
src/sys/rump/dev/lib/libpci_usbhc: Makefile
src/sys/rump/dev/lib/libpci_virtio: Makefile
src/sys/rump/dev/lib/libubt: Makefile
src/sys/rump/dev/lib/libugenhc: Makefile
src/sys/rump/dev/lib/libusb: Makefile
src/sys/rump/dev/lib/libvirtio_if_vioif: Makefile
src/sys/rump/dev/lib/libvirtio_viornd: Makefile
src/sys/rump/dev/lib/libvirtio_vioscsi: Makefile

Log Message:
Use IOCONF #define to determine component name.

Avoids having to manually retype info already in .ioconf.

Also, COMPONENT_SIMPLE -> RUMP_COMPONENT=simple.  That way, we can add
other attributes where necessary.  As "future directions", the "ioconf"
attribute for RUMP_COMPONENT can just be removed when a driver is
converted to modular and has a proper modcmd.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/files.rump
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/component_simple.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libmiiphy/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_auich/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_eap/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_if_iwn/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_if_pcn/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_if_wm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci_usbhc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_virtio/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libubt/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/lib/libugenhc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libusb/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libvirtio_viornd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libvirtio_vioscsi/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/rump/dev/files.rump
diff -u src/sys/rump/dev/files.rump:1.4 src/sys/rump/dev/files.rump:1.5
--- src/sys/rump/dev/files.rump:1.4	Tue Sep 17 00:50:19 2013
+++ src/sys/rump/dev/files.rump	Mon Nov 16 23:27:07 2015
@@ -1,6 +1,8 @@
-#	$NetBSD: files.rump,v 1.4 2013/09/17 00:50:19 pooka Exp $
+#	$NetBSD: files.rump,v 1.5 2015/11/16 23:27:07 pooka Exp $
 #
 
+version 20151112
+
 device mainbus { }: pcibus
 attach mainbus at root
 

Index: src/sys/rump/dev/lib/Makefile.inc
diff -u src/sys/rump/dev/lib/Makefile.inc:1.5 src/sys/rump/dev/lib/Makefile.inc:1.6
--- src/sys/rump/dev/lib/Makefile.inc:1.5	Wed Nov 11 21:52:45 2015
+++ src/sys/rump/dev/lib/Makefile.inc	Mon Nov 16 23:27:07 2015
@@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.inc,v 1.5 2015/11/11 21:52:45 pooka Exp $
+#	$NetBSD: Makefile.inc,v 1.6 2015/11/16 23:27:07 pooka Exp $
 #
 
 RUMPTOP=	${.CURDIR}/../../..
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev
 
 RUMPDEVLIBDIR:= ${.PARSEDIR}
-.ifdef COMPONENT_SIMPLE
+
+.if defined(RUMP_COMPONENT) && !empty(${RUMP_COMPONENT:Mioconf})
 .PATH:	${RUMPDEVLIBDIR}
 SRCS+=   component_simple.c
-CPPFLAGS.component_simple.c+= -DCOMPONENT_NAME=${COMPONENT_SIMPLE}
 .endif
 
 .include "${RUMPTOP}/Makefile.rump"

Index: src/sys/rump/dev/lib/component_simple.c
diff -u src/sys/rump/dev/lib/component_simple.c:1.1 src/sys/rump/dev/lib/component_simple.c:1.2
--- src/sys/rump/dev/lib/component_simple.c:1.1	Wed Nov 11 21:52:45 2015
+++ src/sys/rump/dev/lib/component_simple.c	Mon Nov 16 23:27:07 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: component_simple.c,v 1.1 2015/11/11 21:52:45 pooka Exp $	*/
+/*	$NetBSD: component_simple.c,v 1.2 2015/11/16 23:27:07 pooka Exp $	*/
 
 /*
  * Copyright (c) 2015 Antti Kantee.  All Rights Reserved.
@@ -25,12 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef COMPONENT_NAME
-#error Internal error: COMPONENT_NAME not defined
-#endif
-
 #include 
-__KERNEL_RCSID(0, "$NetBSD: component_simple.c,v 1.1 2015/11/11 21:52:45 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component_simple.c,v 1.2 2015/11/16 23:27:07 pooka Exp $");
 
 #include 
 #include 
@@ -49,5 +45,5 @@ __KERNEL_RCSID(0, "$NetBSD: component_si
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
 
-	CONFIG_INIT_COMPONENT(COMPONENT_NAME);
+	CONFIG_INIT_COMPONENT(IOCONF);
 }

Index: src/sys/rump/dev/lib/libmiiphy/Makefile
diff -u src/sys/rump/dev/lib/libmiiphy/Makefile:1.5 

CVS commit: src/sys/rump/dev

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Mon Nov 16 23:27:08 UTC 2015

Modified Files:
src/sys/rump/dev: files.rump
src/sys/rump/dev/lib: Makefile.inc component_simple.c
src/sys/rump/dev/lib/libmiiphy: Makefile
src/sys/rump/dev/lib/libpci_auich: Makefile
src/sys/rump/dev/lib/libpci_eap: Makefile
src/sys/rump/dev/lib/libpci_if_iwn: Makefile
src/sys/rump/dev/lib/libpci_if_pcn: Makefile
src/sys/rump/dev/lib/libpci_if_wm: Makefile
src/sys/rump/dev/lib/libpci_usbhc: Makefile
src/sys/rump/dev/lib/libpci_virtio: Makefile
src/sys/rump/dev/lib/libubt: Makefile
src/sys/rump/dev/lib/libugenhc: Makefile
src/sys/rump/dev/lib/libusb: Makefile
src/sys/rump/dev/lib/libvirtio_if_vioif: Makefile
src/sys/rump/dev/lib/libvirtio_viornd: Makefile
src/sys/rump/dev/lib/libvirtio_vioscsi: Makefile

Log Message:
Use IOCONF #define to determine component name.

Avoids having to manually retype info already in .ioconf.

Also, COMPONENT_SIMPLE -> RUMP_COMPONENT=simple.  That way, we can add
other attributes where necessary.  As "future directions", the "ioconf"
attribute for RUMP_COMPONENT can just be removed when a driver is
converted to modular and has a proper modcmd.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/files.rump
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/component_simple.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libmiiphy/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_auich/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_eap/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_if_iwn/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_if_pcn/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_if_wm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci_usbhc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_virtio/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libubt/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/lib/libugenhc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libusb/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libvirtio_viornd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile

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/nvidia

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Tue Nov 17 00:08:33 UTC 2015

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

Log Message:
Do not clear the PCIe interrupt until we've allowed its cause to become
deasserted.  This halves the PCIe interrupt rate.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_pcie.c

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

Modified files:

Index: src/sys/arch/arm/nvidia/tegra_pcie.c
diff -u src/sys/arch/arm/nvidia/tegra_pcie.c:1.10 src/sys/arch/arm/nvidia/tegra_pcie.c:1.11
--- src/sys/arch/arm/nvidia/tegra_pcie.c:1.10	Sat Nov 14 03:44:52 2015
+++ src/sys/arch/arm/nvidia/tegra_pcie.c	Tue Nov 17 00:08:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.10 2015/11/14 03:44:52 jakllsch Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.11 2015/11/17 00:08:33 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.10 2015/11/14 03:44:52 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.11 2015/11/17 00:08:33 jakllsch Exp $");
 
 #include 
 #include 
@@ -237,21 +237,27 @@ static int
 tegra_pcie_intr(void *priv)
 {
 	struct tegra_pcie_softc *sc = priv;
+	int rv;
 
 	const uint32_t code = bus_space_read_4(sc->sc_bst, sc->sc_bsh_afi,
 	AFI_INTR_CODE_REG);
 	const uint32_t sig = bus_space_read_4(sc->sc_bst, sc->sc_bsh_afi,
 	AFI_INTR_SIGNATURE_REG);
-	bus_space_write_4(sc->sc_bst, sc->sc_bsh_afi, AFI_INTR_CODE_REG, 0);
 
 	switch (__SHIFTOUT(code, AFI_INTR_CODE_INT_CODE)) {
 	case AFI_INTR_CODE_SM_MSG:
-		return tegra_pcie_legacy_intr(sc);
+		rv = tegra_pcie_legacy_intr(sc);
+		break;
 	default:
 		device_printf(sc->sc_dev, "intr: code %#x sig %#x\n",
 		code, sig);
-		return 1;
+		rv = 1;
+		break;
 	}
+
+	bus_space_write_4(sc->sc_bst, sc->sc_bsh_afi, AFI_INTR_CODE_REG, 0);
+
+	return rv;
 }
 
 static void

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

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Tue Nov 17 00:08:33 UTC 2015

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

Log Message:
Do not clear the PCIe interrupt until we've allowed its cause to become
deasserted.  This halves the PCIe interrupt rate.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_pcie.c

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

CVS commit: src/sys/rump/dev/lib

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Nov 17 01:07:34 UTC 2015

Modified Files:
src/sys/rump/dev/lib: Makefile.inc

Log Message:
Fix argument to empty()

Guess none of the fast-running tests exercised the
component being initialized ...


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/Makefile.inc

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

CVS commit: src/sys/rump/dev/lib

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Nov 17 01:07:34 UTC 2015

Modified Files:
src/sys/rump/dev/lib: Makefile.inc

Log Message:
Fix argument to empty()

Guess none of the fast-running tests exercised the
component being initialized ...


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/Makefile.inc

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

Modified files:

Index: src/sys/rump/dev/lib/Makefile.inc
diff -u src/sys/rump/dev/lib/Makefile.inc:1.6 src/sys/rump/dev/lib/Makefile.inc:1.7
--- src/sys/rump/dev/lib/Makefile.inc:1.6	Mon Nov 16 23:27:07 2015
+++ src/sys/rump/dev/lib/Makefile.inc	Tue Nov 17 01:07:34 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.6 2015/11/16 23:27:07 pooka Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2015/11/17 01:07:34 pooka Exp $
 #
 
 RUMPTOP=	${.CURDIR}/../../..
@@ -6,7 +6,7 @@ CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern
 
 RUMPDEVLIBDIR:= ${.PARSEDIR}
 
-.if defined(RUMP_COMPONENT) && !empty(${RUMP_COMPONENT:Mioconf})
+.if defined(RUMP_COMPONENT) && !empty(RUMP_COMPONENT:Mioconf)
 .PATH:	${RUMPDEVLIBDIR}
 SRCS+=   component_simple.c
 .endif

CVS commit: [netbsd-6] src/sys/arch/powerpc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Nov 16 09:00:01 UTC 2015

Modified Files:
src/sys/arch/powerpc/include [netbsd-6]: psl.h userret.h
src/sys/arch/powerpc/oea [netbsd-6]: altivec.c oea_machdep.c
src/sys/arch/powerpc/powerpc [netbsd-6]: fpu.c

Log Message:
Revert ticket 1310:
> sys/arch/powerpc/include/psl.h1.20
> sys/arch/powerpc/include/userret.h1.29, 1.30
> sys/arch/powerpc/oea/altivec.c1.30
> sys/arch/powerpc/oea/oea_machdep.c1.72
> sys/arch/powerpc/powerpc/fpu.c1.36
>
>   powerpc PCU fixes

because it breaks the build:
http://releng.netbsd.org/builds/netbsd-6/201511152000Z/


To generate a diff of this commit:
cvs rdiff -u -r1.18.8.1 -r1.18.8.2 src/sys/arch/powerpc/include/psl.h
cvs rdiff -u -r1.22.8.2 -r1.22.8.3 src/sys/arch/powerpc/include/userret.h
cvs rdiff -u -r1.25.8.1 -r1.25.8.2 src/sys/arch/powerpc/oea/altivec.c
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.31.8.1 -r1.31.8.2 src/sys/arch/powerpc/powerpc/fpu.c

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

CVS commit: [netbsd-6] src/sys/arch/powerpc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Nov 16 09:00:01 UTC 2015

Modified Files:
src/sys/arch/powerpc/include [netbsd-6]: psl.h userret.h
src/sys/arch/powerpc/oea [netbsd-6]: altivec.c oea_machdep.c
src/sys/arch/powerpc/powerpc [netbsd-6]: fpu.c

Log Message:
Revert ticket 1310:
> sys/arch/powerpc/include/psl.h1.20
> sys/arch/powerpc/include/userret.h1.29, 1.30
> sys/arch/powerpc/oea/altivec.c1.30
> sys/arch/powerpc/oea/oea_machdep.c1.72
> sys/arch/powerpc/powerpc/fpu.c1.36
>
>   powerpc PCU fixes

because it breaks the build:
http://releng.netbsd.org/builds/netbsd-6/201511152000Z/


To generate a diff of this commit:
cvs rdiff -u -r1.18.8.1 -r1.18.8.2 src/sys/arch/powerpc/include/psl.h
cvs rdiff -u -r1.22.8.2 -r1.22.8.3 src/sys/arch/powerpc/include/userret.h
cvs rdiff -u -r1.25.8.1 -r1.25.8.2 src/sys/arch/powerpc/oea/altivec.c
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.31.8.1 -r1.31.8.2 src/sys/arch/powerpc/powerpc/fpu.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/powerpc/include/psl.h
diff -u src/sys/arch/powerpc/include/psl.h:1.18.8.1 src/sys/arch/powerpc/include/psl.h:1.18.8.2
--- src/sys/arch/powerpc/include/psl.h:1.18.8.1	Sun Nov 15 16:36:57 2015
+++ src/sys/arch/powerpc/include/psl.h	Mon Nov 16 09:00:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: psl.h,v 1.18.8.1 2015/11/15 16:36:57 bouyer Exp $	*/
+/*	$NetBSD: psl.h,v 1.18.8.2 2015/11/16 09:00:01 bouyer Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -102,7 +102,8 @@
 #include "opt_ppcarch.h"
 #endif /* _KERNEL_OPT */
 
-#if defined(PPC_OEA) || defined (PPC_OEA64_BRIDGE) || defined(_MODULE)
+#if defined(PPC_OEA) || defined (PPC_OEA64_BRIDGE) || defined (PPC_OEA64) \
+|| defined(_MODULE)
 extern register_t cpu_psluserset, cpu_pslusermod, cpu_pslusermask;
 
 #define	PSL_USERSET		cpu_psluserset

Index: src/sys/arch/powerpc/include/userret.h
diff -u src/sys/arch/powerpc/include/userret.h:1.22.8.2 src/sys/arch/powerpc/include/userret.h:1.22.8.3
--- src/sys/arch/powerpc/include/userret.h:1.22.8.2	Sun Nov 15 16:36:57 2015
+++ src/sys/arch/powerpc/include/userret.h	Mon Nov 16 09:00:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: userret.h,v 1.22.8.2 2015/11/15 16:36:57 bouyer Exp $	*/
+/*	$NetBSD: userret.h,v 1.22.8.3 2015/11/16 09:00:01 bouyer Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -58,6 +58,14 @@ userret(struct lwp *l, struct trapframe 
 	/* Invoke MI userret code */
 	mi_userret(l);
 
+	KASSERTMSG((tf->tf_srr1 & PSL_PR) != 0,
+	"tf=%p: srr1 (%#lx): PSL_PR isn't set!",
+	tf, tf->tf_srr1);
+	KASSERTMSG((tf->tf_srr1 & PSL_FP) == 0
+	|| l->l_cpu->ci_data.cpu_pcu_curlwp[PCU_FPU] == l,
+	"tf=%p: srr1 (%#lx): PSL_FP set but FPU curlwp %p is not curlwp %p!",
+	tf, tf->tf_srr1, l->l_cpu->ci_data.cpu_pcu_curlwp[PCU_FPU], l);
+
 	/* clear SRR1 status bits */
 	tf->tf_srr1 &= (PSL_USERSRR1|PSL_FP|PSL_VEC);
 
@@ -71,12 +79,12 @@ userret(struct lwp *l, struct trapframe 
 #endif
 #ifdef PPC_BOOKE
 	/*
-	 * BookE doesn't PSL_SE but it does have a debug instruction completion
-	 * exception but it needs PSL_DE to fire.  Since we don't want it to
-	 * happen in the kernel, we must disable PSL_DE and let it get
-	 * restored by rfi/rfci.
+	 * BookE doesn't have PSL_SE but it does have a debug instruction
+	 * completion exception but it needs PSL_DE to fire.  Instead we
+	 * use IAC1/IAC2 to match the next PC.
 	 */
 	if (__predict_false(tf->tf_srr1 & PSL_SE)) {
+		tf->tf_srr1 &= ~PSL_SE;
 		extern void booke_sstep(struct trapframe *); /* ugly */
 		booke_sstep(tf);
 	}

Index: src/sys/arch/powerpc/oea/altivec.c
diff -u src/sys/arch/powerpc/oea/altivec.c:1.25.8.1 src/sys/arch/powerpc/oea/altivec.c:1.25.8.2
--- src/sys/arch/powerpc/oea/altivec.c:1.25.8.1	Sun Nov 15 16:36:57 2015
+++ src/sys/arch/powerpc/oea/altivec.c	Mon Nov 16 09:00:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: altivec.c,v 1.25.8.1 2015/11/15 16:36:57 bouyer Exp $	*/
+/*	$NetBSD: altivec.c,v 1.25.8.2 2015/11/16 09:00:01 bouyer Exp $	*/
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.25.8.1 2015/11/15 16:36:57 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.25.8.2 2015/11/16 09:00:01 bouyer Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: altivec.c,v 
 #include 
 #include 
 
-static void vec_state_load(lwp_t *, bool);
+static void vec_state_load(lwp_t *, u_int);
 static void vec_state_save(lwp_t *);
 static void vec_state_release(lwp_t *);
 
@@ -63,21 +63,21 @@ const pcu_ops_t vec_ops = {
 bool
 vec_used_p(lwp_t *l)
 {
-	return (l->l_md.md_flags & MDLWP_USEDVEC) != 0;
+	return pcu_valid_p(_ops);
 }
 
 void
 vec_mark_used(lwp_t *l)
 {
-	

CVS commit: [netbsd-6] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Nov 16 09:02:28 UTC 2015

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
Revert ticket 1310


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.233 -r1.1.2.234 src/doc/CHANGES-6.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-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.233 src/doc/CHANGES-6.2:1.1.2.234
--- src/doc/CHANGES-6.2:1.1.2.233	Mon Nov 16 07:54:09 2015
+++ src/doc/CHANGES-6.2	Mon Nov 16 09:02:28 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.233 2015/11/16 07:54:09 msaitoh Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.234 2015/11/16 09:02:28 bouyer Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -12561,15 +12561,6 @@ usr.bin/tset/set.c1.18
 	- use terminfo data not only for an unset tty.
 	[mlelstv, ticket #1308]
 
-sys/arch/powerpc/include/psl.h			1.20
-sys/arch/powerpc/include/userret.h		1.29, 1.30
-sys/arch/powerpc/oea/altivec.c			1.30
-sys/arch/powerpc/oea/oea_machdep.c		1.72
-sys/arch/powerpc/powerpc/fpu.c			1.36
-
-	powerpc PCU fixes
-	[matt, ticket #1310]
-
 lib/libm/src/lrint.c1.5
 lib/libm/src/lrintf.c1.6
 

CVS commit: [netbsd-6] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Mon Nov 16 09:02:28 UTC 2015

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
Revert ticket 1310


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.233 -r1.1.2.234 src/doc/CHANGES-6.2

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 Nov 16 09:10:58 UTC 2015

Modified Files:
src/sys/dev/pci: pci_subr.c pcireg.h ppb.c

Log Message:
Define PCIE_XCAP_{VER,TYPE}(x) and use them.


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.108 -r1.109 src/sys/dev/pci/pcireg.h
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/ppb.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 Nov 16 09:10:58 UTC 2015

Modified Files:
src/sys/dev/pci: pci_subr.c pcireg.h ppb.c

Log Message:
Define PCIE_XCAP_{VER,TYPE}(x) and use them.


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.108 -r1.109 src/sys/dev/pci/pcireg.h
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/ppb.c

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

Modified files:

Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.142 src/sys/dev/pci/pci_subr.c:1.143
--- src/sys/dev/pci/pci_subr.c:1.142	Fri Nov 13 03:56:44 2015
+++ src/sys/dev/pci/pci_subr.c	Mon Nov 16 09:10:58 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.142 2015/11/13 03:56:44 msaitoh Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.143 2015/11/16 09:10:58 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.142 2015/11/13 03:56:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.143 2015/11/16 09:10:58 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -2185,7 +2185,7 @@ pci_conf_print_aer_cap(const pcireg_t *r
 
 	if (pci_conf_find_cap(regs, capoff, PCI_CAP_PCIEXPRESS, _capoff)) {
 		reg = regs[o2i(pcie_capoff)];
-		pcie_devtype = reg & PCIE_XCAP_TYPE_MASK;
+		pcie_devtype = PCIE_XCAP_TYPE(reg);
 		/* PCIe DW9 to DW14 is for PCIe 2.0 and newer */
 		if (__SHIFTOUT(reg, PCIE_XCAP_VER_MASK) >= 2) {
 			reg = regs[o2i(pcie_capoff + PCIE_DCAP2)];

Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.108 src/sys/dev/pci/pcireg.h:1.109
--- src/sys/dev/pci/pcireg.h:1.108	Thu Nov 12 12:17:59 2015
+++ src/sys/dev/pci/pcireg.h	Mon Nov 16 09:10:58 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcireg.h,v 1.108 2015/11/12 12:17:59 msaitoh Exp $	*/
+/*	$NetBSD: pcireg.h,v 1.109 2015/11/16 09:10:58 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -871,18 +871,20 @@ typedef u_int8_t pci_revision_t;
 #define	PCIE_XCAP_MASK		__BITS(31, 16)
 /* Capability Version */
 #define PCIE_XCAP_VER_MASK	__SHIFTIN(__BITS(3, 0), PCIE_XCAP_MASK)
-#define	 PCIE_XCAP_VER_1	__SHIFTIN(1, PCIE_XCAP_VER_MASK)
-#define	 PCIE_XCAP_VER_2	__SHIFTIN(2, PCIE_XCAP_VER_MASK)
+#define PCIE_XCAP_VER(x)	__SHIFTOUT((x), PCIE_XCAP_VER_MASK)
+#define	 PCIE_XCAP_VER_1		1
+#define	 PCIE_XCAP_VER_2		2
 #define	PCIE_XCAP_TYPE_MASK	__SHIFTIN(__BITS(7, 4), PCIE_XCAP_MASK)
-#define	 PCIE_XCAP_TYPE_PCIE_DEV __SHIFTIN(0x0, PCIE_XCAP_TYPE_MASK)
-#define	 PCIE_XCAP_TYPE_PCI_DEV	__SHIFTIN(0x1, PCIE_XCAP_TYPE_MASK)
-#define	 PCIE_XCAP_TYPE_ROOT	__SHIFTIN(0x4, PCIE_XCAP_TYPE_MASK)
-#define	 PCIE_XCAP_TYPE_UP	__SHIFTIN(0x5, PCIE_XCAP_TYPE_MASK)
-#define	 PCIE_XCAP_TYPE_DOWN	__SHIFTIN(0x6, PCIE_XCAP_TYPE_MASK)
-#define	 PCIE_XCAP_TYPE_PCIE2PCI __SHIFTIN(0x7, PCIE_XCAP_TYPE_MASK)
-#define	 PCIE_XCAP_TYPE_PCI2PCIE __SHIFTIN(0x8, PCIE_XCAP_TYPE_MASK)
-#define	 PCIE_XCAP_TYPE_ROOT_INTEP __SHIFTIN(0x9, PCIE_XCAP_TYPE_MASK)
-#define	 PCIE_XCAP_TYPE_ROOT_EVNTC __SHIFTIN(0xa, PCIE_XCAP_TYPE_MASK)
+#define	PCIE_XCAP_TYPE(x)	__SHIFTOUT((x), PCIE_XCAP_TYPE_MASK)
+#define	 PCIE_XCAP_TYPE_PCIE_DEV	0x0
+#define	 PCIE_XCAP_TYPE_PCI_DEV		0x1
+#define	 PCIE_XCAP_TYPE_ROOT		0x4
+#define	 PCIE_XCAP_TYPE_UP		0x5
+#define	 PCIE_XCAP_TYPE_DOWN		0x6
+#define	 PCIE_XCAP_TYPE_PCIE2PCI	0x7
+#define	 PCIE_XCAP_TYPE_PCI2PCIE	0x8
+#define	 PCIE_XCAP_TYPE_ROOT_INTEP	0x9
+#define	 PCIE_XCAP_TYPE_ROOT_EVNTC	0xa
 #define PCIE_XCAP_SI		__SHIFTIN(__BIT(8), PCIE_XCAP_MASK) /* Slot Implemented */
 #define PCIE_XCAP_IRQ		__SHIFTIN(__BITS(13, 9), PCIE_XCAP_MASK)
 #define PCIE_DCAP	0x04	/* Device Capabilities Register */

Index: src/sys/dev/pci/ppb.c
diff -u src/sys/dev/pci/ppb.c:1.54 src/sys/dev/pci/ppb.c:1.55
--- src/sys/dev/pci/ppb.c:1.54	Wed Sep 24 10:57:03 2014
+++ src/sys/dev/pci/ppb.c	Mon Nov 16 09:10:58 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ppb.c,v 1.54 2014/09/24 10:57:03 msaitoh Exp $	*/
+/*	$NetBSD: ppb.c,v 1.55 2015/11/16 09:10:58 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1996, 1998 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.54 2014/09/24 10:57:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.55 2015/11/16 09:10:58 msaitoh Exp $");
 
 #include 
 #include 
@@ -102,14 +102,16 @@ ppb_fix_pcie(device_t self)
 {
 	struct ppb_softc *sc = device_private(self);
 	pcireg_t reg;
-	int off;
+	int off, capversion, devtype;
 
 	if (!pci_get_capability(sc->sc_pc, sc->sc_tag, PCI_CAP_PCIEXPRESS,
 , ))
 		return; /* Not a PCIe device */
 
+	capversion = PCIE_XCAP_VER(reg);
+	devtype = PCIE_XCAP_TYPE(reg);
 	aprint_normal_dev(self, "PCI Express capability version ");
-	switch (reg & PCIE_XCAP_VER_MASK) {
+	switch (capversion) {
 	case PCIE_XCAP_VER_1:
 		aprint_normal("1");
 		break;
@@ -117,13 +119,11 @@ ppb_fix_pcie(device_t self)
 		

CVS commit: [netbsd-7] src/doc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 11:16:20 UTC 2015

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

Log Message:
Ticket 993.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.30 -r1.1.2.31 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.30 src/doc/CHANGES-7.1:1.1.2.31
--- src/doc/CHANGES-7.1:1.1.2.30	Mon Nov 16 07:37:55 2015
+++ src/doc/CHANGES-7.1	Mon Nov 16 11:16:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.30 2015/11/16 07:37:55 msaitoh Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.31 2015/11/16 11:16:20 msaitoh Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1500,3 +1500,58 @@ sys/arch/xen/xen/xbdback_xenbus.c		1.61
 	when a userland process could use all CPU.
 	Should fix the problem reported by Torbj?rn Granlund on port-xen@
 	[bouyer, ticket #1040]
+
+external/mit/lua/dist/Makefile			1.4
+external/mit/lua/dist/README			1.4
+external/mit/lua/dist/doc/contents.html		1.4
+external/mit/lua/dist/doc/lua.css		1.4
+external/mit/lua/dist/doc/manual.css		1.3
+external/mit/lua/dist/doc/manual.html		1.4
+external/mit/lua/dist/doc/readme.html		1.4
+external/mit/lua/dist/src/Makefile		1.4
+external/mit/lua/dist/src/lapi.c		1.5
+external/mit/lua/dist/src/lapi.h		1.4
+external/mit/lua/dist/src/lauxlib.c		1.5
+external/mit/lua/dist/src/lbaselib.c		1.5
+external/mit/lua/dist/src/lcode.c		1.4
+external/mit/lua/dist/src/ldblib.c		1.6
+external/mit/lua/dist/src/ldebug.c		1.5
+external/mit/lua/dist/src/ldebug.h		1.4
+external/mit/lua/dist/src/ldo.c			1.4
+external/mit/lua/dist/src/ldo.h			1.4
+external/mit/lua/dist/src/ldump.c		1.4
+external/mit/lua/dist/src/lfunc.h		1.3
+external/mit/lua/dist/src/lgc.c			1.4
+external/mit/lua/dist/src/liolib.c		1.4
+external/mit/lua/dist/src/llex.c		1.5
+external/mit/lua/dist/src/llex.c		1.6
+external/mit/lua/dist/src/llimits.h		1.5
+external/mit/lua/dist/src/lmathlib.c		1.4
+external/mit/lua/dist/src/lmem.c		1.4
+external/mit/lua/dist/src/loadlib.c		1.4
+external/mit/lua/dist/src/lobject.c		1.5
+external/mit/lua/dist/src/lobject.h		1.4
+external/mit/lua/dist/src/loslib.c		1.4
+external/mit/lua/dist/src/lstate.c		1.4
+external/mit/lua/dist/src/lstate.h		1.4
+external/mit/lua/dist/src/lstring.c		1.4
+external/mit/lua/dist/src/lstring.h		1.4
+external/mit/lua/dist/src/lstrlib.c		1.8
+external/mit/lua/dist/src/lstrlib.c		1.9
+external/mit/lua/dist/src/ltable.c		1.4
+external/mit/lua/dist/src/ltable.c		1.5
+external/mit/lua/dist/src/ltablib.c		1.4
+external/mit/lua/dist/src/ltm.c			1.4
+external/mit/lua/dist/src/lua.c			1.4
+external/mit/lua/dist/src/lua.h			1.5
+external/mit/lua/dist/src/luac.c		1.4
+external/mit/lua/dist/src/luaconf.h		1.14
+external/mit/lua/dist/src/lutf8lib.c		1.3
+external/mit/lua/dist/src/lvm.c			1.6
+external/mit/lua/dist/src/lvm.c			1.7
+external/mit/lua/dist/src/lvm.h			1.4
+external/mit/lua/dist/src/lvm.h			1.5
+doc/3RDPARTY		  			1.1259
+
+	Updated to Lua 5.3.1
+	[mbalmer, ticket #993]

Re: CVS commit: src/lib/libpanel

[Valery Ushakov]

On Mon, Nov 16, 2015 at 00:00:48 +0100, Kamil Rytarowski wrote:

> On 27.10.2015 00:09, Valeriy E. Ushakov wrote:
> > Module Name:src
> > Committed By:   uwe
> > Date:   Mon Oct 26 23:09:50 UTC 2015
> > 
> > Added Files: src/lib/libpanel: Makefile _deck.c above.c below.c
> > bottom.c del.c getuser.c hidden.c hide.c move.c new.c panel.h
> > panel_impl.h replace.c setuser.c shlib_version show.c top.c
> > update.c window.c
> > 
> > Log Message: First cut at ETI libpanel.  Lacks man pages and
> > tests. Not hooked into the build yet.
> 
> Are we ready to hook it into the build?

Sorry, I don't have time.  Feel free to.

-uwe

CVS commit: [netbsd-7] src

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 11:14:49 UTC 2015

Modified Files:
src/doc [netbsd-7]: 3RDPARTY
src/external/mit/lua/dist [netbsd-7]: Makefile README
src/external/mit/lua/dist/doc [netbsd-7]: contents.html lua.css
manual.css manual.html readme.html
src/external/mit/lua/dist/src [netbsd-7]: Makefile lapi.c lapi.h
lauxlib.c lbaselib.c lcode.c ldblib.c ldebug.c ldebug.h ldo.c ldo.h
ldump.c lfunc.h lgc.c liolib.c llex.c llimits.h lmathlib.c lmem.c
loadlib.c lobject.c lobject.h loslib.c lstate.c lstate.h lstring.c
lstring.h lstrlib.c ltable.c ltablib.c ltm.c lua.c lua.h luac.c
luaconf.h lutf8lib.c lvm.c lvm.h

Log Message:
Pullup the following revision (requested by mbalmer in ticket #993):

external/mit/lua/dist/Makefile  1.4
external/mit/lua/dist/README1.4
external/mit/lua/dist/doc/contents.html 1.4
external/mit/lua/dist/doc/lua.css   1.4
external/mit/lua/dist/doc/manual.css1.3
external/mit/lua/dist/doc/manual.html   1.4
external/mit/lua/dist/doc/readme.html   1.4
external/mit/lua/dist/src/Makefile  1.4
external/mit/lua/dist/src/lapi.c1.5
external/mit/lua/dist/src/lapi.h1.4
external/mit/lua/dist/src/lauxlib.c 1.5
external/mit/lua/dist/src/lbaselib.c1.5
external/mit/lua/dist/src/lcode.c   1.4
external/mit/lua/dist/src/ldblib.c  1.6
external/mit/lua/dist/src/ldebug.c  1.5
external/mit/lua/dist/src/ldebug.h  1.4
external/mit/lua/dist/src/ldo.c 1.4
external/mit/lua/dist/src/ldo.h 1.4
external/mit/lua/dist/src/ldump.c   1.4
external/mit/lua/dist/src/lfunc.h   1.3
external/mit/lua/dist/src/lgc.c 1.4
external/mit/lua/dist/src/liolib.c  1.4
external/mit/lua/dist/src/llex.c1.5
external/mit/lua/dist/src/llex.c1.6
external/mit/lua/dist/src/llimits.h 1.5
external/mit/lua/dist/src/lmathlib.c1.4
external/mit/lua/dist/src/lmem.c1.4
external/mit/lua/dist/src/loadlib.c 1.4
external/mit/lua/dist/src/lobject.c 1.5
external/mit/lua/dist/src/lobject.h 1.4
external/mit/lua/dist/src/loslib.c  1.4
external/mit/lua/dist/src/lstate.c  1.4
external/mit/lua/dist/src/lstate.h  1.4
external/mit/lua/dist/src/lstring.c 1.4
external/mit/lua/dist/src/lstring.h 1.4
external/mit/lua/dist/src/lstrlib.c 1.8
external/mit/lua/dist/src/lstrlib.c 1.9
external/mit/lua/dist/src/ltable.c  1.4
external/mit/lua/dist/src/ltable.c  1.5
external/mit/lua/dist/src/ltablib.c 1.4
external/mit/lua/dist/src/ltm.c 1.4
external/mit/lua/dist/src/lua.c 1.4
external/mit/lua/dist/src/lua.h 1.5
external/mit/lua/dist/src/luac.c1.4
external/mit/lua/dist/src/luaconf.h 1.14
external/mit/lua/dist/src/lutf8lib.c1.3
external/mit/lua/dist/src/lvm.c 1.6
external/mit/lua/dist/src/lvm.c 1.7
external/mit/lua/dist/src/lvm.h 1.4
external/mit/lua/dist/src/lvm.h 1.5
doc/3RDPARTY1.1259

Updated to Lua 5.3.1


To generate a diff of this commit:
cvs rdiff -u -r1.1145.2.19 -r1.1145.2.20 src/doc/3RDPARTY
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/external/mit/lua/dist/Makefile \
src/external/mit/lua/dist/README
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/external/mit/lua/dist/doc/contents.html \
src/external/mit/lua/dist/doc/lua.css \
src/external/mit/lua/dist/doc/manual.html \
src/external/mit/lua/dist/doc/readme.html
cvs rdiff -u -r1.2 -r1.2.2.1 src/external/mit/lua/dist/doc/manual.css
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/external/mit/lua/dist/src/Makefile \
src/external/mit/lua/dist/src/lapi.h \
src/external/mit/lua/dist/src/lcode.c \
src/external/mit/lua/dist/src/ldebug.h \
src/external/mit/lua/dist/src/ldo.c src/external/mit/lua/dist/src/ldo.h \
src/external/mit/lua/dist/src/ldump.c src/external/mit/lua/dist/src/lgc.c \
src/external/mit/lua/dist/src/liolib.c \
src/external/mit/lua/dist/src/lmathlib.c \
src/external/mit/lua/dist/src/lmem.c \
src/external/mit/lua/dist/src/loadlib.c \
src/external/mit/lua/dist/src/lobject.h \
src/external/mit/lua/dist/src/loslib.c \
src/external/mit/lua/dist/src/lstate.c \
src/external/mit/lua/dist/src/lstate.h \
src/external/mit/lua/dist/src/lstring.c \
src/external/mit/lua/dist/src/lstring.h \
src/external/mit/lua/dist/src/ltable.c \
src/external/mit/lua/dist/src/ltablib.c \
src/external/mit/lua/dist/src/ltm.c src/external/mit/lua/dist/src/lua.c 

CVS commit: [netbsd-7] src/doc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Nov 16 11:16:20 UTC 2015

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

Log Message:
Ticket 993.


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

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

CVS commit: src/tests/net/ndp

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Nov 17 06:44:13 UTC 2015

Modified Files:
src/tests/net/ndp: t_ndp.sh

Log Message:
Add tests for GC of neighbor caches


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/net/ndp/t_ndp.sh

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

CVS commit: src/tests/net/ndp

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Nov 17 06:44:13 UTC 2015

Modified Files:
src/tests/net/ndp: t_ndp.sh

Log Message:
Add tests for GC of neighbor caches


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/net/ndp/t_ndp.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/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.6 src/tests/net/ndp/t_ndp.sh:1.7
--- src/tests/net/ndp/t_ndp.sh:1.6	Tue Aug 18 00:58:35 2015
+++ src/tests/net/ndp/t_ndp.sh	Tue Nov 17 06:44:13 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ndp.sh,v 1.6 2015/08/18 00:58:35 ozaki-r Exp $
+#	$NetBSD: t_ndp.sh,v 1.7 2015/11/17 06:44:13 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -40,6 +40,7 @@ TIMEOUT=1
 atf_test_case cache_expiration cleanup
 atf_test_case command cleanup
 atf_test_case cache_overwriting cleanup
+atf_test_case neighborgcthresh cleanup
 
 cache_expiration_head()
 {
@@ -59,6 +60,12 @@ cache_overwriting_head()
 	atf_set "require.progs" "rump_server"
 }
 
+neighborgcthresh_head()
+{
+	atf_set "descr" "Tests for GC of neighbor caches"
+	atf_set "require.progs" "rump_server"
+}
+
 setup_dst_server()
 {
 	export RUMP_SERVER=$SOCKDST
@@ -230,6 +237,68 @@ cache_overwriting_body()
 	return 0
 }
 
+get_n_caches()
+{
+
+	echo $(rump.ndp -a -n |grep -v -e Neighbor -e permanent |wc -l)
+}
+
+neighborgcthresh_body()
+{
+
+	atf_check -s exit:0 ${inetserver} $SOCKSRC
+	atf_check -s exit:0 ${inetserver} $SOCKDST
+
+	setup_dst_server
+	setup_src_server
+
+	export RUMP_SERVER=$SOCKDST
+	for i in $(seq 0 9); do
+		atf_check -s exit:0 rump.ifconfig shmif0 inet6 ${IP6DST}$i
+	done
+
+	export RUMP_SERVER=$SOCKSRC
+
+	# ping to 3 destinations
+	$DEBUG && rump.ndp -n -a
+	for i in $(seq 0 2); do
+		atf_check -s exit:0 -o ignore rump.ping6 -n -X $TIMEOUT -c 1 \
+		${IP6DST}$i
+	done
+	$DEBUG && rump.ndp -n -a
+
+	# 3 caches should be created
+	atf_check_equal $(get_n_caches) 3
+
+	# ping to additional 3 destinations
+	for i in $(seq 3 5); do
+		atf_check -s exit:0 -o ignore rump.ping6 -n -X $TIMEOUT -c 1 \
+		${IP6DST}$i
+	done
+	$DEBUG && rump.ndp -n -a
+
+	# 6 caches should be created in total
+	atf_check_equal $(get_n_caches) 6
+
+	# Limit the number of neighbor caches to 5
+	atf_check -s exit:0 -o ignore rump.sysctl -w \
+	net.inet6.ip6.neighborgcthresh=5
+
+	# ping to additional 4 destinations
+	for i in $(seq 6 9); do
+		atf_check -s exit:0 -o ignore rump.ping6 -n -X $TIMEOUT -c 1 \
+		${IP6DST}$i
+	done
+
+	# More than 5 caches should be created in total, but exceeded caches
+	# should be GC-ed
+	if [ "$(get_n_caches)" -gt 5 ]; then
+		atf_fail "Neighbor caches are not GC-ed"
+	fi
+
+	return 0
+}
+
 cleanup()
 {
 	env RUMP_SERVER=$SOCKSRC rump.halt
@@ -281,9 +350,16 @@ cache_overwriting_cleanup()
 	cleanup
 }
 
+neighborgcthresh_cleanup()
+{
+	$DEBUG && dump
+	cleanup
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case cache_expiration
 	atf_add_test_case command
 	atf_add_test_case cache_overwriting
+	atf_add_test_case neighborgcthresh
 }