CVS commit: src/doc

[Takahiro Kambe]

Module Name:src
Committed By:   taca
Date:   Fri May 27 06:51:13 UTC 2011

Modified Files:
src/doc: 3RDPARTY

Log Message:
BIND 9.8.0-P2 is released.


To generate a diff of this commit:
cvs rdiff -u -r1.840 -r1.841 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.840 src/doc/3RDPARTY:1.841
--- src/doc/3RDPARTY:1.840	Thu May 26 21:56:44 2011
+++ src/doc/3RDPARTY	Fri May 27 06:51:13 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.840 2011/05/26 21:56:44 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.841 2011/05/27 06:51:13 taca Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -93,7 +93,7 @@
 
 Package:	bind [named and utils]
 Version:	9.8.0rc1
-Current Vers:	9.8.0-P1
+Current Vers:	9.8.0-P2
 Maintainer:	Paul Vixie vi...@vix.com
 Archive Site:	ftp://ftp.isc.org/isc/bind9/
 Home Page:	http://www.isc.org/sw/bind/

CVS commit: src

[Iain Hibbert]

Module Name:src
Committed By:   plunky
Date:   Fri May 27 09:28:43 UTC 2011

Modified Files:
src/distrib/sets/lists/etc: mi
src/etc/defaults: rc.conf
src/etc/mtree: special
src/etc/powerd/scripts: sleep_button
src/etc/rc.d: Makefile btattach btconfig btdevctl bthcid sdpd
src/share/man/man5: rc.conf.5
src/usr.sbin/postinstall: postinstall
Added Files:
src/etc/rc.d: bluetooth

Log Message:
provide a new 'bluetooth' rc.d script, to handle Bluetooth configuration
in a simpler manner. This replaces btattach, btconfig, bthcid, btdevctl
and sdpd scripts, and also should not require any configuration settings
other than bluetooth=YES, though the full range of configurations is
still possible.


To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.112 -r1.113 src/etc/defaults/rc.conf
cvs rdiff -u -r1.137 -r1.138 src/etc/mtree/special
cvs rdiff -u -r1.7 -r1.8 src/etc/powerd/scripts/sleep_button
cvs rdiff -u -r1.83 -r1.84 src/etc/rc.d/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/rc.d/bluetooth
cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/btattach src/etc/rc.d/btconfig
cvs rdiff -u -r1.4 -r1.5 src/etc/rc.d/btdevctl
cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/bthcid
cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/sdpd
cvs rdiff -u -r1.146 -r1.147 src/share/man/man5/rc.conf.5
cvs rdiff -u -r1.117 -r1.118 src/usr.sbin/postinstall/postinstall

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/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.223 src/distrib/sets/lists/etc/mi:1.224
--- src/distrib/sets/lists/etc/mi:1.223	Mon Apr 11 22:09:56 2011
+++ src/distrib/sets/lists/etc/mi	Fri May 27 09:28:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.223 2011/04/11 22:09:56 martin Exp $
+# $NetBSD: mi,v 1.224 2011/05/27 09:28:41 plunky Exp $
 #
 # Note: end-user configuration files that are moved to another location
 #	should not be marked obsolete; they should just be removed from
@@ -170,13 +170,14 @@
 ./etc/rc.d/altqdetc-router-rc
 ./etc/rc.d/amd	etc-amd-rc
 ./etc/rc.d/apmd	etc-sys-rc
+./etc/rc.d/bluetoothetc-sys-rc
 ./etc/rc.d/bootconf.shetc-sys-rc
 ./etc/rc.d/bootparamsetc-bootserver-rc
-./etc/rc.d/btattachetc-sys-rc
-./etc/rc.d/btconfigetc-sys-rc
+./etc/rc.d/btattachetc-obsolete		obsolete
+./etc/rc.d/btconfigetc-obsolete		obsolete
 ./etc/rc.d/btcontroletc-obsolete		obsolete
-./etc/rc.d/btdevctletc-sys-rc
-./etc/rc.d/bthcidetc-sys-rc
+./etc/rc.d/btdevctletc-obsolete		obsolete
+./etc/rc.d/bthcidetc-obsolete		obsolete
 ./etc/rc.d/btuartdetc-obsolete		obsolete
 ./etc/rc.d/ccd	etc-sys-rc
 ./etc/rc.d/cgd	etc-sys-rc
@@ -265,7 +266,7 @@
 ./etc/rc.d/rwho	etc-net-rc
 ./etc/rc.d/savecoreetc-sys-rc
 ./etc/rc.d/screenblanketc-sys-rc
-./etc/rc.d/sdpd	etc-sys-rc
+./etc/rc.d/sdpd	etc-obsolete		obsolete
 ./etc/rc.d/secureleveletc-sys-rc
 ./etc/rc.d/sshd	etc-secsh-rc
 ./etc/rc.d/staticrouteetc-sys-rc

Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.112 src/etc/defaults/rc.conf:1.113
--- src/etc/defaults/rc.conf:1.112	Fri Feb 18 00:42:20 2011
+++ src/etc/defaults/rc.conf	Fri May 27 09:28:42 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.112 2011/02/18 00:42:20 jmcneill Exp $
+#	$NetBSD: rc.conf,v 1.113 2011/05/27 09:28:42 plunky Exp $
 #
 # /etc/defaults/rc.conf --
 #	default configuration of /etc/rc.conf
@@ -306,12 +306,12 @@
 # ISDN daemon
 isdnd=NO		isdnd_flags=
 
-# Bluetooth daemons
-btattach=NO	# Bluetooth attach serial HCI
-btconfig=NO	# Bluetooth controller configuration
-btdevctl=NO	# Bluetooth device configuration
-bthcid=NO		bthcid_flags=		# Bluetooth HCI daemon
-sdpd=NO			sdpd_flags=		# Service Discovery daemon
+# Bluetooth configuration
+bluetooth=NO
+# and the following are used when bluetooth=YES
+btconfig_devices= # all
+bthcid=YES  bthcid_flags=
+sdpd=YESsdpd_flags=
 
 # Other daemons.
 #

Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.137 src/etc/mtree/special:1.138
--- src/etc/mtree/special:1.137	Sun Apr 17 13:07:18 2011
+++ src/etc/mtree/special	Fri May 27 09:28:42 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: special,v 1.137 2011/04/17 13:07:18 martin Exp $
+#	$NetBSD: special,v 1.138 2011/05/27 09:28:42 plunky Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -186,12 +186,9 @@
 ./etc/rc.d/altqd		type=file mode=0555
 ./etc/rc.d/amd			type=file mode=0555
 ./etc/rc.d/apmd			type=file mode=0555
+./etc/rc.d/bluetooth		type=file mode=0555
 ./etc/rc.d/bootconf.sh		type=file mode=0555
 ./etc/rc.d/bootparams		type=file mode=0555
-./etc/rc.d/btattach		type=file mode=0555
-./etc/rc.d/btconfig		type=file mode=0555
-./etc/rc.d/btdevctl		type=file mode=0555
-./etc/rc.d/bthcid		type=file mode=0555
 

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

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Fri May 27 10:32:00 UTC 2011

Modified Files:
src/sys/arch/evbmips/conf: ADM5120 ADM5120-NB ADM5120-USB ALCHEMY RB153

Log Message:
eliminate obsolete option SOSEND_LOAN


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/ADM5120 \
src/sys/arch/evbmips/conf/ADM5120-NB \
src/sys/arch/evbmips/conf/ADM5120-USB src/sys/arch/evbmips/conf/RB153
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbmips/conf/ALCHEMY

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/evbmips/conf/ADM5120
diff -u src/sys/arch/evbmips/conf/ADM5120:1.7 src/sys/arch/evbmips/conf/ADM5120:1.8
--- src/sys/arch/evbmips/conf/ADM5120:1.7	Sun Mar  6 17:08:23 2011
+++ src/sys/arch/evbmips/conf/ADM5120	Fri May 27 10:31:59 2011
@@ -1,11 +1,11 @@
-#	$NetBSD: ADM5120,v 1.7 2011/03/06 17:08:23 bouyer Exp $
+#	$NetBSD: ADM5120,v 1.8 2011/05/27 10:31:59 ryo Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	arch/evbmips/conf/std.adm5120
 
-#ident 		GENERIC-$Revision: 1.7 $
+#ident 		GENERIC-$Revision: 1.8 $
 
 maxusers	32
 
@@ -17,7 +17,6 @@
 options 	MEMSIZE=(16*1024*1024)
 
 #options 	LOCKDEBUG
-options 	SOSEND_LOAN
 options 	SOSEND_COUNTERS
 options 	INET_CSUM_COUNTERS
 options 	TCP_CSUM_COUNTERS
Index: src/sys/arch/evbmips/conf/ADM5120-NB
diff -u src/sys/arch/evbmips/conf/ADM5120-NB:1.7 src/sys/arch/evbmips/conf/ADM5120-NB:1.8
--- src/sys/arch/evbmips/conf/ADM5120-NB:1.7	Sun Mar  6 17:08:23 2011
+++ src/sys/arch/evbmips/conf/ADM5120-NB	Fri May 27 10:31:59 2011
@@ -1,11 +1,11 @@
-#	$NetBSD: ADM5120-NB,v 1.7 2011/03/06 17:08:23 bouyer Exp $
+#	$NetBSD: ADM5120-NB,v 1.8 2011/05/27 10:31:59 ryo Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	arch/evbmips/conf/std.adm5120
 
-#ident 		GENERIC-$Revision: 1.7 $
+#ident 		GENERIC-$Revision: 1.8 $
 
 maxusers	32
 
@@ -17,7 +17,6 @@
 options 	MEMSIZE=(16*1024*1024)
 
 #options 	LOCKDEBUG
-options 	SOSEND_LOAN
 options 	SOSEND_COUNTERS
 options 	INET_CSUM_COUNTERS
 options 	TCP_CSUM_COUNTERS
Index: src/sys/arch/evbmips/conf/ADM5120-USB
diff -u src/sys/arch/evbmips/conf/ADM5120-USB:1.7 src/sys/arch/evbmips/conf/ADM5120-USB:1.8
--- src/sys/arch/evbmips/conf/ADM5120-USB:1.7	Sun Mar  6 17:08:23 2011
+++ src/sys/arch/evbmips/conf/ADM5120-USB	Fri May 27 10:31:59 2011
@@ -1,11 +1,11 @@
-#	$NetBSD: ADM5120-USB,v 1.7 2011/03/06 17:08:23 bouyer Exp $
+#	$NetBSD: ADM5120-USB,v 1.8 2011/05/27 10:31:59 ryo Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	arch/evbmips/conf/std.adm5120
 
-#ident 		GENERIC-$Revision: 1.7 $
+#ident 		GENERIC-$Revision: 1.8 $
 
 maxusers	32
 
@@ -16,7 +16,6 @@
 options 	HZ=512		# for profiling
 
 #options 	LOCKDEBUG
-options 	SOSEND_LOAN
 options 	SOSEND_COUNTERS
 options 	INET_CSUM_COUNTERS
 options 	TCP_CSUM_COUNTERS
Index: src/sys/arch/evbmips/conf/RB153
diff -u src/sys/arch/evbmips/conf/RB153:1.7 src/sys/arch/evbmips/conf/RB153:1.8
--- src/sys/arch/evbmips/conf/RB153:1.7	Tue May 17 22:19:38 2011
+++ src/sys/arch/evbmips/conf/RB153	Fri May 27 10:31:59 2011
@@ -1,10 +1,10 @@
-#	$NetBSD: RB153,v 1.7 2011/05/17 22:19:38 dyoung Exp $
+#	$NetBSD: RB153,v 1.8 2011/05/27 10:31:59 ryo Exp $
 #
 # Example kernel config for the RouterBOARD 153.
 
 include 	arch/evbmips/conf/std.adm5120
 
-#ident 		RB153-$Revision: 1.7 $
+#ident 		RB153-$Revision: 1.8 $
 
 maxusers	32
 
@@ -17,7 +17,6 @@
 #options 	MEMSIZE=(32*1024*1024)
 
 #options 	LOCKDEBUG
-options 	SOSEND_LOAN
 options 	SOSEND_COUNTERS
 options 	INET_CSUM_COUNTERS
 options 	TCP_CSUM_COUNTERS

Index: src/sys/arch/evbmips/conf/ALCHEMY
diff -u src/sys/arch/evbmips/conf/ALCHEMY:1.33 src/sys/arch/evbmips/conf/ALCHEMY:1.34
--- src/sys/arch/evbmips/conf/ALCHEMY:1.33	Mon Mar  7 15:37:46 2011
+++ src/sys/arch/evbmips/conf/ALCHEMY	Fri May 27 10:31:59 2011
@@ -1,11 +1,11 @@
-#	$NetBSD: ALCHEMY,v 1.33 2011/03/07 15:37:46 jakllsch Exp $
+#	$NetBSD: ALCHEMY,v 1.34 2011/05/27 10:31:59 ryo Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	arch/evbmips/conf/std.alchemy
 
-#ident 		ALCHEMY-$Revision: 1.33 $
+#ident 		ALCHEMY-$Revision: 1.34 $
 
 maxusers	32
 
@@ -25,7 +25,6 @@
 options 	ALCHEMY_GENERIC
 
 #options 	LOCKDEBUG
-options 	SOSEND_LOAN
 options 	SOSEND_COUNTERS
 options 	INET_CSUM_COUNTERS
 options 	TCP_CSUM_COUNTERS

CVS commit: src/share/man/man5

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri May 27 11:15:17 UTC 2011

Modified Files:
src/share/man/man5: rc.conf.5

Log Message:
Bump date for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/share/man/man5/rc.conf.5

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

Modified files:

Index: src/share/man/man5/rc.conf.5
diff -u src/share/man/man5/rc.conf.5:1.147 src/share/man/man5/rc.conf.5:1.148
--- src/share/man/man5/rc.conf.5:1.147	Fri May 27 09:28:42 2011
+++ src/share/man/man5/rc.conf.5	Fri May 27 11:15:17 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: rc.conf.5,v 1.147 2011/05/27 09:28:42 plunky Exp $
+.\	$NetBSD: rc.conf.5,v 1.148 2011/05/27 11:15:17 wiz Exp $
 .\
 .\ Copyright (c) 1996 Matthew R. Green
 .\ All rights reserved.
@@ -55,7 +55,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd March 18, 2011
+.Dd May 27, 2011
 .Dt RC.CONF 5
 .Os
 .Sh NAME

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

[Takeshi Nakayama]

Module Name:src
Committed By:   nakayama
Date:   Fri May 27 12:41:18 UTC 2011

Modified Files:
src/sys/arch/sparc64/include: db_machdep.h

Log Message:
Fix 32-bit kernel build.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/include/db_machdep.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/sparc64/include/db_machdep.h
diff -u src/sys/arch/sparc64/include/db_machdep.h:1.30 src/sys/arch/sparc64/include/db_machdep.h:1.31
--- src/sys/arch/sparc64/include/db_machdep.h:1.30	Thu May 26 15:34:13 2011
+++ src/sys/arch/sparc64/include/db_machdep.h	Fri May 27 12:41:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_machdep.h,v 1.30 2011/05/26 15:34:13 joerg Exp $ */
+/*	$NetBSD: db_machdep.h,v 1.31 2011/05/27 12:41:18 nakayama Exp $ */
 
 /*
  * Mach Operating System
@@ -46,7 +46,11 @@
 
 /* use 64-bit types explicitly for 32-bit kernels */
 typedef	vaddr_t		db_addr_t;	/* address - unsigned */
+#ifdef __arch64__
 #define	DDB_EXPR_FMT	l		/* expression is int64_t (long) */
+#else
+#define	DDB_EXPR_FMT	ll		/* expression is int64_t (long long) */
+#endif
 typedef	int64_t		db_expr_t;	/* expression - signed */
 
 struct trapstate {

CVS commit: src/sys/dev/pci

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri May 27 15:09:45 UTC 2011

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

Log Message:
Add ALI M5288 SATA/Raid Controller


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

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1079 src/sys/dev/pci/pcidevs:1.1080
--- src/sys/dev/pci/pcidevs:1.1079	Sun May 22 08:13:17 2011
+++ src/sys/dev/pci/pcidevs	Fri May 27 15:09:44 2011
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1079 2011/05/22 08:13:17 mrg Exp $
+$NetBSD: pcidevs,v 1.1080 2011/05/27 15:09:44 matt Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -807,6 +807,7 @@
 product ALI M5243	0x5243	M5243 PCI-AGP Bridge
 product ALI M5249	0x5249	M5249 Hypertransport to PCI Bridge
 product ALI M5261	0x5261	M5261 Tulip Ethernet Controller
+product ALI M5288	0x5288	M5288 SATA/Raid Controller
 product ALI M5451	0x5451	M5451 AC-Link Controller Audio Device
 product ALI M5453	0x5453	M5453 AC-Link Controller Modem Device
 product ALI M5455	0x5455	M5455 AC-Link Controller Audio Device

CVS commit: src/sys/dev/pci

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri May 27 15:11:59 UTC 2011

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

Log Message:
Add quirk for ALI M5228


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/ahcisata_pci.c

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

Modified files:

Index: src/sys/dev/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.24 src/sys/dev/pci/ahcisata_pci.c:1.25
--- src/sys/dev/pci/ahcisata_pci.c:1.24	Sun Apr  3 20:05:30 2011
+++ src/sys/dev/pci/ahcisata_pci.c	Fri May 27 15:11:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahcisata_pci.c,v 1.24 2011/04/03 20:05:30 dyoung Exp $	*/
+/*	$NetBSD: ahcisata_pci.c,v 1.25 2011/05/27 15:11:59 matt Exp $	*/
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.24 2011/04/03 20:05:30 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.25 2011/05/27 15:11:59 matt Exp $);
 
 #include sys/types.h
 #include sys/malloc.h
@@ -88,6 +88,8 @@
 	AHCI_PCI_QUIRK_FORCE },
 	{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_12,
 	AHCI_PCI_QUIRK_FORCE },
+	{ PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M5288,
+	AHCI_PCI_QUIRK_FORCE },
 	{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6121,
 	AHCI_PCI_QUIRK_FORCE },
 	/* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */

CVS commit: src/sys/arch/powerpc/include/booke

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri May 27 15:18:30 UTC 2011

Modified Files:
src/sys/arch/powerpc/include/booke: openpicreg.h

Log Message:
Fix P20x0_ONCHIPBITMAP to reflect latest P2020RM.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/include/booke/openpicreg.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/powerpc/include/booke/openpicreg.h
diff -u src/sys/arch/powerpc/include/booke/openpicreg.h:1.3 src/sys/arch/powerpc/include/booke/openpicreg.h:1.4
--- src/sys/arch/powerpc/include/booke/openpicreg.h:1.3	Tue Feb  8 06:16:03 2011
+++ src/sys/arch/powerpc/include/booke/openpicreg.h	Fri May 27 15:18:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: openpicreg.h,v 1.3 2011/02/08 06:16:03 matt Exp $	*/
+/*	$NetBSD: openpicreg.h,v 1.4 2011/05/27 15:18:30 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -277,7 +277,7 @@
 
 #define	P20x0_EXTERNALSOURCES	12
 #define	P20x0_ONCHIPSOURCES	64
-#define	P20x0_ONCHIPBITMAP	{ 0xdd1ff7ff, 0xf9700de7 }
+#define	P20x0_ONCHIPBITMAP	{ 0xbd1ff7ff, 0xf17005e7 }
 #define	P20x0_IPISOURCES	4
 #define	P20x0_TIMERSOURCES	4
 #define	P20x0_MISOURCES		4

CVS commit: src/sys/arch/powerpc/booke

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri May 27 15:19:43 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c

Log Message:
Remove debugging printf.  Add missing IMU2 interrupt string.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/booke/e500_intr.c

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

Modified files:

Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.6 src/sys/arch/powerpc/booke/e500_intr.c:1.7
--- src/sys/arch/powerpc/booke/e500_intr.c:1.6	Tue May 17 17:42:46 2011
+++ src/sys/arch/powerpc/booke/e500_intr.c	Fri May 27 15:19:43 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: e500_intr.c,v 1.6 2011/05/17 17:42:46 dyoung Exp $	*/
+/*	$NetBSD: e500_intr.c,v 1.7 2011/05/27 15:19:43 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -134,6 +134,7 @@
 	{ ISOURCE_SRIO_OMU1, srio-omu1 },
 	{ ISOURCE_SRIO_IMU1, srio-imu1 },
 	{ ISOURCE_SRIO_OMU2, srio-omu2 },
+	{ ISOURCE_SRIO_IMU2, srio-imu2 },
 	{ ISOURCE_SECURITY2, sec2 },
 	{ ISOURCE_SPI, spi },
 	{ ISOURCE_ETSEC1_PTP, etsec1-ptp },
@@ -616,8 +617,6 @@
 	struct cpu_info * const ci = curcpu();
 
 	atomic_or_uint(ci-ci_data.cpu_softints, machdep);
-	if (machdep == (1  IPL_SOFTBIO))
-		printf(%s(%u): cpl=%u\n, __func__, machdep, ci-ci_cpl);
 }
 #endif /* __HAVE_FAST_SOFTINTS */
 

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri May 27 15:21:28 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf: P2020RDB

Log Message:
Comment out sdhc for now.
Remove PCI devices that will never be there.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/P2020RDB

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/evbppc/conf/P2020RDB
diff -u src/sys/arch/evbppc/conf/P2020RDB:1.1 src/sys/arch/evbppc/conf/P2020RDB:1.2
--- src/sys/arch/evbppc/conf/P2020RDB:1.1	Wed Mar 16 21:11:12 2011
+++ src/sys/arch/evbppc/conf/P2020RDB	Fri May 27 15:21:27 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: P2020RDB,v 1.1 2011/03/16 21:11:12 matt Exp $
+#	$NetBSD: P2020RDB,v 1.2 2011/05/27 15:21:27 matt Exp $
 #
 #	P2020RBD -- everything that's currently supported
 #
@@ -7,7 +7,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		P2020RBD-$Revision: 1.1 $
+ident 		P2020RBD-$Revision: 1.2 $
 
 maxusers	32
 
@@ -154,6 +154,9 @@
 cpu0		at cpunode?
 
 obio0		at cpunode?		# On-chip Peripheral Bus
+#nandfcm*	at obio0 cs ?		# nand flash
+#nand*		at nandfcm?
+#flash*		at nand?
 
 e500wdog*	at cpunode?		# Watchdog timer
 
@@ -164,12 +167,9 @@
 tsec0		at cpunode? flags 0x021	# Enhanced 3-Speed Ethernet Controller
 tsec1		at cpunode? flags 0x101	# Enhanced 3-Speed Ethernet Controller
 tsec2		at cpunode? flags 0x102	# Enhanced 3-Speed Ethernet Controller
-#ciphy*		at mii?			# Cicada PHY
 ukphy*		at mii?
 #options 	ETSEC_EVENT_COUNTERS
 
-ehci*		at cpunode?		# usb
-
 diic*		at cpunode?		# i2c bus
 iic*		at diic?
 dsrtc*		at iic1 addr 0x68	# RTC
@@ -182,22 +182,16 @@
 ppb*		at pci? dev ? function ?	# PCI-PCI bridges
 pci*		at ppb?
 
-#ohci1		at pci1 dev 0 function 2
-#ehci1		at pci1 dev 0 function 3
-ohci*		at pci? dev ? function ?
-ehci*		at pci? dev ? function ?
-#uhci*		at pci? dev ? function ?
+ehci*		at cpunode?		# usb
 usb*		at ehci?
-usb*		at ohci?
-#usb*		at uhci?
 uhub*		at usb?
 umass*		at uhub? port ?
 scsibus*	at umass? channel ?
 sd*		at scsibus? target ? lun ?
 
-sdhc*		at cpunode?		# sdmmc
-sdmmc*		at sdhc?		# SD/MMC bus
-ld*		at sdmmc?
+#sdhc*		at cpunode?		# sdmmc
+#sdmmc*		at sdhc?		# SD/MMC bus
+#ld*		at sdmmc?
 
 #siisata*	at pci? dev ? function ?
 #atabus* 	at siisata? channel ?

CVS commit: src/distrib/notes/common

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Fri May 27 15:27:42 UTC 2011

Modified Files:
src/distrib/notes/common: xfer

Log Message:
Tweak some descriptions about Rawrite32 tool on Windows.
XXX: we should rather mention how to write ISO images..


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/distrib/notes/common/xfer

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

Modified files:

Index: src/distrib/notes/common/xfer
diff -u src/distrib/notes/common/xfer:1.69 src/distrib/notes/common/xfer:1.70
--- src/distrib/notes/common/xfer:1.69	Mon Apr 25 22:13:45 2011
+++ src/distrib/notes/common/xfer	Fri May 27 15:27:41 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: xfer,v 1.69 2011/04/25 22:13:45 wiz Exp $
+.\	$NetBSD: xfer,v 1.70 2011/05/27 15:27:41 tsutsui Exp $
 .\
 .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -98,19 +98,24 @@
 scope of this document.
 .Pp
 If you are using
-.Tn MS-DOS
-to write the floppy image(s) to floppy disk, you should use the
-.Ic rawrite
-utility, provided in the
+.Tn Microsoft Windows
+to write the floppy image(s) to floppy disk, you can use the
+.Ic Rawrite32
+Windows32 program.
+It can be installed by
+Pa rawr32.exe
+provieded in the
 .Pa i386/installation/misc
 directory of the
 .Nx
 distribution.
-It will write a file system image (.fs file) to a floppy disk.
 A
-.Ic rawrite32
-is also available that runs under
-.Tn MS Windows .
+.Ic rawrite
+utility for the
+.Tn MS-DOS
+environment is also available in the
+.Pa i386/installation/misc/
+directory.
 .Pp
 .\} \ \n[i386]
 .
@@ -187,28 +192,25 @@
 .Xr dd 1
 command to copy the file system image(s)
 (.fs file(s)) directly to the raw floppy disk.
-It is suggested that you read the
-.Xr dd 1
-manual page or ask your system administrator to determine the correct
-set of arguments to use; it will be slightly different from system to
-system, and a comprehensive list of the possibilities is beyond the
-scope of this document.
 .Pp
 If you have an i386 machine which runs
-.Tn MS-DOS
-and use it to write the floppy image(s) to floppy disk,
-you can use the
-.Ic rawrite
-utility, provided in the
-.Pa i386/installation/misc
+.Tn Microsoft Windows
+and use it to write the floppy image(s) to floppy disk, you can use the
+.Ic Rawrite32
+Windows32 program.
+It can be installed by
+Pa rawr32.exe
+provided in the
+.Pa i386/installation/misc/
 directory of the
 .Nx
 distribution.
-It will write a file system image (.fs file) to a floppy disk.
-A
-.Ic rawrite32
-is also available that runs under
-.Tn MS Windows .
+.Ic rawrite
+utility for the
+.Tn MS-DOS
+environment is also available in the
+.Pa i386/installation/misc/
+directory.
 .Pp
 Though
 .Nx*M

CVS commit: src/distrib/notes/common

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Fri May 27 15:43:00 UTC 2011

Modified Files:
src/distrib/notes/common: contents main

Log Message:
Remove sizes of set files.  They were too hard to maintain,
while nowadays few users care about bandwidth or storage
in modern Internet environment.  Ok'ed by snj@ a while ago.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/distrib/notes/common/contents
cvs rdiff -u -r1.477 -r1.478 src/distrib/notes/common/main

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

Modified files:

Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.167 src/distrib/notes/common/contents:1.168
--- src/distrib/notes/common/contents:1.167	Sat Feb 26 20:38:49 2011
+++ src/distrib/notes/common/contents	Fri May 27 15:43:00 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: contents,v 1.167 2011/02/26 20:38:49 phx Exp $
+.\	$NetBSD: contents,v 1.168 2011/05/27 15:43:00 tsutsui Exp $
 .\
 .\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -527,60 +527,6 @@
 .Nx
 utilities that are necessary for the
 system to run and be minimally functional.
-.\
-.\ XXX set sizes can be calculated using list-setsizes.sh
-.\
-.if \n[acorn26] .setsize 28 80
-.if \n[acorn32] .setsize 28 80
-.if \n[algor] .setsize 30 95
-.if \n[alpha] .setsize 33 102
-.if \n[amd64] .setsize 34 100
-.if \n[amiga] .setsize 25 75
-.if \n[arc] .setsize 30 95
-.if \n[atari] .setsize 26 75
-.if \n[bebox] .setsize 31 90
-.if \n[cats] .setsize 28 80
-.if \n[cesfic] .setsize 25 75
-.if \n[cobalt] .setsize 30 95
-.if \n[dreamcast] .setsize 27 73
-.if \n[evbarm] .setsize 28 80
-.if \n[evbmips] .setsize 30 95
-.if \n[evbppc] .setsize 27 79
-.if \n[evbsh3] .setsize 28 73
-.if \n[hp300] .setsize 25 75
-.if \n[hp700] .setsize 30 85
-.if \n[hpcarm] .setsize 28 80
-.if \n[hpcmips] .setsize 30 95
-.if \n[hpcsh] .setsize 28 73
-.if \n[i386] .setsize 26 76
-.if \n[ibmnws] .setsize 28 83
-.if \n[iyonix] .setsize 28 80
-.if \n[landisk] .setsize 28 73
-.if \n[luna68k] .setsize 25 75
-.if \n[mac68k] .setsize 25 75
-.if \n[macppc] .setsize 29 83
-.if \n[mipsco] .setsize 30 95
-.if \n[mmeye] .setsize 28 73
-.if \n[mvme68k] .setsize 25 75
-.if \n[mvmeppc] .setsize 28 83
-.if \n[netwinder] .setsize 28 80
-.if \n[news68k] .setsize 25 75
-.if \n[newsmips] .setsize 30 95
-.if \n[next68k] .setsize 25 75
-.if \n[ofppc] .setsize 28 83
-.if \n[pmax] .setsize 30 96
-.if \n[prep] .setsize 29 83
-.if \n[sandpoint] .setsize 28 83
-.if \n[sbmips] .setsize 30 95
-.if \n[sgimips] .setsize 30 95
-.if \n[shark] .setsize 28 80
-.if \n[sparc] .setsize 27 80
-.if \n[sparc64] .setsize 33 103
-.if \n[sun2] .setsize 166 413
-.if \n[sun3] .setsize 25 75
-.if \n[vax] .setsize 25 70
-.if \n[x68k] .setsize 26 75
-.showsize
 .
 .It Sy comp
 Things needed for compiling programs.
@@ -593,57 +539,6 @@
 This set also includes the manual pages for
 all of the utilities it contains, as well as the
 system call and library manual pages.
-.if \n[acorn26] .setsize 41 140
-.if \n[acorn32] .setsize 41 140
-.if \n[algor] .setsize 37 139
-.if \n[alpha] .setsize 49 206
-.if \n[amd64] .setsize 58 218
-.if \n[amiga] .setsize 36 130
-.if \n[arc] .setsize 37 139
-.if \n[atari] .setsize 35 130
-.if \n[bebox] .setsize 51 180
-.if \n[cats] .setsize 41 140
-.if \n[cesfic] .setsize 35 130
-.if \n[cobalt] .setsize 37 139
-.if \n[dreamcast] .setsize 38 125
-.if \n[evbarm] .setsize 41 140
-.if \n[evbmips] .setsize 37 139
-.if \n[evbppc] .setsize 44 153
-.if \n[evbsh3] .setsize 39 125
-.if \n[hp300] .setsize 36 130
-.if \n[hp700] .setsize 44 148
-.if \n[hpcarm] .setsize 41 140
-.if \n[hpcmips] .setsize 37 139
-.if \n[hpcsh] .setsize 38 126
-.if \n[i386] .setsize 37 131
-.if \n[ibmnws] .setsize 44 153
-.if \n[iyonix] .setsize 41 140
-.if \n[landisk] .setsize 38 126
-.if \n[luna68k] .setsize 35 130
-.if \n[mac68k] .setsize 36 130
-.if \n[macppc] .setsize 44 153
-.if \n[mipsco] .setsize 37 139
-.if \n[mmeye] .setsize 39 125
-.if \n[mvme68k] .setsize 35 130
-.if \n[mvmeppc] .setsize 44 153
-.if \n[netwinder] .setsize 41 140
-.if \n[news68k] .setsize 36 130
-.if \n[newsmips] .setsize 37 139
-.if \n[next68k] .setsize 36 130
-.if \n[ofppc] .setsize 44 153
-.if \n[pmax] .setsize 37 139
-.if \n[prep] .setsize 44 153
-.if \n[sandpoint] .setsize 44 153
-.if \n[sbmips] .setsize 37 139
-.if \n[sgimips] .setsize 37 139
-.if \n[shark] .setsize 41 140
-.if \n[sparc] .setsize 39 140
-.if \n[sparc64] .setsize 59 225
-.if \n[sun2] .setsize 30 108
-.if \n[sun3] .setsize 36 130
-.if \n[vax] .setsize 29 107
-.if \n[x68k] .setsize 36 130
-.showsize
 .
 .It Sy etc
 This distribution set contains the system
@@ -655,64 +550,9 @@
 be installed if you are installing the system from scratch, but should
 .Em not
 be used if you are upgrading.
-.\ Not MI, but close enough to the same size on all ports...
-.showsize 1 1
 .
 .It Sy games
 This set includes the games and their manual 

CVS commit: src

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Fri May 27 17:06:55 UTC 2011

Modified Files:
src/lib/libc: Makefile
src/share/mk: bsd.own.mk

Log Message:
make the tags target non-.PHONY because it reflects a real file,
and remove some nonsense in libc Makefile which caused that
a tags file was written in my source tree


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/lib/libc/Makefile
cvs rdiff -u -r1.668 -r1.669 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.144 src/lib/libc/Makefile:1.145
--- src/lib/libc/Makefile:1.144	Wed Mar  9 23:10:06 2011
+++ src/lib/libc/Makefile	Fri May 27 17:06:55 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.144 2011/03/09 23:10:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.145 2011/05/27 17:06:55 drochner Exp $
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -123,15 +123,14 @@
 	no.msg pl.msg sk.msg sv.msg
 
 realall: tags
-tags: ${.OBJDIR}/tags
-${.OBJDIR}/tags: ${SRCS}
+tags: ${SRCS}
 	${_MKTARGET_CREATE}
 	-${TOOL_CTAGS} -w ${.ALLSRC:M*.c}
 	-egrep ^ENTRY(.*)|^FUNC(.*)|^SYSCALL(.*) /dev/null ${.ALLSRC:M*.S} | \
 	sed s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/; \
 	 ${.TARGET}; sort -o ${.TARGET} ${.TARGET}
 
-FILES=		${.OBJDIR}/tags
+FILES=		tags
 FILESNAME=	libc.tags
 FILESDIR=	/var/db
 

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.668 src/share/mk/bsd.own.mk:1.669
--- src/share/mk/bsd.own.mk:1.668	Fri May 20 16:02:23 2011
+++ src/share/mk/bsd.own.mk	Fri May 27 17:06:54 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.668 2011/05/20 16:02:23 plunky Exp $
+#	$NetBSD: bsd.own.mk,v 1.669 2011/05/27 17:06:54 drochner Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -653,7 +653,7 @@
 TARGETS+=	all clean cleandir depend dependall includes \
 		install lint obj regress tags html
 PHONY_NOTMAIN =	all clean cleandir depend dependall distclean includes \
-		install lint obj regress tags beforedepend afterdepend \
+		install lint obj regress beforedepend afterdepend \
 		beforeinstall afterinstall realinstall realdepend realall \
 		html subdir-all subdir-install subdir-depend
 .PHONY:		${PHONY_NOTMAIN}

CVS commit: src/share/misc

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Fri May 27 17:12:47 UTC 2011

Modified Files:
src/share/misc: inter.phone

Log Message:
add Upper Volta (Burkina Faso)
(got a nigeria-style spam mail with a phone number and was curious
where it came from)


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/share/misc/inter.phone

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

Modified files:

Index: src/share/misc/inter.phone
diff -u src/share/misc/inter.phone:1.25 src/share/misc/inter.phone:1.26
--- src/share/misc/inter.phone:1.25	Thu May 31 05:57:01 2007
+++ src/share/misc/inter.phone	Fri May 27 17:12:47 2011
@@ -1,5 +1,5 @@
 # Country Code : City Code : City : Country
-#	$NetBSD: inter.phone,v 1.25 2007/05/31 05:57:01 wiz Exp $
+#	$NetBSD: inter.phone,v 1.26 2011/05/27 17:12:47 drochner Exp $
 #	@(#)inter.phone	8.1 (Berkeley) 6/9/93
 20:2:Cairo:Egypt, Arab Rep. of
 20:3:Alexandria:Egypt, Arab Rep. of
@@ -326,6 +326,7 @@
 221:::Senegal Republic
 224:4:Conakry:Guinea, People's Rev. Rep.
 225:::Ivory Coast Rep. of
+226:::Upper Volta (Burkina Faso)
 227:::Niger Republic
 228:::Togo, Rep. of
 229:::Benin, People's Rep. of

CVS commit: [matt-nb5-mips64] src/sys/uvm

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri May 27 17:17:17 UTC 2011

Modified Files:
src/sys/uvm [matt-nb5-mips64]: uvm_pglist.c

Log Message:
Fix a bug where limit could be greater avail_end.  Now if that happens, we
just bail.  Use KDASSERTMSG so panics are more informative.


To generate a diff of this commit:
cvs rdiff -u -r1.42.16.7 -r1.42.16.8 src/sys/uvm/uvm_pglist.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/uvm/uvm_pglist.c
diff -u src/sys/uvm/uvm_pglist.c:1.42.16.7 src/sys/uvm/uvm_pglist.c:1.42.16.8
--- src/sys/uvm/uvm_pglist.c:1.42.16.7	Wed May 25 23:58:50 2011
+++ src/sys/uvm/uvm_pglist.c	Fri May 27 17:17:17 2011
@@ -170,6 +170,8 @@
 			second_pass = true;
 			try = roundup2(max(low, ps-avail_start), alignment);
 			limit = min(high, ps-avail_start + ps-start_hint);
+			if (limit = ps-avail_end)
+return 0;
 			skip = 0;
 			continue;
 		}
@@ -184,20 +186,28 @@
 			skip = 0;
 			continue;
 		}
-#ifdef DEBUG
+
 		/*
 		 * Make sure this is a managed physical page.
 		 */
+		KDASSERTMSG(vm_physseg_find(try, cidx) == ps - vm_physmem,
+		(%s: %s(%#x, cidx) (%d) != ps - vm_physmem (%zd),
+		 __func__, vm_physseg_find, try,
+		vm_physseg_find(try, cidx), ps - vm_physmem));
+
+		KDASSERTMSG(cidx == try - ps-start,
+		(%s: cidx (%#x) != try (%#x) - ps-start (%#PRIxPADDR),
+		 __func__, cidx, try, ps-start));
+
+		KDASSERTMSG(vm_physseg_find(try + num - 1, cidx) == ps - vm_physmem,
+		(%s: %s(%#x + %#x - 1, cidx) (%d) != ps - vm_physmem (%zd),
+		 __func__, vm_physseg_find, try, num,
+		vm_physseg_find(try, cidx), ps - vm_physmem));
+
+		KDASSERTMSG(cidx == try - ps-start + num - 1,
+		(%s: cidx (%#x) != try (%#x) - ps-start (%#PRIxPADDR) + num (%#x) - 1,
+		 __func__, cidx, try, ps-start, num));
 
-		if (vm_physseg_find(try, cidx) != ps - vm_physmem)
-			panic(pgalloc contig: botch1);
-		if (cidx != try - ps-start)
-			panic(pgalloc contig: botch2);
-		if (vm_physseg_find(try + num - 1, cidx) != ps - vm_physmem)
-			panic(pgalloc contig: botch3);
-		if (cidx != try - ps-start + num - 1)
-			panic(pgalloc contig: botch4);
-#endif
 		tryidx = try - ps-start;
 		end = tryidx + num;
 
@@ -390,21 +400,31 @@
 	second_pass = false;
 
 	for (;; try++, pg++) {
+		KDASSERTMSG(limit = ps-avail_end,
+		(%s: limit (%#x)  ps-avail_end (%#PRIxPADDR),
+		 __func__, limit, ps-avail_end));
+
 		if (try = limit) {
 			if (ps-start_hint == 0 || second_pass)
 break;
 			second_pass = true;
 			try = max(low, ps-avail_start) - 1;
 			limit = min(high, ps-avail_start + ps-start_hint);
+			if (limit = ps-avail_end)
+break;
 			pg = ps-pgs[try - ps-start];
 			continue;
 		}
-#ifdef DEBUG
-		if (vm_physseg_find(try, cidx) != ps - vm_physmem)
-			panic(pgalloc simple: botch1);
-		if (cidx != (try - ps-start))
-			panic(pgalloc simple: botch2);
-#endif
+
+		KDASSERTMSG(vm_physseg_find(try, cidx) == ps - vm_physmem,
+		(%s: %s(%#x, cidx) (%d) != ps - vm_physmem (%zd),
+		 __func__, vm_physseg_find, try,
+		vm_physseg_find(try, cidx), ps - vm_physmem));
+
+		KDASSERTMSG(cidx == try - ps-start,
+		(%s: cidx (%#x) != try (%#x) - ps-start (%#PRIxPADDR),
+		 __func__, cidx, try, ps-start));
+
 		/*
 		 * If this page isn't free, then we need to skip a colors worth
 		 * of pages to get a matching color.  Note that colormask is 1

CVS commit: src/sys/dev/usb

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Fri May 27 17:19:18 UTC 2011

Modified Files:
src/sys/dev/usb: ehci.c uhci.c usb_subr.c usbdivar.h

Log Message:
remember the data toggle bit per (bulk) endpoint rather than per
pipe, as required by the spec
This helps in cases where pipes are opened/closed without reconfiguring
the device in between, eg with the ugen driver.
only for UHCI/EHCI, don't have an OHCI to test


To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.235 -r1.236 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.178 -r1.179 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/usb/usbdivar.h

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.174 src/sys/dev/usb/ehci.c:1.175
--- src/sys/dev/usb/ehci.c:1.174	Wed Apr 20 09:32:43 2011
+++ src/sys/dev/usb/ehci.c	Fri May 27 17:19:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.174 2011/04/20 09:32:43 drochner Exp $ */
+/*	$NetBSD: ehci.c,v 1.175 2011/05/27 17:19:18 drochner Exp $ */
 
 /*
  * Copyright (c) 2004-2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.174 2011/04/20 09:32:43 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.175 2011/05/27 17:19:18 drochner Exp $);
 
 #include ohci.h
 #include uhci.h
@@ -1567,7 +1567,8 @@
 	if (sc-sc_dying)
 		return (USBD_IOERROR);
 
-	epipe-nexttoggle = 0;
+	/* toggle state needed for bulk endpoints */
+	epipe-nexttoggle = pipe-endpoint-datatoggle;
 
 	if (addr == sc-sc_addr) {
 		switch (ed-bEndpointAddress) {
@@ -3569,8 +3570,10 @@
 ehci_device_bulk_close(usbd_pipe_handle pipe)
 {
 	ehci_softc_t *sc = pipe-device-bus-hci_private;
+	struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
 
 	DPRINTF((ehci_device_bulk_close: pipe=%p\n, pipe));
+	pipe-endpoint-datatoggle = epipe-nexttoggle;
 	ehci_close_pipe(pipe, sc-sc_async_head);
 }
 

Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.235 src/sys/dev/usb/uhci.c:1.236
--- src/sys/dev/usb/uhci.c:1.235	Sat Nov 13 13:52:12 2010
+++ src/sys/dev/usb/uhci.c	Fri May 27 17:19:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhci.c,v 1.235 2010/11/13 13:52:12 uebayasi Exp $	*/
+/*	$NetBSD: uhci.c,v 1.236 2011/05/27 17:19:18 drochner Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
 /*
@@ -42,7 +42,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.235 2010/11/13 13:52:12 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.236 2011/05/27 17:19:18 drochner Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -2175,6 +2175,8 @@
 	uhci_softc_t *sc = dev-bus-hci_private;
 
 	uhci_free_sqh(sc, upipe-u.bulk.sqh);
+
+	pipe-endpoint-datatoggle = upipe-nexttoggle;
 }
 
 usbd_status
@@ -3183,7 +3185,8 @@
 		 ed-bEndpointAddress, sc-sc_addr));
 
 	upipe-aborting = 0;
-	upipe-nexttoggle = 0;
+	/* toggle state needed for bulk endpoints */
+	upipe-nexttoggle = pipe-endpoint-datatoggle;
 
 	if (pipe-device-address == sc-sc_addr) {
 		switch (ed-bEndpointAddress) {

Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.178 src/sys/dev/usb/usb_subr.c:1.179
--- src/sys/dev/usb/usb_subr.c:1.178	Sun Mar 20 17:38:11 2011
+++ src/sys/dev/usb/usb_subr.c	Fri May 27 17:19:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.178 2011/03/20 17:38:11 tsutsui Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.179 2011/05/27 17:19:18 drochner Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.178 2011/03/20 17:38:11 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.179 2011/05/27 17:19:18 drochner Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_usbverbose.h
@@ -495,6 +495,7 @@
 			}
 		}
 		ifc-endpoints[endpt].refcnt = 0;
+		ifc-endpoints[endpt].datatoggle = 0;
 		p += ed-bLength;
 	}
 #undef ed
@@ -1105,6 +1106,9 @@
 	USETW(dev-def_ep_desc.wMaxPacketSize, 64);
 	dev-def_ep_desc.bInterval = 0;
 
+	/* doesn't matter, just don't let it uninitialized */
+	dev-def_ep.datatoggle = 0;
+
 	dev-quirks = usbd_no_quirk;
 	dev-address = USB_START_ADDR;
 	dev-ddesc.bMaxPacketSize = 0;

Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.92 src/sys/dev/usb/usbdivar.h:1.93
--- src/sys/dev/usb/usbdivar.h:1.92	Mon Dec 20 18:49:12 2010
+++ src/sys/dev/usb/usbdivar.h	Fri May 27 17:19:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdivar.h,v 1.92 2010/12/20 18:49:12 phx Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.93 2011/05/27 17:19:18 drochner Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $	*/
 
 /*
@@ -46,6 +46,7 @@
 struct usbd_endpoint {
 	usb_endpoint_descriptor_t *edesc;
 	int			refcnt;
+	int datatoggle;
 };
 
 struct usbd_bus_methods {

CVS commit: src/gnu/usr.bin/groff/font

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Fri May 27 17:23:47 UTC 2011

Modified Files:
src/gnu/usr.bin/groff/font: Makefile.tty

Log Message:
add a line image_generator gs to the DESC file as the original
build framework does, lets groff -Thtml at least start
(it seems that ghostscript is not needed at least for simple documents)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/gnu/usr.bin/groff/font/Makefile.tty

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

Modified files:

Index: src/gnu/usr.bin/groff/font/Makefile.tty
diff -u src/gnu/usr.bin/groff/font/Makefile.tty:1.8 src/gnu/usr.bin/groff/font/Makefile.tty:1.9
--- src/gnu/usr.bin/groff/font/Makefile.tty:1.8	Sat Oct 25 22:27:35 2008
+++ src/gnu/usr.bin/groff/font/Makefile.tty	Fri May 27 17:23:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.tty,v 1.8 2008/10/25 22:27:35 apb Exp $
+# $NetBSD: Makefile.tty,v 1.9 2011/05/27 17:23:47 drochner Exp $
 
 # $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.7 2001/04/17 12:36:42 ru Exp $
 
@@ -34,3 +34,4 @@
 	-e s/^vert .*$$/vert `expr $(RES) / $(LPI)`/ \
 	-e s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/ \
 	${.ALLSRC} ${.TARGET}
+	echo image_generator gs ${.TARGET}

CVS commit: src/distrib/notes

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Fri May 27 17:50:14 UTC 2011

Modified Files:
src/distrib/notes/emips: legal
src/distrib/notes/pmax: legal

Log Message:
- fix mdoc warnings
- remove entries which are not necessary or in common/legal


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/notes/emips/legal
cvs rdiff -u -r1.9 -r1.10 src/distrib/notes/pmax/legal

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

Modified files:

Index: src/distrib/notes/emips/legal
diff -u src/distrib/notes/emips/legal:1.1 src/distrib/notes/emips/legal:1.2
--- src/distrib/notes/emips/legal:1.1	Wed Jan 26 01:18:45 2011
+++ src/distrib/notes/emips/legal	Fri May 27 17:50:14 2011
@@ -1,33 +1,15 @@
-.\	$NetBSD: legal,v 1.1 2011/01/26 01:18:45 pooka Exp $
+.\	$NetBSD: legal,v 1.2 2011/05/27 17:50:14 tsutsui Exp $
 .
 .It
-This product includes software developed by Ted Lemon.
-.It
 This product includes software contributed to Berkeley by
 Ralph Campbell.
 .It
 This product includes software contributed to Berkeley by
 Ralph Campbell and Rick Macklem.
 .It
-This product includes software contributed to Berkeley by
-Van Jacobson of Lawrence Berkeley Laboratory and Ralph
-Campbell.
-.It
-This product includes software developed by Chris G.
-Demetriou, and Jonathan Stone.
-.It
-This product includes software developed by Keith Bostic,
-Chris G. Demetriou, and Jonathan Stone.
-.It
-This product includes software developed by the University
-of California, Lawrence Berkeley Laboratory.
-.It
 This product includes software developed by Jonathan Stone for
 the NetBSD Project.
 .It
-This product includes software developed by Tohru Nishimura
-for the NetBSD Project.
-.It
 Some files have the following copyright:
 .(item -offset indent -compact
 Mach Operating System
@@ -35,19 +17,19 @@
 Copyright (c) 1991,1990,1989 Carnegie Mellon University
 .br
 All Rights Reserved.
-
+.Pp
 Permission to use, copy, modify and distribute this software and its
 documentation is hereby granted, provided that both the copyright
 notice and this permission notice appear in all copies of the
 software, derivative works or modified versions, and any portions
 thereof, and that both notices appear in supporting documentation.
-
+.Pp
 CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS
 CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-
+.Pp
 Carnegie Mellon requests users of this software to return to
-
+.br
 Software Distribution Coordinator  or  software.distribut...@cs.cmu.edu
 .br
 School of Computer Science
@@ -55,7 +37,7 @@
 Carnegie Mellon University
 .br
 Pittsburgh PA 15213-3890
-
+.Pp
 any improvements or extensions that they make and grant Carnegie the
 rights to redistribute these changes.
 .item)
@@ -65,21 +47,21 @@
 Copyright (c) 1994, 1995 Carnegie-Mellon University.
 .br
 All rights reserved.
-
+.Pp
 Author: Chris G. Demetriou
-
+.Pp
 Permission to use, copy, modify and distribute this software and
 its documentation is hereby granted, provided that both the copyright
 notice and this permission notice appear in all copies of the
 software, derivative works or modified versions, and any portions
 thereof, and that both notices appear in supporting documentation.
-
+.br
 CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS AS IS
 CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
 FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-
+.Pp
 Carnegie Mellon requests users of this software to return to
-
+.br
 Software Distribution Coordinator  or  software.distribut...@cs.cmu.edu
 .br
 School of Computer Science
@@ -87,55 +69,7 @@
 Carnegie Mellon University
 .br
 Pittsburgh PA 15213-3890
-
+.Pp
 any improvements or extensions that they make and grant Carnegie the
 rights to redistribute these changes.
 .item)
-.It
-Some files have the following copyright:
-.(item -offset indent -compact
-  Copyright (C) 1989 Digital Equipment Corporation.
-.br
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appears in all copies.
-Digital Equipment Corporation makes no representations about the
-suitability of this software for any purpose.  It is provided as is
-without express or implied warranty.
-
-Some files have the following copyright:
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
-
-		 All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in

CVS commit: src/distrib/notes/common

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Fri May 27 17:50:41 UTC 2011

Modified Files:
src/distrib/notes/common: sysinst

Log Message:
- fix mdoc warning


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/distrib/notes/common/sysinst

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

Modified files:

Index: src/distrib/notes/common/sysinst
diff -u src/distrib/notes/common/sysinst:1.100 src/distrib/notes/common/sysinst:1.101
--- src/distrib/notes/common/sysinst:1.100	Sat Dec  5 16:29:10 2009
+++ src/distrib/notes/common/sysinst	Fri May 27 17:50:41 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: sysinst,v 1.100 2009/12/05 16:29:10 pooka Exp $
+.\	$NetBSD: sysinst,v 1.101 2011/05/27 17:50:41 tsutsui Exp $
 .\
 .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -666,7 +666,7 @@
 .el \{\
 Boot your machine.
 The boot loader will start, and will print a countdown and begin booting.
-.if !\n[alpha]:\n[amd64]:\n[i386] \{
+.if !\n[alpha]:\n[amd64]:\n[i386] \{\
 .Pp
 If the boot loader messages do not appear in a reasonable
 amount of time, you either have a bad boot floppy or a

CVS commit: src/crypto/dist/ipsec-tools/src/setkey

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Fri May 27 18:00:21 UTC 2011

Modified Files:
src/crypto/dist/ipsec-tools/src/setkey: setkey.c

Log Message:
replace questionable pointer games which could cause reads of
uninitialized memory, from Wolfgang Stukenbrock per PR bin/44951


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/crypto/dist/ipsec-tools/src/setkey/setkey.c

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

Modified files:

Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.c
diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.14 src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.15
--- src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.14	Thu Aug  6 04:44:43 2009
+++ src/crypto/dist/ipsec-tools/src/setkey/setkey.c	Fri May 27 18:00:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: setkey.c,v 1.14 2009/08/06 04:44:43 tteras Exp $	*/
+/*	$NetBSD: setkey.c,v 1.15 2011/05/27 18:00:21 drochner Exp $	*/
 
 /*	$KAME: setkey.c,v 1.36 2003/09/24 23:52:51 itojun Exp $	*/
 
@@ -753,12 +753,6 @@
 			else
 pfkey_sadump(msg);
 		}
-		msg = (struct sadb_msg *)((caddr_t)msg +
- PFKEY_UNUNIT64(msg-sadb_msg_len));
-		if (f_verbose) {
-			kdebug_sadb((struct sadb_msg *)msg);
-			printf(\n);
-		}
 		break;
 
 	case SADB_X_SPDGET:
@@ -773,13 +767,6 @@
 			pfkey_spdump_withports(msg);
 		else
 			pfkey_spdump(msg);
-		if (msg-sadb_msg_seq == 0) break;
-		msg = (struct sadb_msg *)((caddr_t)msg +
- PFKEY_UNUNIT64(msg-sadb_msg_len));
-		if (f_verbose) {
-			kdebug_sadb((struct sadb_msg *)msg);
-			printf(\n);
-		}
 		break;
 #ifdef HAVE_PFKEY_POLICY_PRIORITY
 	case SADB_X_SPDADD:
@@ -867,6 +854,10 @@
 	while (p  ep) {
 		msg = (struct sadb_msg *)p;
 		len = PFKEY_UNUNIT64(msg-sadb_msg_len);
+		if (f_verbose) {
+			kdebug_sadb((struct sadb_msg *)msg);
+			printf(\n);
+		}
 		postproc(msg, len);
 		p += len;
 	}

CVS commit: src/sys/dev/usb

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Fri May 27 19:04:24 UTC 2011

Modified Files:
src/sys/dev/usb: ehci.c ohci.c ohcivar.h uhci.c

Log Message:
Apply patch in PR kern/44907 (crash due to race in ehci.c):
 - make sure to remove abort_task in ehci_freex
 - always initialize abort_task in ehci_allocx,
   not in ehci_timeout just before adding the task
Also apply similar fixes to ohci and uhci.

XXX: should we also call abort_task handler before removing it from queue
 if *hci_freex() is called for usbd_xfer_handle with queued abort_task?


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.212 -r1.213 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/ohcivar.h
cvs rdiff -u -r1.236 -r1.237 src/sys/dev/usb/uhci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.175 src/sys/dev/usb/ehci.c:1.176
--- src/sys/dev/usb/ehci.c:1.175	Fri May 27 17:19:18 2011
+++ src/sys/dev/usb/ehci.c	Fri May 27 19:04:24 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.175 2011/05/27 17:19:18 drochner Exp $ */
+/*	$NetBSD: ehci.c,v 1.176 2011/05/27 19:04:24 tsutsui Exp $ */
 
 /*
  * Copyright (c) 2004-2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.175 2011/05/27 17:19:18 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.176 2011/05/27 19:04:24 tsutsui Exp $);
 
 #include ohci.h
 #include uhci.h
@@ -1284,6 +1284,7 @@
 {
 	struct ehci_softc *sc = bus-hci_private;
 	usbd_xfer_handle xfer;
+	struct ehci_xfer *exfer;
 
 	xfer = SIMPLEQ_FIRST(sc-sc_free_xfers);
 	if (xfer != NULL) {
@@ -1295,12 +1296,14 @@
 		}
 #endif
 	} else {
-		xfer = malloc(sizeof(struct ehci_xfer), M_USB, M_NOWAIT);
+		xfer = malloc(sizeof(*exfer), M_USB, M_NOWAIT);
 	}
 	if (xfer != NULL) {
-		memset(xfer, 0, sizeof(struct ehci_xfer));
+		exfer = EXFER(xfer);
+		memset(exfer, 0, sizeof(*exfer));
+		usb_init_task(exfer-abort_task, ehci_timeout_task, exfer);
 #ifdef DIAGNOSTIC
-		EXFER(xfer)-isdone = 1;
+		exfer-isdone = 1;
 		xfer-busy_free = XFER_BUSY;
 #endif
 	}
@@ -1311,6 +1314,7 @@
 ehci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
 {
 	struct ehci_softc *sc = bus-hci_private;
+	struct ehci_xfer *exfer = EXFER(xfer);
 
 #ifdef DIAGNOSTIC
 	if (xfer-busy_free != XFER_BUSY) {
@@ -1318,10 +1322,11 @@
 		   xfer-busy_free);
 	}
 	xfer-busy_free = XFER_FREE;
-	if (!EXFER(xfer)-isdone) {
+	if (!exfer-isdone) {
 		printf(ehci_freex: !isdone\n);
 	}
 #endif
+	usb_rem_task(xfer-pipe-device, exfer-abort_task);
 	SIMPLEQ_INSERT_HEAD(sc-sc_free_xfers, xfer, next);
 }
 
@@ -3150,7 +3155,6 @@
 	}
 
 	/* Execute the abort in a process context. */
-	usb_init_task(exfer-abort_task, ehci_timeout_task, addr);
 	usb_add_task(exfer-xfer.pipe-device, exfer-abort_task,
 	USB_TASKQ_HC);
 }

Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.212 src/sys/dev/usb/ohci.c:1.213
--- src/sys/dev/usb/ohci.c:1.212	Wed Dec 22 01:34:19 2010
+++ src/sys/dev/usb/ohci.c	Fri May 27 19:04:24 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci.c,v 1.212 2010/12/22 01:34:19 macallan Exp $	*/
+/*	$NetBSD: ohci.c,v 1.213 2011/05/27 19:04:24 tsutsui Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.212 2010/12/22 01:34:19 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.213 2011/05/27 19:04:24 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -945,6 +945,7 @@
 {
 	struct ohci_softc *sc = bus-hci_private;
 	usbd_xfer_handle xfer;
+	struct ohci_xfer *oxfer;
 
 	xfer = SIMPLEQ_FIRST(sc-sc_free_xfers);
 	if (xfer != NULL) {
@@ -956,10 +957,12 @@
 		}
 #endif
 	} else {
-		xfer = malloc(sizeof(struct ohci_xfer), M_USB, M_NOWAIT);
+		xfer = malloc(sizeof(*oxfer), M_USB, M_NOWAIT);
 	}
 	if (xfer != NULL) {
-		memset(xfer, 0, sizeof (struct ohci_xfer));
+		oxfer = OXFER(xfer);
+		memset(oxfer, 0, sizeof(*oxfer));
+		usb_init_task(oxfer-abort_task, ohci_timeout_task, oxfer);
 #ifdef DIAGNOSTIC
 		xfer-busy_free = XFER_BUSY;
 #endif
@@ -971,6 +974,7 @@
 ohci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
 {
 	struct ohci_softc *sc = bus-hci_private;
+	struct ohci_xfer *oxfer = OXFER(xfer);
 
 #ifdef DIAGNOSTIC
 	if (xfer-busy_free != XFER_BUSY) {
@@ -979,6 +983,7 @@
 	}
 	xfer-busy_free = XFER_FREE;
 #endif
+	usb_rem_task(xfer-pipe-device, oxfer-abort_task);
 	SIMPLEQ_INSERT_HEAD(sc-sc_free_xfers, xfer, next);
 }
 
@@ -1948,7 +1953,6 @@
 	}
 
 	/* Execute the abort in a process context. */
-	usb_init_task(oxfer-abort_task, ohci_timeout_task, addr);
 	usb_add_task(oxfer-xfer.pipe-device, oxfer-abort_task,
 	USB_TASKQ_HC);
 }

Index: src/sys/dev/usb/ohcivar.h
diff -u src/sys/dev/usb/ohcivar.h:1.49 src/sys/dev/usb/ohcivar.h:1.50

CVS commit: src/sys/dev/usb

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Fri May 27 20:37:13 UTC 2011

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

Log Message:
Data toggle accounting for endpoints on OHCI.


To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/sys/dev/usb/ohci.c

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

Modified files:

Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.213 src/sys/dev/usb/ohci.c:1.214
--- src/sys/dev/usb/ohci.c:1.213	Fri May 27 19:04:24 2011
+++ src/sys/dev/usb/ohci.c	Fri May 27 20:37:13 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci.c,v 1.213 2011/05/27 19:04:24 tsutsui Exp $	*/
+/*	$NetBSD: ohci.c,v 1.214 2011/05/27 20:37:13 jakllsch Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.213 2011/05/27 19:04:24 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.214 2011/05/27 20:37:13 jakllsch Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -2122,7 +2122,9 @@
 			(dev-speed == USB_SPEED_LOW ? OHCI_ED_SPEED : 0) |
 			fmt |
 			OHCI_ED_SET_MAXP(UGETW(ed-wMaxPacketSize)));
-		sed-ed.ed_headp = sed-ed.ed_tailp = HTOO32(tdphys);
+		sed-ed.ed_headp = HTOO32(tdphys |
+		(pipe-endpoint-datatoggle ? OHCI_TOGGLECARRY : 0));
+		sed-ed.ed_tailp = HTOO32(tdphys);
 		usb_syncmem(sed-dma, sed-offs, sizeof(sed-ed),
 		BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 
@@ -2209,6 +2211,8 @@
 	ohci_rem_ed(sed, head);
 	/* Make sure the host controller is not touching this ED */
 	usb_delay_ms(sc-sc_bus, 1);
+	pipe-endpoint-datatoggle =
+	(O32TOH(sed-ed.ed_headp)  OHCI_TOGGLECARRY) ? 1 : 0;
 	splx(s);
 	ohci_free_sed(sc, opipe-sed);
 }

CVS commit: xsrc/xfree/xc/programs/Xserver/dix

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Fri May 27 21:29:26 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/dix: dixfonts.c

Log Message:
missing type


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c

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

Modified files:

Index: xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c
diff -u xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c:1.2 xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c:1.3
--- xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c:1.2	Sun Jul  2 15:17:56 2006
+++ xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c	Fri May 27 17:29:26 2011
@@ -2197,6 +2197,7 @@
 #define GLYPH_SIZE(ch, nbytes)  \
 	GLWIDTHBYTESPADDED((ch)-metrics.rightSideBearing - \
 			(ch)-metrics.leftSideBearing, (nbytes))
+void
 dump_char_ascii(cip)
 CharInfoPtr cip;
 {

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Fri May 27 21:32:50 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h

Log Message:
deal with amiga_membarrier being a macro.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h

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

Modified files:

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.2	Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h	Fri May 27 17:32:49 2011
@@ -296,9 +296,11 @@
 #endif
 }
 
-static __inline void amiga_membarrier() {
+#ifndef amiga_membarrier
+static __inline void amiga_membarrier(void) {
 	abort();
 }
+#endif
 
 /* don't forget to init vgaBase and inf before using these macros! */
 

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri May 27 22:42:26 UTC 2011

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

Log Message:
add missing debuglib


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xserver/md.sparc64

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.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.47 src/distrib/sets/lists/xserver/md.sparc64:1.48
--- src/distrib/sets/lists/xserver/md.sparc64:1.47	Wed Mar  9 13:55:56 2011
+++ src/distrib/sets/lists/xserver/md.sparc64	Fri May 27 18:42:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.47 2011/03/09 18:55:56 mrg Exp $	x11
+# $NetBSD: md.sparc64,v 1.48 2011/05/27 22:42:26 christos Exp $	x11
 ./usr/X11R6/bin/X	-unknown-	x11
 ./usr/X11R6/bin/XFree86	-unknown-	x11
 ./usr/X11R6/bin/Xsun	-unknown-	x11
@@ -401,6 +401,7 @@
 ./usr/X11R7/lib/modules/libexa.a			-unknown-	xorg
 ./usr/X11R7/lib/modules/libexa.so			-unknown-	xorg
 ./usr/X11R7/lib/modules/libexa.so.0			-unknown-	xorg
+./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libexa_pic.a			-unknown-	xorg
 ./usr/X11R7/lib/modules/libfb.a-unknown-	xorg
 ./usr/X11R7/lib/modules/libfb.so			-unknown-	xorg

CVS commit: src/sys/dev/raidframe

[YAMAMOTO Takashi]

Module Name:src
Committed By:   yamt
Date:   Fri May 27 22:48:25 UTC 2011

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

Log Message:
don't forget to destroy mutex.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/raidframe/rf_driver.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_driver.c
diff -u src/sys/dev/raidframe/rf_driver.c:1.128 src/sys/dev/raidframe/rf_driver.c:1.129
--- src/sys/dev/raidframe/rf_driver.c:1.128	Wed May 11 18:13:12 2011
+++ src/sys/dev/raidframe/rf_driver.c	Fri May 27 22:48:24 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_driver.c,v 1.128 2011/05/11 18:13:12 mrg Exp $	*/
+/*	$NetBSD: rf_driver.c,v 1.129 2011/05/27 22:48:24 yamt Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -66,7 +66,7 @@
 
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_driver.c,v 1.128 2011/05/11 18:13:12 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_driver.c,v 1.129 2011/05/27 22:48:24 yamt Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_raid_diagnostic.h
@@ -179,6 +179,7 @@
 	rf_lock_mutex2(configureMutex);
 	if (--configureCount == 0) {	/* if no active configurations, shut
 	 * everything down */
+		rf_destroy_mutex2(rf_printf_mutex);
 		isconfigged = 0;
 		rf_ShutdownList(globalShutdown);
 
@@ -278,6 +279,7 @@
 		rf_ShutdownList(globalShutdown); \
 		configureCount--; \
 		rf_unlock_mutex2(configureMutex); \
+		rf_destroy_mutex2(rf_printf_mutex); \
 		return(rc); \
 	} \
 }

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 00:01:43 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf: std.mpc85xx

Log Message:
NEEDS_MDSETIMAGE - NEED_MDSETIMAGE


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/conf/std.mpc85xx

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/evbppc/conf/std.mpc85xx
diff -u src/sys/arch/evbppc/conf/std.mpc85xx:1.3 src/sys/arch/evbppc/conf/std.mpc85xx:1.4
--- src/sys/arch/evbppc/conf/std.mpc85xx:1.3	Mon May  2 01:45:26 2011
+++ src/sys/arch/evbppc/conf/std.mpc85xx	Sat May 28 00:01:43 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: std.mpc85xx,v 1.3 2011/05/02 01:45:26 matt Exp $
+#	$NetBSD: std.mpc85xx,v 1.4 2011/05/28 00:01:43 matt Exp $
 #
 # Standard/required options for NetBSD/mpc85xx.
 
@@ -16,7 +16,7 @@
 makeoptions	TEXTADDR=0x2
 makeoptions	BOARDTYPE=mpc85xx
 makeoptions	PPCDIR=booke
-makeoptions	NEEDS_MDSETIMAGE=yes
+makeoptions	NEED_MDSETIMAGE=yes
 
 options 	PPC_INTR_IMPL=powerpc/booke/intr.h
 options 	PPC_PCI_MACHDEP_IMPL=powerpc/pci_machdep.h

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 00:06:38 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf: Makefile.evbppc.inc

Log Message:
Add common processing for .srec, .bin, and .ub (ubootimage) files.
When creating u-boot image, use a compressed binary kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/conf/Makefile.evbppc.inc

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

Modified files:

Index: src/sys/arch/evbppc/conf/Makefile.evbppc.inc
diff -u src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.4 src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.5
--- src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.4	Tue Jan  4 08:58:59 2011
+++ src/sys/arch/evbppc/conf/Makefile.evbppc.inc	Sat May 28 00:06:38 2011
@@ -1,14 +1,45 @@
-#	$NetBSD: Makefile.evbppc.inc,v 1.4 2011/01/04 08:58:59 matt Exp $
+#	$NetBSD: Makefile.evbppc.inc,v 1.5 2011/05/28 00:06:38 matt Exp $
 
 CPPFLAGS += -D__${BOARDTYPE}__
 
 RAMDISKDIR!=	cd ${NETBSDSRCDIR}/distrib/${THISPPC:T}/ramdisk  ${PRINTOBJDIR}
 
-.if defined(NEEDS_MDSETIMAGE)  exists(${RAMDISKDIR}/ramdisk.fs)
+.if defined(NEED_MDSETIMAGE)  ${NEED_MKDSETIMAGE} != no \
+ exists(${RAMDISKDIR}/ramdisk.fs)
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs; \
 	${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs
+.endif
+
+.if defined(NEED_SREC)  ${NEED_SREC} != no
+SYSTEM_LD_TAIL_EXTRA+=; \
+	echo ${STRIP} -O srec -o $@.srec $@; \
+	${STRIP} -O srec -o $@.srec $@
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@}
+.endif
+
+.if defined(NEED_BINARY)  ${NEED_BINARY} != no
+SYSTEM_LD_TAIL_EXTRA+=; \
+	echo ${OBJCOPY} -S -O binary $@ $@.bin; \
+	${OBJCOPY} -S -O binary $@ $@.bin
 
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+
+.if defined(NEED_UBOOTIMAGE)  ${NEED_UBOOTIMAGE} != no
+_OSRELEASE!=		${HOST_SH} $S/conf/osrelease.sh
+MKUBOOTIMAGEARGS=   -A powerpc -T kernel -C gz
+MKUBOOTIMAGEARGS+=  -a ${TEXTADDR:C/$//} -e $(TEXTADDR)
+MKUBOOTIMAGEARGS+=  -n NetBSD/$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))
+
+SYSTEM_LD_TAIL_EXTRA+=; \
+	echo gzip -v9cn $@.bin '' $@.bin.gz; \
+	gzip -v9cn $@.bin  $@.bin.gz; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub
+
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+.endif
 .endif
 
 .-include ${THISPPC}/conf/Makefile.${BOARDTYPE}.inc

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 00:07:25 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf: Makefile.mpc85xx.inc

Log Message:
Get rid of LD_TAIL now that there is a common version in Makefile.evbppc.inc


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc

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

Modified files:

Index: src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc
diff -u src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc:1.2 src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc:1.3
--- src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc:1.2	Tue Jan 18 01:10:24 2011
+++ src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc	Sat May 28 00:07:24 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mpc85xx.inc,v 1.2 2011/01/18 01:10:24 matt Exp $
+#	$NetBSD: Makefile.mpc85xx.inc,v 1.3 2011/05/28 00:07:24 matt Exp $
 
 CFLAGS+=		-mmultiple
 CFLAGS+=		-mno-string -misel -Wa,-me500
@@ -11,10 +11,3 @@
 
 SYSTEM_FIRST_OBJ=	mpc85xx_start.o
 SYSTEM_FIRST_SFILE=	${THISPPC}/mpc85xx/mpc85xx_start.S
-
-SYSTEM_LD_TAIL_EXTRA+=; \
-	echo ${OBJCOPY} -S -O binary $@ $@.bin; \
-	${OBJCOPY} -S -O binary $@ $@.bin
-
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 00:07:56 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf: RB800

Log Message:
NEEDS_MDSETIMAGE - NEED_MDSETIMAGE


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

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/evbppc/conf/RB800
diff -u src/sys/arch/evbppc/conf/RB800:1.4 src/sys/arch/evbppc/conf/RB800:1.5
--- src/sys/arch/evbppc/conf/RB800:1.4	Wed Mar 16 21:10:35 2011
+++ src/sys/arch/evbppc/conf/RB800	Sat May 28 00:07:56 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: RB800,v 1.4 2011/03/16 21:10:35 matt Exp $
+#	$NetBSD: RB800,v 1.5 2011/05/28 00:07:56 matt Exp $
 #
 #	RB800 -- everything that's currently supported
 #
@@ -7,7 +7,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		RB800-$Revision: 1.4 $
+ident 		RB800-$Revision: 1.5 $
 
 maxusers	32
 
@@ -22,7 +22,7 @@
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
 #options 	MEMORY_DISK_ROOT_SIZE=6144	# size of memory disk, in blocks
-no makeoptions	NEEDS_MDSETIMAGE
+no makeoptions	NEED_MDSETIMAGE
 
 options 	NFS_BOOT_BOOTP
 

CVS commit: src/sys/dev/raidframe

[YAMAMOTO Takashi]

Module Name:src
Committed By:   yamt
Date:   Sat May 28 00:53:04 UTC 2011

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

Log Message:
rf_ReconstructInPlace: don't leave a vnode open on errors.
fixes a part of PR/44972.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/raidframe/rf_reconstruct.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_reconstruct.c
diff -u src/sys/dev/raidframe/rf_reconstruct.c:1.114 src/sys/dev/raidframe/rf_reconstruct.c:1.115
--- src/sys/dev/raidframe/rf_reconstruct.c:1.114	Tue May 24 07:33:41 2011
+++ src/sys/dev/raidframe/rf_reconstruct.c	Sat May 28 00:53:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_reconstruct.c,v 1.114 2011/05/24 07:33:41 buhrow Exp $	*/
+/*	$NetBSD: rf_reconstruct.c,v 1.115 2011/05/28 00:53:04 yamt Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
  /
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_reconstruct.c,v 1.114 2011/05/24 07:33:41 buhrow Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_reconstruct.c,v 1.115 2011/05/28 00:53:04 yamt Exp $);
 
 #include sys/param.h
 #include sys/time.h
@@ -456,6 +456,7 @@
 	   How about actually getting a vp for it? */
 
 	if ((retcode = VOP_GETATTR(vp, va, curlwp-l_cred)) != 0) {
+		vn_close(vp, FREAD | FWRITE, kauth_cred_get());
 		rf_lock_mutex2(raidPtr-mutex);
 		raidPtr-reconInProgress--;
 		rf_signal_cond2(raidPtr-waitForReconCond);
@@ -465,6 +466,7 @@
 
 	retcode = VOP_IOCTL(vp, DIOCGPART, dpart, FREAD, curlwp-l_cred);
 	if (retcode) {
+		vn_close(vp, FREAD | FWRITE, kauth_cred_get());
 		rf_lock_mutex2(raidPtr-mutex);
 		raidPtr-reconInProgress--;
 		rf_signal_cond2(raidPtr-waitForReconCond);

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 02:20:13 UTC 2011

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mipsX_subr.S

Log Message:
Since we mostly use RAS (even if we have LL/SC), need to check for lock ras
addresses even on ll/sc capable CPUs.


To generate a diff of this commit:
cvs rdiff -u -r1.26.36.1.2.43 -r1.26.36.1.2.44 \
src/sys/arch/mips/mips/mipsX_subr.S

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

Modified files:

Index: src/sys/arch/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.43 src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.44
--- src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.43	Thu May 26 19:21:56 2011
+++ src/sys/arch/mips/mips/mipsX_subr.S	Sat May 28 02:20:13 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mipsX_subr.S,v 1.26.36.1.2.43 2011/05/26 19:21:56 matt Exp $	*/
+/*	$NetBSD: mipsX_subr.S,v 1.26.36.1.2.44 2011/05/28 02:20:13 matt Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -773,7 +773,6 @@
 	 nop
 #endif /* PARANOIA */
 
-#ifdef notyet
 	/*
 	 * Check for kernel restartable atomic sequences.
 	 */
@@ -785,7 +784,6 @@
 	jal	_C_LABEL(_restart_lock_ras)	# fix the pc (k1)
 	 nop
 1:
-#endif
 
 	_MTC0	k1, MIPS_COP_0_EXC_PC		# set return address
 	COP0_SYNC

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Sat May 28 02:21:37 UTC 2011

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: trap.c

Log Message:
add cpu number to fault print


To generate a diff of this commit:
cvs rdiff -u -r1.217.12.36 -r1.217.12.37 src/sys/arch/mips/mips/trap.c

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

Modified files:

Index: src/sys/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.217.12.36 src/sys/arch/mips/mips/trap.c:1.217.12.37
--- src/sys/arch/mips/mips/trap.c:1.217.12.36	Thu May 26 19:21:56 2011
+++ src/sys/arch/mips/mips/trap.c	Sat May 28 02:21:36 2011
@@ -629,9 +629,9 @@
 	utf-tf_regs[_R_CAUSE] = cause;
 	utf-tf_regs[_R_BADVADDR] = vaddr;
 #if defined(DEBUG)
-	printf(trap: pid %d(%s): sig %d: cause=%#x epc=%#PRIxREGISTER
+	printf(trap: cpu%d, pid %d(%s): sig %d: cause=%#x epc=%#PRIxREGISTER
 	 va=%#PRIxVADDR\n,
-	p-p_pid, p-p_comm, ksi.ksi_signo, cause,
+	cpu_number(), p-p_pid, p-p_comm, ksi.ksi_signo, cause,
 	utf-tf_regs[_R_PC], vaddr);
 	printf(registers:\n);
 	for (size_t i = 0; i  32; i += 4) {

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Sat May 28 02:24:47 UTC 2011

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: cpu_subr.c

Log Message:
use intr instead of int for clock evcnt names


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

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

Modified files:

Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.1.2.18 src/sys/arch/mips/mips/cpu_subr.c:1.1.2.19
--- src/sys/arch/mips/mips/cpu_subr.c:1.1.2.18	Thu May 26 19:21:56 2011
+++ src/sys/arch/mips/mips/cpu_subr.c	Sat May 28 02:24:47 2011
@@ -228,10 +228,10 @@
 
 	evcnt_attach_dynamic(ci-ci_ev_count_compare,
 		EVCNT_TYPE_INTR, NULL, xname,
-		int 5 (clock));
+		intr 5 (clock));
 	evcnt_attach_dynamic(ci-ci_ev_count_compare_missed,
 		EVCNT_TYPE_INTR, NULL, xname,
-		int 5 (clock) missed);
+		intr 5 (clock) missed);
 	evcnt_attach_dynamic(ci-ci_ev_fpu_loads,
 		EVCNT_TYPE_MISC, NULL, xname,
 		fpu loads);

CVS commit: src/sys/arch/evbppc/mpc85xx

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 05:21:40 UTC 2011

Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c

Log Message:
allow configuring multiple CPUs (still needs work).
Detect boot page on MP e500 CPUs (P2020, MPC8572, etc) and prevent use of
that page in NetBSD.  This page is used to communicate with u-boot to spin
up secondary CPUs.
Probe LBC before PCI so that LBC attached devices can be configured before
probing the PCI.  This gives a chance to download/setup PCI Express switches
before probing/configuring PCI.
Fix PIXIS speed entry bug/typo.
Rework SYS_CLK logic so that the SYS_CLK config option has the highest priority.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/mpc85xx/machdep.c

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

Modified files:

Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.5 src/sys/arch/evbppc/mpc85xx/machdep.c:1.6
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.5	Thu Feb 17 13:57:12 2011
+++ src/sys/arch/evbppc/mpc85xx/machdep.c	Sat May 28 05:21:40 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.5 2011/02/17 13:57:12 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.6 2011/05/28 05:21:40 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -136,10 +136,15 @@
 
 const bus_space_handle_t gur_bsh = (bus_space_handle_t)(uintptr_t)(GUR_BASE);
 
+#if defined(SYS_CLK)
+static uint64_t e500_sys_clk = SYS_CLK;
+#endif
 #ifdef CADMUS
 static uint8_t cadmus_pci;
 static uint8_t cadmus_csr;
+#ifndef SYS_CLK
 static uint64_t e500_sys_clk = ; /* 33.33Mhz */
+#endif
 #elif defined(PIXIS)
 static const uint32_t pixis_spd_map[8] = {
 [PX_SPD_33MHZ] = ,
@@ -147,15 +152,15 @@
 [PX_SPD_50MHZ] = 5000,
 [PX_SPD_66MHZ] = ,
 [PX_SPD_83MHZ] = 8333,
-[PX_SPD_133MHZ] = 1,
+[PX_SPD_100MHZ] = 1,
 [PX_SPD_133MHZ] = 1,
 [PX_SPD_166MHZ] = 16667,
 };
 static uint8_t pixis_spd;
+#ifndef SYS_CLK
 static uint64_t e500_sys_clk;
-#elif defined(SYS_CLK)
-static uint64_t e500_sys_clk = SYS_CLK;
-#else
+#endif
+#elif !defined(SYS_CLK)
 static uint64_t e500_sys_clk = 6667; /* 66.67Mhz */
 #endif
 
@@ -172,7 +177,14 @@
  * List of port-specific devices to attach to the processor local bus.
  */
 static const struct cpunode_locators mpc8548_cpunode_locs[] = {
-	{ cpu },	/* not a real device */
+	{ cpu, 0, 0, 0, 0, { 0 }, 0,	/* not a real device */
+		{ 0x, SVR_MPC8572v1  16, SVR_P2020v2  16 } },
+#if defined(MPC8572) || defined(P2020)
+	{ cpu, 0, 0, 1, 0, { 0 }, 0,	/* not a real device */
+		{ SVR_MPC8572v1  16, SVR_P2020v2  16 } },
+	{ cpu, 0, 0, 2, 0, { 0 }, 0,	/* not a real device */
+		{ SVR_MPC8572v1  16, SVR_P2020v2  16 } },
+#endif
 	{ wdog },	/* not a real device */
 	{ duart, DUART1_BASE, 2*DUART_SIZE, 0,
 		1, { ISOURCE_DUART },
@@ -234,6 +246,9 @@
 		1 + ilog2(DEVDISR_DDR2_14),
 		{ SVR_MPC8572v1  16 } },
 #endif
+	{ lbc, LBC_BASE, LBC_SIZE, 0,
+		1, { ISOURCE_LBC },
+		1 + ilog2(DEVDISR_LBC) },
 #if defined(MPC8544) || defined(MPC8536)
 	{ pcie, PCIE1_BASE, PCI_SIZE, 1,
 		1, { ISOURCE_PCIEX },
@@ -322,9 +337,6 @@
 		1 + ilog2(DEVDISR_ESDHC_10),
 		{ SVR_P2020v2  16 }, },
 #endif
-	{ lbc, LBC_BASE, LBC_SIZE, 0,
-		1, { ISOURCE_LBC },
-		1 + ilog2(DEVDISR_LBC) },
 	//{ sec, RNG_BASE, RNG_SIZE, 0, 0, },
 	{ NULL }
 };
@@ -380,6 +392,16 @@
 memprobe(vaddr_t endkernel)
 {
 	phys_ram_seg_t *mr;
+	paddr_t boot_page = cpu_read_4(GUR_BPTR);
+	printf( bptr=%PRIxPADDR, boot_page);
+	if (boot_page  BPTR_EN) {
+		/*
+		 * shift it to an address
+		 */
+		boot_page = (boot_page  BPTR_BOOT_PAGE)  PAGE_SHIFT;
+	} else {
+		boot_page = ~(paddr_t)0;
+	}
 
 	/*
 	 * First we need to find out how much physical memory we have.
@@ -392,8 +414,14 @@
 		uint32_t v = cpu_read_4(DDRC1_BASE + CS_CONFIG(i));
 		if (v  CS_CONFIG_EN) {
 			v = cpu_read_4(DDRC1_BASE + CS_BNDS(i));
+			if (v == 0)
+continue;
 			mr-start = BNDS_SA_GET(v);
 			mr-size  = BNDS_SIZE_GET(v);
+#if 0
+			printf( [%zd]={%#PRIx64@%#PRIx64},
+			mr - physmemr, mr-size, mr-start);
+#endif
 			mr++;
 		}
 	}
@@ -442,6 +470,38 @@
 	availmemr[0].size -= endkernel - availmemr[0].start;
 	availmemr[0].start = endkernel;
 
+	mr = availmemr;
+	for (u_int i = 0; i  cnt; i++, mr++) {
+		/*
+		 * U-boot reserves a boot-page on multi-core chips.
+		 * We need to make sure that we never disturb it.
+		 */
+		const paddr_t mr_end = mr-start + mr-size;
+		if (mr_end  boot_page  boot_page = mr-start) {
+			/*
+			 * Normally u-boot will put in at the end
+			 * of memory.  But in case it doesn't, deal
+			 * with all possibilities.
+			 */
+			if (boot_page + PAGE_SIZE == mr_end) {
+mr-size -= PAGE_SIZE;
+			} else if (boot_page == mr-start) {
+mr-start += PAGE_SIZE;
+mr-size -= PAGE_SIZE;
+			} else {
+mr-size = boot_page 

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 05:22:25 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf: Makefile.evbppc.inc

Log Message:
Fix typo and make MDSETIMAGE block the same as the others.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/Makefile.evbppc.inc

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

Modified files:

Index: src/sys/arch/evbppc/conf/Makefile.evbppc.inc
diff -u src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.5 src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.6
--- src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.5	Sat May 28 00:06:38 2011
+++ src/sys/arch/evbppc/conf/Makefile.evbppc.inc	Sat May 28 05:22:25 2011
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile.evbppc.inc,v 1.5 2011/05/28 00:06:38 matt Exp $
+#	$NetBSD: Makefile.evbppc.inc,v 1.6 2011/05/28 05:22:25 matt Exp $
 
 CPPFLAGS += -D__${BOARDTYPE}__
 
 RAMDISKDIR!=	cd ${NETBSDSRCDIR}/distrib/${THISPPC:T}/ramdisk  ${PRINTOBJDIR}
 
-.if defined(NEED_MDSETIMAGE)  ${NEED_MKDSETIMAGE} != no \
+.if defined(NEED_MDSETIMAGE)  $(NEED_MDSETIMAGE) != no \
  exists(${RAMDISKDIR}/ramdisk.fs)
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs; \

CVS commit: src/sys/arch/powerpc/include/booke

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 05:23:08 UTC 2011

Modified Files:
src/sys/arch/powerpc/include/booke: e500reg.h

Log Message:
Add Boot Page PTR Register definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/booke/e500reg.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/powerpc/include/booke/e500reg.h
diff -u src/sys/arch/powerpc/include/booke/e500reg.h:1.6 src/sys/arch/powerpc/include/booke/e500reg.h:1.7
--- src/sys/arch/powerpc/include/booke/e500reg.h:1.6	Mon May  2 01:47:26 2011
+++ src/sys/arch/powerpc/include/booke/e500reg.h	Sat May 28 05:23:08 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: e500reg.h,v 1.6 2011/05/02 01:47:26 matt Exp $	*/
+/*	$NetBSD: e500reg.h,v 1.7 2011/05/28 05:23:08 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -45,6 +45,9 @@
 #endif
 
 #define	GUR_SIZE		0x10
+#define	GUR_BPTR		0x0020		/* Boot Page Translation */
+#define	BPTR_EN			__PPCBIT(0)	/* Boot Page Enabled */
+#define	BPTR_BOOT_PAGE		__PPCBITS(8,31)	/* high 24 bits of phys addr */
 
 #define	DDRC1_BASE		0x02000
 #define	DDRC2_BASE		0x06000

CVS commit: src/sys/arch/powerpc/booke

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 05:24:55 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke: booke_machdep.c

Log Message:
Cast physmem to uint64_t before calling ctob to avoid sign extension errors.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/booke_machdep.c

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

Modified files:

Index: src/sys/arch/powerpc/booke/booke_machdep.c
diff -u src/sys/arch/powerpc/booke/booke_machdep.c:1.4 src/sys/arch/powerpc/booke/booke_machdep.c:1.5
--- src/sys/arch/powerpc/booke/booke_machdep.c:1.4	Thu Feb 17 13:53:32 2011
+++ src/sys/arch/powerpc/booke/booke_machdep.c	Sat May 28 05:24:55 2011
@@ -174,7 +174,7 @@
 
 	printf(%s%s, copyright, version);
 
-	format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
+	format_bytes(pbuf, sizeof(pbuf), ctob((uint64_t)physmem));
 	printf(total memory = %s\n, pbuf);
 
 	minaddr = 0;

CVS commit: src/sys/arch/powerpc/booke/dev

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 05:25:39 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke/dev: cpunode.c

Log Message:
Move debug printfs higher.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/dev/cpunode.c

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

Modified files:

Index: src/sys/arch/powerpc/booke/dev/cpunode.c
diff -u src/sys/arch/powerpc/booke/dev/cpunode.c:1.4 src/sys/arch/powerpc/booke/dev/cpunode.c:1.5
--- src/sys/arch/powerpc/booke/dev/cpunode.c:1.4	Wed Feb 16 18:45:33 2011
+++ src/sys/arch/powerpc/booke/dev/cpunode.c	Sat May 28 05:25:39 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpunode.c,v 1.4 2011/02/16 18:45:33 matt Exp $	*/
+/*	$NetBSD: cpunode.c,v 1.5 2011/05/28 05:25:39 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: cpunode.c,v 1.4 2011/02/16 18:45:33 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpunode.c,v 1.5 2011/05/28 05:25:39 matt Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -110,6 +110,19 @@
 	for (u_int childmask = 1; cnl-cnl_name != NULL; cnl++) {
 		bool inclusive = true;
 		bool found = (cnl-cnl_ids[0] == 0);
+
+#if DEBUG  1
+		aprint_normal_dev(self, dev=%s[%u], addr=%x@%x,
+		cnl-cnl_name, cnl-cnl_instance, cnl-cnl_size,
+		cnl-cnl_addr);
+		if (cnl-cnl_nintr  0) {
+			aprint_normal(, intrs=%u, cnl-cnl_intrs[0]);
+			for (u_int i = 1; i  cnl-cnl_nintr; i++)
+aprint_normal(,%u, cnl-cnl_intrs[i]);
+		}
+		aprint_normal(\n);
+#endif
+
 		for (u_int i = 0;
 		 !found
 		  i  __arraycount(cnl-cnl_ids)
@@ -141,17 +154,6 @@
 		cna.cna_childmask = childmask;
 		cna.cna_locs = *cnl;
 
-#if DEBUG  1
-		aprint_normal_dev(self, dev=%s[%u], addr=%x@%x,
-		cnl-cnl_name, cnl-cnl_instance, cnl-cnl_size,
-		cnl-cnl_addr);
-		if (cnl-cnl_nintr  0) {
-			aprint_normal(, intrs=%u, cnl-cnl_intrs[0]);
-			for (u_int i = 1; i  cnl-cnl_nintr; i++)
-aprint_normal(,%u, cnl-cnl_intrs[i]);
-		}
-		aprint_normal(\n);
-#endif
 		(void)config_found_sm_loc(self, cpunode, NULL, cna,
 		cpunode_print, NULL);
 		childmask = 1;

CVS commit: src/sys/arch/powerpc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 05:27:20 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke/dev: pq3obio.c
Added Files:
src/sys/arch/powerpc/include/booke: obiovar.h

Log Message:
Move obio softc definitions to a header so it can use by children of obio.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/dev/pq3obio.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/booke/obiovar.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/powerpc/booke/dev/pq3obio.c
diff -u src/sys/arch/powerpc/booke/dev/pq3obio.c:1.2 src/sys/arch/powerpc/booke/dev/pq3obio.c:1.3
--- src/sys/arch/powerpc/booke/dev/pq3obio.c:1.2	Tue Jan 18 01:02:53 2011
+++ src/sys/arch/powerpc/booke/dev/pq3obio.c	Sat May 28 05:27:20 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3obio.c,v 1.2 2011/01/18 01:02:53 matt Exp $	*/
+/*	$NetBSD: pq3obio.c,v 1.3 2011/05/28 05:27:20 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -40,7 +40,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pq3obio.c,v 1.2 2011/01/18 01:02:53 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pq3obio.c,v 1.3 2011/05/28 05:27:20 matt Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -51,21 +51,7 @@
 #include powerpc/booke/cpuvar.h
 #include powerpc/booke/e500var.h
 #include powerpc/booke/e500reg.h
-
-struct pq3lbc_softc {
-	bus_addr_t lbc_base;
-	bus_addr_t lbc_limit;
-	uint32_t lbc_br;
-	uint32_t lbc_or;
-};
-
-struct pq3obio_softc {
-	device_t sc_dev;
-	bus_space_tag_t sc_bst;
-	bus_space_handle_t sc_bsh;
-	struct pq3lbc_softc sc_lbcs[8];
-	struct powerpc_bus_space sc_obio_bst;
-};
+#include powerpc/booke/obiovar.h
 
 static int pq3obio_match(device_t, cfdata_t, void *);
 static void pq3obio_attach(device_t, device_t, void *);

Added files:

Index: src/sys/arch/powerpc/include/booke/obiovar.h
diff -u /dev/null src/sys/arch/powerpc/include/booke/obiovar.h:1.1
--- /dev/null	Sat May 28 05:27:20 2011
+++ src/sys/arch/powerpc/include/booke/obiovar.h	Sat May 28 05:27:20 2011
@@ -0,0 +1,52 @@
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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.
+ */
+
+#ifndef _POWERPC_BOOKE_OBIOVAR_H_
+#define _POWERPC_BOOKE_OBIOVAR_H_
+
+#include sys/device.h
+#include sys/bus.h
+
+struct pq3lbc_softc {
+	bus_addr_t lbc_base;
+	bus_addr_t lbc_limit;
+	uint32_t lbc_br;
+	uint32_t lbc_or;
+};
+
+struct pq3obio_softc {
+	device_t sc_dev;
+	bus_space_tag_t sc_bst;
+	bus_space_handle_t sc_bsh;
+	struct pq3lbc_softc sc_lbcs[8];
+	struct powerpc_bus_space sc_obio_bst;
+};
+
+
+#endif /* _POWERPC_BOOKE_OBIOVAR_H_ */

CVS commit: src/sys/dev/mii

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 05:55:58 UTC 2011

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

Log Message:
Fix CS8244 entry (changed to VSC8244).


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 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.100 src/sys/dev/mii/miidevs:1.101
--- src/sys/dev/mii/miidevs:1.100	Fri May 20 00:46:53 2011
+++ src/sys/dev/mii/miidevs	Sat May 28 05:55:58 2011
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.100 2011/05/20 00:46:53 msaitoh Exp $
+$NetBSD: miidevs,v 1.101 2011/05/28 05:55:58 matt Exp $
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -183,7 +183,7 @@
 model CICADA VSC8211		0x000b Cicada VSC8211 10/100/1000TX PHY
 model CICADA CS8201A		0x0020 Cicada CS8201 10/100/1000TX PHY
 model CICADA CS8201B		0x0021 Cicada CS8201 10/100/1000TX PHY
-model CICADA CS8244		0x002c Cicada CS8244 10/100/1000TX PHY
+model xxCICADA VSC8244		0x002c Vitesse VSC8244 Quad 10/100/1000BASE-T PHY
 model xxCICADA CS8201B		0x0021 Cicada CS8201 10/100/1000TX PHY
 
 /* Davicom Semiconductor PHYs */

CVS commit: src/sys/dev/mii

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat May 28 05:56:15 UTC 2011

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.103 -r1.104 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.91 -r1.92 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.103 src/sys/dev/mii/miidevs.h:1.104
--- src/sys/dev/mii/miidevs.h:1.103	Fri May 20 00:47:11 2011
+++ src/sys/dev/mii/miidevs.h	Sat May 28 05:56:15 2011
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs.h,v 1.103 2011/05/20 00:47:11 msaitoh Exp $	*/
+/*	$NetBSD: miidevs.h,v 1.104 2011/05/28 05:56:15 matt Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.100 2011/05/20 00:46:53 msaitoh Exp
+ *	NetBSD: miidevs,v 1.101 2011/05/28 05:55:58 matt Exp
  */
 
 /*-
@@ -246,8 +246,8 @@
 #define	MII_STR_CICADA_CS8201A	Cicada CS8201 10/100/1000TX PHY
 #define	MII_MODEL_CICADA_CS8201B	0x0021
 #define	MII_STR_CICADA_CS8201B	Cicada CS8201 10/100/1000TX PHY
-#define	MII_MODEL_CICADA_CS8244	0x002c
-#define	MII_STR_CICADA_CS8244	Cicada CS8244 10/100/1000TX PHY
+#define	MII_MODEL_xxCICADA_VSC8244	0x002c
+#define	MII_STR_xxCICADA_VSC8244	Vitesse VSC8244 Quad 10/100/1000BASE-T PHY
 #define	MII_MODEL_xxCICADA_CS8201B	0x0021
 #define	MII_STR_xxCICADA_CS8201B	Cicada CS8201 10/100/1000TX PHY
 

Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.91 src/sys/dev/mii/miidevs_data.h:1.92
--- src/sys/dev/mii/miidevs_data.h:1.91	Fri May 20 00:47:11 2011
+++ src/sys/dev/mii/miidevs_data.h	Sat May 28 05:56:15 2011
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs_data.h,v 1.91 2011/05/20 00:47:11 msaitoh Exp $	*/
+/*	$NetBSD: miidevs_data.h,v 1.92 2011/05/28 05:56:15 matt Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.100 2011/05/20 00:46:53 msaitoh Exp
+ *	NetBSD: miidevs,v 1.101 2011/05/28 05:55:58 matt Exp
  */
 
 /*-
@@ -93,7 +93,7 @@
  { MII_OUI_CICADA, MII_MODEL_CICADA_VSC8211, MII_STR_CICADA_VSC8211 },
  { MII_OUI_CICADA, MII_MODEL_CICADA_CS8201A, MII_STR_CICADA_CS8201A },
  { MII_OUI_CICADA, MII_MODEL_CICADA_CS8201B, MII_STR_CICADA_CS8201B },
- { MII_OUI_CICADA, MII_MODEL_CICADA_CS8244, MII_STR_CICADA_CS8244 },
+ { MII_OUI_xxCICADA, MII_MODEL_xxCICADA_VSC8244, MII_STR_xxCICADA_VSC8244 },
  { MII_OUI_xxCICADA, MII_MODEL_xxCICADA_CS8201B, MII_STR_xxCICADA_CS8201B },
  { MII_OUI_xxDAVICOM, MII_MODEL_xxDAVICOM_DM9101, MII_STR_xxDAVICOM_DM9101 },
  { MII_OUI_xxDAVICOM, MII_MODEL_xxDAVICOM_DM9102, MII_STR_xxDAVICOM_DM9102 },