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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Thu Oct 31 01:55:13 UTC 2019

Modified Files:
src/sys/arch/evbarm/conf: README.evbarm
Removed Files:
src/sys/arch/evbarm/conf: BEAGLEBOARDXM BEAGLEBOARDXM_INSTALL

Log Message:
Remove BEAGLEBOARDXM kernel (supported by GENERIC now)


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r0 src/sys/arch/evbarm/conf/BEAGLEBOARDXM
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/BEAGLEBOARDXM_INSTALL
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/README.evbarm

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/README.evbarm
diff -u src/sys/arch/evbarm/conf/README.evbarm:1.24 src/sys/arch/evbarm/conf/README.evbarm:1.25
--- src/sys/arch/evbarm/conf/README.evbarm:1.24	Wed Oct 30 22:25:44 2019
+++ src/sys/arch/evbarm/conf/README.evbarm	Thu Oct 31 01:55:12 2019
@@ -1,4 +1,4 @@
-$NetBSD: README.evbarm,v 1.24 2019/10/30 22:25:44 jmcneill Exp $
+$NetBSD: README.evbarm,v 1.25 2019/10/31 01:55:12 jmcneill Exp $
 
 config		date		boards
 ---
@@ -6,7 +6,6 @@ ADI_BRH		2003/01/25	ADI Eng. Big Read He
 ARMADILLO210	2006/02/06	Atmark Techno Armadillo-210
 ARMADILLO9	2005/11/13	Atmark Techno Armadillo-9
 BCM5301X	2012/08/31	Broadcom BCM95301X evaluation/reference board
-BEAGLEBOARDXM	2008/08/20	TI DM37xx BeagleBoard-XM
 CUBOX		2017/01/07	SolidRun Cubox
 CP3100		2006/11/08	Certance IOP321 CP-3100
 DNS323		2010/10/02	D-Link DNS-323 Marvell SoC based NAS



CVS commit: src/etc/etc.evbarm

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Thu Oct 31 01:54:34 UTC 2019

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Remove BEAGLEBOARDXM from the build


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/etc/etc.evbarm/Makefile.inc

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

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Oct 31 01:55:23 UTC 2019

Modified Files:
src/distrib/sets/lists/modules [netbsd-7-0]: md.amd64 md.evbppc.powerpc
md.i386
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
Fix set lists for ticket #1710


To generate a diff of this commit:
cvs rdiff -u -r1.41.2.3 -r1.41.2.3.2.1 \
src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.3.4.1 -r1.3.4.1.2.1 \
src/distrib/sets/lists/modules/md.evbppc.powerpc
cvs rdiff -u -r1.46.2.2 -r1.46.2.2.2.1 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1.2.153 -r1.1.2.154 src/doc/CHANGES-7.0.3

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

Modified files:

Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.41.2.3 src/distrib/sets/lists/modules/md.amd64:1.41.2.3.2.1
--- src/distrib/sets/lists/modules/md.amd64:1.41.2.3	Sat Mar 21 17:11:35 2015
+++ src/distrib/sets/lists/modules/md.amd64	Thu Oct 31 01:55:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.41.2.3 2015/03/21 17:11:35 snj Exp $
+# $NetBSD: md.amd64,v 1.41.2.3.2.1 2019/10/31 01:55:22 martin Exp $
 #
 # NOTE that there are two sets of files here:
 # @MODULEDIR@ and amd64-xen
@@ -292,8 +292,8 @@
 ./stand/amd64-xen/@OSRELEASE@/modules/ffs/ffs.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/filecorebase-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/filecore/filecore.kmod		base-kernel-modules	kmod,compatmodules
-./stand/amd64-xen/@OSRELEASE@/modules/filemonbase-kernel-modules	kmod,compatmodules
-./stand/amd64-xen/@OSRELEASE@/modules/filemon/filemon.kmod		base-kernel-modules	kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/filemonbase-obsolete		obsolete
+./stand/amd64-xen/@OSRELEASE@/modules/filemon/filemon.kmod		base-obsolete		obsolete
 ./stand/amd64-xen/@OSRELEASE@/modules/finsiobase-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/finsio/finsio.kmod		base-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/flashbase-kernel-modules	kmod,compatmodules

Index: src/distrib/sets/lists/modules/md.evbppc.powerpc
diff -u src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1 src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1.2.1
--- src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1	Sat Mar 21 17:11:35 2015
+++ src/distrib/sets/lists/modules/md.evbppc.powerpc	Thu Oct 31 01:55:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbppc.powerpc,v 1.3.4.1 2015/03/21 17:11:35 snj Exp $
+# $NetBSD: md.evbppc.powerpc,v 1.3.4.1.2.1 2019/10/31 01:55:22 martin Exp $
 ./stand/powerpc-4xx			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@		base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules	base-kernel-modules	kmod,compatmodules
@@ -70,8 +70,8 @@
 ./stand/powerpc-4xx/@OSRELEASE@/modules/ffs/ffs.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/filecore			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/filecore/filecore.kmod		base-kernel-modules	kmod,compatmodules
-./stand/powerpc-4xx/@OSRELEASE@/modules/filemonbase-kernel-modules	kmod,compatmodules
-./stand/powerpc-4xx/@OSRELEASE@/modules/filemon/filemon.kmod		base-kernel-modules	kmod,compatmodules
+./stand/powerpc-4xx/@OSRELEASE@/modules/filemonbase-obsolete		obsolete
+./stand/powerpc-4xx/@OSRELEASE@/modules/filemon/filemon.kmod		base-obsolete		obsolete
 ./stand/powerpc-4xx/@OSRELEASE@/modules/flashbase-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/flash/flash.kmod		base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/fssbase-kernel-modules	kmod,compatmodules
@@ -307,8 +307,8 @@
 ./stand/powerpc-booke/@OSRELEASE@/modules/ffs/ffs.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/filecorebase-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/filecore/filecore.kmod		base-kernel-modules	kmod,compatmodules
-./stand/powerpc-booke/@OSRELEASE@/modules/filemonbase-kernel-modules	kmod,compatmodules
-./stand/powerpc-booke/@OSRELEASE@/modules/filemon/filemon.kmod		base-kernel-modules	kmod,compatmodules
+./stand/powerpc-booke/@OSRELEASE@/modules/filemonbase-obsolete		obsolete
+./stand/powerpc-booke/@OSRELEASE@/modules/filemon/filemon.kmod		base-obsolete		obsolete
 ./stand/powerpc-booke/@OSRELEASE@/modules/flashbase-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/flash/flash.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/fssbase-kernel-modules	kmod,compatmodules

Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.46.2.2 

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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Thu Oct 31 01:55:13 UTC 2019

Modified Files:
src/sys/arch/evbarm/conf: README.evbarm
Removed Files:
src/sys/arch/evbarm/conf: BEAGLEBOARDXM BEAGLEBOARDXM_INSTALL

Log Message:
Remove BEAGLEBOARDXM kernel (supported by GENERIC now)


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r0 src/sys/arch/evbarm/conf/BEAGLEBOARDXM
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/BEAGLEBOARDXM_INSTALL
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/README.evbarm

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

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Oct 31 01:55:23 UTC 2019

Modified Files:
src/distrib/sets/lists/modules [netbsd-7-0]: md.amd64 md.evbppc.powerpc
md.i386
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
Fix set lists for ticket #1710


To generate a diff of this commit:
cvs rdiff -u -r1.41.2.3 -r1.41.2.3.2.1 \
src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.3.4.1 -r1.3.4.1.2.1 \
src/distrib/sets/lists/modules/md.evbppc.powerpc
cvs rdiff -u -r1.46.2.2 -r1.46.2.2.2.1 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1.2.153 -r1.1.2.154 src/doc/CHANGES-7.0.3

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



CVS commit: src/etc/etc.evbarm

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Thu Oct 31 01:54:34 UTC 2019

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Remove BEAGLEBOARDXM from the build


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/etc/etc.evbarm/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/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.111 src/etc/etc.evbarm/Makefile.inc:1.112
--- src/etc/etc.evbarm/Makefile.inc:1.111	Wed Oct 30 22:31:06 2019
+++ src/etc/etc.evbarm/Makefile.inc	Thu Oct 31 01:54:34 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.111 2019/10/30 22:31:06 jmcneill Exp $
+#	$NetBSD: Makefile.inc,v 1.112 2019/10/31 01:54:34 jmcneill Exp $
 #
 #	etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -82,8 +82,6 @@ EVBARM_BOARDS.armv7+=		BCM5301X
 EVBARM_BOARDS.armv7hf+= 	BCM5301X
 #EVBARM_BOARDS.armv7+=		BCM56340
 #EVBARM_BOARDS.armv7hf+= 	BCM56340
-EVBARM_BOARDS.armv7+=		BEAGLEBOARDXM
-EVBARM_BOARDS.armv7hf+= 	BEAGLEBOARDXM
 EVBARM_BOARDS.armv7+=		CUBOX
 EVBARM_BOARDS.armv7hf+= 	CUBOX
 EVBARM_BOARDS.armv7+=		CUBOX-I



CVS commit: [netbsd-7-1] src

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Oct 31 01:54:21 UTC 2019

Modified Files:
src/distrib/sets/lists/modules [netbsd-7-1]: md.amd64 md.evbppc.powerpc
md.i386
src/doc [netbsd-7-1]: CHANGES-7.1.3

Log Message:
Fix set lists for ticket #1710


To generate a diff of this commit:
cvs rdiff -u -r1.41.2.3 -r1.41.2.3.6.1 \
src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.3.4.1 -r1.3.4.1.6.1 \
src/distrib/sets/lists/modules/md.evbppc.powerpc
cvs rdiff -u -r1.46.2.2 -r1.46.2.2.6.1 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1.2.60 -r1.1.2.61 src/doc/CHANGES-7.1.3

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



CVS commit: [netbsd-7-1] src

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Oct 31 01:54:21 UTC 2019

Modified Files:
src/distrib/sets/lists/modules [netbsd-7-1]: md.amd64 md.evbppc.powerpc
md.i386
src/doc [netbsd-7-1]: CHANGES-7.1.3

Log Message:
Fix set lists for ticket #1710


To generate a diff of this commit:
cvs rdiff -u -r1.41.2.3 -r1.41.2.3.6.1 \
src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.3.4.1 -r1.3.4.1.6.1 \
src/distrib/sets/lists/modules/md.evbppc.powerpc
cvs rdiff -u -r1.46.2.2 -r1.46.2.2.6.1 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1.2.60 -r1.1.2.61 src/doc/CHANGES-7.1.3

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

Modified files:

Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.41.2.3 src/distrib/sets/lists/modules/md.amd64:1.41.2.3.6.1
--- src/distrib/sets/lists/modules/md.amd64:1.41.2.3	Sat Mar 21 17:11:35 2015
+++ src/distrib/sets/lists/modules/md.amd64	Thu Oct 31 01:54:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.41.2.3 2015/03/21 17:11:35 snj Exp $
+# $NetBSD: md.amd64,v 1.41.2.3.6.1 2019/10/31 01:54:21 martin Exp $
 #
 # NOTE that there are two sets of files here:
 # @MODULEDIR@ and amd64-xen
@@ -292,8 +292,8 @@
 ./stand/amd64-xen/@OSRELEASE@/modules/ffs/ffs.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/filecorebase-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/filecore/filecore.kmod		base-kernel-modules	kmod,compatmodules
-./stand/amd64-xen/@OSRELEASE@/modules/filemonbase-kernel-modules	kmod,compatmodules
-./stand/amd64-xen/@OSRELEASE@/modules/filemon/filemon.kmod		base-kernel-modules	kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/filemonbase-obsolete		obsolete
+./stand/amd64-xen/@OSRELEASE@/modules/filemon/filemon.kmod		base-obsolete		obsolete
 ./stand/amd64-xen/@OSRELEASE@/modules/finsiobase-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/finsio/finsio.kmod		base-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/flashbase-kernel-modules	kmod,compatmodules

Index: src/distrib/sets/lists/modules/md.evbppc.powerpc
diff -u src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1 src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1.6.1
--- src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1	Sat Mar 21 17:11:35 2015
+++ src/distrib/sets/lists/modules/md.evbppc.powerpc	Thu Oct 31 01:54:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbppc.powerpc,v 1.3.4.1 2015/03/21 17:11:35 snj Exp $
+# $NetBSD: md.evbppc.powerpc,v 1.3.4.1.6.1 2019/10/31 01:54:21 martin Exp $
 ./stand/powerpc-4xx			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@		base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules	base-kernel-modules	kmod,compatmodules
@@ -70,8 +70,8 @@
 ./stand/powerpc-4xx/@OSRELEASE@/modules/ffs/ffs.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/filecore			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/filecore/filecore.kmod		base-kernel-modules	kmod,compatmodules
-./stand/powerpc-4xx/@OSRELEASE@/modules/filemonbase-kernel-modules	kmod,compatmodules
-./stand/powerpc-4xx/@OSRELEASE@/modules/filemon/filemon.kmod		base-kernel-modules	kmod,compatmodules
+./stand/powerpc-4xx/@OSRELEASE@/modules/filemonbase-obsolete		obsolete
+./stand/powerpc-4xx/@OSRELEASE@/modules/filemon/filemon.kmod		base-obsolete		obsolete
 ./stand/powerpc-4xx/@OSRELEASE@/modules/flashbase-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/flash/flash.kmod		base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/fssbase-kernel-modules	kmod,compatmodules
@@ -307,8 +307,8 @@
 ./stand/powerpc-booke/@OSRELEASE@/modules/ffs/ffs.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/filecorebase-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/filecore/filecore.kmod		base-kernel-modules	kmod,compatmodules
-./stand/powerpc-booke/@OSRELEASE@/modules/filemonbase-kernel-modules	kmod,compatmodules
-./stand/powerpc-booke/@OSRELEASE@/modules/filemon/filemon.kmod		base-kernel-modules	kmod,compatmodules
+./stand/powerpc-booke/@OSRELEASE@/modules/filemonbase-obsolete		obsolete
+./stand/powerpc-booke/@OSRELEASE@/modules/filemon/filemon.kmod		base-obsolete		obsolete
 ./stand/powerpc-booke/@OSRELEASE@/modules/flashbase-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/flash/flash.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/fssbase-kernel-modules	kmod,compatmodules

Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.46.2.2 

CVS commit: [netbsd-7] src

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Oct 31 01:53:00 UTC 2019

Modified Files:
src/distrib/sets/lists/modules [netbsd-7]: md.amd64 md.evbppc.powerpc
md.i386
src/doc [netbsd-7]: CHANGES-7.3

Log Message:
Fix set lists for ticket #1710


To generate a diff of this commit:
cvs rdiff -u -r1.41.2.3 -r1.41.2.4 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.3.4.1 -r1.3.4.2 \
src/distrib/sets/lists/modules/md.evbppc.powerpc
cvs rdiff -u -r1.46.2.2 -r1.46.2.3 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-7.3

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/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.41.2.3 src/distrib/sets/lists/modules/md.amd64:1.41.2.4
--- src/distrib/sets/lists/modules/md.amd64:1.41.2.3	Sat Mar 21 17:11:35 2015
+++ src/distrib/sets/lists/modules/md.amd64	Thu Oct 31 01:53:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.41.2.3 2015/03/21 17:11:35 snj Exp $
+# $NetBSD: md.amd64,v 1.41.2.4 2019/10/31 01:53:00 martin Exp $
 #
 # NOTE that there are two sets of files here:
 # @MODULEDIR@ and amd64-xen
@@ -292,8 +292,8 @@
 ./stand/amd64-xen/@OSRELEASE@/modules/ffs/ffs.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/filecorebase-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/filecore/filecore.kmod		base-kernel-modules	kmod,compatmodules
-./stand/amd64-xen/@OSRELEASE@/modules/filemonbase-kernel-modules	kmod,compatmodules
-./stand/amd64-xen/@OSRELEASE@/modules/filemon/filemon.kmod		base-kernel-modules	kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/filemonbase-obsolete		obsolete
+./stand/amd64-xen/@OSRELEASE@/modules/filemon/filemon.kmod		base-obsolete		obsolete
 ./stand/amd64-xen/@OSRELEASE@/modules/finsiobase-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/finsio/finsio.kmod		base-kernel-modules	kmod,compatmodules
 ./stand/amd64-xen/@OSRELEASE@/modules/flashbase-kernel-modules	kmod,compatmodules

Index: src/distrib/sets/lists/modules/md.evbppc.powerpc
diff -u src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1 src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.2
--- src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1	Sat Mar 21 17:11:35 2015
+++ src/distrib/sets/lists/modules/md.evbppc.powerpc	Thu Oct 31 01:53:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbppc.powerpc,v 1.3.4.1 2015/03/21 17:11:35 snj Exp $
+# $NetBSD: md.evbppc.powerpc,v 1.3.4.2 2019/10/31 01:53:00 martin Exp $
 ./stand/powerpc-4xx			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@		base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules	base-kernel-modules	kmod,compatmodules
@@ -70,8 +70,8 @@
 ./stand/powerpc-4xx/@OSRELEASE@/modules/ffs/ffs.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/filecore			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/filecore/filecore.kmod		base-kernel-modules	kmod,compatmodules
-./stand/powerpc-4xx/@OSRELEASE@/modules/filemonbase-kernel-modules	kmod,compatmodules
-./stand/powerpc-4xx/@OSRELEASE@/modules/filemon/filemon.kmod		base-kernel-modules	kmod,compatmodules
+./stand/powerpc-4xx/@OSRELEASE@/modules/filemonbase-obsolete		obsolete
+./stand/powerpc-4xx/@OSRELEASE@/modules/filemon/filemon.kmod		base-obsolete		obsolete
 ./stand/powerpc-4xx/@OSRELEASE@/modules/flashbase-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/flash/flash.kmod		base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/fssbase-kernel-modules	kmod,compatmodules
@@ -307,8 +307,8 @@
 ./stand/powerpc-booke/@OSRELEASE@/modules/ffs/ffs.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/filecorebase-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/filecore/filecore.kmod		base-kernel-modules	kmod,compatmodules
-./stand/powerpc-booke/@OSRELEASE@/modules/filemonbase-kernel-modules	kmod,compatmodules
-./stand/powerpc-booke/@OSRELEASE@/modules/filemon/filemon.kmod		base-kernel-modules	kmod,compatmodules
+./stand/powerpc-booke/@OSRELEASE@/modules/filemonbase-obsolete		obsolete
+./stand/powerpc-booke/@OSRELEASE@/modules/filemon/filemon.kmod		base-obsolete		obsolete
 ./stand/powerpc-booke/@OSRELEASE@/modules/flashbase-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/flash/flash.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/fssbase-kernel-modules	kmod,compatmodules

Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.46.2.2 src/distrib/sets/lists/modules/md.i386:1.46.2.3
--- 

CVS commit: [netbsd-7] src

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Oct 31 01:53:00 UTC 2019

Modified Files:
src/distrib/sets/lists/modules [netbsd-7]: md.amd64 md.evbppc.powerpc
md.i386
src/doc [netbsd-7]: CHANGES-7.3

Log Message:
Fix set lists for ticket #1710


To generate a diff of this commit:
cvs rdiff -u -r1.41.2.3 -r1.41.2.4 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.3.4.1 -r1.3.4.2 \
src/distrib/sets/lists/modules/md.evbppc.powerpc
cvs rdiff -u -r1.46.2.2 -r1.46.2.3 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-7.3

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

2019-10-30 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Thu Oct 31 01:25:56 UTC 2019

Added Files:
src/sys/arch/arm/dts: omap3-beagle-xm.dts

Log Message:
Set the stdout-path on xM like Ti OMAP3 BeagleBoard


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/omap3-beagle-xm.dts

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

2019-10-30 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Thu Oct 31 01:25:56 UTC 2019

Added Files:
src/sys/arch/arm/dts: omap3-beagle-xm.dts

Log Message:
Set the stdout-path on xM like Ti OMAP3 BeagleBoard


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/omap3-beagle-xm.dts

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

Added files:

Index: src/sys/arch/arm/dts/omap3-beagle-xm.dts
diff -u /dev/null src/sys/arch/arm/dts/omap3-beagle-xm.dts:1.1
--- /dev/null	Thu Oct 31 01:25:56 2019
+++ src/sys/arch/arm/dts/omap3-beagle-xm.dts	Thu Oct 31 01:25:56 2019
@@ -0,0 +1,38 @@
+/* $NetBSD: omap3-beagle-xm.dts,v 1.1 2019/10/31 01:25:56 sevan Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Sevan Janiyan 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include_next "omap3-beagle-xm.dts"
+
+/ {
+	chosen {
+		stdout-path = 
+	};
+};



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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Thu Oct 31 01:05:06 UTC 2019

Modified Files:
src/sys/arch/arm/ti: omap3_cm.c

Log Message:
Remove DPLL5 init ported from old omap code, it is not required


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/omap3_cm.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/ti/omap3_cm.c
diff -u src/sys/arch/arm/ti/omap3_cm.c:1.2 src/sys/arch/arm/ti/omap3_cm.c:1.3
--- src/sys/arch/arm/ti/omap3_cm.c:1.2	Wed Oct 30 21:41:40 2019
+++ src/sys/arch/arm/ti/omap3_cm.c	Thu Oct 31 01:05:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_cm.c,v 1.2 2019/10/30 21:41:40 jmcneill Exp $ */
+/* $NetBSD: omap3_cm.c,v 1.3 2019/10/31 01:05:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: omap3_cm.c,v 1.2 2019/10/30 21:41:40 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: omap3_cm.c,v 1.3 2019/10/31 01:05:06 jmcneill Exp $");
 
 #include 
 #include 
@@ -43,7 +43,6 @@ __KERNEL_RCSID(1, "$NetBSD: omap3_cm.c,v
 #define	CM_CORE1_BASE		0x0a00
 #define	CM_CORE3_BASE		0x0a08
 #define	CM_WKUP_BASE		0x0c00
-#define	CM_CLK_CTRL_REG_BASE	0x0d00
 #define	CM_PER_BASE		0x1000
 #define	CM_USBHOST_BASE		0x1400
 
@@ -52,12 +51,6 @@ __KERNEL_RCSID(1, "$NetBSD: omap3_cm.c,v
 #define	CM_AUTOIDLE		0x30
 #define	CM_CLKSEL		0x40
 
-#define	CM_CLKEN2_PLL		0x04
-#define	CM_IDLEST2_CKGEN	0x24
-#define	CM_AUTOIDLE2_PLL	0x34
-#define	CM_CLKSEL4_PLL		0x4c
-#define	CM_CLKSEL5_PLL		0x50
-
 static int omap3_cm_match(device_t, cfdata_t, void *);
 static void omap3_cm_attach(device_t, device_t, void *);
 
@@ -173,15 +166,6 @@ omap3_cm_initclocks(struct ti_prcm_softc
 	val |= __BIT(0);	/* CLKSEL_GPT2  0x1: source is SYS_CLK */
 	val |= __BIT(1);	/* CLKSEL_GPT3  0x1: source is SYS_CLK */
 	PRCM_WRITE(sc, CM_PER_BASE + CM_CLKSEL, val);
-
-	/* Enable DPLL5  */
-	const u_int m = 443, n = 11, m2 = 4;
-	PRCM_WRITE(sc, CM_CLK_CTRL_REG_BASE + CM_CLKEN2_PLL, (0x4 << 4) | 0x7);
-	PRCM_WRITE(sc, CM_CLK_CTRL_REG_BASE + CM_CLKSEL4_PLL, (m << 8) | n);
-	PRCM_WRITE(sc, CM_CLK_CTRL_REG_BASE + CM_CLKSEL5_PLL, m2);
-	PRCM_WRITE(sc, CM_CLK_CTRL_REG_BASE + CM_AUTOIDLE2_PLL, 1);
-	while ((PRCM_READ(sc, CM_CLK_CTRL_REG_BASE + CM_IDLEST2_CKGEN) & 1) == 0)
-		delay(100);
 }
 
 static int



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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Thu Oct 31 01:05:06 UTC 2019

Modified Files:
src/sys/arch/arm/ti: omap3_cm.c

Log Message:
Remove DPLL5 init ported from old omap code, it is not required


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

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



CVS commit: src/etc/etc.evbarm

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 22:28:17 UTC 2019

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Remove IGEPV2 and OVERO kernels from build


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/etc/etc.evbarm/Makefile.inc

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



CVS commit: src/etc/etc.evbarm

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 22:31:06 UTC 2019

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Revert previous for now.


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/etc/etc.evbarm/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/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.110 src/etc/etc.evbarm/Makefile.inc:1.111
--- src/etc/etc.evbarm/Makefile.inc:1.110	Wed Oct 30 22:28:16 2019
+++ src/etc/etc.evbarm/Makefile.inc	Wed Oct 30 22:31:06 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.110 2019/10/30 22:28:16 jmcneill Exp $
+#	$NetBSD: Makefile.inc,v 1.111 2019/10/30 22:31:06 jmcneill Exp $
 #
 #	etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -88,6 +88,7 @@ EVBARM_BOARDS.armv7+=		CUBOX
 EVBARM_BOARDS.armv7hf+= 	CUBOX
 EVBARM_BOARDS.armv7+=		CUBOX-I
 EVBARM_BOARDS.armv7hf+= 	CUBOX-I
+#EVBARM_BOARDS.armv7+=		IGEPV2
 EVBARM_BOARDS.armv7+=		IMX6UL-STARTER
 EVBARM_BOARDS.armv7hf+=		IMX6UL-STARTER
 EVBARM_BOARDS.armv7+=		KOBO
@@ -99,6 +100,8 @@ EVBARM_BOARDS.armv7+=		NETWALKER
 EVBARM_BOARDS.armv7hf+=		NETWALKER
 EVBARM_BOARDS.armv7+=		OMAP5EVM
 EVBARM_BOARDS.armv7hf+=		OMAP5EVM
+EVBARM_BOARDS.armv7+=		OVERO
+EVBARM_BOARDS.armv7hf+=		OVERO
 EVBARM_BOARDS.armv7+=		PANDABOARD
 EVBARM_BOARDS.armv7hf+= 	PANDABOARD
 



CVS commit: src/etc/etc.evbarm

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 22:31:06 UTC 2019

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Revert previous for now.


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/etc/etc.evbarm/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/arch/evbarm/conf

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 22:25:44 UTC 2019

Modified Files:
src/sys/arch/evbarm/conf: README.evbarm
Removed Files:
src/sys/arch/evbarm/conf: DEVKIT8000

Log Message:
Remove DEVKIT8000 kernel (GENERIC should work now)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/DEVKIT8000
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/README.evbarm

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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 22:25:44 UTC 2019

Modified Files:
src/sys/arch/evbarm/conf: README.evbarm
Removed Files:
src/sys/arch/evbarm/conf: DEVKIT8000

Log Message:
Remove DEVKIT8000 kernel (GENERIC should work now)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/DEVKIT8000
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/README.evbarm

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/README.evbarm
diff -u src/sys/arch/evbarm/conf/README.evbarm:1.23 src/sys/arch/evbarm/conf/README.evbarm:1.24
--- src/sys/arch/evbarm/conf/README.evbarm:1.23	Wed Oct 30 21:46:06 2019
+++ src/sys/arch/evbarm/conf/README.evbarm	Wed Oct 30 22:25:44 2019
@@ -1,4 +1,4 @@
-$NetBSD: README.evbarm,v 1.23 2019/10/30 21:46:06 jmcneill Exp $
+$NetBSD: README.evbarm,v 1.24 2019/10/30 22:25:44 jmcneill Exp $
 
 config		date		boards
 ---
@@ -9,7 +9,6 @@ BCM5301X	2012/08/31	Broadcom BCM95301X e
 BEAGLEBOARDXM	2008/08/20	TI DM37xx BeagleBoard-XM
 CUBOX		2017/01/07	SolidRun Cubox
 CP3100		2006/11/08	Certance IOP321 CP-3100
-DEVKIT8000	2010/09/08	Embest OMAP3530 DevKit8000 eval Kit 
 DNS323		2010/10/02	D-Link DNS-323 Marvell SoC based NAS
 DUOVERO		2016/10/15	Gumstix Inc. DuoVero COMS boards
 GEMINI		2008/10/24	Cortina Systems SL3516 eval board



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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 22:21:06 UTC 2019

Modified Files:
src/sys/arch/arm/ti: omap3_platform.c

Log Message:
Fix PRM_RSTCTRL_RST_DPLL3 definition, now reset works.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/omap3_platform.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/ti/omap3_platform.c
diff -u src/sys/arch/arm/ti/omap3_platform.c:1.1 src/sys/arch/arm/ti/omap3_platform.c:1.2
--- src/sys/arch/arm/ti/omap3_platform.c:1.1	Tue Oct 29 22:19:13 2019
+++ src/sys/arch/arm/ti/omap3_platform.c	Wed Oct 30 22:21:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_platform.c,v 1.1 2019/10/29 22:19:13 jmcneill Exp $ */
+/* $NetBSD: omap3_platform.c,v 1.2 2019/10/30 22:21:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill 
@@ -30,7 +30,7 @@
 #include "opt_console.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.1 2019/10/29 22:19:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.2 2019/10/30 22:21:06 jmcneill Exp $");
 
 #include 
 #include 
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap3_platfo
 #define	OMAP3_PRCM_BASE		0x48306000
 #define	OMAP3_PRCM_GR_BASE	(OMAP3_PRCM_BASE + 0x1200)
 #define	 PRM_RSTCTRL		(OMAP3_PRCM_GR_BASE + 0x50)
-#define	  PRM_RSTCTRL_RST_DPLL3	__BIT(1)
+#define	  PRM_RSTCTRL_RST_DPLL3	__BIT(2)
 
 #define	OMAP3_32KTIMER_BASE	0x4832
 #define	 REG_32KSYNCNT_CR	(OMAP3_32KTIMER_BASE + 0x10)



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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 22:21:06 UTC 2019

Modified Files:
src/sys/arch/arm/ti: omap3_platform.c

Log Message:
Fix PRM_RSTCTRL_RST_DPLL3 definition, now reset works.


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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:46:06 UTC 2019

Modified Files:
src/sys/arch/evbarm/conf: README.evbarm
Removed Files:
src/sys/arch/evbarm/conf: BEAGLEBOARD BEAGLEBOARD_INSTALL

Log Message:
Remove BEAGLEBOARD kernel (supported by GENERIC now)


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r0 src/sys/arch/evbarm/conf/BEAGLEBOARD
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/BEAGLEBOARD_INSTALL
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/README.evbarm

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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:46:06 UTC 2019

Modified Files:
src/sys/arch/evbarm/conf: README.evbarm
Removed Files:
src/sys/arch/evbarm/conf: BEAGLEBOARD BEAGLEBOARD_INSTALL

Log Message:
Remove BEAGLEBOARD kernel (supported by GENERIC now)


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r0 src/sys/arch/evbarm/conf/BEAGLEBOARD
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/BEAGLEBOARD_INSTALL
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/README.evbarm

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/README.evbarm
diff -u src/sys/arch/evbarm/conf/README.evbarm:1.22 src/sys/arch/evbarm/conf/README.evbarm:1.23
--- src/sys/arch/evbarm/conf/README.evbarm:1.22	Mon Oct 28 22:24:56 2019
+++ src/sys/arch/evbarm/conf/README.evbarm	Wed Oct 30 21:46:06 2019
@@ -1,4 +1,4 @@
-$NetBSD: README.evbarm,v 1.22 2019/10/28 22:24:56 jmcneill Exp $
+$NetBSD: README.evbarm,v 1.23 2019/10/30 21:46:06 jmcneill Exp $
 
 config		date		boards
 ---
@@ -6,7 +6,6 @@ ADI_BRH		2003/01/25	ADI Eng. Big Read He
 ARMADILLO210	2006/02/06	Atmark Techno Armadillo-210
 ARMADILLO9	2005/11/13	Atmark Techno Armadillo-9
 BCM5301X	2012/08/31	Broadcom BCM95301X evaluation/reference board
-BEAGLEBOARD	2008/10/22	TI OMAP3530 BeagleBoard
 BEAGLEBOARDXM	2008/08/20	TI DM37xx BeagleBoard-XM
 CUBOX		2017/01/07	SolidRun Cubox
 CP3100		2006/11/08	Certance IOP321 CP-3100



CVS commit: src/etc/etc.evbarm

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:45:25 UTC 2019

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Remove BEAGLEBOARD kernel from list of kernels to build


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/etc/etc.evbarm/Makefile.inc

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



CVS commit: src/etc/etc.evbarm

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:45:25 UTC 2019

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Remove BEAGLEBOARD kernel from list of kernels to build


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/etc/etc.evbarm/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/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.108 src/etc/etc.evbarm/Makefile.inc:1.109
--- src/etc/etc.evbarm/Makefile.inc:1.108	Mon Oct 28 22:23:51 2019
+++ src/etc/etc.evbarm/Makefile.inc	Wed Oct 30 21:45:25 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.108 2019/10/28 22:23:51 jmcneill Exp $
+#	$NetBSD: Makefile.inc,v 1.109 2019/10/30 21:45:25 jmcneill Exp $
 #
 #	etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -82,8 +82,6 @@ EVBARM_BOARDS.armv7+=		BCM5301X
 EVBARM_BOARDS.armv7hf+= 	BCM5301X
 #EVBARM_BOARDS.armv7+=		BCM56340
 #EVBARM_BOARDS.armv7hf+= 	BCM56340
-KERNEL_SETS.armv7+=		BEAGLEBOARD
-KERNEL_SETS.armv7hf+= 		BEAGLEBOARD
 EVBARM_BOARDS.armv7+=		BEAGLEBOARDXM
 EVBARM_BOARDS.armv7hf+= 	BEAGLEBOARDXM
 EVBARM_BOARDS.armv7+=		CUBOX



CVS commit: src/distrib/utils/embedded/conf

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:43:42 UTC 2019

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf

Log Message:
Move omap3 dtb files to /boot/dtb


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/embedded/conf/armv7.conf

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

Modified files:

Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.38 src/distrib/utils/embedded/conf/armv7.conf:1.39
--- src/distrib/utils/embedded/conf/armv7.conf:1.38	Wed Oct 30 14:34:30 2019
+++ src/distrib/utils/embedded/conf/armv7.conf	Wed Oct 30 21:43:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.38 2019/10/30 14:34:30 martin Exp $
+# $NetBSD: armv7.conf,v 1.39 2019/10/30 21:43:42 jmcneill Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -143,7 +143,7 @@ populate() {
 	for k in ${kernels}; do
 		tgt="$(basename ${k} | sed 's/\.gz$//')"
 		case "${tgt}" in
-		sun*.dtb|am335x-*.dtb|meson8b-*.dtb|tegra*.dtb|vexpress*.dtb)
+		sun*.dtb|am335x-*.dtb|omap3-*.dtb|meson8b-*.dtb|tegra*.dtb|vexpress*.dtb)
 			pfx="dtb/";;
 		*)
 			pfx=;;



CVS commit: src/distrib/utils/embedded/conf

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:43:42 UTC 2019

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf

Log Message:
Move omap3 dtb files to /boot/dtb


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/embedded/conf/armv7.conf

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



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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:41:40 UTC 2019

Modified Files:
src/sys/arch/arm/ti: files.ti omap3_cm.c ti_prcm.h
Added Files:
src/sys/arch/arm/ti: ti_ehci.c ti_usb.c ti_usbtll.c

Log Message:
Add OMAP3 USB support.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/ti/files.ti
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/omap3_cm.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/ti/ti_ehci.c \
src/sys/arch/arm/ti/ti_usb.c src/sys/arch/arm/ti/ti_usbtll.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_prcm.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/ti/files.ti
diff -u src/sys/arch/arm/ti/files.ti:1.16 src/sys/arch/arm/ti/files.ti:1.17
--- src/sys/arch/arm/ti/files.ti:1.16	Tue Oct 29 22:19:13 2019
+++ src/sys/arch/arm/ti/files.ti	Wed Oct 30 21:41:40 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: files.ti,v 1.16 2019/10/29 22:19:13 jmcneill Exp $
+#	$NetBSD: files.ti,v 1.17 2019/10/30 21:41:40 jmcneill Exp $
 #
 
 file	arch/arm/ti/ti_cpufreq.c	soc_ti
@@ -88,6 +88,17 @@ device	tiotg { } : fdt
 attach	tiotg at fdt with ti_otg
 file	arch/arm/ti/ti_otg.c		ti_otg
 
+device	tiusb { } : fdt
+attach	tiusb at fdt with ti_usb
+file	arch/arm/ti/ti_usb.c		ti_usb
+
+device	tiusbtll
+attach	tiusbtll at fdt with ti_usbtll
+file	arch/arm/ti/ti_usbtll.c		ti_usbtll
+
+attach	ehci at fdt with ti_ehci
+file	arch/arm/ti/ti_ehci.c		ti_ehci
+
 attach	motg at fdt with ti_motg
 file	arch/arm/ti/ti_motg.c		ti_motg
 

Index: src/sys/arch/arm/ti/omap3_cm.c
diff -u src/sys/arch/arm/ti/omap3_cm.c:1.1 src/sys/arch/arm/ti/omap3_cm.c:1.2
--- src/sys/arch/arm/ti/omap3_cm.c:1.1	Tue Oct 29 22:19:13 2019
+++ src/sys/arch/arm/ti/omap3_cm.c	Wed Oct 30 21:41:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_cm.c,v 1.1 2019/10/29 22:19:13 jmcneill Exp $ */
+/* $NetBSD: omap3_cm.c,v 1.2 2019/10/30 21:41:40 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: omap3_cm.c,v 1.1 2019/10/29 22:19:13 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: omap3_cm.c,v 1.2 2019/10/30 21:41:40 jmcneill Exp $");
 
 #include 
 #include 
@@ -43,11 +43,20 @@ __KERNEL_RCSID(1, "$NetBSD: omap3_cm.c,v
 #define	CM_CORE1_BASE		0x0a00
 #define	CM_CORE3_BASE		0x0a08
 #define	CM_WKUP_BASE		0x0c00
+#define	CM_CLK_CTRL_REG_BASE	0x0d00
 #define	CM_PER_BASE		0x1000
 #define	CM_USBHOST_BASE		0x1400
 
 #define	CM_FCLKEN		0x00
 #define	CM_ICLKEN		0x10
+#define	CM_AUTOIDLE		0x30
+#define	CM_CLKSEL		0x40
+
+#define	CM_CLKEN2_PLL		0x04
+#define	CM_IDLEST2_CKGEN	0x24
+#define	CM_AUTOIDLE2_PLL	0x34
+#define	CM_CLKSEL4_PLL		0x4c
+#define	CM_CLKSEL5_PLL		0x50
 
 static int omap3_cm_match(device_t, cfdata_t, void *);
 static void omap3_cm_attach(device_t, device_t, void *);
@@ -71,19 +80,25 @@ omap3_cm_hwmod_enable(struct ti_prcm_sof
 		val &= ~tc->u.hwmod.mask;
 	PRCM_WRITE(sc, tc->u.hwmod.reg + CM_ICLKEN, val);
 
+	if (tc->u.hwmod.flags & TI_HWMOD_DISABLE_AUTOIDLE) {
+		val = PRCM_READ(sc, tc->u.hwmod.reg + CM_AUTOIDLE);
+		val &= ~tc->u.hwmod.mask;
+		PRCM_WRITE(sc, tc->u.hwmod.reg + CM_AUTOIDLE, val);
+	}
+
 	return 0;
 }
 
-#define	OMAP3_CM_HWMOD_CORE1(_name, _bit, _parent)	\
-	TI_PRCM_HWMOD_MASK((_name), CM_CORE1_BASE, __BIT(_bit), (_parent), omap3_cm_hwmod_enable)
-#define	OMAP3_CM_HWMOD_CORE3(_name, _bit, _parent)	\
-	TI_PRCM_HWMOD_MASK((_name), CM_CORE3_BASE, __BIT(_bit), (_parent), omap3_cm_hwmod_enable)
-#define	OMAP3_CM_HWMOD_WKUP(_name, _bit, _parent)	\
-	TI_PRCM_HWMOD_MASK((_name), CM_WKUP_BASE, __BIT(_bit), (_parent), omap3_cm_hwmod_enable)
-#define	OMAP3_CM_HWMOD_PER(_name, _bit, _parent)	\
-	TI_PRCM_HWMOD_MASK((_name), CM_PER_BASE, __BIT(_bit), (_parent), omap3_cm_hwmod_enable)
-#define	OMAP3_CM_HWMOD_USBHOST(_name, _mask, _parent)	\
-	TI_PRCM_HWMOD_MASK((_name), CM_USBHOST_BASE, (_mask), (_parent), omap3_cm_hwmod_enable)
+#define	OMAP3_CM_HWMOD_CORE1(_name, _bit, _parent, _flags)	\
+	TI_PRCM_HWMOD_MASK((_name), CM_CORE1_BASE, __BIT(_bit), (_parent), omap3_cm_hwmod_enable, (_flags))
+#define	OMAP3_CM_HWMOD_CORE3(_name, _bit, _parent, _flags)	\
+	TI_PRCM_HWMOD_MASK((_name), CM_CORE3_BASE, __BIT(_bit), (_parent), omap3_cm_hwmod_enable, (_flags))
+#define	OMAP3_CM_HWMOD_WKUP(_name, _bit, _parent, _flags)	\
+	TI_PRCM_HWMOD_MASK((_name), CM_WKUP_BASE, __BIT(_bit), (_parent), omap3_cm_hwmod_enable, (_flags))
+#define	OMAP3_CM_HWMOD_PER(_name, _bit, _parent, _flags)	\
+	TI_PRCM_HWMOD_MASK((_name), CM_PER_BASE, __BIT(_bit), (_parent), omap3_cm_hwmod_enable, (_flags))
+#define	OMAP3_CM_HWMOD_USBHOST(_name, _bit, _parent, _flags)	\
+	TI_PRCM_HWMOD_MASK((_name), CM_USBHOST_BASE, __BIT(_bit), (_parent), omap3_cm_hwmod_enable, (_flags))
 
 static const char * const compatible[] = {
 	"ti,omap3-cm",
@@ -96,59 +111,79 @@ CFATTACH_DECL_NEW(omap3_cm, sizeof(struc
 static struct ti_prcm_clk omap3_cm_clks[] = {
 	/* XXX until we get a proper clock 

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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:41:40 UTC 2019

Modified Files:
src/sys/arch/arm/ti: files.ti omap3_cm.c ti_prcm.h
Added Files:
src/sys/arch/arm/ti: ti_ehci.c ti_usb.c ti_usbtll.c

Log Message:
Add OMAP3 USB support.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/ti/files.ti
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/omap3_cm.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/ti/ti_ehci.c \
src/sys/arch/arm/ti/ti_usb.c src/sys/arch/arm/ti/ti_usbtll.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_prcm.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/arm/ti

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:40:04 UTC 2019

Modified Files:
src/sys/arch/arm/ti: am3_prcm.c ti_omaptimer.c

Log Message:
Use the hwmod clk to get the timer rate and explicitly enable the
timecounter timer.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ti/am3_prcm.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_omaptimer.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/ti/am3_prcm.c
diff -u src/sys/arch/arm/ti/am3_prcm.c:1.7 src/sys/arch/arm/ti/am3_prcm.c:1.8
--- src/sys/arch/arm/ti/am3_prcm.c:1.7	Mon Oct 28 23:57:59 2019
+++ src/sys/arch/arm/ti/am3_prcm.c	Wed Oct 30 21:40:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: am3_prcm.c,v 1.7 2019/10/28 23:57:59 jmcneill Exp $ */
+/* $NetBSD: am3_prcm.c,v 1.8 2019/10/30 21:40:04 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.7 2019/10/28 23:57:59 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.8 2019/10/30 21:40:04 jmcneill Exp $");
 
 #include 
 #include 
@@ -86,6 +86,7 @@ CFATTACH_DECL_NEW(am3_prcm, sizeof(struc
 static struct ti_prcm_clk am3_prcm_clks[] = {
 	/* XXX until we get a proper clock tree */
 	TI_PRCM_FIXED("FIXED_32K", 32768),
+	TI_PRCM_FIXED("FIXED_24MHZ", 2400),
 	TI_PRCM_FIXED("FIXED_48MHZ", 4800),
 	TI_PRCM_FIXED("FIXED_96MHZ", 9600),
 	TI_PRCM_FIXED_FACTOR("PERIPH_CLK", 1, 1, "FIXED_48MHZ"),
@@ -107,12 +108,12 @@ static struct ti_prcm_clk am3_prcm_clks[
 	AM3_PRCM_HWMOD_PER("gpio4", 0xb4, "PERIPH_CLK"),
 
 	AM3_PRCM_HWMOD_WKUP("timer0", 0x10, "FIXED_32K"),
-	AM3_PRCM_HWMOD_PER("timer2", 0x80, "PERIPH_CLK"),
-	AM3_PRCM_HWMOD_PER("timer3", 0x84, "PERIPH_CLK"),
-	AM3_PRCM_HWMOD_PER("timer4", 0x88, "PERIPH_CLK"),
-	AM3_PRCM_HWMOD_PER("timer5", 0xec, "PERIPH_CLK"),
-	AM3_PRCM_HWMOD_PER("timer6", 0xf0, "PERIPH_CLK"),
-	AM3_PRCM_HWMOD_PER("timer7", 0x7c, "PERIPH_CLK"),
+	AM3_PRCM_HWMOD_PER("timer2", 0x80, "FIXED_24MHZ"),
+	AM3_PRCM_HWMOD_PER("timer3", 0x84, "FIXED_24MHZ"),
+	AM3_PRCM_HWMOD_PER("timer4", 0x88, "FIXED_24MHZ"),
+	AM3_PRCM_HWMOD_PER("timer5", 0xec, "FIXED_24MHZ"),
+	AM3_PRCM_HWMOD_PER("timer6", 0xf0, "FIXED_24MHZ"),
+	AM3_PRCM_HWMOD_PER("timer7", 0x7c, "FIXED_24MHZ"),
 
 	AM3_PRCM_HWMOD_PER("mmc0", 0x3c, "MMC_CLK"),
 	AM3_PRCM_HWMOD_PER("mmc1", 0xf4, "MMC_CLK"),

Index: src/sys/arch/arm/ti/ti_omaptimer.c
diff -u src/sys/arch/arm/ti/ti_omaptimer.c:1.3 src/sys/arch/arm/ti/ti_omaptimer.c:1.4
--- src/sys/arch/arm/ti/ti_omaptimer.c:1.3	Tue Oct 29 22:19:13 2019
+++ src/sys/arch/arm/ti/ti_omaptimer.c	Wed Oct 30 21:40:04 2019
@@ -1,7 +1,7 @@
-/*	$NetBSD: ti_omaptimer.c,v 1.3 2019/10/29 22:19:13 jmcneill Exp $	*/
+/*	$NetBSD: ti_omaptimer.c,v 1.4 2019/10/30 21:40:04 jmcneill Exp $	*/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_omaptimer.c,v 1.3 2019/10/29 22:19:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_omaptimer.c,v 1.4 2019/10/30 21:40:04 jmcneill Exp $");
 
 #include 
 #include 
@@ -125,6 +125,16 @@ omaptimer_get_timecount(struct timecount
 	return RD4(sc, TIMER_TCRR);
 }
 
+static void
+omaptimer_enable(struct omaptimer_softc *sc, uint32_t value)
+{
+	/* Configure the timer */
+	WR4(sc, TIMER_TLDR, value);
+	WR4(sc, TIMER_TCRR, value);
+	WR4(sc, TIMER_TIER, 0);
+	WR4(sc, TIMER_TCLR, TCLR_ST | TCLR_AR);
+}
+
 static int
 omaptimer_match(device_t parent, cfdata_t match, void *aux)
 {
@@ -141,8 +151,10 @@ omaptimer_attach(device_t parent, device
 	const int phandle = faa->faa_phandle;
 	struct timecounter *tc = >sc_tc;
 	const char *modname;
+	struct clk *hwmod;
 	bus_addr_t addr;
 	bus_size_t size;
+	u_int rate;
 
 	if (fdtbus_get_reg(phandle, 0, , ) != 0) {
 		aprint_error(": couldn't get registers\n");
@@ -159,7 +171,8 @@ omaptimer_attach(device_t parent, device
 		return;
 	}
 
-	if (ti_prcm_enable_hwmod(phandle, 0) != 0) {
+	hwmod = ti_prcm_get_hwmod(phandle, 0);
+	if (hwmod == NULL || clk_enable(hwmod) != 0) {
 		aprint_error(": couldn't enable module\n");
 		return;
 	}
@@ -171,22 +184,23 @@ omaptimer_attach(device_t parent, device
 	aprint_naive("\n");
 	aprint_normal(": Timer (%s)\n", modname);
 
+	rate = clk_get_rate(hwmod);
+
 	if (strcmp(modname, "timer2") == 0) {
+		omaptimer_enable(sc, 0);
+
 		/* Install timecounter */
 		tc->tc_get_timecount = omaptimer_get_timecount;
 		tc->tc_counter_mask = ~0u;
-		tc->tc_frequency = 2400;
+		tc->tc_frequency = rate;
 		tc->tc_name = modname;
 		tc->tc_quality = 200;
 		tc->tc_priv = sc;
 		tc_init(tc);
+
 	} else if (strcmp(modname, "timer3") == 0) {
-		/* Configure the timer */
-		const uint32_t value = (0x - ((2400UL / hz) - 1));
-		WR4(sc, TIMER_TLDR, value);
-		WR4(sc, TIMER_TCRR, value);
-		WR4(sc, TIMER_TIER, 0);
-		WR4(sc, TIMER_TCLR, TCLR_ST | TCLR_AR);
+		const uint32_t value = (0x - ((rate / hz) - 1));
+		omaptimer_enable(sc, value);
 
 		/* Use this 

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

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:40:04 UTC 2019

Modified Files:
src/sys/arch/arm/ti: am3_prcm.c ti_omaptimer.c

Log Message:
Use the hwmod clk to get the timer rate and explicitly enable the
timecounter timer.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ti/am3_prcm.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_omaptimer.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/i2c

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:38:28 UTC 2019

Modified Files:
src/sys/dev/i2c: files.i2c
Added Files:
src/sys/dev/i2c: twl4030.c

Log Message:
Add driver for TI TWL4030 Power Management IC


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/i2c/files.i2c
cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/twl4030.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/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.101 src/sys/dev/i2c/files.i2c:1.102
--- src/sys/dev/i2c/files.i2c:1.101	Sun Oct 27 20:11:13 2019
+++ src/sys/dev/i2c/files.i2c	Wed Oct 30 21:38:28 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i2c,v 1.101 2019/10/27 20:11:13 jmcneill Exp $
+#	$NetBSD: files.i2c,v 1.102 2019/10/30 21:38:28 jmcneill Exp $
 
 obsolete defflag	opt_i2cbus.h		I2C_SCAN
 define	i2cbus { }
@@ -373,3 +373,8 @@ file	dev/i2c/anxedp.c			anxedp
 device	pcapwm: pwm
 attach	pcapwm at iic
 file	dev/i2c/pca9685.c			pcapwm
+
+# TI TWL4030 Power Management IC
+device	twl
+attach	twl at iic
+file	dev/i2c/twl4030.c			twl

Added files:

Index: src/sys/dev/i2c/twl4030.c
diff -u /dev/null src/sys/dev/i2c/twl4030.c:1.1
--- /dev/null	Wed Oct 30 21:38:28 2019
+++ src/sys/dev/i2c/twl4030.c	Wed Oct 30 21:38:28 2019
@@ -0,0 +1,281 @@
+/* $NetBSD: twl4030.c,v 1.1 2019/10/30 21:38:28 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2019 Jared McNeill 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include 
+__KERNEL_RCSID(0, "$NetBSD: twl4030.c,v 1.1 2019/10/30 21:38:28 jmcneill Exp $");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+#define	TWL_PIN_COUNT	16
+
+/* TWL4030 is a multi-function IC. Each module is at a separate I2C address */
+#define	ADDR_USB	0x00
+#define	ADDR_INT	0x01
+#define	ADDR_AUX	0x02
+#define	ADDR_POWER	0x03
+
+/* GPIO registers */
+#define	GPIOBASE		0x98
+#define	GPIODATAIN(pin)		(GPIOBASE + 0x00 + (pin) / 8)
+#define	GPIODATADIR(pin)	(GPIOBASE + 0x03 + (pin) / 8)
+#define	CLEARGPIODATAOUT(pin)	(GPIOBASE + 0x09 + (pin) / 8)
+#define	SETGPIODATAOUT(pin)	(GPIOBASE + 0x0c + (pin) / 8)
+#define	 PIN_BIT(pin)		__BIT((pin) % 8)
+#define	GPIOPUPDCTR(pin)	(GPIOBASE + 0x13 + (n) / 4)
+#define	 PUPD_BITS(pin)		__BITS((pin) % 4 + 1, (pin) % 4)
+
+struct twl_softc {
+	device_t	sc_dev;
+	i2c_tag_t	sc_i2c;
+	i2c_addr_t	sc_addr;
+	int		sc_phandle;
+
+	int		sc_npins;
+};
+
+struct twl_pin {
+	struct twl_softc	*pin_sc;
+	int			pin_num;
+	int			pin_flags;
+	bool			pin_actlo;
+};
+
+static const struct device_compatible_entry compat_data[] = {
+	{ "ti,twl4030",			0 },
+	{ NULL,0 }
+};
+
+static const char * const gpio_compatible[] = { "ti,twl4030-gpio", NULL };
+
+static uint8_t
+twl_read(struct twl_softc *sc, uint8_t mod, uint8_t reg, int flags)
+{
+	uint8_t val = 0;
+	int error;
+
+	error = iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr + mod,
+	, 1, , 1, flags);
+	if (error != 0)
+		aprint_error_dev(sc->sc_dev, "error reading reg %#x: %d\n", reg, error);
+
+	return val;
+}
+
+static void
+twl_write(struct twl_softc *sc, uint8_t mod, uint8_t reg, uint8_t val, int flags)
+{
+	uint8_t buf[2];
+	int error;
+
+	buf[0] = reg;
+	buf[1] = val;
+
+	error = iic_exec(sc->sc_i2c, I2C_OP_WRITE_WITH_STOP, sc->sc_addr + mod,
+	NULL, 0, buf, 2, flags);
+	if (error != 0)
+		aprint_error_dev(sc->sc_dev, "error writing reg %#x: %d\n", reg, error);
+}
+
+#define	I2C_LOCK(sc)		iic_acquire_bus((sc)->sc_i2c, I2C_F_POLL)
+#define	I2C_UNLOCK(sc)		iic_release_bus((sc)->sc_i2c, I2C_F_POLL)
+
+#define	INT_READ(sc, reg)	

CVS commit: src/sys/dev/fdt

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:37:56 UTC 2019

Modified Files:
src/sys/dev/fdt: files.fdt
Added Files:
src/sys/dev/fdt: usbnopphy.c

Log Message:
Add generic USB PHY driver


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/fdt/files.fdt
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/usbnopphy.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/fdt/files.fdt
diff -u src/sys/dev/fdt/files.fdt:1.46 src/sys/dev/fdt/files.fdt:1.47
--- src/sys/dev/fdt/files.fdt:1.46	Sun Oct 27 15:31:15 2019
+++ src/sys/dev/fdt/files.fdt	Wed Oct 30 21:37:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.46 2019/10/27 15:31:15 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.47 2019/10/30 21:37:56 jmcneill Exp $
 
 include	"external/bsd/libfdt/conf/files.libfdt"
 
@@ -153,3 +153,8 @@ file	dev/fdt/amdccp_fdt.c			amdccp_fdt
 # Arasan SDHCI controller
 attach	sdhc at fdt with arasan_sdhc_fdt
 file	dev/fdt/arasan_sdhc_fdt.c		arasan_sdhc_fdt
+
+# Generic USB PHY
+device	usbnopphy
+attach	usbnopphy at fdt
+file	dev/fdt/usbnopphy.c			usbnopphy

Added files:

Index: src/sys/dev/fdt/usbnopphy.c
diff -u /dev/null src/sys/dev/fdt/usbnopphy.c:1.1
--- /dev/null	Wed Oct 30 21:37:56 2019
+++ src/sys/dev/fdt/usbnopphy.c	Wed Oct 30 21:37:56 2019
@@ -0,0 +1,140 @@
+/* $NetBSD: usbnopphy.c,v 1.1 2019/10/30 21:37:56 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2019 Jared McNeill 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include 
+
+__KERNEL_RCSID(0, "$NetBSD: usbnopphy.c,v 1.1 2019/10/30 21:37:56 jmcneill Exp $");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+static int usbnopphy_match(device_t, cfdata_t, void *);
+static void usbnopphy_attach(device_t, device_t, void *);
+
+static const char * const compatible[] = {
+	"usb-nop-xceiv",
+	NULL
+};
+
+struct usbnopphy_softc {
+	device_t		sc_dev;
+
+	struct clk		*sc_clk;
+	struct fdtbus_regulator *sc_reg;
+	struct fdtbus_gpio_pin	*sc_pin_reset;
+	struct fdtbus_gpio_pin	*sc_pin_vbus_det;
+};
+
+CFATTACH_DECL_NEW(usbnopphy, sizeof(struct usbnopphy_softc),
+	usbnopphy_match, usbnopphy_attach, NULL, NULL);
+
+static void *
+usbnopphy_acquire(device_t dev, const void *data, size_t len)
+{
+	struct usbnopphy_softc * const sc = device_private(dev);
+
+	return sc;
+}
+
+static void
+usbnopphy_release(device_t dev, void *priv)
+{
+}
+
+static int
+usbnopphy_enable(device_t dev, void *priv, bool enable)
+{
+	struct usbnopphy_softc * const sc = device_private(dev);
+	int error;
+
+	if (enable) {
+		if (sc->sc_reg != NULL) {
+			error = fdtbus_regulator_enable(sc->sc_reg);
+			if (error != 0)
+return error;
+		}
+		if (sc->sc_clk != NULL) {
+			error = clk_enable(sc->sc_clk);
+			if (error != 0)
+return error;
+		}
+		if (sc->sc_pin_reset != NULL) {
+			fdtbus_gpio_write(sc->sc_pin_reset, 1);
+			delay(2);
+			fdtbus_gpio_write(sc->sc_pin_reset, 0);
+		}
+	} else {
+		if (sc->sc_pin_reset != NULL)
+			fdtbus_gpio_write(sc->sc_pin_reset, 1);
+		if (sc->sc_reg != NULL)
+			fdtbus_regulator_disable(sc->sc_reg);
+		if (sc->sc_clk != NULL)
+			clk_disable(sc->sc_clk);
+	}
+
+	return 0;
+}
+
+const struct fdtbus_phy_controller_func usbnopphy_funcs = {
+	.acquire = usbnopphy_acquire,
+	.release = usbnopphy_release,
+	.enable = usbnopphy_enable,
+};
+
+static int
+usbnopphy_match(device_t parent, cfdata_t cf, void *aux)
+{
+	struct fdt_attach_args * const faa = aux;
+
+	return of_match_compatible(faa->faa_phandle, compatible);
+}
+
+static void
+usbnopphy_attach(device_t parent, device_t self, void *aux)
+{
+	

CVS commit: src/sys/dev/i2c

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:38:28 UTC 2019

Modified Files:
src/sys/dev/i2c: files.i2c
Added Files:
src/sys/dev/i2c: twl4030.c

Log Message:
Add driver for TI TWL4030 Power Management IC


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/i2c/files.i2c
cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/twl4030.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/fdt

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:37:36 UTC 2019

Modified Files:
src/sys/dev/fdt: fdt_phy.c

Log Message:
Skip xref if it is 0


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/fdt/fdt_phy.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/fdt

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:37:56 UTC 2019

Modified Files:
src/sys/dev/fdt: files.fdt
Added Files:
src/sys/dev/fdt: usbnopphy.c

Log Message:
Add generic USB PHY driver


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/fdt/files.fdt
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/usbnopphy.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/fdt

2019-10-30 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Wed Oct 30 21:37:36 UTC 2019

Modified Files:
src/sys/dev/fdt: fdt_phy.c

Log Message:
Skip xref if it is 0


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/fdt/fdt_phy.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/fdt/fdt_phy.c
diff -u src/sys/dev/fdt/fdt_phy.c:1.5 src/sys/dev/fdt/fdt_phy.c:1.6
--- src/sys/dev/fdt/fdt_phy.c:1.5	Wed Feb 27 16:56:00 2019
+++ src/sys/dev/fdt/fdt_phy.c	Wed Oct 30 21:37:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_phy.c,v 1.5 2019/02/27 16:56:00 jakllsch Exp $ */
+/* $NetBSD: fdt_phy.c,v 1.6 2019/10/30 21:37:36 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdt_phy.c,v 1.5 2019/02/27 16:56:00 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_phy.c,v 1.6 2019/10/30 21:37:36 jmcneill Exp $");
 
 #include 
 #include 
@@ -100,6 +100,10 @@ fdtbus_phy_get_index(int phandle, u_int 
 
 	p = phys;
 	for (n = 0, resid = len; resid > 0; n++) {
+		if (p[0] == 0) {
+			phy_cells = 0;
+			goto next;
+		}
 		const int pc_phandle =
 		fdtbus_get_phandle_from_native(be32toh(p[0]));
 		if (of_getprop_uint32(pc_phandle, "#phy-cells", _cells))
@@ -117,6 +121,7 @@ fdtbus_phy_get_index(int phandle, u_int 
 			}
 			break;
 		}
+next:
 		resid -= (phy_cells + 1) * 4;
 		p += phy_cells + 1;
 	}



CVS commit: src/usr.sbin/postinstall

2019-10-30 Thread Patrick Welche
Module Name:src
Committed By:   prlw1
Date:   Wed Oct 30 20:24:44 UTC 2019

Modified Files:
src/usr.sbin/postinstall: postinstall.in

Log Message:
Add nvmm group.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/postinstall/postinstall.in

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

Modified files:

Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.7 src/usr.sbin/postinstall/postinstall.in:1.8
--- src/usr.sbin/postinstall/postinstall.in:1.7	Tue Sep 24 13:27:39 2019
+++ src/usr.sbin/postinstall/postinstall.in	Wed Oct 30 20:24:44 2019
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall.in,v 1.7 2019/09/24 13:27:39 nakayama Exp $
+# $NetBSD: postinstall.in,v 1.8 2019/10/30 20:24:44 prlw1 Exp $
 #
 # Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1138,7 +1138,7 @@ do_gid()
 	"${SRC_DIR}/etc/group" 14 \
 	named ntpd sshd SKIP _pflogd _rwhod staff _proxy _timedc \
 	_sdpd _httpd _mdnsd _tests _tcpdump _tss _gpio _rtadvd SKIP \
-	_unbound _nsd
+	_unbound _nsd nvmm
 }
 
 #



CVS commit: src/usr.sbin/postinstall

2019-10-30 Thread Patrick Welche
Module Name:src
Committed By:   prlw1
Date:   Wed Oct 30 20:24:44 UTC 2019

Modified Files:
src/usr.sbin/postinstall: postinstall.in

Log Message:
Add nvmm group.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/postinstall/postinstall.in

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



CVS commit: src/sys/dev/filemon

2019-10-30 Thread Simon J. Gerraty
Module Name:src
Committed By:   sjg
Date:   Wed Oct 30 18:35:06 UTC 2019

Modified Files:
src/sys/dev/filemon: filemon.c

Log Message:
filemon_ioctl: check fd for write permission

Reviewed by: christos
Reported by: ivansprundel


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/filemon/filemon.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/filemon/filemon.c
diff -u src/sys/dev/filemon/filemon.c:1.30 src/sys/dev/filemon/filemon.c:1.31
--- src/sys/dev/filemon/filemon.c:1.30	Wed Jun  6 01:49:08 2018
+++ src/sys/dev/filemon/filemon.c	Wed Oct 30 18:35:06 2019
@@ -1,4 +1,4 @@
-/*  $NetBSD: filemon.c,v 1.30 2018/06/06 01:49:08 maya Exp $ */
+/*  $NetBSD: filemon.c,v 1.31 2019/10/30 18:35:06 sjg Exp $ */
 /*
  * Copyright (c) 2010, Juniper Networks, Inc.
  *
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.30 2018/06/06 01:49:08 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.31 2019/10/30 18:35:06 sjg Exp $");
 
 #include 
 #include 
@@ -315,6 +315,11 @@ filemon_ioctl(struct file * fp, u_long c
 			error = EBADF;
 			break;
 		}
+		if ((filemon->fm_fp->f_flag & FWRITE) == 0) {
+			closef(filemon->fm_fp);
+			filemon->fm_fp = NULL;
+			return (EBADF);
+		}
 		/* Write the file header. */
 		filemon_comment(filemon);
 		break;



CVS commit: src/sys/dev/filemon

2019-10-30 Thread Simon J. Gerraty
Module Name:src
Committed By:   sjg
Date:   Wed Oct 30 18:35:06 UTC 2019

Modified Files:
src/sys/dev/filemon: filemon.c

Log Message:
filemon_ioctl: check fd for write permission

Reviewed by: christos
Reported by: ivansprundel


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/filemon/filemon.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

2019-10-30 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Wed Oct 30 17:06:57 UTC 2019

Modified Files:
src/sys/arch/amd64/amd64: cpufunc.S
src/sys/arch/i386/i386: cpufunc.S
src/sys/arch/x86/include: cpufunc.h

Log Message:
More inlined ASM.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/i386/i386/cpufunc.S
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x86/include/cpufunc.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

2019-10-30 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Wed Oct 30 17:06:57 UTC 2019

Modified Files:
src/sys/arch/amd64/amd64: cpufunc.S
src/sys/arch/i386/i386: cpufunc.S
src/sys/arch/x86/include: cpufunc.h

Log Message:
More inlined ASM.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/i386/i386/cpufunc.S
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x86/include/cpufunc.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/amd64/amd64/cpufunc.S
diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.45 src/sys/arch/amd64/amd64/cpufunc.S:1.46
--- src/sys/arch/amd64/amd64/cpufunc.S:1.45	Sat Sep  7 18:56:01 2019
+++ src/sys/arch/amd64/amd64/cpufunc.S	Wed Oct 30 17:06:57 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.S,v 1.45 2019/09/07 18:56:01 maxv Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.46 2019/10/30 17:06:57 maxv Exp $	*/
 
 /*
  * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -313,16 +313,6 @@ ENTRY(x86_mwait)
 	ret
 END(x86_mwait)
 
-ENTRY(fnsave)
-	fnsave	(%rdi)
-	ret
-END(fnsave)
-
-ENTRY(frstor)
-	frstor	(%rdi)
-	ret
-END(frstor)
-
 ENTRY(stts)
 	movq	%cr0, %rax
 	orq	$CR0_TS, %rax
@@ -330,46 +320,12 @@ ENTRY(stts)
 	ret
 END(stts)
 
-ENTRY(fxsave)
-	fxsave	(%rdi)
-	ret
-END(fxsave)
-
-ENTRY(fxrstor)
-	fxrstor	(%rdi)
-	ret
-END(fxrstor)
-
 ENTRY(fldummy)
 	ffree	%st(7)
 	fldz
 	ret
 END(fldummy)
 
-ENTRY(xsave)
-	movq	%rsi, %rax
-	movq	%rsi, %rdx
-	shrq	$32, %rdx
-	xsave	(%rdi)
-	ret
-END(xsave)
-
-ENTRY(xsaveopt)
-	movq	%rsi, %rax
-	movq	%rsi, %rdx
-	shrq	$32, %rdx
-	xsaveopt	(%rdi)
-	ret
-END(xsaveopt)
-
-ENTRY(xrstor)
-	movq	%rsi, %rax
-	movq	%rsi, %rdx
-	shrq	$32, %rdx
-	xrstor	(%rdi)
-	ret
-END(xrstor)
-
 ENTRY(inb)
 	movq	%rdi, %rdx
 	xorq	%rax, %rax

Index: src/sys/arch/i386/i386/cpufunc.S
diff -u src/sys/arch/i386/i386/cpufunc.S:1.35 src/sys/arch/i386/i386/cpufunc.S:1.36
--- src/sys/arch/i386/i386/cpufunc.S:1.35	Sat Sep  7 18:33:16 2019
+++ src/sys/arch/i386/i386/cpufunc.S	Wed Oct 30 17:06:57 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.S,v 1.35 2019/09/07 18:33:16 maxv Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.36 2019/10/30 17:06:57 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 #include 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.35 2019/09/07 18:33:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.36 2019/10/30 17:06:57 maxv Exp $");
 
 #include "opt_xen.h"
 
@@ -224,18 +224,6 @@ ENTRY(x86_mwait)  
 	ret
 END(x86_mwait)  
 
-ENTRY(fnsave)
-	movl	4(%esp), %eax
-	fnsave	(%eax)
-	ret
-END(fnsave)
-
-ENTRY(frstor)
-	movl	4(%esp), %eax
-	frstor	(%eax)
-	ret
-END(frstor)
-
 ENTRY(stts)
 	movl	%cr0, %eax
 	testl	$CR0_TS, %eax
@@ -246,42 +234,6 @@ ENTRY(stts)
 	ret
 END(stts)
 
-ENTRY(fxsave)
-	movl	4(%esp), %eax
-	fxsave	(%eax)
-	ret
-END(fxsave)
-
-ENTRY(fxrstor)
-	movl	4(%esp), %eax
-	fxrstor	(%eax)
-	ret
-END(fxrstor)
-
-ENTRY(xsave)
-	movl	4(%esp), %ecx
-	movl	8(%esp), %eax	/* feature mask bits */
-	movl	12(%esp), %edx
-	xsave	(%ecx)
-	ret
-END(xsave)
-
-ENTRY(xsaveopt)
-	movl	4(%esp), %ecx
-	movl	8(%esp), %eax	/* feature mask bits */
-	movl	12(%esp), %edx
-	xsaveopt	(%ecx)
-	ret
-END(xsaveopt)
-
-ENTRY(xrstor)
-	movl	4(%esp), %ecx
-	movl	8(%esp), %eax	/* feature mask bits */
-	movl	12(%esp), %edx
-	xrstor	(%ecx)
-	ret
-END(xrstor)
-
 ENTRY(fldummy)
 	ffree	%st(7)
 	fldz

Index: src/sys/arch/x86/include/cpufunc.h
diff -u src/sys/arch/x86/include/cpufunc.h:1.36 src/sys/arch/x86/include/cpufunc.h:1.37
--- src/sys/arch/x86/include/cpufunc.h:1.36	Sat Sep  7 18:33:16 2019
+++ src/sys/arch/x86/include/cpufunc.h	Wed Oct 30 17:06:57 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.h,v 1.36 2019/09/07 18:33:16 maxv Exp $	*/
+/*	$NetBSD: cpufunc.h,v 1.37 2019/10/30 17:06:57 maxv Exp $	*/
 
 /*
  * Copyright (c) 1998, 2007, 2019 The NetBSD Foundation, Inc.
@@ -358,15 +358,105 @@ wrxcr(uint32_t xcr, uint64_t val)
 	);
 }
 
-void	fnsave(union savefpu *);
-void	frstor(const union savefpu *);
+static inline void
+fnsave(void *addr)
+{
+	uint8_t *area = addr;
+
+	__asm volatile (
+		"fnsave	%[area]"
+		: [area] "=m" (*area)
+		:
+		: "memory"
+	);
+}
 
-void	fxsave(union savefpu *);
-void	fxrstor(const union savefpu *);
+static inline void
+frstor(void *addr)
+{
+	const uint8_t *area = addr;
+
+	__asm volatile (
+		"frstor	%[area]"
+		:
+		: [area] "m" (*area)
+		: "memory"
+	);
+}
 
-void	xsave(union savefpu *, uint64_t);
-void	xsaveopt(union savefpu *, uint64_t);
-void	xrstor(const union savefpu *, uint64_t);
+static inline void
+fxsave(void *addr)
+{
+	uint8_t *area = addr;
+
+	__asm volatile (
+		"fxsave	%[area]"
+		: [area] "=m" (*area)
+		:
+		: "memory"
+	);
+}
+
+static inline void
+fxrstor(void *addr)
+{
+	const uint8_t *area = addr;
+
+	__asm volatile (
+		"fxrstor %[area]"
+		:
+		: [area] "m" (*area)
+		: "memory"
+	);
+}
+
+static inline 

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

2019-10-30 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Wed Oct 30 16:32:04 UTC 2019

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

Log Message:
Style.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/x86/x86/fpu.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/x86/x86

2019-10-30 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Wed Oct 30 16:32:04 UTC 2019

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

Log Message:
Style.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/x86/x86/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/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.58 src/sys/arch/x86/x86/fpu.c:1.59
--- src/sys/arch/x86/x86/fpu.c:1.58	Sat Oct 12 06:31:04 2019
+++ src/sys/arch/x86/x86/fpu.c	Wed Oct 30 16:32:04 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.58 2019/10/12 06:31:04 maxv Exp $	*/
+/*	$NetBSD: fpu.c,v 1.59 2019/10/30 16:32:04 maxv Exp $	*/
 
 /*
  * Copyright (c) 2008, 2019 The NetBSD Foundation, Inc.  All
@@ -96,7 +96,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.58 2019/10/12 06:31:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.59 2019/10/30 16:32:04 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -784,16 +784,15 @@ process_read_xstate(struct lwp *l, struc
 	xstate->xs_xstate_bv = fpu_save->sv_xsave_hdr.xsh_xstate_bv;
 	KASSERT(!(xstate->xs_xstate_bv & ~xstate->xs_rfbm));
 
-#define COPY_COMPONENT(xcr0_val, xsave_val, field)\
-	if (xstate->xs_xstate_bv & xcr0_val) {	\
-		KASSERT(x86_xsave_offsets[xsave_val]\
-		>= sizeof(struct xsave_header));\
-		KASSERT(x86_xsave_sizes[xsave_val]\
-		>= sizeof(xstate -> field));\
-		\
-		memcpy( -> field,	\
-		(char*)fpu_save + x86_xsave_offsets[xsave_val],		\
-		sizeof(xstate -> field));	\
+#define COPY_COMPONENT(xcr0_val, xsave_val, field)			\
+	if (xstate->xs_xstate_bv & xcr0_val) {\
+		KASSERT(x86_xsave_offsets[xsave_val]			\
+		>= sizeof(struct xsave_header));			\
+		KASSERT(x86_xsave_sizes[xsave_val]			\
+		>= sizeof(xstate->field));\
+		memcpy(>field,	\
+		(char*)fpu_save + x86_xsave_offsets[xsave_val],	\
+		sizeof(xstate->field));\
 	}
 
 	COPY_COMPONENT(XCR0_YMM_Hi128, XSAVE_YMM_Hi128, xs_ymm_hi128);
@@ -846,8 +845,8 @@ process_write_xstate(struct lwp *l, cons
 	/* If XSAVE is supported, make sure that xstate_bv is set correctly. */
 	if (x86_fpu_save >= FPU_SAVE_XSAVE) {
 		/*
-		 * Bit-wise xstate->xs_rfbm ? xstate->xs_xstate_bv
-		 *  : fpu_save->sv_xsave_hdr.xsh_xstate_bv
+		 * Bit-wise "xstate->xs_rfbm ? xstate->xs_xstate_bv :
+		 *   fpu_save->sv_xsave_hdr.xsh_xstate_bv"
 		 */
 		fpu_save->sv_xsave_hdr.xsh_xstate_bv =
 		(fpu_save->sv_xsave_hdr.xsh_xstate_bv & ~xstate->xs_rfbm) |
@@ -865,8 +864,8 @@ process_write_xstate(struct lwp *l, cons
 	}
 
 	/*
-	 * Copy MXCSR if either SSE or AVX state is requested, to match the XSAVE
-	 * behavior for those flags.
+	 * Copy MXCSR if either SSE or AVX state is requested, to match the
+	 * XSAVE behavior for those flags.
 	 */
 	if (xstate->xs_xstate_bv & (XCR0_SSE|XCR0_YMM_Hi128)) {
 		/*
@@ -880,19 +879,17 @@ process_write_xstate(struct lwp *l, cons
 
 	if (xstate->xs_xstate_bv & XCR0_SSE) {
 		memcpy(_save->sv_xsave_hdr.xsh_fxsave[160],
-		xstate->xs_fxsave.fx_xmm,
-		sizeof(xstate->xs_fxsave.fx_xmm));
+		xstate->xs_fxsave.fx_xmm, sizeof(xstate->xs_fxsave.fx_xmm));
 	}
 
-#define COPY_COMPONENT(xcr0_val, xsave_val, field)\
-	if (xstate->xs_xstate_bv & xcr0_val) {	\
-		KASSERT(x86_xsave_offsets[xsave_val]\
-		>= sizeof(struct xsave_header));\
-		KASSERT(x86_xsave_sizes[xsave_val]\
-		>= sizeof(xstate -> field));\
-		\
-		memcpy((char*)fpu_save + x86_xsave_offsets[xsave_val],		\
-		 -> field, sizeof(xstate -> field));		\
+#define COPY_COMPONENT(xcr0_val, xsave_val, field)			\
+	if (xstate->xs_xstate_bv & xcr0_val) {\
+		KASSERT(x86_xsave_offsets[xsave_val]			\
+		>= sizeof(struct xsave_header));			\
+		KASSERT(x86_xsave_sizes[xsave_val]			\
+		>= sizeof(xstate->field));\
+		memcpy((char *)fpu_save + x86_xsave_offsets[xsave_val],	\
+		>field, sizeof(xstate->field));		\
 	}
 
 	COPY_COMPONENT(XCR0_YMM_Hi128, XSAVE_YMM_Hi128, xs_ymm_hi128);



CVS commit: src/sys/dev/raidframe

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Oct 30 16:00:13 UTC 2019

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
Gcc -Os on landisk is not smart enough to follow the conditional
initialization and warns, unconditionaly initialize dksc at declaration
with a XXX gcc comment.


To generate a diff of this commit:
cvs rdiff -u -r1.377 -r1.378 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Oct 30 16:00:13 UTC 2019

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
Gcc -Os on landisk is not smart enough to follow the conditional
initialization and warns, unconditionaly initialize dksc at declaration
with a XXX gcc comment.


To generate a diff of this commit:
cvs rdiff -u -r1.377 -r1.378 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.377 src/sys/dev/raidframe/rf_netbsdkintf.c:1.378
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.377	Wed Oct 30 07:59:44 2019
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Wed Oct 30 16:00:13 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.377 2019/10/30 07:59:44 maxv Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.378 2019/10/30 16:00:13 martin Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.377 2019/10/30 07:59:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.378 2019/10/30 16:00:13 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_raid_autoconfig.h"
@@ -487,7 +487,7 @@ rf_buildroothack(RF_ConfigSet_t *config_
 	RF_ConfigSet_t *next_cset;
 	int num_root;
 	struct raid_softc *sc, *rsc;
-	struct dk_softc *dksc;
+	struct dk_softc *dksc = NULL;	/* XXX gcc -Os: may be used uninit. */
 
 	sc = rsc = NULL;
 	num_root = 0;



CVS commit: src/distrib/utils/embedded/conf

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Oct 30 14:34:30 UTC 2019

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf

Log Message:
Remove debug output, fix a progress message


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/embedded/conf/armv7.conf

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



CVS commit: src/distrib/utils/embedded/conf

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Oct 30 14:34:30 UTC 2019

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf

Log Message:
Remove debug output, fix a progress message


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/embedded/conf/armv7.conf

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

Modified files:

Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.37 src/distrib/utils/embedded/conf/armv7.conf:1.38
--- src/distrib/utils/embedded/conf/armv7.conf:1.37	Wed Oct 30 12:28:32 2019
+++ src/distrib/utils/embedded/conf/armv7.conf	Wed Oct 30 14:34:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.37 2019/10/30 12:28:32 martin Exp $
+# $NetBSD: armv7.conf,v 1.38 2019/10/30 14:34:30 martin Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -148,7 +148,7 @@ populate() {
 		*)
 			pfx=;;
 		esac
-		echo "${bar} installing ${k} to /boot/${tgt} (on ${mnt}, pfx=${pfx}) ${bar}"
+		echo "${bar} installing ${k} to /boot/${pfx}${tgt} ${bar}"
 		case "${k}" in
 		*.gz)
 			${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${pfx}${tgt}"



CVS commit: src/distrib/utils/embedded

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Oct 30 14:16:15 UTC 2019

Modified Files:
src/distrib/utils/embedded: mkimage

Log Message:
Derive the FAT type from the MBR partition type and pass it on to makefs
when crating a msdos file system.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/distrib/utils/embedded/mkimage

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



CVS commit: src/distrib/utils/embedded

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Oct 30 14:16:15 UTC 2019

Modified Files:
src/distrib/utils/embedded: mkimage

Log Message:
Derive the FAT type from the MBR partition type and pass it on to makefs
when crating a msdos file system.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/distrib/utils/embedded/mkimage

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

Modified files:

Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.70 src/distrib/utils/embedded/mkimage:1.71
--- src/distrib/utils/embedded/mkimage:1.70	Wed Oct  2 11:16:00 2019
+++ src/distrib/utils/embedded/mkimage	Wed Oct 30 14:16:15 2019
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.70 2019/10/02 11:16:00 maya Exp $
+# $NetBSD: mkimage,v 1.71 2019/10/30 14:16:15 martin Exp $
 #
 # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -217,7 +217,14 @@ populate
 
 if [ -n "${msdosid}" ]; then
 	echo ${bar} Populating msdos filesystem ${bar}
-	${MAKEFS} -N ${release}/etc -t msdos -o volume_label=NETBSD \
+	case $(( ${msdosid} )) in
+	1)	fat_opt=",fat_type=12";;
+	4|6|14)	fat_opt=",fat_type=16";;
+	11|12)	fat_opt=",fat_type=32";;
+	*)	fat_opt=;;
+	esac
+	${MAKEFS} -N ${release}/etc -t msdos \
+	-o "volume_label=NETBSD${fat_opt}" \
 	-O $((${init} / 2))m -s $((${boot} / 2))m \
 	${image} ${mnt}/boot
 fi



CVS commit: src/share/man/man4

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 13:32:32 UTC 2019

Added Files:
src/share/man/man4: jmphy.4

Log Message:
Add jmphy.4.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/share/man/man4/jmphy.4

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



CVS commit: src/share/man/man4

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 13:32:32 UTC 2019

Added Files:
src/share/man/man4: jmphy.4

Log Message:
Add jmphy.4.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/share/man/man4/jmphy.4

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

Added files:

Index: src/share/man/man4/jmphy.4
diff -u /dev/null src/share/man/man4/jmphy.4:1.1
--- /dev/null	Wed Oct 30 13:32:32 2019
+++ src/share/man/man4/jmphy.4	Wed Oct 30 13:32:32 2019
@@ -0,0 +1,61 @@
+.\"	$NetBSD: jmphy.4,v 1.1 2019/10/30 13:32:32 msaitoh Exp $
+.\"	$openbsd: jmphy.4,v 1.2 2013/07/16 16:05:49 schwarze Exp $
+.\"
+.\" Copyright (c) 2008 Jonathan Gray 
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd October 30 2019
+.Dt JMPHY 4
+.Os
+.Sh NAME
+.Nm jmphy
+.Nd JMicron JMP202/JMP211 10/100/Gigabit Ethernet PHY
+.Sh SYNOPSIS
+.Cd "jmphy* at mii?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the JMicron JMP202 10/100 and
+JMP211 10/100/Gigabit Ethernet PHYs.
+.Sh SEE ALSO
+.Xr ifmedia 4 ,
+.Xr intro 4 ,
+.Xr jme 4 ,
+.Xr mii 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Ox 4.5 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Pyun YongHyeon
+for
+.Fx
+and ported to
+.Ox
+by
+.An Jonathan Gray Aq Mt j...@openbsd.org
+and then ported to
+.Nx 9.0
+by
+.An Masanobu SAITOH.
+.Sh BUGS
+It the media is set to gigabit speed, it may not linkup or takes very log time
+to go link up.
+It depends on the link partnet.



CVS commit: src/sys/arch

2019-10-30 Thread Ryo Shimizu
Module Name:src
Committed By:   ryo
Date:   Wed Oct 30 13:15:30 UTC 2019

Modified Files:
src/sys/arch: README

Log Message:
add aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/README

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/README
diff -u src/sys/arch/README:1.63 src/sys/arch/README:1.64
--- src/sys/arch/README:1.63	Wed Jan 24 09:04:43 2018
+++ src/sys/arch/README	Wed Oct 30 13:15:30 2019
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.63 2018/01/24 09:04:43 skrll Exp $
+$NetBSD: README,v 1.64 2019/10/30 13:15:30 ryo Exp $
 
 acorn32	arm	2008	Acorn computers Ltd. ARM 6/7/SA based machines
 algor	mipsel,mips64el	20010528	Algorithmics, Ltd. MIPS evaluation boards
@@ -15,7 +15,7 @@ cobalt	mipsel,mips64el	2319	Cobalt N
 dreamcast	sh3el	20010107	SEGA Dreamcast
 emips	mipseb	20110126	Machines based on Extensible MIPS
 epoc32	arm	20130502	32bit EPOC OS machines
-evbarm	armeb	20010905	ARM-based eval boards
+evbarm	armeb,aarch64	20010905	ARM-based eval boards
 evbmips	mipseb,mipsel,mips64eb,mips64el	20020307	MIPS-based eval boards
 evbppc	powerpc,powerpc64	20021209	PowerPC-based eval boards
 evbsh3	sh3eb,sh3el	20010206	Hitachi SuperH(TM) sh3 and sh4 eval boards
@@ -60,6 +60,7 @@ xen	xen	20040311	Xen virtual machine mon
 zaurus	arm	20061217	Sharp Zaurus C7x0/860/1000/3x00 PDAs
 
 Generic cpu features shared among multiple ports
+aarch64:	ARMv8 CPU based platform files
 arm:		ARM CPU based platform files
 hppa:		Hewlett Packard PA-RISC CPU based platform files
 m68k:		Motorola 680x0 CPU based platform files



CVS commit: src/sys/arch

2019-10-30 Thread Ryo Shimizu
Module Name:src
Committed By:   ryo
Date:   Wed Oct 30 13:15:30 UTC 2019

Modified Files:
src/sys/arch: README

Log Message:
add aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/README

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



CVS commit: src/distrib/utils/embedded/conf

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Oct 30 12:28:32 UTC 2019

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf

Log Message:
Move a lot of *.dtb files to a dtb/ subdirectory on the FAT partition.
Mkimage (eroneously) creates a FAT16 partition (despite the configuration
asking for FAT32), and that has a root directory size limit.
Idea from Jared.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/embedded/conf/armv7.conf

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



CVS commit: src/distrib/utils/embedded/conf

2019-10-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Oct 30 12:28:32 UTC 2019

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf

Log Message:
Move a lot of *.dtb files to a dtb/ subdirectory on the FAT partition.
Mkimage (eroneously) creates a FAT16 partition (despite the configuration
asking for FAT32), and that has a root directory size limit.
Idea from Jared.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/embedded/conf/armv7.conf

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

Modified files:

Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.36 src/distrib/utils/embedded/conf/armv7.conf:1.37
--- src/distrib/utils/embedded/conf/armv7.conf:1.36	Sun Oct 27 21:38:58 2019
+++ src/distrib/utils/embedded/conf/armv7.conf	Wed Oct 30 12:28:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.36 2019/10/27 21:38:58 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.37 2019/10/30 12:28:32 martin Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -106,7 +106,7 @@ populate_amlogic() {
 ODROIDC-UBOOT-CONFIG
 
 setenv bootargs "awge0.mac-address=\${ethaddr}"
-setenv bootcmd "fatload mmc 0:1 0x2100 ${odroidc1_kernelimg}; fatload mmc 0:1 0x2000 meson8b-odroidc1.dtb; bootm 0x2100 - 0x2000"
+setenv bootcmd "fatload mmc 0:1 0x2100 ${odroidc1_kernelimg}; fatload mmc 0:1 0x2000 dtb/meson8b-odroidc1.dtb; bootm 0x2100 - 0x2000"
 run bootcmd
 EOF
 }
@@ -135,16 +135,26 @@ populate() {
 		done
 	done
 
+	# "kernels" includes some .dtb files that should go into a separate
+	# directory
+	mkdir -p "${mnt}/boot/dtb"
+
 	# install kernels to /boot partition
 	for k in ${kernels}; do
 		tgt="$(basename ${k} | sed 's/\.gz$//')"
-		echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
+		case "${tgt}" in
+		sun*.dtb|am335x-*.dtb|meson8b-*.dtb|tegra*.dtb|vexpress*.dtb)
+			pfx="dtb/";;
+		*)
+			pfx=;;
+		esac
+		echo "${bar} installing ${k} to /boot/${tgt} (on ${mnt}, pfx=${pfx}) ${bar}"
 		case "${k}" in
 		*.gz)
-			${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
+			${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${pfx}${tgt}"
 			;;
 		*)
-			cp "${k}" "${mnt}/boot/${tgt}"
+			cp "${k}" "${mnt}/boot/${pfx}${tgt}"
 			;;
 		esac ||
 			fail "Copy of ${k} to ${mnt}/boot/${tgt} failed"



CVS commit: src/doc

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 12:25:28 UTC 2019

Modified Files:
src/doc: CHANGES

Log Message:
Add note about ipgphy(4) and jmphy(4).


To generate a diff of this commit:
cvs rdiff -u -r1.2605 -r1.2606 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.2605 src/doc/CHANGES:1.2606
--- src/doc/CHANGES:1.2605	Mon Oct 28 22:26:05 2019
+++ src/doc/CHANGES	Wed Oct 30 12:25:28 2019
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2605 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2606 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -53,6 +53,7 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	sup: removed, use ftp://ftp.astron.com/pub/sup [christos 20191015]
 	dhcpcd(8): Import dhcpcd-8.1.1 [roy 20191016]
 	evbarm: Add support for the NanoPi R1 and Duo2. [bad 20191016]
+	ipgphy(4): Add support for IC Plus IP1000* PHY. [msaitoh 20191017]
 	alc(4): Add support for Killer E2400 and E2500. [msaitoh 20191017]
 	bind: Import version 9.14.7. [christos 20191017]
 	libc: Changed the iconv(3) function signature to the POSIX variation
@@ -62,3 +63,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 		[ozaki-r 20191028]
 	evbarm: Update TI AM335x SoC support to use FDT based configuration.
 		[jmcneill 20191028]
+	jmphy(4): Add support for JMicron JMP202 and JMP211 PHY.
+		[msaitoh 20191030]



CVS commit: src/doc

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 12:25:28 UTC 2019

Modified Files:
src/doc: CHANGES

Log Message:
Add note about ipgphy(4) and jmphy(4).


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

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



CVS commit: src

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 12:06:26 UTC 2019

Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile jme.4 mii.4
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/i386/conf: ALL GENERIC
src/sys/dev: DEVNAMES
src/sys/dev/mii: files.mii
Added Files:
src/sys/dev/mii: jmphy.c jmphyreg.h

Log Message:
Add jmphy(4) from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1660 -r1.1661 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.686 -r1.687 src/share/man/man4/Makefile
cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/jme.4
cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/mii.4
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.542 -r1.543 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.472 -r1.473 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1213 -r1.1214 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.323 -r1.324 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/mii/files.mii
cvs rdiff -u -r0 -r1.1 src/sys/dev/mii/jmphy.c src/sys/dev/mii/jmphyreg.h

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.1660 src/distrib/sets/lists/man/mi:1.1661
--- src/distrib/sets/lists/man/mi:1.1660	Mon Oct 28 13:04:18 2019
+++ src/distrib/sets/lists/man/mi	Wed Oct 30 12:06:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1660 2019/10/28 13:04:18 maxv Exp $
+# $NetBSD: mi,v 1.1661 2019/10/30 12:06:25 msaitoh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1379,6 +1379,7 @@
 ./usr/share/man/cat4/iy.0			man-sys-catman		.cat
 ./usr/share/man/cat4/jme.0			man-sys-catman		.cat
 ./usr/share/man/cat4/jmide.0			man-sys-catman		.cat
+./usr/share/man/cat4/jmphy.0			man-sys-catman		.cat
 ./usr/share/man/cat4/joy.0			man-sys-catman		.cat
 ./usr/share/man/cat4/kame_ipsec.0		man-obsolete		obsolete
 ./usr/share/man/cat4/kcov.0			man-sys-catman		.cat
@@ -4522,6 +4523,7 @@
 ./usr/share/man/html4/iy.html			man-sys-htmlman		html
 ./usr/share/man/html4/jme.html			man-sys-htmlman		html
 ./usr/share/man/html4/jmide.html		man-sys-htmlman		html
+./usr/share/man/html4/jmphy.html		man-sys-htmlman		html
 ./usr/share/man/html4/joy.html			man-sys-htmlman		html
 ./usr/share/man/html4/kame_ipsec.html		man-obsolete		obsolete
 ./usr/share/man/html4/kcov.html		man-sys-htmlman		html
@@ -7505,6 +7507,7 @@
 ./usr/share/man/man4/iy.4			man-sys-man		.man
 ./usr/share/man/man4/jme.4			man-sys-man		.man
 ./usr/share/man/man4/jmide.4			man-sys-man		.man
+./usr/share/man/man4/jmphy.4			man-sys-man		.man
 ./usr/share/man/man4/joy.4			man-sys-man		.man
 ./usr/share/man/man4/kame_ipsec.4		man-obsolete		obsolete
 ./usr/share/man/man4/kcov.4			man-sys-man		.man

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.686 src/share/man/man4/Makefile:1.687
--- src/share/man/man4/Makefile:1.686	Mon Oct 28 02:56:40 2019
+++ src/share/man/man4/Makefile	Wed Oct 30 12:06:25 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.686 2019/10/28 02:56:40 ozaki-r Exp $
+#	$NetBSD: Makefile,v 1.687 2019/10/30 12:06:25 msaitoh Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -35,7 +35,7 @@ MAN=	aac.4 ac97.4 acardide.4 aceride.4 a
 	ioasic.4 ioat.4 iop.4 iophy.4 iopsp.4 ip.4 ipgphy.4 ipmi.4 ipw.4 \
 	irmce.4 isp.4 ismt.4 isv.4 itesio.4 iteide.4 iwi.4 iwm.4 iwn.4 ixg.4 \
 	ixpide.4 ixv.4 \
-	jme.4 jmide.4 joy.4 \
+	jme.4 jmide.4 jmphy.4 joy.4 \
 	kcov.4 kloader.4 kse.4 ksyms.4 kttcp.4 \
 	l2tp.4 lc.4 ld.4 lii.4 lo.4 lua.4 lxtphy.4 \
 	mainbus.4 makphy.4 malo.4 mbe.4 mca.4 mcclock.4 mcx.4 md.4 mfb.4 \

Index: src/share/man/man4/jme.4
diff -u src/share/man/man4/jme.4:1.7 src/share/man/man4/jme.4:1.8
--- src/share/man/man4/jme.4:1.7	Mon Jul  3 21:30:58 2017
+++ src/share/man/man4/jme.4	Wed Oct 30 12:06:25 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: jme.4,v 1.7 2017/07/03 21:30:58 wiz Exp $
+.\"	$NetBSD: jme.4,v 1.8 2019/10/30 12:06:25 msaitoh Exp $
 .\"
 .\" Copyright (c) 2008 Manuel Bouyer
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 17, 2008
+.Dd October 30, 2019
 .Dt JME 4
 .Os
 .Sh NAME
@@ -69,6 +69,7 @@ jme transmit interrupt moderation packet
 .El
 .Sh SEE ALSO
 .Xr ifmedia 4 ,
+.Xr jmphy 4 ,
 .Xr mii 4 ,
 .Xr netintro 4 ,
 .Xr pci 4 ,

Index: src/share/man/man4/mii.4
diff -u src/share/man/man4/mii.4:1.28 src/share/man/man4/mii.4:1.29
--- src/share/man/man4/mii.4:1.28	Mon Oct  7 11:53:40 2019
+++ src/share/man/man4/mii.4	Wed Oct 30 12:06:25 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mii.4,v 1.28 2019/10/07 11:53:40 msaitoh Exp $
+.\"	$NetBSD: mii.4,v 1.29 2019/10/30 12:06:25 msaitoh Exp $
 .\"
 .\" Copyright (c) 1998, 2002 The NetBSD 

CVS commit: src

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 12:06:26 UTC 2019

Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile jme.4 mii.4
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/i386/conf: ALL GENERIC
src/sys/dev: DEVNAMES
src/sys/dev/mii: files.mii
Added Files:
src/sys/dev/mii: jmphy.c jmphyreg.h

Log Message:
Add jmphy(4) from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1660 -r1.1661 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.686 -r1.687 src/share/man/man4/Makefile
cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/jme.4
cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/mii.4
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.542 -r1.543 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.472 -r1.473 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1213 -r1.1214 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.323 -r1.324 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/mii/files.mii
cvs rdiff -u -r0 -r1.1 src/sys/dev/mii/jmphy.c src/sys/dev/mii/jmphyreg.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/mii

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 12:02:01 UTC 2019

Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h

Log Message:
Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.145 -r1.146 src/sys/dev/mii/miidevs_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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.157 src/sys/dev/mii/miidevs.h:1.158
--- src/sys/dev/mii/miidevs.h:1.157	Fri Oct 18 20:42:10 2019
+++ src/sys/dev/mii/miidevs.h	Wed Oct 30 12:02:01 2019
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs.h,v 1.157 2019/10/18 20:42:10 maya Exp $	*/
+/*	$NetBSD: miidevs.h,v 1.158 2019/10/30 12:02:01 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.158 2019/10/17 09:21:40 msaitoh Exp
+ *	NetBSD: miidevs,v 1.160 2019/10/30 12:01:36 msaitoh Exp
  */
 
 /*-
@@ -411,10 +411,10 @@
 
 
 /* JMicron PHYs */
-#define	MII_MODEL_JMICRON_JMC250	0x0021
-#define	MII_STR_JMICRON_JMC250	"JMC250 10/100/1000 media interface"
-#define	MII_MODEL_JMICRON_JMC260	0x0022
-#define	MII_STR_JMICRON_JMC260	"JMC260 10/100 media interface"
+#define	MII_MODEL_JMICRON_JMP211	0x0021
+#define	MII_STR_JMICRON_JMP211	"JMP211 10/100/1000 media interface"
+#define	MII_MODEL_JMICRON_JMP202	0x0022
+#define	MII_STR_JMICRON_JMP202	"JMP202 10/100 media interface"
 
 /* Level 1 PHYs */
 #define	MII_MODEL_xxLEVEL1_LXT970	0x

Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.145 src/sys/dev/mii/miidevs_data.h:1.146
--- src/sys/dev/mii/miidevs_data.h:1.145	Fri Oct 18 20:42:10 2019
+++ src/sys/dev/mii/miidevs_data.h	Wed Oct 30 12:02:01 2019
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs_data.h,v 1.145 2019/10/18 20:42:10 maya Exp $	*/
+/*	$NetBSD: miidevs_data.h,v 1.146 2019/10/30 12:02:01 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.158 2019/10/17 09:21:40 msaitoh Exp
+ *	NetBSD: miidevs,v 1.160 2019/10/30 12:01:36 msaitoh Exp
  */
 
 /*-
@@ -165,8 +165,8 @@ struct mii_knowndev mii_knowndevs[] = {
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_I210, MII_STR_xxMARVELL_I210 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_I82563, MII_STR_xxMARVELL_I82563 },
  { MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_I82578, MII_STR_ATTANSIC_I82578 },
- { MII_OUI_JMICRON, MII_MODEL_JMICRON_JMC250, MII_STR_JMICRON_JMC250 },
- { MII_OUI_JMICRON, MII_MODEL_JMICRON_JMC260, MII_STR_JMICRON_JMC260 },
+ { MII_OUI_JMICRON, MII_MODEL_JMICRON_JMP211, MII_STR_JMICRON_JMP211 },
+ { MII_OUI_JMICRON, MII_MODEL_JMICRON_JMP202, MII_STR_JMICRON_JMP202 },
  { MII_OUI_xxLEVEL1, MII_MODEL_xxLEVEL1_LXT970, MII_STR_xxLEVEL1_LXT970 },
  { MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT1000_OLD, MII_STR_LEVEL1_LXT1000_OLD },
  { MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT974, MII_STR_LEVEL1_LXT974 },



CVS commit: src/sys/dev/mii

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 12:01:36 UTC 2019

Modified Files:
src/sys/dev/mii: miidevs

Log Message:
- Rename JMICRON 0x0021 from JMC250 to JMP211
- Rename JMICRON 0x0022 from JMC260 to JMP202


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/dev/mii/miidevs

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/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.159 src/sys/dev/mii/miidevs:1.160
--- src/sys/dev/mii/miidevs:1.159	Fri Oct 18 20:42:10 2019
+++ src/sys/dev/mii/miidevs	Wed Oct 30 12:01:36 2019
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.159 2019/10/18 20:42:10 maya Exp $
+$NetBSD: miidevs,v 1.160 2019/10/30 12:01:36 msaitoh Exp $
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -281,8 +281,8 @@ model ATTANSIC I82578		0x0004 Intel 8257
 
 
 /* JMicron PHYs */
-model JMICRON JMC250		0x0021 JMC250 10/100/1000 media interface
-model JMICRON JMC260		0x0022 JMC260 10/100 media interface
+model JMICRON JMP211		0x0021 JMP211 10/100/1000 media interface
+model JMICRON JMP202		0x0022 JMP202 10/100 media interface
 
 /* Level 1 PHYs */
 model xxLEVEL1 LXT970		0x LXT970 10/100 media interface



CVS commit: src/sys/dev/mii

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 12:01:36 UTC 2019

Modified Files:
src/sys/dev/mii: miidevs

Log Message:
- Rename JMICRON 0x0021 from JMC250 to JMP211
- Rename JMICRON 0x0022 from JMC260 to JMP202


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/dev/mii/miidevs

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



CVS commit: src/sys/dev/mii

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 12:02:01 UTC 2019

Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h

Log Message:
Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.145 -r1.146 src/sys/dev/mii/miidevs_data.h

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



CVS commit: src/distrib/sets/lists/xserver

2019-10-30 Thread Yuuki Enomoto
Module Name:src
Committed By:   uki
Date:   Wed Oct 30 11:59:02 UTC 2019

Modified Files:
src/distrib/sets/lists/xserver: md.amd64

Log Message:
Give syspkg names to xserver amd64 md files without xorg_server_ver=110


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/distrib/sets/lists/xserver/md.amd64

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/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.110 src/distrib/sets/lists/xserver/md.amd64:1.111
--- src/distrib/sets/lists/xserver/md.amd64:1.110	Sat Oct 26 07:31:39 2019
+++ src/distrib/sets/lists/xserver/md.amd64	Wed Oct 30 11:59:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.110 2019/10/26 07:31:39 uki Exp $
+# $NetBSD: md.amd64,v 1.111 2019/10/30 11:59:02 uki Exp $
 ./usr/X11R7/bin/X	xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg	xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt	xserver-xorg-server-bin	xorg
@@ -47,15 +47,15 @@
 ./usr/X11R7/lib/modules/dri/trident_dri.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/dri/unichrome_dri.so		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/dri/unichrome_dri.so.0		xserver-obsolete	obsolete
-./usr/X11R7/lib/modules/drivers/amdgpu_drv.so		-unknown-	xorg,xorg_server_ver=120
-./usr/X11R7/lib/modules/drivers/amdgpu_drv.so.19	-unknown-	xorg,xorg_server_ver=120
-./usr/X11R7/lib/modules/drivers/apm_drv.so		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/amdgpu_drv.so		xserver-xf86-video-amdgpu-drivers	xorg,xorg_server_ver=120
+./usr/X11R7/lib/modules/drivers/amdgpu_drv.so.19	xserver-xf86-video-amdgpu-drivers	xorg,xorg_server_ver=120
+./usr/X11R7/lib/modules/drivers/apm_drv.so		xserver-xf86-video-apm-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/apm_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/apm_drv.so.1		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/apm_drv.so.1		xserver-xf86-video-apm-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/apm_drv.so.1		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/ark_drv.so		xserver-xf86-video-ark-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ark_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/ark_drv.so.0		xserver-xf86-video-ark-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ark_drv.so.0		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/ast_drv.so		xserver-xf86-video-ast-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ast_drv.so.1		xserver-xf86-video-ast-drivers	xorg
@@ -83,9 +83,9 @@
 ./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1	xdebug-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so.1		xserver-obsolete	obsolete
-./usr/X11R7/lib/modules/drivers/glint_drv.so		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/glint_drv.so		xserver-xf86-video-glint-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/glint_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/glint_drv.so.1		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-xf86-video-glint-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/i128_drv.so		xserver-xf86-video-i128-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/i128_drv.so.1		xserver-xf86-video-i128-drivers	xorg
@@ -95,9 +95,9 @@
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so.1		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/intel_drv.so		xserver-xf86-video-intel-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/intel_drv.so.2		xserver-xf86-video-intel-drivers	xorg
-./usr/X11R7/lib/modules/drivers/intel_drv_old.so	-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so	xserver-xf86-video-intel-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/intel_drv_old.so	xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2	-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2	xserver-xf86-video-intel-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2	xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/ivch_drv.so		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ivch_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
@@ 

CVS commit: src/distrib/sets/lists/xserver

2019-10-30 Thread Yuuki Enomoto
Module Name:src
Committed By:   uki
Date:   Wed Oct 30 11:59:02 UTC 2019

Modified Files:
src/distrib/sets/lists/xserver: md.amd64

Log Message:
Give syspkg names to xserver amd64 md files without xorg_server_ver=110


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/distrib/sets/lists/xserver/md.amd64

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



CVS commit: src/sys

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 10:12:37 UTC 2019

Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_eth.c
src/sys/arch/arm/gemini: gemini_gmac.c if_gpn.c
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/dev/pcmcia: if_xi.c

Log Message:
 ether_input() automatically add input bytes to if_ibytes, so it's not
required to do in the driver who use ether_input().


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/broadcom/bcm53xx_eth.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/gemini/gemini_gmac.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/gemini/if_gpn.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/pcmcia/if_xi.c

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



CVS commit: src/sys

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 10:12:37 UTC 2019

Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_eth.c
src/sys/arch/arm/gemini: gemini_gmac.c if_gpn.c
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/dev/pcmcia: if_xi.c

Log Message:
 ether_input() automatically add input bytes to if_ibytes, so it's not
required to do in the driver who use ether_input().


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/broadcom/bcm53xx_eth.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/gemini/gemini_gmac.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/gemini/if_gpn.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/pcmcia/if_xi.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/broadcom/bcm53xx_eth.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.38 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.39
--- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.38	Wed May 29 13:25:54 2019
+++ src/sys/arch/arm/broadcom/bcm53xx_eth.c	Wed Oct 30 10:12:37 2019
@@ -35,7 +35,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.38 2019/05/29 13:25:54 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.39 2019/10/30 10:12:37 msaitoh Exp $");
 
 #include 
 #include 
@@ -1032,8 +1032,6 @@ bcmeth_rx_input(
 	}
 	m_set_rcvif(m, ifp);
 
-	ifp->if_ibytes += m->m_pkthdr.len;
-
 	/*
 	 * Let's give it to the network subsystm to deal with.
 	 */

Index: src/sys/arch/arm/gemini/gemini_gmac.c
diff -u src/sys/arch/arm/gemini/gemini_gmac.c:1.17 src/sys/arch/arm/gemini/gemini_gmac.c:1.18
--- src/sys/arch/arm/gemini/gemini_gmac.c:1.17	Tue Jan 22 03:42:25 2019
+++ src/sys/arch/arm/gemini/gemini_gmac.c	Wed Oct 30 10:12:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmac.c,v 1.17 2019/01/22 03:42:25 msaitoh Exp $ */
+/* $NetBSD: gemini_gmac.c,v 1.18 2019/10/30 10:12:37 msaitoh Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -49,7 +49,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.17 2019/01/22 03:42:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.18 2019/10/30 10:12:37 msaitoh Exp $");
 
 #define	SWFREEQ_DESCS	256	/* one page worth */
 #define	HWFREEQ_DESCS	256	/* one page worth */
@@ -852,7 +852,6 @@ gmac_hwqueue_rxconsume(gmac_hwqueue_t *h
 	 */
 	m = hwq->hwq_rxmbuf;
 	m_set_rcvif(m, ifp);	/* set receive interface */
-	ifp->if_ibytes += m->m_pkthdr.len;
 	switch (DESC0_RXSTS_GET(d->d_desc0)) {
 	case DESC0_RXSTS_GOOD:
 	case DESC0_RXSTS_LONG:

Index: src/sys/arch/arm/gemini/if_gpn.c
diff -u src/sys/arch/arm/gemini/if_gpn.c:1.12 src/sys/arch/arm/gemini/if_gpn.c:1.13
--- src/sys/arch/arm/gemini/if_gpn.c:1.12	Wed May 29 10:07:28 2019
+++ src/sys/arch/arm/gemini/if_gpn.c	Wed Oct 30 10:12:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gpn.c,v 1.12 2019/05/29 10:07:28 msaitoh Exp $ */
+/* $NetBSD: if_gpn.c,v 1.13 2019/10/30 10:12:37 msaitoh Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include "opt_gemini.h"
 
-__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.12 2019/05/29 10:07:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.13 2019/10/30 10:12:37 msaitoh Exp $");
 
 #include 
 #include 
@@ -299,7 +299,6 @@ gpn_process_data(struct gpn_softc *sc, c
 		sc->sc_rxmbuf = NULL;
 		m_set_rcvif(m, ifp);
 		KASSERT(((m->m_pkthdr.len + 63) >> 6) == gd->gd_pktlen64);
-		ifp->if_ibytes += m->m_pkthdr.len;
 #ifdef GPNDEBUG
 		printf("%s: rx len=%d crc=%#x\n", ifp->if_xname,
 		m->m_pkthdr.len, m_crc32_le(m));

Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.46 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.47
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.46	Tue Jul  9 08:46:58 2019
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c	Wed Oct 30 10:12:37 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3etsec.c,v 1.46 2019/07/09 08:46:58 msaitoh Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.47 2019/10/30 10:12:37 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -41,7 +41,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.46 2019/07/09 08:46:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.47 2019/10/30 10:12:37 msaitoh Exp $");
 
 #include 
 #include 
@@ -1609,8 +1609,6 @@ pq3etsec_rx_input(
 	m->m_flags |= M_HASFCS;
 	m_set_rcvif(m, >sc_if);
 
-	ifp->if_ibytes += m->m_pkthdr.len;
-
 	/*
 	 * Let's give it to the network subsystm to deal with.
 	 */

Index: src/sys/dev/pcmcia/if_xi.c
diff -u src/sys/dev/pcmcia/if_xi.c:1.90 src/sys/dev/pcmcia/if_xi.c:1.91
--- src/sys/dev/pcmcia/if_xi.c:1.90	Tue May 28 07:41:49 2019
+++ src/sys/dev/pcmcia/if_xi.c	Wed Oct 30 10:12:37 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_xi.c,v 1.90 2019/05/28 07:41:49 

CVS commit: src/sys/dev/raidframe

2019-10-30 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Wed Oct 30 07:59:45 UTC 2019

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
Get >sc_dksc only when we know 'rsc' is not NULL. This was actually
harmless because we didn't use the pointer then.

Reported-by: syzbot+77097fae0e3aad6de...@syzkaller.appspotmail.com


To generate a diff of this commit:
cvs rdiff -u -r1.376 -r1.377 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe

2019-10-30 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Wed Oct 30 07:59:45 UTC 2019

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
Get >sc_dksc only when we know 'rsc' is not NULL. This was actually
harmless because we didn't use the pointer then.

Reported-by: syzbot+77097fae0e3aad6de...@syzkaller.appspotmail.com


To generate a diff of this commit:
cvs rdiff -u -r1.376 -r1.377 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.376 src/sys/dev/raidframe/rf_netbsdkintf.c:1.377
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.376	Fri Mar  1 11:06:56 2019
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Wed Oct 30 07:59:44 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.376 2019/03/01 11:06:56 pgoyette Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.377 2019/10/30 07:59:44 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.376 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.377 2019/10/30 07:59:44 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_raid_autoconfig.h"
@@ -518,7 +518,6 @@ rf_buildroothack(RF_ConfigSet_t *config_
 		rf_cleanup_config_set(cset);
 		cset = next_cset;
 	}
-	dksc = >sc_dksc;
 
 	/* if the user has specified what the root device should be
 	   then we don't touch booted_device or boothowto... */
@@ -543,6 +542,7 @@ rf_buildroothack(RF_ConfigSet_t *config_
 	 */
 	if (num_root == 1) {
 		device_t candidate_root;
+		dksc = >sc_dksc;
 		if (dksc->sc_dkdev.dk_nwedges != 0) {
 			char cname[sizeof(cset->ac->devname)];
 			/* XXX: assume partition 'a' first */



CVS commit: src/sys/arch

2019-10-30 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Wed Oct 30 07:40:06 UTC 2019

Modified Files:
src/sys/arch/i386/i386: gdt.c
src/sys/arch/x86/x86: pmap.c
src/sys/arch/xen/include: xenpmap.h
src/sys/arch/xen/x86: x86_xpmap.c xen_pmap.c
src/sys/arch/xen/xen: if_xennet_xenbus.c

Log Message:
Switch to new PTE bits.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/i386/gdt.c
cvs rdiff -u -r1.336 -r1.337 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/include/xenpmap.h
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/xen/x86/x86_xpmap.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/xen/x86/xen_pmap.c
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/xen/xen/if_xennet_xenbus.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

2019-10-30 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Wed Oct 30 07:40:06 UTC 2019

Modified Files:
src/sys/arch/i386/i386: gdt.c
src/sys/arch/x86/x86: pmap.c
src/sys/arch/xen/include: xenpmap.h
src/sys/arch/xen/x86: x86_xpmap.c xen_pmap.c
src/sys/arch/xen/xen: if_xennet_xenbus.c

Log Message:
Switch to new PTE bits.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/i386/gdt.c
cvs rdiff -u -r1.336 -r1.337 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/include/xenpmap.h
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/xen/x86/x86_xpmap.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/xen/x86/xen_pmap.c
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/xen/xen/if_xennet_xenbus.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/i386/i386/gdt.c
diff -u src/sys/arch/i386/i386/gdt.c:1.70 src/sys/arch/i386/i386/gdt.c:1.71
--- src/sys/arch/i386/i386/gdt.c:1.70	Sat Mar  9 08:42:25 2019
+++ src/sys/arch/i386/i386/gdt.c	Wed Oct 30 07:40:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.70 2019/03/09 08:42:25 maxv Exp $	*/
+/*	$NetBSD: gdt.c,v 1.71 2019/10/30 07:40:05 maxv Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.70 2019/03/09 08:42:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.71 2019/10/30 07:40:05 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -83,7 +83,7 @@ update_descriptor(union descriptor *tabl
 	pt_entry_t *ptp;
 
 	ptp = kvtopte((vaddr_t)table);
-	pa = (*ptp & PG_FRAME) | ((vaddr_t)table & ~PG_FRAME);
+	pa = (*ptp & PTE_4KFRAME) | ((vaddr_t)table & ~PTE_4KFRAME);
 	if (HYPERVISOR_update_descriptor(pa, entry->raw[0], entry->raw[1]))
 		panic("HYPERVISOR_update_descriptor failed\n");
 #endif

Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.336 src/sys/arch/x86/x86/pmap.c:1.337
--- src/sys/arch/x86/x86/pmap.c:1.336	Sat Oct  5 07:19:49 2019
+++ src/sys/arch/x86/x86/pmap.c	Wed Oct 30 07:40:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.336 2019/10/05 07:19:49 maxv Exp $	*/
+/*	$NetBSD: pmap.c,v 1.337 2019/10/30 07:40:05 maxv Exp $	*/
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.336 2019/10/05 07:19:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.337 2019/10/30 07:40:05 maxv Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -747,7 +747,7 @@ pmap_exec_account(struct pmap *pm, vaddr
 	pm != vm_map_pmap(>p_vmspace->vm_map))
 		return;
 
-	if ((opte ^ npte) & PG_X)
+	if ((opte ^ npte) & PTE_X)
 		pmap_update_pg(va);
 
 	/*
@@ -757,7 +757,7 @@ pmap_exec_account(struct pmap *pm, vaddr
 	 * We can't do that because of locking constraints on the vm map.
 	 */
 
-	if ((opte & PG_X) && (npte & PG_X) == 0 && va == pm->pm_hiexec) {
+	if ((opte & PTE_X) && (npte & PTE_X) == 0 && va == pm->pm_hiexec) {
 		struct trapframe *tf = curlwp->l_md.md_regs;
 
 		tf->tf_cs = GSEL(GUCODE_SEL, SEL_UPL);
@@ -1068,13 +1068,13 @@ pmap_bootstrap(vaddr_t kva_start)
 	 * into a x86 PTE.
 	 */
 	protection_codes[VM_PROT_NONE] = pmap_pg_nx;
-	protection_codes[VM_PROT_EXECUTE] = PG_X;
+	protection_codes[VM_PROT_EXECUTE] = PTE_X;
 	protection_codes[VM_PROT_READ] = pmap_pg_nx;
-	protection_codes[VM_PROT_READ|VM_PROT_EXECUTE] = PG_X;
+	protection_codes[VM_PROT_READ|VM_PROT_EXECUTE] = PTE_X;
 	protection_codes[VM_PROT_WRITE] = PTE_W | pmap_pg_nx;
-	protection_codes[VM_PROT_WRITE|VM_PROT_EXECUTE] = PTE_W | PG_X;
+	protection_codes[VM_PROT_WRITE|VM_PROT_EXECUTE] = PTE_W | PTE_X;
 	protection_codes[VM_PROT_WRITE|VM_PROT_READ] = PTE_W | pmap_pg_nx;
-	protection_codes[VM_PROT_ALL] = PTE_W | PG_X;
+	protection_codes[VM_PROT_ALL] = PTE_W | PTE_X;
 
 	/*
 	 * Now we init the kernel's pmap.

Index: src/sys/arch/xen/include/xenpmap.h
diff -u src/sys/arch/xen/include/xenpmap.h:1.41 src/sys/arch/xen/include/xenpmap.h:1.42
--- src/sys/arch/xen/include/xenpmap.h:1.41	Wed Feb 13 06:52:43 2019
+++ src/sys/arch/xen/include/xenpmap.h	Wed Oct 30 07:40:06 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: xenpmap.h,v 1.41 2019/02/13 06:52:43 cherry Exp $	*/
+/*	$NetBSD: xenpmap.h,v 1.42 2019/10/30 07:40:06 maxv Exp $	*/
 
 /*
  *
@@ -85,7 +85,7 @@ xpmap_mtop_masked(paddr_t mpa)
 static __inline paddr_t
 xpmap_mtop(paddr_t mpa)
 {
-	return (xpmap_mtop_masked(mpa) | (mpa & ~PG_FRAME));
+	return (xpmap_mtop_masked(mpa) | (mpa & ~PTE_4KFRAME));
 }
 
 static __inline paddr_t
@@ -99,7 +99,7 @@ xpmap_ptom_masked(paddr_t ppa)
 static __inline paddr_t
 xpmap_ptom(paddr_t ppa)
 {
-	return (xpmap_ptom_masked(ppa) | (ppa & ~PG_FRAME));
+	return (xpmap_ptom_masked(ppa) | (ppa & ~PTE_4KFRAME));
 }
 
 static __inline void

Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.84 

CVS commit: src/libexec/httpd

2019-10-30 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Wed Oct 30 07:28:13 UTC 2019

Modified Files:
src/libexec/httpd: Makefile.boot

Log Message:
set -D_GNU_SOURCE, needed for linux systems and should be
harmless or ignored elsewhere.

from perry.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/libexec/httpd/Makefile.boot

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

Modified files:

Index: src/libexec/httpd/Makefile.boot
diff -u src/libexec/httpd/Makefile.boot:1.6 src/libexec/httpd/Makefile.boot:1.7
--- src/libexec/httpd/Makefile.boot:1.6	Thu Jan  2 08:30:22 2014
+++ src/libexec/httpd/Makefile.boot	Wed Oct 30 07:28:13 2019
@@ -6,7 +6,7 @@
 CC=	cc
 OPT=	-O
 LARGE_CFLAGS=	-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-LOCAL_CFLAGS=	-DNO_LUA_SUPPORT
+LOCAL_CFLAGS=	-DNO_LUA_SUPPORT -D_GNU_SOURCE
 CFLAGS=	$(OPT) $(LARGE_CFLAGS) $(LOCAL_CFLAGS)
 
 GROFF=	groff -Tascii



CVS commit: src/libexec/httpd

2019-10-30 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Wed Oct 30 07:28:13 UTC 2019

Modified Files:
src/libexec/httpd: Makefile.boot

Log Message:
set -D_GNU_SOURCE, needed for linux systems and should be
harmless or ignored elsewhere.

from perry.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/libexec/httpd/Makefile.boot

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

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 07:27:51 UTC 2019

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.h

Log Message:
G.C. (if_ipackets)


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.58 src/sys/dev/pci/ixgbe/ixgbe.h:1.59
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.58	Fri Sep 13 07:55:07 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.h	Wed Oct 30 07:27:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.58 2019/09/13 07:55:07 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.59 2019/10/30 07:27:51 msaitoh Exp $ */
 
 /**
   SPDX-License-Identifier: BSD-3-Clause
@@ -645,7 +645,6 @@ struct adapter {
 
 /* Stats macros */
 #if __FreeBSD_version >= 1100036
-#define IXGBE_SET_IPACKETS(sc, count)(sc)->ipackets = (count)
 #define IXGBE_SET_IERRORS(sc, count) (sc)->ierrors = (count)
 #define IXGBE_SET_OPACKETS(sc, count)(sc)->opackets = (count)
 #define IXGBE_SET_OERRORS(sc, count) (sc)->oerrors = (count)
@@ -656,7 +655,6 @@ struct adapter {
 #define IXGBE_SET_OMCASTS(sc, count) (sc)->omcasts = (count)
 #define IXGBE_SET_IQDROPS(sc, count) (sc)->iqdrops = (count)
 #else
-#define IXGBE_SET_IPACKETS(sc, count)(sc)->ifp->if_ipackets = (count)
 #define IXGBE_SET_IERRORS(sc, count) (sc)->ifp->if_ierrors = (count)
 #define IXGBE_SET_OPACKETS(sc, count)(sc)->ifp->if_opackets = (count)
 #define IXGBE_SET_OERRORS(sc, count) (sc)->ifp->if_oerrors = (count)



CVS commit: src/sys/dev/pci/ixgbe

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 07:27:51 UTC 2019

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.h

Log Message:
G.C. (if_ipackets)


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/ixgbe/ixgbe.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

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 07:26:28 UTC 2019

Modified Files:
src/sys/dev/ic: aic6915.c elinkxl.c i82557.c
src/sys/dev/pci: if_age.c if_alc.c if_ale.c if_ste.c if_stge.c if_tl.c
if_txp.c if_vte.c

Log Message:
 if_percpuq(9) automatically increments if_ipackets, so don't add number of
RX frames from device's statistics counter to if_ipackets to avoid double
count.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/aic6915.c
cvs rdiff -u -r1.132 -r1.133 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.155 -r1.156 src/sys/dev/ic/i82557.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/if_ste.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/if_stge.c
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_vte.c

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

Modified files:

Index: src/sys/dev/ic/aic6915.c
diff -u src/sys/dev/ic/aic6915.c:1.39 src/sys/dev/ic/aic6915.c:1.40
--- src/sys/dev/ic/aic6915.c:1.39	Tue May 28 07:41:48 2019
+++ src/sys/dev/ic/aic6915.c	Wed Oct 30 07:26:28 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic6915.c,v 1.39 2019/05/28 07:41:48 msaitoh Exp $	*/
+/*	$NetBSD: aic6915.c,v 1.40 2019/10/30 07:26:28 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.39 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.40 2019/10/30 07:26:28 msaitoh Exp $");
 
 
 #include 
@@ -855,8 +855,6 @@ sf_stats_update(struct sf_softc *sc)
 	stats.TransmitAbortDueToExcessingDeferral +
 	stats.FramesLostDueToInternalTransmitErrors;
 
-	ifp->if_ipackets += stats.ReceiveOKFrames;
-
 	ifp->if_ierrors += stats.ReceiveCRCErrors + stats.AlignmentErrors +
 	stats.ReceiveFramesTooLong + stats.ReceiveFramesTooShort +
 	stats.ReceiveFramesJabbersError +

Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.132 src/sys/dev/ic/elinkxl.c:1.133
--- src/sys/dev/ic/elinkxl.c:1.132	Fri Sep 13 07:55:06 2019
+++ src/sys/dev/ic/elinkxl.c	Wed Oct 30 07:26:28 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: elinkxl.c,v 1.132 2019/09/13 07:55:06 msaitoh Exp $	*/
+/*	$NetBSD: elinkxl.c,v 1.133 2019/10/30 07:26:28 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.132 2019/09/13 07:55:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.133 2019/10/30 07:26:28 msaitoh Exp $");
 
 #include 
 #include 
@@ -1487,8 +1487,6 @@ ex_getstats(struct ex_softc *sc)
 
 	GO_WINDOW(6);
 	upperok = bus_space_read_1(iot, ioh, UPPER_FRAMES_OK);
-	ifp->if_ipackets += bus_space_read_1(iot, ioh, RX_FRAMES_OK);
-	ifp->if_ipackets += (upperok & 0x03) << 8;
 	ifp->if_opackets += bus_space_read_1(iot, ioh, TX_FRAMES_OK);
 	ifp->if_opackets += (upperok & 0x30) << 4;
 	ifp->if_ierrors += bus_space_read_1(iot, ioh, RX_OVERRUNS);

Index: src/sys/dev/ic/i82557.c
diff -u src/sys/dev/ic/i82557.c:1.155 src/sys/dev/ic/i82557.c:1.156
--- src/sys/dev/ic/i82557.c:1.155	Fri Sep 20 09:00:50 2019
+++ src/sys/dev/ic/i82557.c	Wed Oct 30 07:26:28 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: i82557.c,v 1.155 2019/09/20 09:00:50 maxv Exp $	*/
+/*	$NetBSD: i82557.c,v 1.156 2019/10/30 07:26:28 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.155 2019/09/20 09:00:50 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.156 2019/10/30 07:26:28 msaitoh Exp $");
 
 #include 
 #include 
@@ -1479,7 +1479,6 @@ fxp_tick(void *arg)
 	ifp->if_opackets += le32toh(sp->tx_good);
 	ifp->if_collisions += le32toh(sp->tx_total_collisions);
 	if (sp->rx_good) {
-		ifp->if_ipackets += le32toh(sp->rx_good);
 		sc->sc_rxidle = 0;
 	} else if (sc->sc_flags & FXPF_RECV_WORKAROUND) {
 		sc->sc_rxidle++;

Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.61 src/sys/dev/pci/if_age.c:1.62
--- src/sys/dev/pci/if_age.c:1.61	Fri Sep 20 08:58:25 2019
+++ src/sys/dev/pci/if_age.c	Wed Oct 30 07:26:28 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_age.c,v 1.61 2019/09/20 08:58:25 maxv Exp $ */
+/*	$NetBSD: if_age.c,v 1.62 2019/10/30 07:26:28 msaitoh Exp $ */
 /*	$OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $	*/
 
 /*-
@@ -31,7 +31,7 @@
 /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.61 2019/09/20 08:58:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.62 2019/10/30 07:26:28 msaitoh Exp $");
 
 #include "vlan.h"
 
@@ -2043,8 +2043,6 @@ age_stats_update(struct 

CVS commit: src/sys/dev

2019-10-30 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Wed Oct 30 07:26:28 UTC 2019

Modified Files:
src/sys/dev/ic: aic6915.c elinkxl.c i82557.c
src/sys/dev/pci: if_age.c if_alc.c if_ale.c if_ste.c if_stge.c if_tl.c
if_txp.c if_vte.c

Log Message:
 if_percpuq(9) automatically increments if_ipackets, so don't add number of
RX frames from device's statistics counter to if_ipackets to avoid double
count.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/aic6915.c
cvs rdiff -u -r1.132 -r1.133 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.155 -r1.156 src/sys/dev/ic/i82557.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/if_ste.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/if_stge.c
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_vte.c

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