date:20141102

CVS commit: [netbsd-7] src

2014-11-02 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sun Nov  2 09:47:04 UTC 2014

Modified Files:
src/doc [netbsd-7]: CHANGES
src/sys/dev [netbsd-7]: rndpseudo.c
src/sys/kern [netbsd-7]: kern_rndq.c kern_rndsink.c
src/sys/sys [netbsd-7]: rnd.h

Log Message:
Pull up following revision(s) (requested by tls in ticket #173):
doc/CHANGES: revision 1.2004
sys/sys/rnd.h: revision 1.43
sys/kern/kern_rndq.c: revision 1.28
sys/kern/kern_rndsink.c: revision 1.10
sys/dev/rndpseudo.c: revision 1.23
Fixes and enhancements for polled entropy sources:
Add explicit enable/disable hooks for callout-driven sources (be more
power friendly).
Make skew source polled so it runs only when there is entropy
demand.
Adjust entropy collection from polled sources so it's processed
sooner.


To generate a diff of this commit:
cvs rdiff -u -r1.1967.2.2 -r1.1967.2.3 src/doc/CHANGES
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/dev/rndpseudo.c
cvs rdiff -u -r1.26.2.1 -r1.26.2.2 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.8 -r1.8.6.1 src/sys/kern/kern_rndsink.c
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/sys/rnd.h

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
diff -u src/doc/CHANGES:1.1967.2.2 src/doc/CHANGES:1.1967.2.3
--- src/doc/CHANGES:1.1967.2.2	Thu Sep 11 13:54:54 2014
+++ src/doc/CHANGES	Sun Nov  2 09:47:03 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.2 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.3 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -21,7 +21,7 @@
 #
 # See htutils/changes/changes2html script for more details.
 #
-LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.2 $
+LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.3 $
 
 
 Changes from NetBSD 6.0 to NetBSD 7.0:
@@ -83,6 +83,12 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	kernel, libc: Add MurmurHash2 function. [rmind 20120708]
 	atf(7): Import 0.16.  [jmmv 20120711]
 	dhcpcd(8): Import dhcpcd-5.6.1. [roy 20120712]
+	rnd(9): Add explicit enable/disable hooks for callout-driven
+		sources (be more power friendly). [tls 20141026]
+	rnd(9): Make skew source polled so it runs only when there
+	is entropy demand. [tls 20141026]
+	rnd(9): Adjust entropy collection from polled sources so it's
+		processed sooner. [tls 20141026]
 	kernel: Add support for sensors to provide entropy to rnd(4)
 		[pgoyette 20120715]
 	tdvfb(4): Add 3Dfx Voodoo2 driver. [rkujawa 20120719]

Index: src/sys/dev/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.21 src/sys/dev/rndpseudo.c:1.21.2.1
--- src/sys/dev/rndpseudo.c:1.21	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/rndpseudo.c	Sun Nov  2 09:47:04 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rndpseudo.c,v 1.21 2014/08/10 16:44:35 tls Exp $	*/
+/*	$NetBSD: rndpseudo.c,v 1.21.2.1 2014/11/02 09:47:04 martin Exp $	*/
 
 /*-
  * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rndpseudo.c,v 1.21 2014/08/10 16:44:35 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: rndpseudo.c,v 1.21.2.1 2014/11/02 09:47:04 martin Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_compat_netbsd.h
@@ -526,6 +526,20 @@ krndsource_to_rndsource_est(krndsource_t
 	re-dv_total = kr-value_delta.outbits;
 }
 
+static void
+krs_setflags(krndsource_t *kr, uint32_t flags, uint32_t mask)
+{
+	uint32_t oflags = kr-flags;
+
+	kr-flags = ~mask;
+	kr-flags |= (flags  mask);
+
+	if (oflags  RND_FLAG_HASENABLE 
+((oflags  RND_FLAG_NO_COLLECT) != (flags  RND_FLAG_NO_COLLECT))) {
+		kr-enable(kr, !(flags  RND_FLAG_NO_COLLECT));
+	}
+}
+
 int
 rnd_ioctl(struct file *fp, u_long cmd, void *addr)
 {
@@ -536,7 +550,7 @@ rnd_ioctl(struct file *fp, u_long cmd, v
 	rndstat_est_name_t *rsetnm;
 	rndctl_t *rctl;
 	rnddata_t *rnddata;
-	u_int32_t count, start;
+	uint32_t count, start;
 	int ret = 0;
 	int estimate_ok = 0, estimate = 0;
 
@@ -736,12 +750,9 @@ rnd_ioctl(struct file *fp, u_long cmd, v
 		if (rctl-type != 0xff) {
 			while (kr != NULL) {
 if (kr-type == rctl-type) {
-	kr-flags = ~rctl-mask;
-
-	kr-flags |=
-	(rctl-flags  rctl-mask);
+	krs_setflags(kr,
+		 rctl-flags, rctl-mask);
 }
-
 kr = kr-list.le_next;
 			}
 			mutex_spin_exit(rndpool_mtx);
@@ -755,9 +766,7 @@ rnd_ioctl(struct file *fp, u_long cmd, v
 			if (strncmp(kr-name, rctl-name,
 MIN(sizeof(kr-name),
 sizeof(rctl-name))) == 0) {
-kr-flags = ~rctl-mask;
-kr-flags |= (rctl-flags  rctl-mask);
-
+krs_setflags(kr, rctl-flags, rctl-mask);
 mutex_spin_exit(rndpool_mtx);
 return (0);
 			}

Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.26.2.1 src/sys/kern/kern_rndq.c:1.26.2.2
---

CVS commit: [netbsd-7] src/doc

2014-11-02 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sun Nov  2 09:53:37 UTC 2014

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

Log Message:
Backout previous


To generate a diff of this commit:
cvs rdiff -u -r1.1967.2.3 -r1.1967.2.4 src/doc/CHANGES

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
diff -u src/doc/CHANGES:1.1967.2.3 src/doc/CHANGES:1.1967.2.4
--- src/doc/CHANGES:1.1967.2.3	Sun Nov  2 09:47:03 2014
+++ src/doc/CHANGES	Sun Nov  2 09:53:36 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.3 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.4 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -21,7 +21,7 @@
 #
 # See htutils/changes/changes2html script for more details.
 #
-LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.3 $
+LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.4 $
 
 
 Changes from NetBSD 6.0 to NetBSD 7.0:
@@ -83,12 +83,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	kernel, libc: Add MurmurHash2 function. [rmind 20120708]
 	atf(7): Import 0.16.  [jmmv 20120711]
 	dhcpcd(8): Import dhcpcd-5.6.1. [roy 20120712]
-	rnd(9): Add explicit enable/disable hooks for callout-driven
-		sources (be more power friendly). [tls 20141026]
-	rnd(9): Make skew source polled so it runs only when there
-	is entropy demand. [tls 20141026]
-	rnd(9): Adjust entropy collection from polled sources so it's
-		processed sooner. [tls 20141026]
 	kernel: Add support for sensors to provide entropy to rnd(4)
 		[pgoyette 20120715]
 	tdvfb(4): Add 3Dfx Voodoo2 driver. [rkujawa 20120719]

CVS commit: [netbsd-7] src/doc

2014-11-02 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sun Nov  2 09:57:12 UTC 2014

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

Log Message:
Redo previous in the right location


To generate a diff of this commit:
cvs rdiff -u -r1.1967.2.4 -r1.1967.2.5 src/doc/CHANGES

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
diff -u src/doc/CHANGES:1.1967.2.4 src/doc/CHANGES:1.1967.2.5
--- src/doc/CHANGES:1.1967.2.4	Sun Nov  2 09:53:36 2014
+++ src/doc/CHANGES	Sun Nov  2 09:57:12 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.4 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.5 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -21,7 +21,7 @@
 #
 # See htutils/changes/changes2html script for more details.
 #
-LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.4 $
+LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.5 $
 
 
 Changes from NetBSD 6.0 to NetBSD 7.0:
@@ -510,3 +510,10 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		[tls 20140810]
 	OpenSSL: Update to 1.0.1i. [spz 20140810]
 	kernel: Add MODULAR infrastructure for Xen kernels. [jnemeth 20140810]
+	rnd(9): Add explicit enable/disable hooks for callout-driven
+		sources (be more power friendly). [tls 20141026]
+	rnd(9): Make skew source polled so it runs only when there
+	is entropy demand. [tls 20141026]
+	rnd(9): Adjust entropy collection from polled sources so it's
+		processed sooner. [tls 20141026]
+

CVS commit: [netbsd-7] src

2014-11-02 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sun Nov  2 10:09:44 UTC 2014

Modified Files:
src/doc [netbsd-7]: CHANGES
src/sys/arch/amd64/conf [netbsd-7]: GENERIC
src/sys/dev/pci [netbsd-7]: files.pci
Added Files:
src/share/man/man4 [netbsd-7]: viornd.4
src/sys/dev/pci [netbsd-7]: viornd.c

Log Message:
Pull up following revision(s) (requested by tls in ticket #174):
doc/CHANGES: revision 1.2005
sys/dev/pci/viornd.c: revision 1.1
sys/dev/pci/files.pci: revision 1.372
sys/arch/amd64/conf/GENERIC: revision 1.401
share/man/man4/viornd.4: revision 1.1
Add viornd(4), a driver for the VirtIO entropy source available on
QEMU, KVM, and Google Compute Engine.  From OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1967.2.5 -r1.1967.2.6 src/doc/CHANGES
cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/viornd.4
cvs rdiff -u -r1.392.2.1 -r1.392.2.2 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.371 -r1.371.4.1 src/sys/dev/pci/files.pci
cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/pci/viornd.c

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
diff -u src/doc/CHANGES:1.1967.2.5 src/doc/CHANGES:1.1967.2.6
--- src/doc/CHANGES:1.1967.2.5	Sun Nov  2 09:57:12 2014
+++ src/doc/CHANGES	Sun Nov  2 10:09:44 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.5 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.6 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -21,7 +21,7 @@
 #
 # See htutils/changes/changes2html script for more details.
 #
-LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.5 $
+LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.6 $
 
 
 Changes from NetBSD 6.0 to NetBSD 7.0:
@@ -516,4 +516,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	is entropy demand. [tls 20141026]
 	rnd(9): Adjust entropy collection from polled sources so it's
 		processed sooner. [tls 20141026]
-
+	viornd(4):	Add driver for VirtIO entropy source available on
+		QEMU, KVM, and Google Compute Engine.  From OpenBSD.

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.392.2.1 src/sys/arch/amd64/conf/GENERIC:1.392.2.2
--- src/sys/arch/amd64/conf/GENERIC:1.392.2.1	Fri Oct 10 18:16:36 2014
+++ src/sys/arch/amd64/conf/GENERIC	Sun Nov  2 10:09:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392.2.1 2014/10/10 18:16:36 snj Exp $
+# $NetBSD: GENERIC,v 1.392.2.2 2014/11/02 10:09:44 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	arch/amd64/conf/std.amd64
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.392.2.1 $
+#ident 		GENERIC-$Revision: 1.392.2.2 $
 
 maxusers	64		# estimated number of users
 
@@ -1167,6 +1167,7 @@ virtio*	at pci? dev ? function ?	# Virti
 viomb*	at virtio?			# Virtio memory balloon device
 ld*	at virtio?			# Virtio disk device
 vioif*	at virtio?			# Virtio network device
+viornd*	at virtio?			# Virtio entropy device
 
 
 # Pull in optional local configuration

Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.371 src/sys/dev/pci/files.pci:1.371.4.1
--- src/sys/dev/pci/files.pci:1.371	Wed Mar 19 15:26:41 2014
+++ src/sys/dev/pci/files.pci	Sun Nov  2 10:09:44 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pci,v 1.371 2014/03/19 15:26:41 nonaka Exp $
+#	$NetBSD: files.pci,v 1.371.4.1 2014/11/02 10:09:44 martin Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -1125,6 +1125,10 @@ device	vioif
 attach	vioif at virtio
 file	dev/pci/if_vioif.c	vioif
 
+device	viornd
+attach	viornd at virtio
+file dev/pci/viornd.c		viornd
+
 # Silicon Motion SM712(LynxEM+) frame buffer
 device	lynxfb: wsemuldisplaydev, rasops16
 attach	lynxfb at pci

Added files:

Index: src/share/man/man4/viornd.4
diff -u /dev/null src/share/man/man4/viornd.4:1.2.2.2
--- /dev/null	Sun Nov  2 10:09:44 2014
+++ src/share/man/man4/viornd.4	Sun Nov  2 10:09:44 2014
@@ -0,0 +1,61 @@
+.\ $NetBSD: viornd.4,v 1.2.2.2 2014/11/02 10:09:44 martin Exp $
+.\
+.\ Copyright (c) 2014 The NetBSD Foundation, Inc.
+.\ All rights reserved.
+.\
+.\ This code is derived from software contributed to The NetBSD Foundation
+.\ by Thor Lancelot Simon.
+.\
+.\ Redistribution and use in source and binary forms, with or without
+.\ modification, are permitted provided that the following conditions
+.\ are met:
+.\ 1. Redistributions of source code must retain the above copyright
+.\notice, this list of conditions and the following disclaimer.
+.\ 2. Redistributions in binary form must reproduce the above copyright
+.\notice, this list of conditions and the following disclaimer in the
+.\documentation and/or other materials provided with the

CVS commit: [netbsd-7] src

2014-11-02 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sun Nov  2 10:12:47 UTC 2014

Modified Files:
src/distrib/sets/lists/man [netbsd-7]: mi
src/share/man/man4 [netbsd-7]: Makefile

Log Message:
Pull up following revision(s) (requested by tls in ticket #175):
share/man/man4/Makefile: revision 1.618
distrib/sets/lists/man/mi: revision 1.1488
Build and install virtio(4) manual page - missed in previous commit.


To generate a diff of this commit:
cvs rdiff -u -r1.1485.2.1 -r1.1485.2.2 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.616.2.1 -r1.616.2.2 src/share/man/man4/Makefile

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

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1485.2.1 src/distrib/sets/lists/man/mi:1.1485.2.2
--- src/distrib/sets/lists/man/mi:1.1485.2.1	Fri Aug 29 11:42:15 2014
+++ src/distrib/sets/lists/man/mi	Sun Nov  2 10:12:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1485.2.1 2014/08/29 11:42:15 martin Exp $
+# $NetBSD: mi,v 1.1485.2.2 2014/11/02 10:12:47 martin Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -1915,6 +1915,7 @@
 ./usr/share/man/cat4/vinum.0			man-obsolete		obsolete
 ./usr/share/man/cat4/vioif.0			man-sys-catman		.cat
 ./usr/share/man/cat4/viomb.0			man-sys-catman		.cat
+./usr/share/man/cat4/viornd.0			man-sys-catman		.cat
 ./usr/share/man/cat4/virt.0			man-sys-catman		.cat
 ./usr/share/man/cat4/virtio.0			man-sys-catman		.cat
 ./usr/share/man/cat4/vlan.0			man-sys-catman		.cat
@@ -4883,6 +4884,7 @@
 ./usr/share/man/html4/video.html		man-sys-htmlman		html
 ./usr/share/man/html4/vioif.html		man-sys-htmlman		html
 ./usr/share/man/html4/viomb.html		man-sys-htmlman		html
+./usr/share/man/html4/viornd.html		man-sys-htmlman		html
 ./usr/share/man/html4/virt.html			man-sys-htmlman		html
 ./usr/share/man/html4/virtio.html		man-sys-htmlman		html
 ./usr/share/man/html4/vlan.html			man-sys-htmlman		html
@@ -7782,6 +7784,7 @@
 ./usr/share/man/man4/vinum.4			man-obsolete		obsolete
 ./usr/share/man/man4/vioif.4			man-sys-man		.man
 ./usr/share/man/man4/viomb.4			man-sys-man		.man
+./usr/share/man/man4/viornd.4			man-sys-man		.man
 ./usr/share/man/man4/virt.4			man-sys-man		.man
 ./usr/share/man/man4/virtio.4			man-sys-man		.man
 ./usr/share/man/man4/vlan.4			man-sys-man		.man

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.616.2.1 src/share/man/man4/Makefile:1.616.2.2
--- src/share/man/man4/Makefile:1.616.2.1	Fri Aug 29 11:42:15 2014
+++ src/share/man/man4/Makefile	Sun Nov  2 10:12:46 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.616.2.1 2014/08/29 11:42:15 martin Exp $
+#	$NetBSD: Makefile,v 1.616.2.2 2014/11/02 10:12:46 martin Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -62,7 +62,8 @@ MAN=	aac.4 ac97.4 acardide.4 aceride.4 a
 	ti.4 tl.4 tlp.4 tlphy.4 tpm.4 tprof.4 tr.4 tra.4 \
 	trm.4 tty.4 tun.4 tqphy.4 twa.4 twe.4 txp.4 \
 	uark.4 ubsec.4 udp.4 uep.4 ug.4 uha.4 uk.4 ukphy.4 unix.4 userconf.4 \
-	vald.4 veriexec.4 vga.4 vge.4 viaide.4 video.4 vioif.4 viomb.4 virt.4 \
+	vald.4 veriexec.4 vga.4 vge.4 viaide.4 video.4 vioif.4 viomb.4 \
+	viornd.4 virt.4 \
 	virtio.4 vlan.4 vmmon.4 vmnet.4 vnd.4 voodoofb.4 vr.4 vte.4 \
 	wapbl.4 wb.4 wbsio.4 wd.4 wdc.4 wi.4 wm.4 wpi.4 \
 	wscons.4 wsdisplay.4 wsfont.4 wskbd.4 wsmouse.4 wsmux.4 \

CVS commit: [netbsd-7] src/share/man/man4

2014-11-02 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sun Nov  2 10:15:12 UTC 2014

Modified Files:
src/share/man/man4 [netbsd-7]: viornd.4

Log Message:
Pull up following revision(s) (requested by tls in ticket #176):
share/man/man4/viornd.4: revision 1.2
Use proper markup in AUTHORS, and sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/share/man/man4/viornd.4

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

Modified files:

Index: src/share/man/man4/viornd.4
diff -u src/share/man/man4/viornd.4:1.2.2.2 src/share/man/man4/viornd.4:1.2.2.3
--- src/share/man/man4/viornd.4:1.2.2.2	Sun Nov  2 10:09:44 2014
+++ src/share/man/man4/viornd.4	Sun Nov  2 10:15:12 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: viornd.4,v 1.2.2.2 2014/11/02 10:09:44 martin Exp $
+.\ $NetBSD: viornd.4,v 1.2.2.3 2014/11/02 10:15:12 martin Exp $
 .\
 .\ Copyright (c) 2014 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -43,8 +43,8 @@ driver, used with a compatible hyperviso
 Compute Engine, requests entropy using the VirtIO random number interface
 and feeds it into the system entropy pool.
 .Sh SEE ALSO
-.Xr virtio 4 ,
-.Xr rnd 4
+.Xr rnd 4 ,
+.Xr virtio 4
 .Sh HISTORY
 The
 .Nm
@@ -53,8 +53,10 @@ driver appeared in
 .Sh AUTHORS
 The
 .Nm
-driver was written by Stephan Fritsch s...@fritsch.de and reworked to
-request entropy upon demand by Thor Lancelot Simon t...@netbsd.org.
+driver was written by
+.An Stephan Fritsch Aq Mt s...@fritsch.de
+and reworked to request entropy upon demand by
+.An Thor Lancelot Simon Aq Mt t...@netbsd.org .
 .Sh CAVEATS
 VirtIO appears to support at least 8 pending entropy requests, but
 .Nm

CVS commit: [netbsd-7] src/doc

2014-11-02 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sun Nov  2 10:16:21 UTC 2014

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

Log Message:
Tickets #173 - #176


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.73 -r1.1.2.74 src/doc/CHANGES-7.0

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

Modified files:

Index: src/doc/CHANGES-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.73 src/doc/CHANGES-7.0:1.1.2.74
--- src/doc/CHANGES-7.0:1.1.2.73	Fri Oct 31 08:31:13 2014
+++ src/doc/CHANGES-7.0	Sun Nov  2 10:16:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.73 2014/10/31 08:31:13 martin Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.74 2014/11/02 10:16:20 martin Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -1947,3 +1947,41 @@ usr.bin/ftp/version.h1.85
 	Fixes CVE-2014-8517
 	[lukem, ticket #172]
 
+doc/CHANGES	1.2004
+sys/dev/rndpseudo.c1.23
+sys/kern/kern_rndq.c1.28
+sys/kern/kern_rndsink.c1.10
+sys/sys/rnd.h	1.43
+
+	Fixes and enhancements for polled entropy sources:
+	  Add explicit enable/disable hooks for callout-driven sources (be more
+	  power friendly).
+
+	  Make skew source polled so it runs only when there is entropy
+	  demand.
+
+	  Adjust entropy collection from polled sources so it's processed
+	  sooner.
+	[tls, ticket #173]
+
+doc/CHANGES	1.2005
+share/man/man4/viornd.41.1
+sys/arch/amd64/conf/GENERIC			1.401
+sys/dev/pci/files.pci1.372
+sys/dev/pci/viornd.c1.1
+
+	Add viornd(4), a driver for the VirtIO entropy source available on
+	QEMU, KVM, and Google Compute Engine.  From OpenBSD.
+	[tls, ticket #174]
+
+distrib/sets/lists/man/mi			1.1488
+share/man/man4/Makefile1.618
+
+	Build and install virtio(4) manual page - missed in previous commit.
+	[tls, ticket #175]
+
+share/man/man4/viornd.41.2
+
+	Use proper markup in AUTHORS, and sort SEE ALSO.
+	[tls, ticket #176]
+

CVS commit: src/doc

2014-11-02 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sun Nov  2 10:21:11 UTC 2014

Modified Files:
src/doc: CHANGES CHANGES.prev

Log Message:
Move entries for changes that have been pulled up


To generate a diff of this commit:
cvs rdiff -u -r1.2011 -r1.2012 src/doc/CHANGES
cvs rdiff -u -r1.122 -r1.123 src/doc/CHANGES.prev

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
diff -u src/doc/CHANGES:1.2011 src/doc/CHANGES:1.2012
--- src/doc/CHANGES:1.2011	Sat Nov  1 14:59:45 2014
+++ src/doc/CHANGES	Sun Nov  2 10:21:11 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2011 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2012 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -83,15 +83,6 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	openpam(3): update to 20140912 (ourouparia) [christos 20141024]
 	pppd(8): updated to version 2.4.7. [christos 20141025]
 	acpi(4): Updated ACPICA to 20140926. [christos 20141025]
-	rnd(9): Add explicit enable/disable hooks for callout-driven
-		sources (be more power friendly). [tls 20141026]
-	rnd(9): Make skew source polled so it runs only when there
-		is entropy demand. [tls 20141026]
-	rnd(9):	Adjust entropy collection from polled sources so it's
-		processed sooner. [tls 20141026]
-	viornd(4):	Add driver for VirtIO entropy source available on
-			QEMU, KVM, and Google Compute Engine.  From OpenBSD.
-			[20141026 tls]
 	dhcpcd(8): Import dhcpcd-6.6.0 [roy 20141029]
 	resolvconf(8): Import openresolv-3.6.1 [roy 20141029]
 	rtsx(4): Add support for Realtek RTS5227/RTL8402/RTL8411/RTL8411B.

Index: src/doc/CHANGES.prev
diff -u src/doc/CHANGES.prev:1.122 src/doc/CHANGES.prev:1.123
--- src/doc/CHANGES.prev:1.122	Sun Oct  5 13:27:33 2014
+++ src/doc/CHANGES.prev	Sun Nov  2 10:21:11 2014
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.122 $
+LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.123 $
 
 
 Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8:
@@ -11702,3 +11702,12 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	kernel: Add MODULAR infrastructure for Xen kernels. [jnemeth 20140810]
 	hp300: Add arcofi(4) audio driver for the HP Audio1 device found on
 		HP9000/425e.  Ported from OpenBSD.  [tsutsui 20140824]
+	rnd(9): Add explicit enable/disable hooks for callout-driven
+		sources (be more power friendly). [tls 20141026]
+	rnd(9): Make skew source polled so it runs only when there
+		is entropy demand. [tls 20141026]
+	rnd(9):	Adjust entropy collection from polled sources so it's
+		processed sooner. [tls 20141026]
+	viornd(4):	Add driver for VirtIO entropy source available on
+			QEMU, KVM, and Google Compute Engine.  From OpenBSD.
+			[20141026 tls]

CVS commit: [netbsd-7] src/doc

2014-11-02 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sun Nov  2 10:22:54 UTC 2014

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

Log Message:
Pullup arcofi(4) changes entry missed in previous handling of Ticket #62.


To generate a diff of this commit:
cvs rdiff -u -r1.1967.2.6 -r1.1967.2.7 src/doc/CHANGES

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
diff -u src/doc/CHANGES:1.1967.2.6 src/doc/CHANGES:1.1967.2.7
--- src/doc/CHANGES:1.1967.2.6	Sun Nov  2 10:09:44 2014
+++ src/doc/CHANGES	Sun Nov  2 10:22:54 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.6 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1967.2.7 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -21,7 +21,7 @@
 #
 # See htutils/changes/changes2html script for more details.
 #
-LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.6 $
+LIST OF CHANGES FROM PREVIOUS RELEASES:			$Revision: 1.1967.2.7 $
 
 
 Changes from NetBSD 6.0 to NetBSD 7.0:
@@ -510,6 +510,8 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		[tls 20140810]
 	OpenSSL: Update to 1.0.1i. [spz 20140810]
 	kernel: Add MODULAR infrastructure for Xen kernels. [jnemeth 20140810]
+	hp300: Add arcofi(4) audio driver for the HP Audio1 device found on
+		HP9000/425e.  Ported from OpenBSD.  [tsutsui 20140824]
 	rnd(9): Add explicit enable/disable hooks for callout-driven
 		sources (be more power friendly). [tls 20141026]
 	rnd(9): Make skew source polled so it runs only when there

CVS commit: src/lib/libc/sys

2014-11-02 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Sun Nov  2 11:28:03 UTC 2014

Modified Files:
src/lib/libc/sys: swapctl.2

Log Message:
Use more markups in AUTHORS section.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/lib/libc/sys/swapctl.2

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

Modified files:

Index: src/lib/libc/sys/swapctl.2
diff -u src/lib/libc/sys/swapctl.2:1.38 src/lib/libc/sys/swapctl.2:1.39
--- src/lib/libc/sys/swapctl.2:1.38	Thu Apr 28 11:58:50 2011
+++ src/lib/libc/sys/swapctl.2	Sun Nov  2 11:28:03 2014
@@ -1,4 +1,4 @@
-.\	$NetBSD: swapctl.2,v 1.38 2011/04/28 11:58:50 wiz Exp $
+.\	$NetBSD: swapctl.2,v 1.39 2014/11/02 11:28:03 njoly Exp $
 .\
 .\ Copyright (c) 1997 Matthew R. Green
 .\ All rights reserved.
@@ -273,12 +273,12 @@ when the header file was also moved from
 to its current location in
 .In sys/swap.h .
 .Sh AUTHORS
+.An -nosplit
 The current swap system was designed and implemented by
-Matthew Green
-.Aq m...@eterna.com.au ,
-with help from Paul Kranenburg
-.Aq p...@netbsd.org
-and Leo Weppelman
-.Aq l...@netbsd.org ,
-and insights from Jason R. Thorpe
-.Aq thor...@netbsd.org .
+.An Matthew Green Aq Mt m...@eterna.com.au ,
+with help from
+.An Paul Kranenburg Aq Mt p...@netbsd.org
+and
+.An Leo Weppelman Aq Mt l...@netbsd.org ,
+and insights from
+.An Jason R. Thorpe Aq Mt thor...@netbsd.org .

CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc

2014-11-02 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Sun Nov  2 14:54:27 UTC 2014

Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile

Log Message:
Avoid using ld -x.  Instead use ${OBJCOPY} ${OBJCOPYLIBFLAGS} to string
local symbols.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile

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

Modified files:

Index: src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.22 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.23
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.22	Sun Jun  1 19:51:01 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile	Sun Nov  2 14:54:27 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2014/06/01 19:51:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.23 2014/11/02 14:54:27 matt Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -50,11 +50,12 @@ CLEANFILES+=	${SOBJS:=.tmp1} ${SOBJS:=.t
 	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
 	${NM} -pg ${.TARGET}.tmp1 | \
 	${TOOL_AWK} 'NF == 3 { print \t.hidden, $$3 }' | \
-	${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+	${CC} ${COPTS} -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2
 .if defined(COPTS)  !empty(COPTS:M*-g*)
 	mv ${.TARGET}.tmp2 ${.TARGET}
 .else
-	${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+	${LD} -r ${.TARGET}.tmp2 -o ${.TARGET}
 	rm -f ${.TARGET}.tmp2
 .endif
 	rm -f ${.TARGET}.tmp1
@@ -64,11 +65,12 @@ CLEANFILES+=	${SOBJS:=.tmp1} ${SOBJS:=.t
 	${COMPILE.S} ${PICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
 	${NM} -pg ${.TARGET}.tmp1 | \
 	${TOOL_AWK} 'NF == 3 { print \t.hidden, $$3 }' | \
-	${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+	${CC} ${COPTS} -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2
 .if defined(COPTS)  !empty(COPTS:M*-g*)
 	mv ${.TARGET}.tmp2 ${.TARGET}
 .else
-	${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+	${LD} -r ${.TARGET}.tmp2 -o ${.TARGET}
 	rm -f ${.TARGET}.tmp2
 .endif
 	rm -f ${.TARGET}.tmp1

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

2014-11-02 Thread Kenichi Hashimoto

Module Name:src
Committed By:   hkenken
Date:   Sun Nov  2 16:07:15 UTC 2014

Modified Files:
src/sys/arch/evbarm/conf: std.n900

Log Message:
Add options __HAVE_MM_MD_DIRECT_MAPPED_PHYS and ARM_HAS_VBAR for N900.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/std.n900

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/std.n900
diff -u src/sys/arch/evbarm/conf/std.n900:1.4 src/sys/arch/evbarm/conf/std.n900:1.5
--- src/sys/arch/evbarm/conf/std.n900:1.4	Fri Nov  1 18:41:06 2013
+++ src/sys/arch/evbarm/conf/std.n900	Sun Nov  2 16:07:15 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: std.n900,v 1.4 2013/11/01 18:41:06 skrll Exp $
+#	$NetBSD: std.n900,v 1.5 2014/11/02 16:07:15 hkenken Exp $
 #
 # standard NetBSD/evbarm for N900 options
 
@@ -12,6 +12,8 @@ include		arch/evbarm/conf/files.n900
 options 	__HAVE_CPU_COUNTER
 options 	CORTEX_PMC
 options 	__HAVE_FAST_SOFTINTS		# should be in types.h
+options 	ARM_HAS_VBAR
+options 	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 options 	TPIDRPRW_IS_CURCPU
 options 	KERNEL_BASE_EXT=0x8000
 options 	FPU_VFP

CVS commit: src/sys/arch

2014-11-02 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Sun Nov  2 17:58:14 UTC 2014

Modified Files:
src/sys/arch/amd64/conf: kern.ldscript kern.ldscript.2MB
kern.ldscript.Xen
src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen

Log Message:
Revert previous per joerg@'s request.

According to him, exposing .data.{read_mostly,cacheline_aligned} is
intentional so that people can easily see which variables are optimized.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/conf/kern.ldscript
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/conf/kern.ldscript.2MB \
src/sys/arch/amd64/conf/kern.ldscript.Xen
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/conf/kern.ldscript.Xen

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

Modified files:

Index: src/sys/arch/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.7 src/sys/arch/amd64/conf/kern.ldscript:1.8
--- src/sys/arch/amd64/conf/kern.ldscript:1.7	Sat Nov  1 11:58:55 2014
+++ src/sys/arch/amd64/conf/kern.ldscript	Sun Nov  2 17:58:14 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript,v 1.7 2014/11/01 11:58:55 uebayasi Exp $	*/
+/*	$NetBSD: kern.ldscript,v 1.8 2014/11/02 17:58:14 uebayasi Exp $	*/
 
 OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
 	  elf64-x86-64)
@@ -32,13 +32,22 @@ SECTIONS
AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
  *(.data)
- . = ALIGN(64);	/* COHERENCY_UNIT */
+   }
+
+   . = ALIGN(64);	/* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
  *(.data.cacheline_aligned)
- . = ALIGN(64);	/* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);	/* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
  *(.data.read_mostly)
- . = ALIGN(64);	/* COHERENCY_UNIT */
}
. = ALIGN(64);	/* COHERENCY_UNIT */
+
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;

Index: src/sys/arch/amd64/conf/kern.ldscript.2MB
diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.4 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.5
--- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.4	Sat Nov  1 11:58:55 2014
+++ src/sys/arch/amd64/conf/kern.ldscript.2MB	Sun Nov  2 17:58:14 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.2MB,v 1.4 2014/11/01 11:58:55 uebayasi Exp $	*/
+/*	$NetBSD: kern.ldscript.2MB,v 1.5 2014/11/02 17:58:14 uebayasi Exp $	*/
 
 OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
 	  elf64-x86-64)
@@ -33,11 +33,18 @@ SECTIONS
AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
  *(.data)
- . = ALIGN(64);	/* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);	/* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
  *(.data.cacheline_aligned)
- . = ALIGN(64);	/* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);	/* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
  *(.data.read_mostly)
- . = ALIGN(64);	/* COHERENCY_UNIT */
}
. = ALIGN(64);	/* COHERENCY_UNIT */
_edata = . ;
Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.4 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.5
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.4	Sat Nov  1 11:58:55 2014
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen	Sun Nov  2 17:58:14 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.Xen,v 1.4 2014/11/01 11:58:55 uebayasi Exp $	*/
+/*	$NetBSD: kern.ldscript.Xen,v 1.5 2014/11/02 17:58:14 uebayasi Exp $	*/
 
 OUTPUT_FORMAT(elf64-x86-64, elf64-x86-64,
 	  elf64-x86-64)
@@ -26,11 +26,18 @@ SECTIONS
AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
  *(.data)
- . = ALIGN(64);	/* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);	/* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
  *(.data.cacheline_aligned)
- . = ALIGN(64);	/* COHERENCY_UNIT */
+   }
+   . = ALIGN(64);	/* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
  *(.data.read_mostly)
- . = ALIGN(64);	/* COHERENCY_UNIT */
}
. = ALIGN(64);	/* COHERENCY_UNIT */
_edata = . ;

Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.10 src/sys/arch/i386/conf/kern.ldscript:1.11
--- src/sys/arch/i386/conf/kern.ldscript:1.10	Sat Nov  1 11:58:55 2014
+++ src/sys/arch/i386/conf/kern.ldscript	Sun Nov  2 17:58:14 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript,v 1.10 2014/11/01 11:58:55 uebayasi Exp $	*/
+/*	$NetBSD: kern.ldscript,v 1.11

CVS commit: src/sys/arch/sparc64/sparc64

2014-11-02 Thread Palle Lyckegaard

Module Name:src
Committed By:   palle
Date:   Sun Nov  2 19:40:06 UTC 2014

Modified Files:
src/sys/arch/sparc64/sparc64: ipifuncs.c mp_subr.S

Log Message:
sun4v: Implement missing sparc64_ipi_dcache_flush_page_xxx() function. ok 
martin@


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc64/sparc64/ipifuncs.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/sparc64/mp_subr.S

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/ipifuncs.c
diff -u src/sys/arch/sparc64/sparc64/ipifuncs.c:1.50 src/sys/arch/sparc64/sparc64/ipifuncs.c:1.51
--- src/sys/arch/sparc64/sparc64/ipifuncs.c:1.50	Sun Jun  8 17:33:24 2014
+++ src/sys/arch/sparc64/sparc64/ipifuncs.c	Sun Nov  2 19:40:06 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipifuncs.c,v 1.50 2014/06/08 17:33:24 palle Exp $ */
+/*	$NetBSD: ipifuncs.c,v 1.51 2014/11/02 19:40:06 palle Exp $ */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.50 2014/06/08 17:33:24 palle Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.51 2014/11/02 19:40:06 palle Exp $);
 
 #include opt_ddb.h
 
@@ -85,6 +85,9 @@ void	sparc64_ipi_flush_pte_sun4v(void *,
 #endif
 void	sparc64_ipi_dcache_flush_page_us(void *, void *);
 void	sparc64_ipi_dcache_flush_page_usiii(void *, void *);
+#ifdef SUN4V
+void	sparc64_ipi_dcache_flush_page_sun4v(void *, void *);
+#endif
 void	sparc64_ipi_blast_dcache(void *, void *);
 void	sparc64_ipi_ccall(void *, void *);
 
@@ -491,7 +494,13 @@ smp_dcache_flush_page_cpuset(paddr_t pa,
 {
 	ipifunc_t func;
 
+#ifdef SUN4V
+	if (CPU_ISSUN4V)
+		func = sparc64_ipi_dcache_flush_page_sun4v;
+	else if (CPU_IS_USIII_UP())
+#else		
 	if (CPU_IS_USIII_UP())
+#endif		
 		func = sparc64_ipi_dcache_flush_page_usiii;
 	else
 		func = sparc64_ipi_dcache_flush_page_us;

Index: src/sys/arch/sparc64/sparc64/mp_subr.S
diff -u src/sys/arch/sparc64/sparc64/mp_subr.S:1.7 src/sys/arch/sparc64/sparc64/mp_subr.S:1.8
--- src/sys/arch/sparc64/sparc64/mp_subr.S:1.7	Wed Sep 24 18:32:10 2014
+++ src/sys/arch/sparc64/sparc64/mp_subr.S	Sun Nov  2 19:40:06 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: mp_subr.S,v 1.7 2014/09/24 18:32:10 palle Exp $	*/
+/*	$NetBSD: mp_subr.S,v 1.8 2014/11/02 19:40:06 palle Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -389,9 +389,10 @@ ENTRY(sparc64_ipi_drop_fpstate)
 	 nop
 
 /*
- * IPI handler to drop the current FPU state.
+ * Flush data cache page.
  * void sparc64_ipi_dcache_flush_page_usiii(paddr_t pa, int line_size)
  * void sparc64_ipi_dcache_flush_page_us(paddr_t pa, int line_size)
+ * void sparc64_ipi_dcache_flush_page_sun4v(paddr_t pa, int line_size)
  *
  * On entry:
  *	%g2 = pa
@@ -447,4 +448,21 @@ ENTRY(sparc64_ipi_dcache_flush_page_us)
 	ba,a	ret_from_intr_vector
 	 nop
 
+#ifdef SUN4V
+ENTRY(sparc64_ipi_dcache_flush_page_sun4v)
+	set	NBPG, %o1
+	call	hv_mem_sync
+	 mov	%g2, %o0
+	cmp	%o0, 0
+	be,pt	%icc, 1f
+	 nop
+	sir! crash if hv-call fails
+1:
+	sethi	%hi(KERNBASE), %g5
+	flush	%g5
+	membar	#Sync
+	ba,a	ret_from_intr_vector
+	 nop
+#endif
+		
 #endif

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

2014-11-02 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Nov  2 23:08:40 UTC 2014

Modified Files:
src/sys/arch/amd64/conf: GENERIC
Removed Files:
src/sys/arch/amd64/conf: DRMKMS NO_DRM

Log Message:
make DRMKMS the default on GENERIC and comment out the legacy drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r0 src/sys/arch/amd64/conf/DRMKMS
cvs rdiff -u -r1.401 -r1.402 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.2 -r0 src/sys/arch/amd64/conf/NO_DRM

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

Modified files:

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.401 src/sys/arch/amd64/conf/GENERIC:1.402
--- src/sys/arch/amd64/conf/GENERIC:1.401	Sun Oct 26 14:43:18 2014
+++ src/sys/arch/amd64/conf/GENERIC	Sun Nov  2 18:08:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.401 2014/10/26 18:43:18 tls Exp $
+# $NetBSD: GENERIC,v 1.402 2014/11/02 23:08:40 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	arch/amd64/conf/std.amd64
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.401 $
+#ident 		GENERIC-$Revision: 1.402 $
 
 maxusers	64		# estimated number of users
 
@@ -386,16 +386,26 @@ attimer0	at isa?
 pcppi0		at isa?
 sysbeep0	at pcppi?
 
-# DRI driver
-i915drm*	at drm?		# Intel i915, i945 DRM driver
-mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
-r128drm*	at drm?		# ATI Rage 128 DRM driver
-radeondrm*	at drm?		# ATI Radeon DRM driver
-savagedrm*	at drm?		# S3 Savage DRM driver
-sisdrm* 	at drm?		# SiS DRM driver
-tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
-viadrm*		at drm?		# VIA DRM driver
+# DRI legacy drivers
+#i915drm*	at drm?		# Intel i915, i945 DRM driver
+#mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
+#mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
+#r128drm*	at drm?		# ATI Rage 128 DRM driver
+#radeondrm*	at drm?		# ATI Radeon DRM driver
+#savagedrm*	at drm?		# S3 Savage DRM driver
+#sisdrm* 	at drm?		# SiS DRM driver
+#tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
+#viadrm*	at drm?		# VIA DRM driver
+
+# DRMKMS drivers
+i915drmkms* at pci? dev ? function ?
+intelfb*at intelfbbus?
+
+radeon* at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau*   at pci? dev ? function ?
+#nouveaufb* at nouveaufbbus
 
 # Cryptographic Devices

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

2014-11-02 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Nov  2 23:12:01 UTC 2014

Modified Files:
src/sys/arch/amd64/conf: ALL INSTALL

Log Message:
propagate drm changes


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/amd64/conf/INSTALL

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

Modified files:

Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.21 src/sys/arch/amd64/conf/ALL:1.22
--- src/sys/arch/amd64/conf/ALL:1.21	Sat Oct 18 12:56:51 2014
+++ src/sys/arch/amd64/conf/ALL	Sun Nov  2 18:12:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.21 2014/10/18 16:56:51 uebayasi Exp $
+# $NetBSD: ALL,v 1.22 2014/11/02 23:12:00 christos Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	arch/amd64/conf/std.amd64
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		ALL-$Revision: 1.21 $
+#ident 		ALL-$Revision: 1.22 $
 
 maxusers	64		# estimated number of users
 
@@ -514,17 +514,27 @@ voodoofb*	at pci? dev ? function ?
 wcfb*	at pci? dev ? function ?
 wsdisplay*	at wsemuldisplaydev?
 
-# DRI driver
-i915drm*	at drm?		# Intel i915, i945 DRM driver
-mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
-r128drm*	at drm?		# ATI Rage 128 DRM driver
-radeondrm*	at drm?		# ATI Radeon DRM driver
-savagedrm*	at drm?		# S3 Savage DRM driver
-sisdrm* 	at drm?		# SiS DRM driver
-tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
-vboxdrm*	at drm?		# VirtualBox DRM driver
-viadrm* 	at drm?		# VIA UniChrome DRM driver
+# DRI legacy drivers
+#i915drm*	at drm?		# Intel i915, i945 DRM driver
+#mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
+#mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
+#r128drm*	at drm?		# ATI Rage 128 DRM driver
+#radeondrm*	at drm?		# ATI Radeon DRM driver
+#savagedrm*	at drm?		# S3 Savage DRM driver
+#sisdrm* 	at drm?		# SiS DRM driver
+#tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
+#vboxdrm*	at drm?		# VirtualBox DRM driver
+#viadrm* 	at drm?		# VIA UniChrome DRM driver
+
+# DRMKMS drivers
+i915drmkms* at pci? dev ? function ?
+intelfb*at intelfbbus?
+
+radeon* at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau*   at pci? dev ? function ?
+#nouveaufb* at nouveaufbbus
 
 attimer0	at isa?
 pcppi0		at isa?

Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.89 src/sys/arch/amd64/conf/INSTALL:1.90
--- src/sys/arch/amd64/conf/INSTALL:1.89	Thu Jun  6 03:11:18 2013
+++ src/sys/arch/amd64/conf/INSTALL	Sun Nov  2 18:12:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.89 2013/06/06 07:11:18 msaitoh Exp $
+# $NetBSD: INSTALL,v 1.90 2014/11/02 23:12:00 christos Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -8,7 +8,7 @@
 include	arch/amd64/conf/GENERIC
 
 options		CONSDEVNAME=\com\,CONADDR=0x2f8,CONSPEED=115200
-#ident 		INSTALL-$Revision: 1.89 $
+#ident 		INSTALL-$Revision: 1.90 $
 
 no options	MEMORY_DISK_DYNAMIC
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
@@ -16,12 +16,7 @@ options 	MEMORY_DISK_SERVER=0	# no users
 options 	MEMORY_DISK_ROOT_SIZE=1	# size of memory disk, in blocks
 options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
 
-# DRI driver
-no i915drm*	at drm?		# Intel i915, i945 DRM driver
-no mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
-no mgadrm*	at drm?		# Matrox G[24]00, G[45]50 DRM driver
-no r128drm*	at drm?		# ATI Rage 128 DRM driver
-no radeondrm*	at drm?		# ATI Radeon DRM driver
-no savagedrm*	at drm?		# S3 Savage DRM driver
-no sisdrm*	at drm?		# SiS DRM driver
-no tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
+# DRMKMS driver
+no i915drmkms* at pci?
+no radeon* at pci?
+#no nouveau*	   at pci?

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

2014-11-02 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Nov  2 23:14:20 UTC 2014

Modified Files:
src/sys/arch/i386/conf: ALL GENERIC INSTALL
Removed Files:
src/sys/arch/i386/conf: DRMKMS NO_DRM

Log Message:
switch to DRMKMS drivers


To generate a diff of this commit:
cvs rdiff -u -r1.387 -r1.388 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.6 -r0 src/sys/arch/i386/conf/DRMKMS
cvs rdiff -u -r1.1115 -r1.1116 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.330 -r1.331 src/sys/arch/i386/conf/INSTALL
cvs rdiff -u -r1.1 -r0 src/sys/arch/i386/conf/NO_DRM

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

Modified files:

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.387 src/sys/arch/i386/conf/ALL:1.388
--- src/sys/arch/i386/conf/ALL:1.387	Sat Oct 18 12:56:51 2014
+++ src/sys/arch/i386/conf/ALL	Sun Nov  2 18:14:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.387 2014/10/18 16:56:51 uebayasi Exp $
+# $NetBSD: ALL,v 1.388 2014/11/02 23:14:20 christos Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	arch/i386/conf/std.i386
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		ALL-$Revision: 1.387 $
+#ident 		ALL-$Revision: 1.388 $
 
 maxusers	64		# estimated number of users
 
@@ -592,17 +592,26 @@ voodoofb*	at pci? dev ? function ?
 wcfb*	at pci? dev ? function ?
 wsdisplay*	at wsemuldisplaydev?
 
-# DRI driver
-i915drm*	at drm?		# Intel i915, i945 DRM driver
-mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
-r128drm*	at drm?		# ATI Rage 128 DRM driver
-radeondrm*	at drm?		# ATI Radeon DRM driver
-savagedrm*	at drm?		# S3 Savage DRM driver
-sisdrm* 	at drm?		# SiS DRM driver
-tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
-vboxdrm*	at drm?		# VirtualBox DRM driver
-viadrm* 	at drm?		# VIA UniChrome DRM driver
+# DRI legacy drivers
+#i915drm*	at drm?		# Intel i915, i945 DRM driver
+#mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
+#mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
+#r128drm*	at drm?		# ATI Rage 128 DRM driver
+#radeondrm*	at drm?		# ATI Radeon DRM driver
+#savagedrm*	at drm?		# S3 Savage DRM driver
+#sisdrm* 	at drm?		# SiS DRM driver
+#tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
+#vboxdrm*	at drm?		# VirtualBox DRM driver
+#viadrm* 	at drm?		# VIA UniChrome DRM driver
+
+i915drmkms* 	at pci? dev ? function ?
+intelfb* 	at intelfbbus?
+
+radeon* 	at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau*	at pci? dev ? function ?
+#nouveaufb*	at nouveaufbbus
 
 attimer0	at isa?
 pcppi0		at isa?

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1115 src/sys/arch/i386/conf/GENERIC:1.1116
--- src/sys/arch/i386/conf/GENERIC:1.1115	Sat Oct 18 12:56:51 2014
+++ src/sys/arch/i386/conf/GENERIC	Sun Nov  2 18:14:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1115 2014/10/18 16:56:51 uebayasi Exp $
+# $NetBSD: GENERIC,v 1.1116 2014/11/02 23:14:20 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	arch/i386/conf/std.i386
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.1115 $
+#ident 		GENERIC-$Revision: 1.1116 $
 
 maxusers	64		# estimated number of users
 
@@ -557,16 +557,25 @@ attimer0	at isa?
 pcppi0		at isa?
 sysbeep0	at pcppi?
 
-# DRI driver
-i915drm*	at drm?		# Intel i915, i945 DRM driver
-mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
-r128drm*	at drm?		# ATI Rage 128 DRM driver
-radeondrm*	at drm?		# ATI Radeon DRM driver
-savagedrm*	at drm?		# S3 Savage DRM driver
-sisdrm* 	at drm?		# SiS DRM driver
-tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
-viadrm* 	at drm?		# VIA DRM driver
+# DRI legacy drivers
+#i915drm*	at drm?		# Intel i915, i945 DRM driver
+#mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
+#mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
+#r128drm*	at drm?		# ATI Rage 128 DRM driver
+#radeondrm*	at drm?		# ATI Radeon DRM driver
+#savagedrm*	at drm?		# S3 Savage DRM driver
+#sisdrm* 	at drm?		# SiS DRM driver
+#tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
+#viadrm* 	at drm?		# VIA DRM driver
+
+i915drmkms* 	at pci? dev ? function ?
+intelfb* 	at intelfbbus?
+
+radeon* 	at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau*	at pci? dev ? function ?
+#nouveaufb*	at nouveaufbbus
 
 # Serial Devices
 

Index: src/sys/arch/i386/conf/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.330 src/sys/arch/i386/conf/INSTALL:1.331
--- src/sys/arch/i386/conf/INSTALL:1.330	Sat May 28 09:01:50 2011
+++ src/sys/arch/i386/conf/INSTALL	Sun Nov  2 18:14:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.330 2011/05/28 13:01:50 ryo Exp $
+# $NetBSD: INSTALL,v 1.331 2014/11/02 23:14:20 christos

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

2014-11-02 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Nov  2 23:54:16 UTC 2014

Modified Files:
src/sys/arch/arm/allwinner: awin_gpio.c awin_var.h

Log Message:
fix a kassert for pin group L and M on A31; allow pinset request to pass pin 
pullup/pulldown flags


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/allwinner/awin_gpio.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/allwinner/awin_var.h

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

Modified files:

Index: src/sys/arch/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.12 src/sys/arch/arm/allwinner/awin_gpio.c:1.13
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.12	Mon Oct 20 19:05:46 2014
+++ src/sys/arch/arm/allwinner/awin_gpio.c	Sun Nov  2 23:54:16 2014
@@ -35,7 +35,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.12 2014/10/20 19:05:46 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.13 2014/11/02 23:54:16 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -488,7 +488,15 @@ awin_gpio_pinset_available(const struct 
 	if (!req-pinset_group)
 		return false;
 
-	KASSERT('A' = req-pinset_group  req-pinset_group = 'I');
+#ifdef DIAGNOSTIC
+	if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+		KASSERT(
+		('A' = req-pinset_group  req-pinset_group = 'I') ||
+		('L' = req-pinset_group  req-pinset_group = 'M'));
+	} else {
+		KASSERT('A' = req-pinset_group  req-pinset_group = 'I');
+	}
+#endif
 
 	struct awin_gpio_pin_group * const grp =
 	pin_groups[req-pinset_group - 'A'];
@@ -564,6 +572,11 @@ awin_gpio_pinset_acquire(const struct aw
 		 * Change the function of this pin.
 		 */
 		awin_gpio_set_pin_func(ncfg, j, req-pinset_func);
+
+		if (req-pinset_flags  GPIO_PIN_PULLDOWN)
+			awin_gpio_set_pin_pull(ncfg, j, AWIN_PIO_PULL_DOWN);
+		else if (req-pinset_flags  GPIO_PIN_PULLUP)
+			awin_gpio_set_pin_pull(ncfg, j, AWIN_PIO_PULL_UP);
 	}
 
 	/*

Index: src/sys/arch/arm/allwinner/awin_var.h
diff -u src/sys/arch/arm/allwinner/awin_var.h:1.18 src/sys/arch/arm/allwinner/awin_var.h:1.19
--- src/sys/arch/arm/allwinner/awin_var.h:1.18	Mon Oct 13 12:34:00 2014
+++ src/sys/arch/arm/allwinner/awin_var.h	Sun Nov  2 23:54:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_var.h,v 1.18 2014/10/13 12:34:00 jmcneill Exp $ */
+/* $NetBSD: awin_var.h,v 1.19 2014/11/02 23:54:16 jmcneill Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -66,6 +66,7 @@ struct awin_gpio_pinset {
 	uint8_t pinset_group;
 	uint8_t pinset_func;
 	uint32_t pinset_mask;
+	int pinset_flags;
 };
 
 struct awin_gpio_pindata {

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

2014-11-02 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Nov  2 23:55:06 UTC 2014

Modified Files:
src/sys/arch/arm/allwinner: awin_intr.h

Log Message:
A31 CIR IRQ


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/allwinner/awin_intr.h

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

Modified files:

Index: src/sys/arch/arm/allwinner/awin_intr.h
diff -u src/sys/arch/arm/allwinner/awin_intr.h:1.8 src/sys/arch/arm/allwinner/awin_intr.h:1.9
--- src/sys/arch/arm/allwinner/awin_intr.h:1.8	Thu Oct 16 00:03:48 2014
+++ src/sys/arch/arm/allwinner/awin_intr.h	Sun Nov  2 23:55:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_intr.h,v 1.8 2014/10/16 00:03:48 jmcneill Exp $ */
+/* $NetBSD: awin_intr.h,v 1.9 2014/11/02 23:55:06 jmcneill Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -148,6 +148,7 @@
 #define AWIN_A31_IRQ_TWI2	40
 #define AWIN_A31_IRQ_TWI3	41
 #define AWIN_A31_IRQ_AC		61
+#define AWIN_A31_IRQ_CIR	69
 #define AWIN_A31_IRQ_P2WI	71
 #define AWIN_A31_IRQ_DMA	82
 #define AWIN_A31_IRQ_SDMMC0	92

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

2014-11-02 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Nov  2 23:54:46 UTC 2014

Modified Files:
src/sys/arch/arm/allwinner: awin_reg.h

Log Message:
CIR regs


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/allwinner/awin_reg.h

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

Modified files:

Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.40 src/sys/arch/arm/allwinner/awin_reg.h:1.41
--- src/sys/arch/arm/allwinner/awin_reg.h:1.40	Mon Oct 20 19:03:30 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h	Sun Nov  2 23:54:46 2014
@@ -755,6 +755,88 @@ struct awin_mmc_idma_descriptor {
 } __packed;
 #endif
 
+#define AWIN_IR_CTL_REG			0x
+#define AWIN_IR_TXCTL_REG		0x0004
+#define AWIN_IR_TXADR_REG		0x0008
+#define AWIN_IR_TXCNT_REG		0x000C
+#define AWIN_IR_RXCTL_REG		0x0010
+#define AWIN_IR_RXADR_REG		0x0014
+#define AWIN_IR_RXCNT_REG		0x0018
+#define AWIN_IR_TXFIFO_REG		0x001C
+#define AWIN_IR_RXFIFO_REG		0x0020
+#define AWIN_IR_TXINT_REG		0x0024
+#define AWIN_IR_TXSTA_REG		0x0028
+#define AWIN_IR_RXINT_REG		0x002C
+#define AWIN_IR_RXSTA_REG		0x0030
+#define AWIN_IR_CIR_REG			0x0034
+
+#define AWIN_IR_CTL_CGPO		__BIT(8)
+#define AWIN_IR_CTL_MD			__BITS(5,4)
+#define AWIN_IR_CTL_MD_0_576_MIR	0
+#define AWIN_IR_CTL_MD_1_152_MIR	1
+#define AWIN_IR_CTL_MD_4_0_FIR		2
+#define AWIN_IR_CTL_MD_CIR		3
+#define AWIN_IR_CTL_TXEN		__BIT(2)
+#define AWIN_IR_CTL_RXEN		__BIT(1)
+#define AWIN_IR_CTL_GEN			__BIT(0)
+
+#define AWIN_IR_TXCTL_PCF		__BIT(5)
+#define AWIN_IR_TXCTL_SIP		__BIT(3)
+#define AWIN_IR_TXCTL_TPPI		__BIT(2)
+
+#define AWIN_IR_TXADR_HAG		__BIT(8)
+#define AWIN_IR_TXADR_TPA		__BITS(7,0)
+
+#define AWIN_IR_TXCNT_TPL		__BITS(10,0)
+
+#define AWIN_IR_RXCTL_RPA		__BIT(3)
+#define AWIN_IR_RXCTL_RPPI		__BIT(2)
+
+#define AWIN_IR_RXADR_RAM		__BIT(8)
+#define AWIN_IR_RXADR_RA		__BITS(7,0)
+
+#define AWIN_IR_RXCNT_RPL		__BITS(11,0)
+
+#define AWIN_IR_TXFIFO_DATA		__BITS(7,0)
+
+#define AWIN_IR_RXFIFO_DATA		__BITS(7,0)
+
+#define AWIN_IR_TXINT_TEL		__BITS(11,8)
+#define AWIN_IR_TXINT_DRQ_EN		__BIT(5)
+#define AWIN_IR_TXINT_TEI_EN		__BIT(4)
+#define AWIN_IR_TXINT_TCI_EN		__BIT(3)
+#define AWIN_IR_TXINT_SIPEI_EN		__BIT(2)
+#define AWIN_IR_TXINT_TPEI_EN		__BIT(1)
+#define AWIN_IR_TUI_EN			__BIT(0)
+
+#define AWIN_IR_TXSTA_TA		__BITS(12,8)
+#define AWIN_IR_TXSTA_TE		__BIT(4)
+#define AWIN_IR_TXSTA_TC		__BIT(3)
+#define AWIN_IR_TXSTA_SIPE		__BIT(2)
+#define AWIN_IR_TXSTA_TPE		__BIT(1)
+#define AWIN_IR_TXSTA_TU		__BIT(0)
+
+#define AWIN_IR_RXINT_RAL		__BITS(11,8)
+#define AWIN_IR_RXINT_DRQ_EN		__BIT(5)
+#define AWIN_IR_RXINT_RAI_EN		__BIT(4)
+#define AWIN_IR_RXINT_CRCI_EN		__BIT(3)
+#define AWIN_IR_RXINT_RISI_EN		__BIT(2)
+#define AWIN_IR_RXINT_RPEI_EN		__BIT(1)
+#define AWIN_IR_RXINT_ROI_EN		__BIT(0)
+
+#define AWIN_IR_RXSTA_RAC		__BITS(12,8)
+#define AWIN_IR_RXSTA_STAT		__BIT(7)	/* A31 */
+#define AWIN_IR_RXSTA_RA		__BIT(4)
+#define AWIN_IR_RXSTA_CRC		__BIT(3)
+#define AWIN_IR_RXSTA_RIS		__BIT(2)
+#define AWIN_IR_RXSTA_RPE		__BIT(1)
+#define AWIN_IR_RXSTA_ROI		__BIT(0)
+
+#define AWIN_IR_CIR_SCS2		__BIT(24)
+#define AWIN_IR_CIR_ITHR		__BITS(15,8)
+#define AWIN_IR_CIR_NTHR		__BITS(7,2)
+#define AWIN_IR_CIR_SCS			__BITS(1,0)
+
 #define AWIN_CPUCFG_CPU0_RST_CTRL_REG	0x0040
 #define AWIN_CPUCFG_CPU0_CTRL_REG	0x0044
 #define AWIN_CPUCFG_CPU0_STATUS_REG	0x0048
@@ -1701,13 +1783,17 @@ struct awin_mmc_idma_descriptor {
 #define AWIN_A31_USB2_OFFSET		0x0001b000	/* EHCI1/OHCI1 */
 #define AWIN_A31_USB3_OFFSET		0x0001c000	/* OHCI2 */
 #define AWIN_A31_GMAC_OFFSET		0x0003	/* GMAC */
+#define AWIN_A31_RTC_OFFSET		0x0030	/* RTC */
 #define AWIN_A31_PRCM_OFFSET		0x00301400	/* PRCM */
 #define AWIN_A31_CPUCFG_OFFSET		0x00301C00
-#define AWIN_A31_RTC_OFFSET		0x0030	/* RTC */
+#define AWIN_A31_CIR_OFFSET		0x00302000	/* CIR */
 #define AWIN_A31_CPUPIO_OFFSET		0x00302c00	/* CPUs-PORT */
 #define AWIN_A31_P2WI_OFFSET		0x00303400	/* P2WI */
 
-#define AWIN_A31_PRCM_PWROFF_GATING_REG		0x100
+#define AWIN_A31_PRCM_APB0_GATING_REG		0x0028
+#define AWIN_A31_PRCM_CIR_CLK_REG		0x0054
+#define AWIN_A31_PRCM_APB0_RESET_REG		0x00B0
+#define AWIN_A31_PRCM_PWROFF_GATING_REG		0x0100
 #define AWIN_A31_PRCM_CPUX_PWR_CLAMP_REG	0x0140
 #define AWIN_A31_PRCM_CPU1_PWR_CLAMP_REG	0x0144
 #define AWIN_A31_PRCM_CPU2_PWR_CLAMP_REG	0x0148
@@ -1728,6 +1814,10 @@ struct awin_mmc_idma_descriptor {
 #define AWIN_A31_AHB_RESET2_REG		0x02C8
 #define AWIN_A31_APB1_RESET_REG		0x02D0
 
+#define AWIN_A31_PRCM_APB0_GATING_CIR	__BIT(1)
+
+#define AWIN_A31_PRCM_APB0_RESET_CIR	__BIT(1)
+
 #define AWIN_A31_CPUCFG_RST_CTRL_CORE_RESET __BIT(1)
 #define AWIN_A31_CPUCFG_RST_CTRL_CPU_RESET __BIT(0)
 
@@ -1987,6 +2077,8 @@ struct awin_a31_dma_desc {
 #define AWIN_A31_PIO_PH_TWI2_PINS	0x000c /* PH pins 19-18 */
 
 #define AWIN_A31_PIO_PL_PINS		9
+#define AWIN_A31_PIO_PL_IR_FUNC		2
+#define AWIN_A31_PIO_PL_IR_PINS

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

2014-11-02 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Nov  2 23:56:13 UTC 2014

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

Log Message:
add awinir and cir


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31

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/HUMMINGBIRD_A31
diff -u src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.12 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.13
--- src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.12	Mon Oct 20 16:35:07 2014
+++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31	Sun Nov  2 23:56:13 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: HUMMINGBIRD_A31,v 1.12 2014/10/20 16:35:07 jmcneill Exp $
+#	$NetBSD: HUMMINGBIRD_A31,v 1.13 2014/11/02 23:56:13 jmcneill Exp $
 #
 #	HUMMINGBIRD_A31 - Merrii Hummingbird A31
 #
@@ -217,6 +217,10 @@ axp22x0		at iic1 addr 0x34	# AXP221 Powe
 com0		at awinio? port 0			# UART0 (console)
 options 	CONADDR=0x01c28000, CONSPEED=115200
 
+# Consumer IR
+awinir0		at awinio?
+cir0		at awinir0
+
 # Watchdog timers
 awinwdt*	at awinio?

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

2014-11-02 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Nov  2 23:55:48 UTC 2014

Modified Files:
src/sys/arch/arm/allwinner: awin_io.c files.awin
Added Files:
src/sys/arch/arm/allwinner: awin_ir.c

Log Message:
work in progress CIR driver


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/allwinner/awin_io.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/allwinner/awin_ir.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/allwinner/files.awin

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/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.23 src/sys/arch/arm/allwinner/awin_io.c:1.24
--- src/sys/arch/arm/allwinner/awin_io.c:1.23	Sun Oct 19 23:18:22 2014
+++ src/sys/arch/arm/allwinner/awin_io.c	Sun Nov  2 23:55:48 2014
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.23 2014/10/19 23:18:22 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.24 2014/11/02 23:55:48 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -147,6 +147,9 @@ static const struct awin_locators awin_l
 	{ awincrypto, OFFANDSIZE(SS), NOPORT, AWIN_IRQ_SS, AANY },
 	{ awinac, OFFANDSIZE(AC), NOPORT, AWIN_IRQ_AC, A10|A20 },
 	{ awinac, OFFANDSIZE(AC), NOPORT, AWIN_A31_IRQ_AC, A31 },
+	{ awinir, OFFANDSIZE(IR0), 0, AWIN_IRQ_IR0, A10|A20 },
+	{ awinir, OFFANDSIZE(IR1), 1, AWIN_IRQ_IR1, A10|A20 },
+	{ awinir, OFFANDSIZE(A31_CIR), NOPORT, AWIN_A31_IRQ_CIR, A31 },
 };
 
 static int

Index: src/sys/arch/arm/allwinner/files.awin
diff -u src/sys/arch/arm/allwinner/files.awin:1.17 src/sys/arch/arm/allwinner/files.awin:1.18
--- src/sys/arch/arm/allwinner/files.awin:1.17	Mon Oct 13 12:34:00 2014
+++ src/sys/arch/arm/allwinner/files.awin	Sun Nov  2 23:55:48 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.awin,v 1.17 2014/10/13 12:34:00 jmcneill Exp $
+#	$NetBSD: files.awin,v 1.18 2014/11/02 23:55:48 jmcneill Exp $
 #
 # Configuration info for Allwinner ARM Peripherals
 #
@@ -132,3 +132,8 @@ file	arch/arm/allwinner/awin_ac.c		awin_
 device	awinhdmi: edid, ddc_read_edid
 attach	awinhdmi at awinio with awin_hdmi
 file	arch/arm/allwinner/awin_hdmi.c		awin_hdmi
+
+# A10/A20/A31 Consumer IR (CIR)
+device	awinir: irbus
+attach	awinir at awinio with awin_ir
+file	arch/arm/allwinner/awin_ir.c		awin_ir

Added files:

Index: src/sys/arch/arm/allwinner/awin_ir.c
diff -u /dev/null src/sys/arch/arm/allwinner/awin_ir.c:1.1
--- /dev/null	Sun Nov  2 23:55:48 2014
+++ src/sys/arch/arm/allwinner/awin_ir.c	Sun Nov  2 23:55:48 2014
@@ -0,0 +1,314 @@
+/* $NetBSD: awin_ir.c,v 1.1 2014/11/02 23:55:48 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include opt_ddb.h
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: awin_ir.c,v 1.1 2014/11/02 23:55:48 jmcneill Exp $);
+
+#include sys/param.h
+#include sys/bus.h
+#include sys/device.h
+#include sys/intr.h
+#include sys/systm.h
+#include sys/kernel.h
+#include sys/select.h
+#include sys/mutex.h
+#include sys/condvar.h
+
+#include arm/allwinner/awin_reg.h
+#include arm/allwinner/awin_var.h
+
+#include dev/ir/ir.h
+#include dev/ir/cirio.h
+#include dev/ir/cirvar.h
+
+#define AWIN_IR_RXSTA_MASK	__BITS(7,0)
+
+struct awin_ir_softc {
+	device_t sc_dev;
+	device_t sc_cirdev;
+	bus_space_tag_t sc_bst;
+	bus_space_handle_t sc_bsh;
+	kmutex_t sc_lock;
+	kcondvar_t sc_cv;
+	device_t sc_i2cdev;
+	void *sc_ih;
+	size_t sc_avail;
+};
+
+#define IR_READ(sc, reg) \
+bus_space_read_4((sc)-sc_bst, (sc)-sc_bsh, (reg))
+#define IR_WRITE(sc, reg, val) \
+bus_space_write_4((sc)-sc_bst, (sc)-sc_bsh, (reg),

CVS commit: [netbsd-7] src

CVS commit: [netbsd-7] src/doc

CVS commit: [netbsd-7] src/doc

CVS commit: [netbsd-7] src

CVS commit: [netbsd-7] src

CVS commit: [netbsd-7] src/share/man/man4

CVS commit: [netbsd-7] src/doc

CVS commit: src/doc

CVS commit: [netbsd-7] src/doc

CVS commit: src/lib/libc/sys

CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc

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

CVS commit: src/sys/arch

CVS commit: src/sys/arch/sparc64/sparc64

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

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

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

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

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

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

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

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

22 matches

Site Navigation

Mail list logo

Footer information