Re: CVS commit: src

[David Laight]

On Mon, Aug 01, 2011 at 12:28:55PM +, Marc Balmer wrote:
 According to the Oxford Dictionary of Etymology, a wether is a male sheep
 or ram.

I always thought it was a ram without its 'bits'...

David

-- 
David Laight: da...@l8s.co.uk

Re: CVS commit: src/sys/dev

[Bernd Ernesti]

On Mon, Aug 01, 2011 at 11:20:28AM +, Matthias Drochner wrote:
 Module Name:  src
 Committed By: drochner
 Date: Mon Aug  1 11:20:28 UTC 2011
 
 Modified Files:
   src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c cardbus.c cardbusreg.h
   cardbusvar.h com_cardbus.c ehci_cardbus.c fwohci_cardbus.c
   if_ath_cardbus.c if_atw_cardbus.c if_ex_cardbus.c if_fxp_cardbus.c
   if_ral_cardbus.c if_re_cardbus.c if_rtk_cardbus.c if_rtw_cardbus.c
   if_tlp_cardbus.c njata_cardbus.c njs_cardbus.c ohci_cardbus.c
   rbus_ppb.c sdhc_cardbus.c siisata_cardbus.c uhci_cardbus.c
   src/sys/dev/pci: pccbb.c
 
 Log Message:
 remove some bloat:

[..]

 -cardbus always uses 3.3V -- no need for a variable to keep track
  of the voltage

What about a pccard which can be used with a cardbus slot and so you
you get 5V cards too?

Bernd

CVS commit: src/usr.bin/mkubootimage

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Mon Aug  1 06:16:36 UTC 2011

Modified Files:
src/usr.bin/mkubootimage: mkubootimage.c

Log Message:
Add an -m flag to mkubootimage, for specifying an alternate magic
value.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/mkubootimage/mkubootimage.c

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

Modified files:

Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.7 src/usr.bin/mkubootimage/mkubootimage.c:1.8
--- src/usr.bin/mkubootimage/mkubootimage.c:1.7	Wed Jun  8 05:54:38 2011
+++ src/usr.bin/mkubootimage/mkubootimage.c	Mon Aug  1 06:16:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.7 2011/06/08 05:54:38 matt Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.8 2011/08/01 06:16:35 riz Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -30,7 +30,7 @@
 #endif
 
 #include sys/cdefs.h
-__RCSID($NetBSD: mkubootimage.c,v 1.7 2011/06/08 05:54:38 matt Exp $);
+__RCSID($NetBSD: mkubootimage.c,v 1.8 2011/08/01 06:16:35 riz Exp $);
 
 #include sys/mman.h
 #include sys/stat.h
@@ -60,6 +60,7 @@
 static uint32_t image_loadaddr = 0;
 static uint32_t image_entrypoint = 0;
 static char *image_name;
+static uint32_t image_magic = IH_MAGIC;
 
 struct uboot_os {
 	enum uboot_image_os os;
@@ -211,7 +212,7 @@
 	fprintf(stderr,  -C none|gz|bz2);
 	fprintf(stderr,  -O openbsd|netbsd|freebsd|linux);
 	fprintf(stderr,  -T standalone|kernel|ramdisk|fs);
-	fprintf(stderr,  -a addr [-e ep] -n name);
+	fprintf(stderr,  -a addr [-e ep] [-m magic] -n name);
 	fprintf(stderr,  srcfile dstfile\n);
 
 	exit(EXIT_FAILURE);
@@ -268,7 +269,7 @@
 	munmap(p, st.st_size);
 
 	memset(hdr, 0, sizeof(*hdr));
-	hdr-ih_magic = htonl(IH_MAGIC);
+	hdr-ih_magic = htonl(image_magic);
 	hdr-ih_time = htonl(st.st_mtime);
 	hdr-ih_size = htonl(st.st_size);
 	hdr-ih_load = htonl(image_loadaddr);
@@ -320,7 +321,7 @@
 	int ch;
 	unsigned long num;
 
-	while ((ch = getopt(argc, argv, A:C:O:T:a:e:hn:)) != -1) {
+	while ((ch = getopt(argc, argv, A:C:O:T:a:e:hm:n:)) != -1) {
 		switch (ch) {
 		case 'A':	/* arch */
 			image_arch = get_arch(optarg);
@@ -350,6 +351,13 @@
 errx(1, illegal number -- %s, optarg);
 			image_entrypoint = (uint32_t)num;
 			break;
+		case 'm':	/* magic */
+			errno = 0;
+			num = strtoul(optarg, ep, 0);
+			if (*ep != '\0' || (errno == ERANGE 
+			(num == ULONG_MAX || num == 0)))
+errx(1, illegal number -- %s, optarg);
+			image_magic = (uint32_t)num;
 		case 'n':	/* name */
 			image_name = strdup(optarg);
 			break;

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug  1 08:36:39 UTC 2011

Modified Files:
src/sys/arch/sparc64/dev: central.c fhc_central.c fhc_mainbus.c

Log Message:
use device_private().  thanks to jmcneill for pointing this out.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/central.c \
src/sys/arch/sparc64/dev/fhc_central.c \
src/sys/arch/sparc64/dev/fhc_mainbus.c

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

Modified files:

Index: src/sys/arch/sparc64/dev/central.c
diff -u src/sys/arch/sparc64/dev/central.c:1.1 src/sys/arch/sparc64/dev/central.c:1.2
--- src/sys/arch/sparc64/dev/central.c:1.1	Fri Jul 29 08:37:36 2011
+++ src/sys/arch/sparc64/dev/central.c	Mon Aug  1 08:36:39 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: central.c,v 1.1 2011/07/29 08:37:36 mrg Exp $	*/
+/*	$NetBSD: central.c,v 1.2 2011/08/01 08:36:39 mrg Exp $	*/
 /*	$OpenBSD: central.c,v 1.7 2010/11/11 17:58:23 miod Exp $	*/
 
 /*
@@ -80,7 +80,7 @@
 static void
 central_attach(device_t parent, device_t self, void *aux)
 {
-	struct central_softc *sc = (struct central_softc *)self;
+	struct central_softc *sc = device_private(self);
 	struct mainbus_attach_args *ma = aux;
 	int node0, node;
 
Index: src/sys/arch/sparc64/dev/fhc_central.c
diff -u src/sys/arch/sparc64/dev/fhc_central.c:1.1 src/sys/arch/sparc64/dev/fhc_central.c:1.2
--- src/sys/arch/sparc64/dev/fhc_central.c:1.1	Fri Jul 29 08:37:36 2011
+++ src/sys/arch/sparc64/dev/fhc_central.c	Mon Aug  1 08:36:39 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fhc_central.c,v 1.1 2011/07/29 08:37:36 mrg Exp $	*/
+/*	$NetBSD: fhc_central.c,v 1.2 2011/08/01 08:36:39 mrg Exp $	*/
 /*	$OpenBSD: fhc_central.c,v 1.5 2004/09/27 18:32:35 jason Exp $	*/
 
 /*
@@ -61,7 +61,7 @@
 void
 fhc_central_attach(device_t parent, device_t self, void *aux)
 {
-	struct fhc_softc *sc = (struct fhc_softc *)self;
+	struct fhc_softc *sc = device_private(self);
 	struct central_attach_args *ca = aux;
 	u_int32_t board;
 
Index: src/sys/arch/sparc64/dev/fhc_mainbus.c
diff -u src/sys/arch/sparc64/dev/fhc_mainbus.c:1.1 src/sys/arch/sparc64/dev/fhc_mainbus.c:1.2
--- src/sys/arch/sparc64/dev/fhc_mainbus.c:1.1	Fri Jul 29 08:37:36 2011
+++ src/sys/arch/sparc64/dev/fhc_mainbus.c	Mon Aug  1 08:36:39 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fhc_mainbus.c,v 1.1 2011/07/29 08:37:36 mrg Exp $	*/
+/*	$NetBSD: fhc_mainbus.c,v 1.2 2011/08/01 08:36:39 mrg Exp $	*/
 /*	$OpenBSD: fhc_mainbus.c,v 1.4 2004/09/27 18:32:35 jason Exp $	*/
 
 /*
@@ -59,7 +59,7 @@
 void
 fhc_mainbus_attach(device_t parent, device_t self, void *aux)
 {
-	struct fhc_softc *sc = (struct fhc_softc *)self;
+	struct fhc_softc *sc = device_private(self);
 	struct mainbus_attach_args *ma = aux;
 
 	sc-sc_node = ma-ma_node;

CVS commit: src/etc/namedb

[Takahiro Kambe]

Module Name:src
Committed By:   taca
Date:   Mon Aug  1 10:04:27 UTC 2011

Modified Files:
src/etc/namedb: root.cache

Log Message:
Update to 2011060800.

- IPv6 address was added to D.ROOT-SERVERS.NET.


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

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

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.15 src/etc/namedb/root.cache:1.16
--- src/etc/namedb/root.cache:1.15	Fri Jun 18 05:53:39 2010
+++ src/etc/namedb/root.cache	Mon Aug  1 10:04:27 2011
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.15 2010/06/18 05:53:39 spz Exp $
+;	$NetBSD: root.cache,v 1.16 2011/08/01 10:04:27 taca Exp $
 ;   This file holds the information on root name servers needed to
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the cache  .  file
@@ -10,8 +10,8 @@
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
 ;
-;   last update:Jun 17, 2010
-;   related version of root zone:   2010061700
+;   last update:Jun 8, 2011
+;   related version of root zone:   2011060800
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -33,6 +33,7 @@
 ;
 .360  NSD.ROOT-SERVERS.NET.
 D.ROOT-SERVERS.NET.  360  A 128.8.10.90
+D.ROOT-SERVERS.NET.	 360    2001:500:2D::D
 ;
 ; FORMERLY NS.NASA.GOV
 ;

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug  1 10:18:23 UTC 2011

Modified Files:
src/sys/arch/sparc64/conf: files.sparc64

Log Message:
fix the zx@fhc attachment.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/sparc64/conf/files.sparc64

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/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.134 src/sys/arch/sparc64/conf/files.sparc64:1.135
--- src/sys/arch/sparc64/conf/files.sparc64:1.134	Fri Jul 29 08:37:37 2011
+++ src/sys/arch/sparc64/conf/files.sparc64	Mon Aug  1 10:18:23 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sparc64,v 1.134 2011/07/29 08:37:37 mrg Exp $
+#	$NetBSD: files.sparc64,v 1.135 2011/08/01 10:18:23 mrg Exp $
 
 # @(#)files.sparc64	8.1 (Berkeley) 7/19/93
 # sparc64-specific configuration info
@@ -139,7 +139,8 @@
 #
 
 device zs {channel = -1}
-attach zs at sbus, fhc
+attach zs at sbus
+attach zs at fhc with zs_fhc
 file	arch/sparc64/dev/zs.c			zs needs-flag
 file	dev/ic/z8530sc.c			zs
 

CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Aug  1 10:21:32 UTC 2011

Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416reg.h

Log Message:
Fix AR_SREV_MERLIN_20 and AR_SREV_MERLIN_20_OR_LATER macros to match
rev 2.1 as well as 2.0, from FreeBSD. Fixes 5GHz mode on my 9280.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.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/external/isc/atheros_hal/dist/ar5416/ar5416reg.h
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h:1.4 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h:1.5
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h:1.4	Mon Mar  7 11:25:44 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h	Mon Aug  1 10:21:32 2011
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: ar5416reg.h,v 1.4 2011/03/07 11:25:44 cegger Exp $
+ * $Id: ar5416reg.h,v 1.5 2011/08/01 10:21:32 jmcneill Exp $
  */
 #ifndef _DEV_ATH_AR5416REG_H
 #define	_DEV_ATH_AR5416REG_H
@@ -609,10 +609,11 @@
 	(AH_PRIVATE((_ah))-ah_macVersion = AR_XSREV_VERSION_MERLIN)
 #define	AR_SREV_MERLIN_20(_ah) \
 	(AR_SREV_MERLIN(_ah)  \
-	 AH_PRIVATE((_ah))-ah_macRev == AR_XSREV_REVISION_MERLIN_20)
+	 AH_PRIVATE((_ah))-ah_macRev = AR_XSREV_REVISION_MERLIN_20)
 #define	AR_SREV_MERLIN_20_OR_LATER(_ah) \
-	(AR_SREV_MERLIN_20(_ah) || \
-	 AH_PRIVATE((_ah))-ah_macVersion = AR_XSREV_VERSION_MERLIN)
+	((AH_PRIVATE((_ah))-ah_macVersion  AR_XSREV_VERSION_MERLIN) || \
+	 (AR_SREV_MERLIN((_ah))  \
+	 AH_PRIVATE((_ah))-ah_macRev = AR_XSREV_REVISION_MERLIN_20))
 
 #define	AR_SREV_KITE(_ah) \
 	(AH_PRIVATE((_ah))-ah_macVersion == AR_XSREV_VERSION_KITE)

CVS commit: src/sys/kern

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Mon Aug  1 10:33:26 UTC 2011

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

Log Message:
modify parsing of device names so that it can deal with names which
have numbers is it, eg i915drm*


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

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

Modified files:

Index: src/sys/kern/subr_userconf.c
diff -u src/sys/kern/subr_userconf.c:1.24 src/sys/kern/subr_userconf.c:1.25
--- src/sys/kern/subr_userconf.c:1.24	Tue May 31 23:28:53 2011
+++ src/sys/kern/subr_userconf.c	Mon Aug  1 10:33:26 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_userconf.c,v 1.24 2011/05/31 23:28:53 dyoung Exp $	*/
+/*	$NetBSD: subr_userconf.c,v 1.25 2011/08/01 10:33:26 drochner Exp $	*/
 
 /*
  * Copyright (c) 1996 Mats O Jansson m...@stacken.kth.se
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_userconf.c,v 1.24 2011/05/31 23:28:53 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_userconf.c,v 1.25 2011/08/01 10:33:26 drochner Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -304,10 +304,16 @@
 	char *c;
 
 	c = cmd;
-	while (*c = 'a'  *c = 'z') {
-		l++;
+	while (!(!*c || *c == ' ' || *c == '\t' || *c == '\n'))
 		c++;
+	while (c  cmd) {
+		c--;
+		if (!((*c = '0'  *c = '9') || *c == '*')) {
+			c++;
+			break;
+		}
 	}
+	l = c - cmd;
 	if (*c == '*') {
 		s = FSTATE_STAR;
 		c++;

CVS commit: src/sys/arch/x86

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Mon Aug  1 10:42:24 UTC 2011

Modified Files:
src/sys/arch/x86/include: intr.h
src/sys/arch/x86/x86: intr.c

Log Message:
if checking whether an interrupt is shared, don't compare pin numbers
if it is -1 -- this is a hack to allow MSIs which don't have a concept
of pin numbers, and are generally not shared
(This doesn't give us sensible event names for statistics display. The
whole abstraction has more exceptions than regular cases, it should
be redesigned imho.)


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/x86/include/intr.h
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x86/x86/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/x86/include/intr.h
diff -u src/sys/arch/x86/include/intr.h:1.42 src/sys/arch/x86/include/intr.h:1.43
--- src/sys/arch/x86/include/intr.h:1.42	Sun Apr  3 22:29:27 2011
+++ src/sys/arch/x86/include/intr.h	Mon Aug  1 10:42:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.42 2011/04/03 22:29:27 dyoung Exp $	*/
+/*	$NetBSD: intr.h,v 1.43 2011/08/01 10:42:23 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -73,7 +73,8 @@
 
 struct intrsource {
 	int is_maxlevel;		/* max. IPL for this source */
-	int is_pin;			/* IRQ for legacy; pin for IO APIC */
+	int is_pin;			/* IRQ for legacy; pin for IO APIC,
+	   -1 for MSI */
 	struct intrhand *is_handlers;	/* handler chain */
 	struct pic *is_pic;		/* originating PIC */
 	void *is_recurse;		/* entry for spllower */

Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.71 src/sys/arch/x86/x86/intr.c:1.72
--- src/sys/arch/x86/x86/intr.c:1.71	Sun Apr  3 22:29:27 2011
+++ src/sys/arch/x86/x86/intr.c	Mon Aug  1 10:42:24 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.71 2011/04/03 22:29:27 dyoung Exp $	*/
+/*	$NetBSD: intr.c,v 1.72 2011/08/01 10:42:24 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.71 2011/04/03 22:29:27 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.72 2011/08/01 10:42:24 drochner Exp $);
 
 #include opt_intrdebug.h
 #include opt_multiprocessor.h
@@ -480,7 +480,8 @@
 			if ((isp = ci-ci_isources[slot]) == NULL) {
 continue;
 			}
-			if (isp-is_pic == pic  isp-is_pin == pin) {
+			if (isp-is_pic == pic 
+			pin != -1  isp-is_pin == pin) {
 *idt_slot = isp-is_idtvec;
 *index = slot;
 *cip = ci;

CVS commit: src/sys/arch/x86

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Mon Aug  1 11:08:03 UTC 2011

Modified Files:
src/sys/arch/x86/include: pci_machdep_common.h
src/sys/arch/x86/pci: pci_intr_machdep.c

Log Message:
add an experimental implementation of PCI MSIs (Message Signaled
Interrupts). Successfully tested with hdaudio and wpi wireless
ethernet.
notes:
-There seem to be buggy chips around which announce MSI support
 but don't correctly implement it. Thus the final word whether MSIs
 can be used should be by the driver.
-Only a single vector is supported. For multiple vectors, the IDT
 allocation code would have to be changed. (And we would possibly
 run into problems due to the limited number of vectors supported
 by the current code.)
-The code is #if NIOAPIC  0 because it uses the ioapic_edge
 interrupt stubs. These actually don't touch any ioapic, so this
 is somewhat a misnomer.
-MSIs can't be identified by a pin but only by a cpu/vector
 pair. Common intr code soesn't deal well with this yet.
-Drivers need to take care of saving/restoring MSI data in the device's
 config space on suspend/resume.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/include/pci_machdep_common.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/pci/pci_intr_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/x86/include/pci_machdep_common.h
diff -u src/sys/arch/x86/include/pci_machdep_common.h:1.6 src/sys/arch/x86/include/pci_machdep_common.h:1.7
--- src/sys/arch/x86/include/pci_machdep_common.h:1.6	Mon Apr  4 20:37:55 2011
+++ src/sys/arch/x86/include/pci_machdep_common.h	Mon Aug  1 11:08:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep_common.h,v 1.6 2011/04/04 20:37:55 dyoung Exp $	*/
+/*	$NetBSD: pci_machdep_common.h,v 1.7 2011/08/01 11:08:03 drochner Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -110,6 +110,10 @@
 		int, int (*)(void *), void *);
 void		pci_intr_disestablish(pci_chipset_tag_t, void *);
 
+/* experimental MSI support */
+void *pci_msi_establish(struct pci_attach_args *, int, int (*)(void *), void *);
+void pci_msi_disestablish(void *);
+
 /*
  * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
  * BY PORTABLE CODE.

Index: src/sys/arch/x86/pci/pci_intr_machdep.c
diff -u src/sys/arch/x86/pci/pci_intr_machdep.c:1.19 src/sys/arch/x86/pci/pci_intr_machdep.c:1.20
--- src/sys/arch/x86/pci/pci_intr_machdep.c:1.19	Mon Apr  4 20:37:55 2011
+++ src/sys/arch/x86/pci/pci_intr_machdep.c	Mon Aug  1 11:08:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_intr_machdep.c,v 1.19 2011/04/04 20:37:55 dyoung Exp $	*/
+/*	$NetBSD: pci_intr_machdep.c,v 1.20 2011/08/01 11:08:03 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_intr_machdep.c,v 1.19 2011/04/04 20:37:55 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_intr_machdep.c,v 1.20 2011/08/01 11:08:03 drochner Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -82,6 +82,7 @@
 #include sys/errno.h
 #include sys/device.h
 #include sys/intr.h
+#include sys/malloc.h
 
 #include dev/pci/pcivar.h
 
@@ -325,3 +326,93 @@
 
 	intr_disestablish(cookie);
 }
+
+#if NIOAPIC  0
+/*
+ * experimental support for MSI, does support a single vector,
+ * no MSI-X, 8-bit APIC IDs
+ * (while it doesn't need the ioapic technically, it borrows
+ * from its kernel support)
+ */
+
+/* dummies, needed by common intr_establish code */
+static void
+msipic_hwmask(struct pic *pic, int pin)
+{
+}
+static void
+msipic_addroute(struct pic *pic, struct cpu_info *ci,
+		int pin, int vec, int type)
+{
+}
+
+static struct pic msi_pic = {
+	.pic_name = msi,
+	.pic_type = PIC_SOFT,
+	.pic_vecbase = 0,
+	.pic_apicid = 0,
+	.pic_lock = __SIMPLELOCK_UNLOCKED,
+	.pic_hwmask = msipic_hwmask,
+	.pic_hwunmask = msipic_hwmask,
+	.pic_addroute = msipic_addroute,
+	.pic_delroute = msipic_addroute,
+	.pic_edge_stubs = ioapic_edge_stubs,
+};
+
+struct msi_hdl {
+	struct intrhand *ih;
+	pci_chipset_tag_t pc;
+	pcitag_t tag;
+	int co;
+};
+
+void *
+pci_msi_establish(struct pci_attach_args *pa, int level,
+		  int (*func)(void *), void *arg)
+{
+	int co;
+	void *ih;
+	struct msi_hdl *msih;
+	struct cpu_info *ci;
+	struct intrsource *s;
+	u_int32_t cr;
+
+	if (!pci_get_capability(pa-pa_pc, pa-pa_tag, PCI_CAP_MSI, co, 0))
+		return NULL;
+
+	ih = intr_establish(-1, msi_pic, -1, IST_EDGE, level,
+			func, arg, 0);
+	if (!ih)
+		return NULL;
+
+	msih = malloc(sizeof(*msih), M_DEVBUF, M_WAITOK);
+	msih-ih = ih;
+	msih-pc = pa-pa_pc;
+	msih-tag = pa-pa_tag;
+	msih-co = co;
+
+	ci = msih-ih-ih_cpu;
+	s = ci-ci_isources[msih-ih-ih_slot];
+	cr = pci_conf_read(pa-pa_pc, pa-pa_tag, co);
+	pci_conf_write(pa-pa_pc, pa-pa_tag, co + 4,
+		   0xfee0 | ci-ci_cpuid  12);
+	if (cr  0x80) {
+		

CVS commit: src/sys/dev/acpi

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Aug  1 11:26:00 UTC 2011

Modified Files:
src/sys/dev/acpi: acpi.c acpireg.h acpivar.h

Log Message:
add support for reset registers in PCI config space


To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/acpireg.h
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/acpi/acpivar.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/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.247 src/sys/dev/acpi/acpi.c:1.248
--- src/sys/dev/acpi/acpi.c:1.247	Sun Jul 17 02:32:01 2011
+++ src/sys/dev/acpi/acpi.c	Mon Aug  1 11:25:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.247 2011/07/17 02:32:01 jakllsch Exp $	*/
+/*	$NetBSD: acpi.c,v 1.248 2011/08/01 11:25:59 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.247 2011/07/17 02:32:01 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.248 2011/08/01 11:25:59 jmcneill Exp $);
 
 #include opt_acpi.h
 #include opt_pcifixup.h
@@ -348,6 +348,46 @@
 	return (config_search_ia(acpi_submatch, parent, ifattr, NULL) != NULL);
 }
 
+int
+acpi_reset(void)
+{
+	struct acpi_softc *sc = acpi_softc;
+	ACPI_GENERIC_ADDRESS *ResetReg;
+	ACPI_PCI_ID PciId;
+	ACPI_STATUS status;
+
+	if (sc == NULL)
+		return ENXIO;
+
+	ResetReg = AcpiGbl_FADT.ResetRegister;
+
+	/* Check if the reset register is supported */
+	if (!(AcpiGbl_FADT.Flags  ACPI_FADT_RESET_REGISTER) ||
+	!ResetReg-Address) {
+		return ENOENT;
+	}
+
+	switch (ResetReg-SpaceId) {
+	case ACPI_ADR_SPACE_PCI_CONFIG:
+		PciId.Segment = PciId.Bus = 0;
+		PciId.Device = ACPI_GAS_PCI_DEV(ResetReg-Address);
+		PciId.Function = ACPI_GAS_PCI_FUNC(ResetReg-Address);
+		status = AcpiOsWritePciConfiguration(PciId,
+		ACPI_GAS_PCI_REGOFF(ResetReg-Address),
+		AcpiGbl_FADT.ResetValue, ResetReg-BitWidth);
+		break;
+	case ACPI_ADR_SPACE_SYSTEM_IO:
+	case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+		status = AcpiReset();
+		break;
+	default:
+		status = AE_TYPE;
+		break;
+	}
+
+	return ACPI_FAILURE(status) ? EIO : 0;
+}
+
 /*
  * Autoconfiguration.
  */

Index: src/sys/dev/acpi/acpireg.h
diff -u src/sys/dev/acpi/acpireg.h:1.11 src/sys/dev/acpi/acpireg.h:1.12
--- src/sys/dev/acpi/acpireg.h:1.11	Tue Oct 12 19:10:50 2010
+++ src/sys/dev/acpi/acpireg.h	Mon Aug  1 11:25:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpireg.h,v 1.11 2010/10/12 19:10:50 gsutre Exp $	*/
+/*	$NetBSD: acpireg.h,v 1.12 2011/08/01 11:25:59 jmcneill Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -61,6 +61,10 @@
 #define	ACPI_ADR_PCI_FUNC(x)	((x)  0x)
 #define	ACPI_ADR_PCI_ALLFUNCS	0x
 
+#define	ACPI_GAS_PCI_DEV(x)	(((x)  32)  0x)
+#define	ACPI_GAS_PCI_FUNC(x)	(((x)  16)  0x)
+#define	ACPI_GAS_PCI_REGOFF(x)	((x)  0x)
+
 /*
  * ACPI driver components.
  */

Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.72 src/sys/dev/acpi/acpivar.h:1.73
--- src/sys/dev/acpi/acpivar.h:1.72	Tue Jun 21 03:37:21 2011
+++ src/sys/dev/acpi/acpivar.h	Mon Aug  1 11:25:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpivar.h,v 1.72 2011/06/21 03:37:21 jruoho Exp $	*/
+/*	$NetBSD: acpivar.h,v 1.73 2011/08/01 11:25:59 jmcneill Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -297,6 +297,8 @@
 void		acpi_disable(void);
 int		acpi_check(device_t, const char *);
 
+int		acpi_reset(void);
+
 ACPI_PHYSICAL_ADDRESS	acpi_OsGetRootPointer(void);
 
 bool		acpi_register_notify(struct acpi_devnode *,

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Aug  1 11:26:31 UTC 2011

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

Log Message:
x86_reset: use acpi_reset instead of AcpiReset


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/x86/x86/x86_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/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.52 src/sys/arch/x86/x86/x86_machdep.c:1.53
--- src/sys/arch/x86/x86/x86_machdep.c:1.52	Sun Jul 31 22:43:01 2011
+++ src/sys/arch/x86/x86/x86_machdep.c	Mon Aug  1 11:26:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_machdep.c,v 1.52 2011/07/31 22:43:01 jmcneill Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.53 2011/08/01 11:26:31 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_machdep.c,v 1.52 2011/07/31 22:43:01 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_machdep.c,v 1.53 2011/08/01 11:26:31 jmcneill Exp $);
 
 #include opt_modular.h
 #include opt_physmem.h
@@ -906,8 +906,9 @@
 	 * defined in the FADT.
 	 */
 	if (acpi_active) {
-		if (AcpiReset() != AE_NOT_EXIST)
+		if (acpi_reset() == 0) {
 			delay(50); /* wait 0.5 sec to see if that did it */
+		}
 	}
 #endif
 

CVS commit: src

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Mon Aug  1 12:28:54 UTC 2011

Modified Files:
src/libexec/atrun: atrun.c
src/share/terminfo: terminfo
src/sys/arch/macppc/dev: ams.c
src/sys/dev/adb: adb_ms.c
src/sys/dev/ic: smc90cx6var.h tropic.c
src/sys/dev/pci: machfb.c
src/sys/dev/pci/n8/common/api: n8_sks.c
src/sys/dev/raidframe: rf_dagdegrd.c rf_dagdegwr.c rf_pqdegdags.c
src/sys/dev/sysmon: sysmon_envsys.c
src/usr.sbin/syslogd: tls.c

Log Message:
According to the Oxford Dictionary of Etymology, a wether is a male sheep
or ram.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/libexec/atrun/atrun.c
cvs rdiff -u -r1.3 -r1.4 src/share/terminfo/terminfo
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/macppc/dev/ams.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/adb/adb_ms.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/smc90cx6var.h
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/tropic.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/n8/common/api/n8_sks.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/raidframe/rf_dagdegrd.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/raidframe/rf_dagdegwr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/raidframe/rf_pqdegdags.c
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/syslogd/tls.c

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

Modified files:

Index: src/libexec/atrun/atrun.c
diff -u src/libexec/atrun/atrun.c:1.19 src/libexec/atrun/atrun.c:1.20
--- src/libexec/atrun/atrun.c:1.19	Sat Apr  5 20:17:37 2008
+++ src/libexec/atrun/atrun.c	Mon Aug  1 12:28:54 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: atrun.c,v 1.19 2008/04/05 20:17:37 christos Exp $	*/
+/*	$NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $	*/
 
 /*
  *  atrun.c - run jobs queued by at; run with root privileges.
@@ -59,7 +59,7 @@
 #if 0
 static char rcsid[] = $OpenBSD: atrun.c,v 1.7 1997/09/08 22:12:10 millert Exp $;
 #else
-__RCSID($NetBSD: atrun.c,v 1.19 2008/04/05 20:17:37 christos Exp $);
+__RCSID($NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $);
 #endif
 
 static int debug = 0;
@@ -366,7 +366,7 @@
 main(int argc, char *argv[])
 {
 	/*
-	 * Browse through  _PATH_ATJOBS, checking all the jobfiles wether
+	 * Browse through  _PATH_ATJOBS, checking all the jobfiles whether
 	 * they should be executed and or deleted. The queue is coded into
 	 * the first byte of the job filename, the date (in minutes since
 	 * Eon) as a hex number in the following eight bytes, followed by

Index: src/share/terminfo/terminfo
diff -u src/share/terminfo/terminfo:1.3 src/share/terminfo/terminfo:1.4
--- src/share/terminfo/terminfo:1.3	Sun Jun 19 16:27:23 2011
+++ src/share/terminfo/terminfo	Mon Aug  1 12:28:54 2011
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncur...@gnu.org
 #
-#	$Revision: 1.3 $
-#	$Date: 2011/06/19 16:27:23 $
+#	$Revision: 1.4 $
+#	$Date: 2011/08/01 12:28:54 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a newer version which differs in some cosmetic details (but actually
@@ -9081,7 +9081,7 @@
 # terminfo. At one point, I found some reference indicating that this
 # terminal bug (not sending \E[) was acknowledged by Wyse (so it's not just
 # me), but I can't find that and the server under my bookmark to Wyse
-# Technical isn't responding.  So there's the question of wether the wy85
+# Technical isn't responding.  So there's the question of whether the wy85
 # terminfo should reflect the manufactuer's intended behaviour of the terminal
 # or the actual.
 wy85-8bit|wyse85-8bit|wyse 85 in 8-bit mode,

Index: src/sys/arch/macppc/dev/ams.c
diff -u src/sys/arch/macppc/dev/ams.c:1.27 src/sys/arch/macppc/dev/ams.c:1.28
--- src/sys/arch/macppc/dev/ams.c:1.27	Sat Jun 18 08:08:28 2011
+++ src/sys/arch/macppc/dev/ams.c	Mon Aug  1 12:28:53 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ams.c,v 1.27 2011/06/18 08:08:28 matt Exp $	*/
+/*	$NetBSD: ams.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $	*/
 
 /*
  * Copyright (C) 1998	Colin Wood
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ams.c,v 1.27 2011/06/18 08:08:28 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ams.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -676,7 +676,7 @@
 	adb_op_sync((Ptr)buffer, NULL, (Ptr)0, cmd);
 
 	/*
-	 * setup a sysctl node to control wether tapping the pad should
+	 * setup a sysctl node to control whether tapping the pad should
 	 * trigger mouse button events
 	 */
 

Index: src/sys/dev/adb/adb_ms.c
diff -u src/sys/dev/adb/adb_ms.c:1.10 src/sys/dev/adb/adb_ms.c:1.11
--- src/sys/dev/adb/adb_ms.c:1.10	Thu Jul 28 16:28:12 2011
+++ src/sys/dev/adb/adb_ms.c	Mon Aug  1 12:28:53 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb_ms.c,v 1.10 2011/07/28 16:28:12 macallan Exp $	*/
+/*	$NetBSD: 

CVS commit: xsrc/external/mit/xorg-cf-files/dist

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Mon Aug  1 14:14:16 UTC 2011

Modified Files:
xsrc/external/mit/xorg-cf-files/dist: NetBSD.cf

Log Message:
Always include xorg.cf for GccAliasingArgs regardless of server support
on the target plattform.
Fixes GccAliasingArgs leftovers in Makefiles generated by imake(1)
on m68k and sh3 etc.

This problem had been once fixed in rev 1.2 per PR xsrc/40970, but
it looks accidentally reverted on xorg-cf-files 1.0.3 merge in rev 1.3.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf

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

Modified files:

Index: xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.4 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.5
--- xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.4	Sun Nov  8 11:39:23 2009
+++ xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf	Mon Aug  1 14:14:15 2011
@@ -596,11 +596,11 @@
 # define BuildXInputLib  YES
 #endif
 
-
-/* was !defined(SparcArchitecture) */
-#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) || defined(AMD64Architecture)
-# include xorg.cf
-#endif
+/*
+ * Always include xorg.cf for GccAliasingArgs,
+ * regardless of server support on this plattform
+ */
+#include xorg.cf
 
 /*
  * Definitions for the SUN server on NetBSD/sparc

CVS commit: src/sys/kern

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Mon Aug  1 15:26:31 UTC 2011

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

Log Message:
Need to include sys/evcnt.h explicitly to build this on at least amiga.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/subr_pserialize.c

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

Modified files:

Index: src/sys/kern/subr_pserialize.c
diff -u src/sys/kern/subr_pserialize.c:1.1 src/sys/kern/subr_pserialize.c:1.2
--- src/sys/kern/subr_pserialize.c:1.1	Sat Jul 30 17:01:04 2011
+++ src/sys/kern/subr_pserialize.c	Mon Aug  1 15:26:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pserialize.c,v 1.1 2011/07/30 17:01:04 christos Exp $	*/
+/*	$NetBSD: subr_pserialize.c,v 1.2 2011/08/01 15:26:31 he Exp $	*/
 
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -38,12 +38,13 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_pserialize.c,v 1.1 2011/07/30 17:01:04 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_pserialize.c,v 1.2 2011/08/01 15:26:31 he Exp $);
 
 #include sys/param.h
 
 #include sys/condvar.h
 #include sys/cpu.h
+#include sys/evcnt.h
 #include sys/kmem.h
 #include sys/mutex.h
 #include sys/pserialize.h

CVS commit: src/distrib/arc/ramdisk

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Mon Aug  1 15:41:34 UTC 2011

Modified Files:
src/distrib/arc/ramdisk: list

Log Message:
Use distrib/utils/more to shrink ramdiskbin.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/arc/ramdisk/list

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

Modified files:

Index: src/distrib/arc/ramdisk/list
diff -u src/distrib/arc/ramdisk/list:1.21 src/distrib/arc/ramdisk/list:1.22
--- src/distrib/arc/ramdisk/list:1.21	Sun Jul  3 23:11:32 2011
+++ src/distrib/arc/ramdisk/list	Mon Aug  1 15:41:34 2011
@@ -1,6 +1,6 @@
-#	$NetBSD: list,v 1.21 2011/07/03 23:11:32 tron Exp $
+#	$NetBSD: list,v 1.22 2011/08/01 15:41:34 tsutsui Exp $
 
-SRCDIRS	external/bsd/less/bin
+#SRCDIRS	external/bsd/less/bin
 SRCDIRS	bin sbin usr.bin usr.sbin
 
 PROG	bin/cat
@@ -64,7 +64,7 @@
 SPECIAL	ed		srcdir	distrib/utils/x_ed
 SPECIAL	gzip		srcdir	distrib/utils/x_gzip
 SPECIAL	ifconfig	srcdir	distrib/utils/x_ifconfig
-#SPECIAL	more		srcdir	distrib/utils/more
+SPECIAL	more		srcdir	distrib/utils/more
 SPECIAL	ping		srcdir	distrib/utils/x_ping
 SPECIAL	route		srcdir	distrib/utils/x_route
 SPECIAL	umount		srcdir	distrib/utils/x_umount

CVS commit: src/crypto/external/bsd/openssh/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Aug  1 15:55:00 UTC 2011

Modified Files:
src/crypto/external/bsd/openssh/dist: atomicio.c

Log Message:
PR/45200: : J. Hannken-Illjes: Scp hangs after sending:
- check for vwrite() instead of read() to avoid read() being renamed by SSP


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/atomicio.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/external/bsd/openssh/dist/atomicio.c
diff -u src/crypto/external/bsd/openssh/dist/atomicio.c:1.3 src/crypto/external/bsd/openssh/dist/atomicio.c:1.4
--- src/crypto/external/bsd/openssh/dist/atomicio.c:1.3	Sun Jul 24 23:03:10 2011
+++ src/crypto/external/bsd/openssh/dist/atomicio.c	Mon Aug  1 11:55:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomicio.c,v 1.3 2011/07/25 03:03:10 christos Exp $	*/
+/*	$NetBSD: atomicio.c,v 1.4 2011/08/01 15:55:00 christos Exp $	*/
 /* $OpenBSD: atomicio.c,v 1.26 2010/09/22 22:58:51 djm Exp $ */
 /*
  * Copyright (c) 2006 Damien Miller. All rights reserved.
@@ -28,7 +28,7 @@
  */
 
 #include includes.h
-__RCSID($NetBSD: atomicio.c,v 1.3 2011/07/25 03:03:10 christos Exp $);
+__RCSID($NetBSD: atomicio.c,v 1.4 2011/08/01 15:55:00 christos Exp $);
 #include sys/param.h
 #include sys/uio.h
 
@@ -52,7 +52,11 @@
 	struct pollfd pfd;
 
 	pfd.fd = fd;
-	pfd.events = f == read ? POLLIN : POLLOUT;
+	/*
+	 * check for vwrite instead of read to avoid read being renamed
+	 * by SSP issues
+	 */
+	pfd.events = f == vwrite ? POLLOUT : POLLIN;
 	while (n  pos) {
 		res = (f) (fd, s + pos, n - pos);
 		switch (res) {

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Aug  1 17:05:17 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke/dev: e500wdog.c pq3diic.c pq3duart.c
pq3etsec.c

Log Message:
Add missing __KERNEL_RCSID


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/dev/e500wdog.c \
src/sys/arch/powerpc/booke/dev/pq3diic.c \
src/sys/arch/powerpc/booke/dev/pq3duart.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/booke/dev/pq3etsec.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/e500wdog.c
diff -u src/sys/arch/powerpc/booke/dev/e500wdog.c:1.2 src/sys/arch/powerpc/booke/dev/e500wdog.c:1.3
--- src/sys/arch/powerpc/booke/dev/e500wdog.c:1.2	Tue Jan 18 01:02:53 2011
+++ src/sys/arch/powerpc/booke/dev/e500wdog.c	Mon Aug  1 17:05:16 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: e500wdog.c,v 1.2 2011/01/18 01:02:53 matt Exp $	*/
+/*	$NetBSD: e500wdog.c,v 1.3 2011/08/01 17:05:16 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,6 +36,8 @@
 
 #include sys/cdefs.h
 
+__KERNEL_RCSID(0, $NetBSD: e500wdog.c,v 1.3 2011/08/01 17:05:16 matt Exp $);
+
 #include sys/param.h
 #include sys/cpu.h
 #include sys/device.h
Index: src/sys/arch/powerpc/booke/dev/pq3diic.c
diff -u src/sys/arch/powerpc/booke/dev/pq3diic.c:1.2 src/sys/arch/powerpc/booke/dev/pq3diic.c:1.3
--- src/sys/arch/powerpc/booke/dev/pq3diic.c:1.2	Tue Jan 18 01:02:53 2011
+++ src/sys/arch/powerpc/booke/dev/pq3diic.c	Mon Aug  1 17:05:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3diic.c,v 1.2 2011/01/18 01:02:53 matt Exp $	*/
+/*	$NetBSD: pq3diic.c,v 1.3 2011/08/01 17:05:17 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,6 +36,8 @@
 
 #include sys/cdefs.h
 
+__KERNEL_RCSID(0, $NetBSD: pq3diic.c,v 1.3 2011/08/01 17:05:17 matt Exp $);
+
 #include sys/param.h
 #include sys/cpu.h
 #include sys/device.h
Index: src/sys/arch/powerpc/booke/dev/pq3duart.c
diff -u src/sys/arch/powerpc/booke/dev/pq3duart.c:1.2 src/sys/arch/powerpc/booke/dev/pq3duart.c:1.3
--- src/sys/arch/powerpc/booke/dev/pq3duart.c:1.2	Tue Jan 18 01:02:53 2011
+++ src/sys/arch/powerpc/booke/dev/pq3duart.c	Mon Aug  1 17:05:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3duart.c,v 1.2 2011/01/18 01:02:53 matt Exp $	*/
+/*	$NetBSD: pq3duart.c,v 1.3 2011/08/01 17:05:17 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,6 +36,8 @@
 
 #include sys/cdefs.h
 
+__KERNEL_RCSID(0, $NetBSD: pq3duart.c,v 1.3 2011/08/01 17:05:17 matt Exp $);
+
 #include sys/param.h
 #include sys/cpu.h
 #include sys/device.h

Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.6 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.7
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.6	Tue Jun 21 06:25:19 2011
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c	Mon Aug  1 17:05:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3etsec.c,v 1.6 2011/06/21 06:25:19 matt Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.7 2011/08/01 17:05:17 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,6 +38,8 @@
 
 #include sys/cdefs.h
 
+__KERNEL_RCSID(0, $NetBSD: pq3etsec.c,v 1.7 2011/08/01 17:05:17 matt Exp $);
+
 #include sys/param.h
 #include sys/cpu.h
 #include sys/device.h

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

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Aug  1 22:21:01 UTC 2011

Modified Files:
src/sys/arch/amd64/amd64: linux32_sigcode.S

Log Message:
Remove redundant , after .balign.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/amd64/linux32_sigcode.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/amd64/amd64/linux32_sigcode.S
diff -u src/sys/arch/amd64/amd64/linux32_sigcode.S:1.1 src/sys/arch/amd64/amd64/linux32_sigcode.S:1.2
--- src/sys/arch/amd64/amd64/linux32_sigcode.S:1.1	Thu Feb  9 19:18:56 2006
+++ src/sys/arch/amd64/amd64/linux32_sigcode.S	Mon Aug  1 22:21:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux32_sigcode.S,v 1.1 2006/02/09 19:18:56 manu Exp $ */
+/*	$NetBSD: linux32_sigcode.S,v 1.2 2011/08/01 22:21:01 joerg Exp $ */
 
 #include assym.h
 #include machine/asm.h
@@ -13,7 +13,7 @@
 	 movl$LINUX32_SYS_exit,%eax
 	 int $0x80
   
-	.balign 16,,
+	.balign 16
 NENTRY(linux32_rt_sigcode)
 	 call*LINUX32_RT_SF_HANDLER(%esp)
 	 lealLINUX32_RT_SF_UC(%esp),%ebx # scp
@@ -22,7 +22,7 @@
 	 int $0x80
 	 movl$LINUX32_SYS_exit,%eax
 	 int $0x80
-	.balign 16,,
+	.balign 16
 	 .globl  _C_LABEL(linux32_esigcode)
 _C_LABEL(linux32_esigcode): 
 

CVS commit: src/sys/arch/macppc/dev

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Mon Aug  1 22:40:22 UTC 2011

Modified Files:
src/sys/arch/macppc/dev: obio.c

Log Message:
sanitize sysctl interface in order to appease gcc 4.5


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/macppc/dev/obio.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/macppc/dev/obio.c
diff -u src/sys/arch/macppc/dev/obio.c:1.34 src/sys/arch/macppc/dev/obio.c:1.35
--- src/sys/arch/macppc/dev/obio.c:1.34	Tue Jul 26 08:36:02 2011
+++ src/sys/arch/macppc/dev/obio.c	Mon Aug  1 22:40:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.34 2011/07/26 08:36:02 macallan Exp $	*/
+/*	$NetBSD: obio.c,v 1.35 2011/08/01 22:40:21 macallan Exp $	*/
 
 /*-
  * Copyright (C) 1998	Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: obio.c,v 1.34 2011/07/26 08:36:02 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: obio.c,v 1.35 2011/08/01 22:40:21 macallan Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -336,7 +336,7 @@
 obio_setup_gpios(struct obio_softc *sc, int node)
 {
 	uint32_t gpio_base, reg[6];
-	struct sysctlnode *sysctl_node, *me, *freq;
+	const struct sysctlnode *sysctl_node, *me, *freq;
 	char name[32];
 	int child, use_dfs, cpunode, hiclock;
 
@@ -398,44 +398,41 @@
 	sysctl_node = NULL;
 
 	if (sysctl_createv(NULL, 0, NULL, 
-	(const struct sysctlnode **)me, 
+	me, 
 	CTLFLAG_READWRITE, CTLTYPE_NODE, intrepid, NULL, NULL,
 	0, NULL, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL) != 0)
-		printf(couldn't create 'interpid' node\n);
+		printf(couldn't create 'intrepid' node\n);
 	
 	if (sysctl_createv(NULL, 0, NULL, 
-	(const struct sysctlnode **)freq, 
+	freq, 
 	CTLFLAG_READWRITE, CTLTYPE_NODE, frequency, NULL, NULL,
 	0, NULL, 0, CTL_MACHDEP, me-sysctl_num, CTL_CREATE, CTL_EOL) != 0)
 		printf(couldn't create 'frequency' node\n);
 
 	if (sysctl_createv(NULL, 0, NULL, 
-	(const struct sysctlnode **)sysctl_node, 
-	CTLFLAG_READWRITE | CTLFLAG_OWNDESC | CTLFLAG_IMMEDIATE,
+	sysctl_node, 
+	CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
 	CTLTYPE_INT, target, CPU speed, sysctl_cpuspeed_temp, 
-	0, NULL, 0, CTL_MACHDEP, me-sysctl_num, freq-sysctl_num, 
+	0, sc, 0, CTL_MACHDEP, me-sysctl_num, freq-sysctl_num, 
 	CTL_CREATE, CTL_EOL) == 0) {
-		sysctl_node-sysctl_data = (void *)sc;
 	} else
 		printf(couldn't create 'target' node\n);
 
 	if (sysctl_createv(NULL, 0, NULL, 
-	(const struct sysctlnode **)sysctl_node, 
-	CTLFLAG_READWRITE | CTLFLAG_IMMEDIATE,
+	sysctl_node, 
+	CTLFLAG_READWRITE,
 	CTLTYPE_INT, current, NULL, sysctl_cpuspeed_cur, 
-	1, NULL, 0, CTL_MACHDEP, me-sysctl_num, freq-sysctl_num, 
+	1, sc, 0, CTL_MACHDEP, me-sysctl_num, freq-sysctl_num, 
 	CTL_CREATE, CTL_EOL) == 0) {
-		sysctl_node-sysctl_data = (void *)sc;
 	} else
 		printf(couldn't create 'current' node\n);
 
 	if (sysctl_createv(NULL, 0, NULL, 
-	(const struct sysctlnode **)sysctl_node, 
+	sysctl_node, 
 	CTLFLAG_READWRITE,
 	CTLTYPE_STRING, available, NULL, sysctl_cpuspeed_available, 
-	2, NULL, 0, CTL_MACHDEP, me-sysctl_num, freq-sysctl_num, 
+	2, sc, 0, CTL_MACHDEP, me-sysctl_num, freq-sysctl_num, 
 	CTL_CREATE, CTL_EOL) == 0) {
-		sysctl_node-sysctl_data = (void *)sc;
 	} else
 		printf(couldn't create 'available' node\n);
 	printf(speed: %d\n, curcpu()-ci_khz);
@@ -518,12 +515,11 @@
 		default:
 			speed = -1;
 	}
-	node.sysctl_idata = mhz;
 	node.sysctl_data = mhz;
 	if (sysctl_lookup(SYSCTLFN_CALL(node)) == 0) {
 		int new_reg;
 
-		new_reg = node.sysctl_idata;
+		new_reg = *(int *)node.sysctl_data;
 		if (new_reg == sc-sc_spd_lo) {
 			obio_set_cpu_speed(sc, 0);
 		} else if (new_reg == sc-sc_spd_hi) {
@@ -555,7 +551,6 @@
 		default:
 			speed = -1;
 	}
-	node.sysctl_idata = mhz;
 	node.sysctl_data = mhz;
 	return sysctl_lookup(SYSCTLFN_CALL(node));
 }

CVS commit: src/sys/dev/i2c

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Mon Aug  1 22:42:57 UTC 2011

Modified Files:
src/sys/dev/i2c: dbcool.c

Log Message:
appease gcc 4.5


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/i2c/dbcool.c

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

Modified files:

Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.31 src/sys/dev/i2c/dbcool.c:1.32
--- src/sys/dev/i2c/dbcool.c:1.31	Sun Jul 31 16:05:01 2011
+++ src/sys/dev/i2c/dbcool.c	Mon Aug  1 22:42:57 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbcool.c,v 1.31 2011/07/31 16:05:01 jmcneill Exp $ */
+/*	$NetBSD: dbcool.c,v 1.32 2011/08/01 22:42:57 macallan Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dbcool.c,v 1.31 2011/07/31 16:05:01 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dbcool.c,v 1.32 2011/08/01 22:42:57 macallan Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1687,8 +1687,7 @@
 dbcool_attach_temp_control(struct dbcool_softc *sc, int idx,
 			   struct chip_id *chip)
 {
-	const struct sysctlnode *me2 = NULL;
-	struct sysctlnode *node = NULL;
+	const struct sysctlnode *me2 = NULL, *node;
 	int j, ret, sysctl_index, rw_flag;
 	uint8_t	sysctl_reg;
 	char name[SYSCTL_NAMELEN];
@@ -1723,8 +1722,9 @@
 		rw_flag = CTLFLAG_READONLY | CTLFLAG_OWNDESC;
 	else
 		rw_flag = CTLFLAG_READWRITE | CTLFLAG_OWNDESC;
+
 	ret = sysctl_createv(NULL, 0, NULL,
-			 (const struct sysctlnode **)node, rw_flag,
+			 node, rw_flag,
 			 CTLTYPE_INT, name,
 			 SYSCTL_DESCR(dbc_sysctl_table[sysctl_index].desc),
 			 dbc_sysctl_table[sysctl_index].helper,
@@ -1732,8 +1732,6 @@
 			 CTL_HW, sc-sc_root_sysctl_num,
 sc-sc_sysctl_num[j],
 DBC_PWM_SYSCTL(idx, sysctl_reg), CTL_EOL);
-	if (node != NULL)
-		node-sysctl_data = sc;
 
 	return ret;
 }
@@ -1745,7 +1743,7 @@
 	uint8_t sysctl_reg;
 	struct chip_id *chip = sc-sc_dc.dc_chip;
 	const struct sysctlnode *me2 = NULL;
-	struct sysctlnode *node = NULL;
+	const struct sysctlnode *node = NULL;
 	char name[SYSCTL_NAMELEN];
 
 	for (i = 0; chip-power[i].desc != NULL; i++) {
@@ -1769,7 +1767,7 @@
 			else
 rw_flag = CTLFLAG_READWRITE | CTLFLAG_OWNDESC;
 			ret = sysctl_createv(NULL, 0, NULL,
-(const struct sysctlnode **)node, rw_flag,
+node, rw_flag,
 (j == DBC_PWM_BEHAVIOR)?
 	CTLTYPE_STRING:CTLTYPE_INT,
 name,
@@ -1780,8 +1778,6 @@
 	sizeof(dbcool_cur_behav): sizeof(int),
 CTL_HW, sc-sc_root_sysctl_num, me2-sysctl_num,
 DBC_PWM_SYSCTL(j, sysctl_reg), CTL_EOL);
-			if (node != NULL)
-node-sysctl_data = sc;
 		}
 	}
 }

CVS commit: src/sys/arch/mips/ralink

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Aug  1 23:01:40 UTC 2011

Modified Files:
src/sys/arch/mips/ralink: ralink_eth.c ralink_var.h

Log Message:
Use sys/ for bus.h and intr.h


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/ralink/ralink_eth.c \
src/sys/arch/mips/ralink/ralink_var.h

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

Modified files:

Index: src/sys/arch/mips/ralink/ralink_eth.c
diff -u src/sys/arch/mips/ralink/ralink_eth.c:1.2 src/sys/arch/mips/ralink/ralink_eth.c:1.3
--- src/sys/arch/mips/ralink/ralink_eth.c:1.2	Thu Jul 28 15:38:49 2011
+++ src/sys/arch/mips/ralink/ralink_eth.c	Mon Aug  1 23:01:40 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ralink_eth.c,v 1.2 2011/07/28 15:38:49 matt Exp $	*/
+/*	$NetBSD: ralink_eth.c,v 1.3 2011/08/01 23:01:40 matt Exp $	*/
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
@@ -29,14 +29,16 @@
 /* ralink_eth.c -- Ralink Ethernet Driver */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ralink_eth.c,v 1.2 2011/07/28 15:38:49 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ralink_eth.c,v 1.3 2011/08/01 23:01:40 matt Exp $);
 
 #include sys/param.h
+#include sys/bus.h
 #include sys/callout.h
 #include sys/device.h
 #include sys/endian.h
 #include sys/errno.h
 #include sys/ioctl.h
+#include sys/intr.h
 #include sys/kernel.h
 #include sys/malloc.h
 #include sys/mbuf.h
@@ -53,9 +55,6 @@
 
 #include net/bpf.h
 
-#include machine/bus.h
-#include machine/intr.h
-
 #include dev/mii/mii.h
 #include dev/mii/miivar.h
 #include dev/mii/mii_bitbang.h
Index: src/sys/arch/mips/ralink/ralink_var.h
diff -u src/sys/arch/mips/ralink/ralink_var.h:1.2 src/sys/arch/mips/ralink/ralink_var.h:1.3
--- src/sys/arch/mips/ralink/ralink_var.h:1.2	Thu Jul 28 15:38:49 2011
+++ src/sys/arch/mips/ralink/ralink_var.h	Mon Aug  1 23:01:40 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ralink_var.h,v 1.2 2011/07/28 15:38:49 matt Exp $	*/
+/*	$NetBSD: ralink_var.h,v 1.3 2011/08/01 23:01:40 matt Exp $	*/
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
 #ifndef _RALINK_VAR_H_
 #define _RALINK_VAR_H_
 
-#include machine/bus.h
+#include sys/bus.h
 
 extern void ralink_com_early(int);
 

CVS commit: src/etc/etc.evbmips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Aug  1 23:18:10 UTC 2011

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

Log Message:
Add CPMBR1400 and GDIUM as kernels to be built


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/etc/etc.evbmips/Makefile.inc

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

Modified files:

Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.15 src/etc/etc.evbmips/Makefile.inc:1.16
--- src/etc/etc.evbmips/Makefile.inc:1.15	Thu Jul 14 05:31:16 2011
+++ src/etc/etc.evbmips/Makefile.inc	Mon Aug  1 23:18:10 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.15 2011/07/14 05:31:16 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.16 2011/08/01 23:18:10 matt Exp $
 #
 #	etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
 #
@@ -9,7 +9,8 @@
 KERNEL_SUFFIXES=	srec
 
 .if ${MACHINE_ARCH} == mipsel
-KERNEL_SETS=		ALCHEMY DBAU1500 DBAU1550 MALTA MTX-1 OMSAL400
+KERNEL_SETS=		ALCHEMY CPMBR1400 DBAU1500 DBAU1550 GDIUM
+KERNEL_SETS+=		MALTA MTX-1 OMSAL400
 BUILD_KERNELS=		INSTALL_OMSAL400 INSTALL_MALTA
 
 KERNEL_SETS+=		P4032 P5064 P6032

CVS commit: src/usr.sbin

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Aug  1 23:19:52 UTC 2011

Modified Files:
src/usr.sbin: Makefile

Log Message:
Break up list of directories by first letter.


To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/usr.sbin/Makefile

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

Modified files:

Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.256 src/usr.sbin/Makefile:1.257
--- src/usr.sbin/Makefile:1.256	Mon May  9 08:51:18 2011
+++ src/usr.sbin/Makefile	Mon Aug  1 23:19:52 2011
@@ -1,30 +1,36 @@
-#	$NetBSD: Makefile,v 1.256 2011/05/09 08:51:18 manu Exp $
+#	$NetBSD: Makefile,v 1.257 2011/08/01 23:19:52 matt Exp $
 #	from: @(#)Makefile	5.20 (Berkeley) 6/12/93
 
 .include bsd.own.mk
 
-SUBDIR=	ac accton acpitools altq apm apmd arp bad144 bootp \
-	btattach btconfig btdevctl bthcid btpand catman \
-	chroot cnwctl cpuctl crash dev_mkdb \
-	dhcp diskpart dumpfs dumplfs edquota eeprom \
-	envstat eshconfig etcupdate extattrctl flashctl fssconfig fusermount \
-	fwctl gpioctl grfconfig gspa hdaudioctl ifwatchd inetd \
-	installboot \
-	iopctl iostat ipwctl irdaattach isdn iteconfig iwictl\
-	kgmon lastlogin ldpd link lmcconfig lockstat lpr mailwrapper makefs \
-	map-mbone mdconfig memswitch mlxctl mmcformat mopd mountd moused \
-	mrinfo mrouted mscdlabel mtrace \
-	mtree ndbootd ndiscvt netgroup_mkdb nfsd ofctl paxctl pcictl perfused \
-	pppd psrset pstat pwd_mkdb postinstall powerd puffs quot quotacheck \
-	quotactl quotaon rarpd rbootd rdate \
-	repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \
- 	rpc.statd rpcbind rwhod sa screenblank sdpd services_mkdb sesd \
-	schedctl sliplogin \
-	spray srtconfig sti sunlabel sup syslogd tadpolectl tcpdchk \
-	tcpdmatch tcpdrop timed tpctl traceroute trpt unlink \
-	usbdevs user videomode vipw veriexecgen vnconfig wake wiconfig \
-	wlanctl \
-	wsconscfg wsfontload wsmoused wsmuxctl zdump zic
+SUBDIR=	ac accton acpitools altq apm apmd arp \
+	bad144 bootp btattach btconfig btdevctl bthcid btpand catman \
+	chroot cnwctl cpuctl crash \
+	dev_mkdb dhcp diskpart dumpfs dumplfs \
+	edquota eeprom envstat eshconfig etcupdate extattrctl \
+	flashctl fssconfig fusermount fwctl \
+	gpioctl grfconfig gspa \
+	hdaudioctl \
+	ifwatchd inetd installboot iopctl iostat ipwctl irdaattach isdn \
+	iteconfig iwictl \
+	kgmon \
+	lastlogin ldpd link lmcconfig lockstat lpr \
+	mailwrapper makefs map-mbone mdconfig memswitch mlxctl mmcformat \
+	mopd mountd moused mrinfo mrouted mscdlabel mtrace mtree \
+	ndbootd ndiscvt netgroup_mkdb nfsd \
+	ofctl \
+	paxctl pcictl perfused pppd psrset pstat pwd_mkdb postinstall \
+	powerd puffs \
+	quot quotacheck quotactl quotaon \
+	rarpd rbootd rdate repquota rmt rpc.bootparamd rpc.lockd \
+	rpc.pcnfsd rpc.statd rpcbind rwhod \
+	sa screenblank sdpd services_mkdb sesd schedctl sliplogin spray \
+	srtconfig sti sunlabel sup syslogd \
+	tadpolectl tcpdchk tcpdmatch tcpdrop timed tpctl traceroute trpt \
+	unlink usbdevs user \
+	videomode vipw veriexecgen vnconfig \
+	wake wiconfig wlanctl wsconscfg wsfontload wsmoused wsmuxctl \
+	zdump zic
 
 .if (${MKYP} != no)
 SUBDIR+= rpc.yppasswdd ypbind yppoll ypserv ypset

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:21:01 UTC 2011

Added Files:
src/sys/arch/powerpc/booke/dev: pq3ddrc.c

Log Message:
Add simple driver to count single bit ECC errors.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/booke/dev/pq3ddrc.c

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

Added files:

Index: src/sys/arch/powerpc/booke/dev/pq3ddrc.c
diff -u /dev/null src/sys/arch/powerpc/booke/dev/pq3ddrc.c:1.1
--- /dev/null	Tue Aug  2 00:21:01 2011
+++ src/sys/arch/powerpc/booke/dev/pq3ddrc.c	Tue Aug  2 00:21:00 2011
@@ -0,0 +1,154 @@
+/*	$NetBSD: pq3ddrc.c,v 1.1 2011/08/02 00:21:00 matt Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
+ * Agency and which was developed by Matt Thomas of 3am Software Foundry.
+ *
+ * This material is based upon work supported by the Defense Advanced Research
+ * Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
+ * Contract No. N66001-09-C-2073.
+ * Approved for Public Release, Distribution Unlimited
+ *
+ * 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.
+ */
+#define	DDRC_PRIVATE
+
+#include sys/cdefs.h
+
+__KERNEL_RCSID(0, $NetBSD: pq3ddrc.c,v 1.1 2011/08/02 00:21:00 matt Exp $);
+
+#include ioconf.h
+
+#include sys/param.h
+#include sys/bus.h
+#include sys/cpu.h
+#include sys/device.h
+#include sys/intr.h
+
+#include powerpc/booke/cpuvar.h
+#include powerpc/booke/e500var.h
+#include powerpc/booke/e500reg.h
+
+struct pq3ddrc_softc {
+	device_t sc_dev;
+	bus_space_tag_t sc_memt;
+	bus_space_handle_t sc_memh;
+	void *sc_ih;
+	struct evcnt sc_ev_sbe;
+};
+
+static int pq3ddrc_match(device_t, cfdata_t, void *);
+static void pq3ddrc_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(pq3ddrc, sizeof(struct pq3ddrc_softc),
+pq3ddrc_match, pq3ddrc_attach, NULL, NULL);
+
+static int
+pq3ddrc_match(device_t parent, cfdata_t cf, void *aux)
+{
+	if (!e500_cpunode_submatch(parent, cf, cf-cf_name, aux))
+		return 0;
+
+	return 1;
+}
+
+static int
+pq3ddrc_intr(void *arg)
+{
+	struct pq3ddrc_softc * const sc = arg;
+	uint32_t v;
+
+	v = bus_space_read_4(sc-sc_memt, sc-sc_memh, ERR_DETECT);
+	bus_space_write_4(sc-sc_memt, sc-sc_memh, ERR_DETECT, v);
+
+	if (v  ERR_SBEE) {
+		v = bus_space_read_4(sc-sc_memt, sc-sc_memh, ERR_SBE);
+		sc-sc_ev_sbe.ev_count += __SHIFTIN(v, ERR_SBE_SBEC);
+		v = ~ERR_SBE_SBEC;
+		bus_space_write_4(sc-sc_memt, sc-sc_memh, ERR_SBE, v);
+	}
+
+	return 1;
+}
+
+static void
+pq3ddrc_attach(device_t parent, device_t self, void *aux)
+{
+	struct cpunode_softc * const psc = device_private(parent);
+	struct pq3ddrc_softc * const sc = device_private(self);
+	struct cpunode_attach_args * const cna = aux;
+	struct cpunode_locators * const cnl = cna-cna_locs;
+	uint32_t v;
+
+	psc-sc_children |= cna-cna_childmask;
+	sc-sc_dev = self;
+	sc-sc_memt = cna-cna_memt;
+
+	int error = bus_space_map(cna-cna_memt, cnl-cnl_addr, cnl-cnl_size,
+	0, sc-sc_memh);
+	if (error) {
+		aprint_error(: failed to map registers: %d\n, error);
+		return;
+	}
+
+	v = bus_space_read_4(sc-sc_memt, sc-sc_memh, DDR_SDRAM_CFG);
+	if ((v  SDRAM_CFG_ECC_EN) == 0) {
+		aprint_normal(: ECC disabled\n);
+		return;
+	}
+
+	evcnt_attach_dynamic(sc-sc_ev_sbe, EVCNT_TYPE_MISC, NULL,
+	device_xname(self), single-bit ecc errors);
+
+	/*
+	 * Clear errors.
+	 */
+	v = bus_space_read_4(sc-sc_memt, sc-sc_memh, ERR_DETECT);
+	bus_space_write_4(sc-sc_memt, sc-sc_memh, ERR_DETECT, v);
+
+	/*
+	

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:22:02 UTC 2011

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

Log Message:
MPC8544 don't any onchip irqs of 20/21


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/sys/arch/powerpc/include/booke/openpicreg.h:1.5
--- src/sys/arch/powerpc/include/booke/openpicreg.h:1.4	Fri May 27 15:18:30 2011
+++ src/sys/arch/powerpc/include/booke/openpicreg.h	Tue Aug  2 00:22:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: openpicreg.h,v 1.4 2011/05/27 15:18:30 matt Exp $	*/
+/*	$NetBSD: openpicreg.h,v 1.5 2011/08/02 00:22:02 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -197,7 +197,7 @@
 
 #define	MPC8544_EXTERNALSOURCES	12
 #define	MPC8544_ONCHIPSOURCES	48
-#define	MPC8544_ONCHIPBITMAP	{ 0x3c3fefff, 0x }
+#define	MPC8544_ONCHIPBITMAP	{ 0x3c07efff, 0x }
 #define	MPC8544_IPISOURCES	4
 #define	MPC8544_TIMERSOURCES	4
 #define	MPC8544_MISOURCES	4

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:23:34 UTC 2011

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

Log Message:
Add some more DDR register definitions


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/sys/arch/powerpc/include/booke/e500reg.h:1.10
--- src/sys/arch/powerpc/include/booke/e500reg.h:1.9	Thu Jun 30 04:45:04 2011
+++ src/sys/arch/powerpc/include/booke/e500reg.h	Tue Aug  2 00:23:34 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: e500reg.h,v 1.9 2011/06/30 04:45:04 matt Exp $	*/
+/*	$NetBSD: e500reg.h,v 1.10 2011/08/02 00:23:34 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -63,6 +63,49 @@
 	((n)  BNDS_EA) + __LOWEST_SET_BIT(BNDS_EA))  16) - (((n)  BNDS_SA)))  8)
 #define	CS_CONFIG(n)		(0x080 + 0x004 * (n))
 #define CS_CONFIG_EN		__PPCBIT(0)
+
+#define	DDR_SDRAM_CFG		0x110
+#define	SDRAM_CFG_MEM_EN	__PPCBIT(0)
+#define	SDRAM_CFG_SREN		__PPCBIT(1)
+#define	SDRAM_CFG_ECC_EN	__PPCBIT(2)
+#define	SDRAM_CFG_RDEN		__PPCBIT(3)
+#define	SDRAM_CFG_TYPE		__PPCBITS(5,7)
+#define	SDRAM_CFG_TYPE_DDR2	3
+#define	SDRAM_CFG_TYPE_DDR3	7
+#define	SDRAM_CFG_DYN_PWR	__PPCBIT(10)
+#define	SDRAM_CFG_DBW		__PPCBITS(11,12)
+#define	SDRAM_CFG_DBW_64BIT	0
+#define	SDRAM_CFG_DBW_32BIT	1
+
+#define	CAPTURE_DATA_HI		0xe20
+#define	CAPTURE_DATA_LO		0xe24
+#define	CAPTURE_ECC		0xe28
+
+#define	ERR_DETECT		0xe40
+#define	ERR_DISABLE		0xe44
+#define	ERR_INT_EN		0xe48
+
+#define	ERR_MMEE		__PPCBIT(0)
+#define	ERR_APEE		__PPCBIT(23)
+#define	ERR_ACEE		__PPCBIT(24)
+#define	ERR_MBEE		__PPCBIT(28)
+#define	ERR_SBEE		__PPCBIT(29)
+#define	ERR_MSEE		__PPCBIT(31)
+
+#define	CAPTURE_ATTRIBUTES	0xe4c
+#define	CATTR_BNUM		__PPCBITS(1,3)
+#define	CATTR_TSIZ		__PPCBITS(5,7)
+#define	CATTR_TSRC		__PPCBITS(11,15)
+#define	CATTR_TTYP		__PPCBITS(18,19)
+#define	CATTR_VLD		__PPCBIT(31)
+
+#define	CAPTURE_ADDRESS		0xe50
+#define	CAPTURE_EXT_ADDRESS	0xe54
+
+#define	ERR_SBE			0xe58
+#define	ERR_SBE_SBET		__PPCBITS(8,15)
+#define	ERR_SBE_SBEC		__PPCBITS(24,31)
+
 #endif /* DDRC_PRIVATE */
 
 #define	GPIO_BASE		0x0fc00

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:25:39 UTC 2011

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

Log Message:
Fix tpyo.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 src/sys/arch/evbppc/mpc85xx/machdep.c:1.21
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.20	Mon Jul 25 05:46:12 2011
+++ src/sys/arch/evbppc/mpc85xx/machdep.c	Tue Aug  2 00:25:38 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.20 2011/07/25 05:46:12 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.21 2011/08/02 00:25:38 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -268,7 +268,7 @@
 		1, { ISOURCE_DDR },
 		1 + ilog2(DEVDISR_DDR_15),
 		{ SVR_MPC8572v1  16 } },
-	{ ddrc, DDRC1_BASE, DDRC_SIZE, 2,
+	{ ddrc, DDRC2_BASE, DDRC_SIZE, 2,
 		1, { ISOURCE_DDR },
 		1 + ilog2(DEVDISR_DDR2_14),
 		{ SVR_MPC8572v1  16 } },

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 01:34:36 UTC 2011

Modified Files:
src/sys/arch/evbppc/mpc85xx [matt-nb5-pq3]: autoconf.c machdep.c
src/sys/arch/powerpc/booke/dev [matt-nb5-pq3]: pq3ehci.c
src/sys/arch/powerpc/include/booke [matt-nb5-pq3]: cpuvar.h e500reg.h

Log Message:
Pull in changes from -current to get ehci at cpunode working.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/evbppc/mpc85xx/autoconf.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/evbppc/mpc85xx/machdep.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/powerpc/booke/dev/pq3ehci.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/powerpc/include/booke/cpuvar.h
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 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/evbppc/mpc85xx/autoconf.c
diff -u src/sys/arch/evbppc/mpc85xx/autoconf.c:1.1.2.1 src/sys/arch/evbppc/mpc85xx/autoconf.c:1.1.2.2
--- src/sys/arch/evbppc/mpc85xx/autoconf.c:1.1.2.1	Fri Jan  7 01:40:36 2011
+++ src/sys/arch/evbppc/mpc85xx/autoconf.c	Tue Aug  2 01:34:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.1.2.1 2011/01/07 01:40:36 matt Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.1.2.2 2011/08/02 01:34:36 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.1.2.1 2011/01/07 01:40:36 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.1.2.2 2011/08/02 01:34:36 matt Exp $);
 
 #define __INTR_PRIVATE
 
@@ -121,6 +121,7 @@
 	ma.ma_name = cpunode;
 	ma.ma_node = 0;
 	ma.ma_memt = curcpu()-ci_softc-cpu_bst;
+	ma.ma_le_memt = curcpu()-ci_softc-cpu_le_bst;
 	ma.ma_dmat = booke_bus_dma_tag;
 
 	config_found_sm_loc(self, mainbus, NULL, ma, mainbus_print, NULL);

Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.1.2.3 src/sys/arch/evbppc/mpc85xx/machdep.c:1.1.2.4
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.1.2.3	Tue Jul 26 03:32:45 2011
+++ src/sys/arch/evbppc/mpc85xx/machdep.c	Tue Aug  2 01:34:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.1.2.3 2011/07/26 03:32:45 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.1.2.4 2011/08/02 01:34:36 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -131,6 +131,12 @@
 	.pbs_limit = GUR_SIZE,
 };
 
+struct powerpc_bus_space gur_le_bst = {
+	.pbs_flags = _BUS_SPACE_LITTLE_ENDIAN|_BUS_SPACE_MEM_TYPE,
+	.pbs_offset = GUR_BASE,
+	.pbs_limit = GUR_SIZE,
+};
+
 const bus_space_handle_t gur_bsh = (bus_space_handle_t)(uintptr_t)(GUR_BASE);
 
 #ifdef CADMUS
@@ -614,7 +620,9 @@
 	CTASSERT(offsetof(struct tlb_md_ops, md_tlb_mapiodev) == 0);
 	cpu_md_ops.md_tlb_ops = (const void *)early_tlb_mapiodev;
 	bus_space_init(gur_bst, NULL, NULL, 0);
+	bus_space_init(gur_le_bst, NULL, NULL, 0);
 	cpu-cpu_bst = gur_bst;
+	cpu-cpu_le_bst = gur_le_bst;
 	cpu-cpu_bsh = gur_bsh;
 
 	/*
@@ -653,6 +661,7 @@
 	 * Now find out how much memory is attached
 	 */
 	pmemsize = memprobe(endkernel);
+	cpu-cpu_highmem = pmemsize;
 		printf( memprobe=%zuMB, (size_t) (pmemsize  20));
 
 	/*

Index: src/sys/arch/powerpc/booke/dev/pq3ehci.c
diff -u src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.1.2.1 src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.1.2.2
--- src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.1.2.1	Fri Jan  7 01:26:19 2011
+++ src/sys/arch/powerpc/booke/dev/pq3ehci.c	Tue Aug  2 01:34:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3ehci.c,v 1.1.2.1 2011/01/07 01:26:19 matt Exp $	*/
+/*	$NetBSD: pq3ehci.c,v 1.1.2.2 2011/08/02 01:34:36 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,9 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pq3ehci.c,v 1.1.2.1 2011/01/07 01:26:19 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pq3ehci.c,v 1.1.2.2 2011/08/02 01:34:36 matt Exp $);
+
+#include opt_usb.h
 
 #include sys/param.h
 #include sys/systm.h
@@ -90,7 +92,7 @@
 	int error;
 
 	psc-sc_children |= cna-cna_childmask;
-	sc-sc.iot = cna-cna_memt;
+	sc-sc.iot = cna-cna_le_memt;	/* EHCI registers are little endian */
 	sc-sc.sc_dev = self;
 	sc-sc.sc_bus.dmatag = cna-cna_dmat;
 	sc-sc.sc_bus.hci_private = sc;
@@ -111,7 +113,17 @@
 	}
 	sc-sc.sc_size = cnl-cnl_size;
 
-	sc-sc_ih = intr_establish(cnl-cnl_intrs[0], IPL_VM, IST_ONCHIP,
+	/*
+	 * We need to tell the USB interface to snoop all off RAM starting
+	 * at 0.  Since it can do it by powers of 2, get the highest RAM
+	 * address and roughly round it to the next power of 2 and find
+	 * the number of leading zero bits.  
+	 */
+	cpu_write_4(cnl-cnl_addr + USB_SNOOP1,
+	SNOOP_2GB - __builtin_clz(curcpu()-ci_softc-cpu_highmem * 2 - 1));
+	cpu_write_4(cnl-cnl_addr + USB_CONTROL, USB_EN);
+
+	sc-sc_ih = intr_establish(cnl-cnl_intrs[0], IPL_USB, 

CVS commit: [matt-nb5-pq3] src/sys/arch/powerpc/booke/dev

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 01:43:03 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke/dev [matt-nb5-pq3]: cpunode.c

Log Message:
need to set cna_le_memt too.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 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.1.2.1 src/sys/arch/powerpc/booke/dev/cpunode.c:1.1.2.2
--- src/sys/arch/powerpc/booke/dev/cpunode.c:1.1.2.1	Fri Jan  7 01:26:19 2011
+++ src/sys/arch/powerpc/booke/dev/cpunode.c	Tue Aug  2 01:43:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpunode.c,v 1.1.2.1 2011/01/07 01:26:19 matt Exp $	*/
+/*	$NetBSD: cpunode.c,v 1.1.2.2 2011/08/02 01:43:03 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.1.2.1 2011/01/07 01:26:19 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpunode.c,v 1.1.2.2 2011/08/02 01:43:03 matt Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -108,6 +108,7 @@
 	for (u_int childmask = 1; cnl-cnl_name != NULL; cnl++, childmask = 1) {
 		cna.cna_busname = cpunode;
 		cna.cna_memt = ma-ma_memt;
+		cna.cna_le_memt = ma-ma_le_memt;
 		cna.cna_dmat = ma-ma_dmat;
 		cna.cna_childmask = childmask;
 		cna.cna_locs = *cnl;

CVS commit: src/sys/dev/nor

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 03:37:25 UTC 2011

Modified Files:
src/sys/dev/nor: cfi.c

Log Message:
when unpacking CFI QRY data, byte order within a word is host order,
but order across words appears to be invariant across -el and -eb systems.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/nor/cfi.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/nor/cfi.c
diff -u src/sys/dev/nor/cfi.c:1.5 src/sys/dev/nor/cfi.c:1.6
--- src/sys/dev/nor/cfi.c:1.5	Sat Jul 23 07:17:34 2011
+++ src/sys/dev/nor/cfi.c	Tue Aug  2 03:37:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cfi.c,v 1.5 2011/07/23 07:17:34 cliff Exp $	*/
+/*	$NetBSD: cfi.c,v 1.6 2011/08/02 03:37:25 cliff Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -33,7 +33,7 @@
 #include opt_cfi.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cfi.c,v 1.5 2011/07/23 07:17:34 cliff Exp $); 
+__KERNEL_RCSID(0, $NetBSD: cfi.c,v 1.6 2011/08/02 03:37:25 cliff Exp $); 
 
 #include sys/param.h
 #include sys/systm.h
@@ -222,11 +222,11 @@
 /* only data[7..0] are used regardless of chip width */
 #define cfi_unpack_1(n)			((n)  0xff)
 
-/* construct (arbitrarily big endian) uint16_t */
+/* construct uint16_t */
 #define cfi_unpack_2(b0, b1)		\
 	((cfi_unpack_1(b1)  8) | cfi_unpack_1(b0))
 
-/* construct (arbitrarily) big endian uint32_t */
+/* construct uint32_t */
 #define cfi_unpack_4(b0, b1, b2, b3)	\
 	((cfi_unpack_1(b3)  24) |	\
 	 (cfi_unpack_1(b2)  16) |	\
@@ -238,12 +238,10 @@
 	(qryp)-qry[0] = cfi_unpack_1(data[0x10]);			\
 	(qryp)-qry[1] = cfi_unpack_1(data[0x11]);			\
 	(qryp)-qry[2] = cfi_unpack_1(data[0x12]);			\
-	(qryp)-id_pri = be16toh(cfi_unpack_2(data[0x13], data[0x14]));	\
-	(qryp)-addr_pri =		\
-		be16toh(cfi_unpack_2(data[0x15], data[0x16]));		\
-	(qryp)-id_alt = be16toh(cfi_unpack_2(data[0x17], data[0x18]));	\
-	(qryp)-addr_alt =		\
-		be16toh(cfi_unpack_2(data[0x19], data[0x1a]));		\
+	(qryp)-id_pri = cfi_unpack_2(data[0x13], data[0x14]);		\
+	(qryp)-addr_pri = cfi_unpack_2(data[0x15], data[0x16]);	\
+	(qryp)-id_alt = cfi_unpack_2(data[0x17], data[0x18]);		\
+	(qryp)-addr_alt = cfi_unpack_2(data[0x19], data[0x1a]);	\
 	(qryp)-vcc_min = cfi_unpack_1(data[0x1b]);			\
 	(qryp)-vcc_max = cfi_unpack_1(data[0x1c]);			\
 	(qryp)-vpp_min = cfi_unpack_1(data[0x1d]);			\
@@ -258,18 +256,18 @@
 	(qryp)-erase_chip_time_max = cfi_unpack_1(data[0x26]);		\
 	(qryp)-device_size = cfi_unpack_1(data[0x27]);			\
 	(qryp)-interface_code_desc =	\
-		be16toh(cfi_unpack_2(data[0x28], data[0x29]));		\
+		cfi_unpack_2(data[0x28], data[0x29]);			\
 	(qryp)-write_nbyte_size_max = 	\
-		be16toh(cfi_unpack_2(data[0x2a], data[0x2b]));		\
+		cfi_unpack_2(data[0x2a], data[0x2b]);			\
 	(qryp)-erase_blk_regions = cfi_unpack_1(data[0x2c]);		\
 	u_int _i = 0x2d;		\
 	const u_int _n = (qryp)-erase_blk_regions;			\
 	KASSERT(_n = 4);		\
 	for (u_int _r = 0; _r  _n; _r++, _i+=4) {			\
 		(qryp)-erase_blk_info[_r].y =\
-			be32toh(cfi_unpack_2(data[_i+0], data[_i+1]));	\
+			cfi_unpack_2(data[_i+0], data[_i+1]);		\
 		(qryp)-erase_blk_info[_r].z =\
-			be32toh(cfi_unpack_2(data[_i+2], data[_i+3]));	\
+			cfi_unpack_2(data[_i+2], data[_i+3]);		\
 	}\
 } while (0)
 

CVS commit: src/sys/arch/mips/ralink

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 03:38:48 UTC 2011

Added Files:
src/sys/arch/mips/ralink: ralink_cfi.c

Log Message:
CFI NOR support for mips/ralink


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/ralink/ralink_cfi.c

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

Added files:

Index: src/sys/arch/mips/ralink/ralink_cfi.c
diff -u /dev/null src/sys/arch/mips/ralink/ralink_cfi.c:1.1
--- /dev/null	Tue Aug  2 03:38:48 2011
+++ src/sys/arch/mips/ralink/ralink_cfi.c	Tue Aug  2 03:38:48 2011
@@ -0,0 +1,191 @@
+/*	$NetBSD: ralink_cfi.c,v 1.1 2011/08/02 03:38:48 cliff Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Cliff Neighbors.
+ *
+ * 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.
+ */
+
+/*
+ * NOR CFI driver support for ralink
+ */
+
+#include opt_flash.h
+#include locators.h
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: ralink_cfi.c,v 1.1 2011/08/02 03:38:48 cliff Exp $);
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/cdefs.h
+#include sys/device.h
+#include sys/endian.h
+
+#include sys/bus.h
+
+#include mips/ralink/ralink_var.h
+#include mips/ralink/ralink_reg.h
+
+#include dev/nor/nor.h
+#include dev/nor/cfi.h
+
+
+static int  ra_cfi_match(device_t, cfdata_t, void *);
+static void ra_cfi_attach(device_t, device_t, void *);
+static int  ra_cfi_detach(device_t, int);
+
+struct ra_cfi_softc {
+	device_t		sc_dev;
+	device_t		sc_nordev;
+	struct cfi			sc_cfi;
+	bus_addr_t		sc_addr;
+	bus_size_t		sc_size;
+	struct nor_interface	sc_nor_if;
+};
+
+CFATTACH_DECL_NEW(ralink_cfi, sizeof(struct ra_cfi_softc), ra_cfi_match,
+ra_cfi_attach, ra_cfi_detach, NULL);
+
+/*
+ * ra_cfi_addr - return bus address for the CFI NOR flash
+ */
+static inline bus_addr_t
+ra_cfi_addr(struct mainbus_attach_args * const ma)
+{
+	return RA_FLASH_BASE;	/* XXX configure TBD */
+}
+
+static int
+ra_cfi_match(device_t parent, cfdata_t match, void *aux)
+{
+	struct mainbus_attach_args * const ma = aux;
+	bus_size_t tmpsize = CFI_QRY_MIN_MAP_SIZE;
+	bus_addr_t addr;
+	struct cfi cfi;
+	int rv;
+
+	KASSERT(ma-ma_memt != NULL);
+
+	addr = ra_cfi_addr(ma);
+#ifdef NOTYET
+	if (addr == MAINBUSCF_ADDR_DEFAULT) {
+		aprint_error(%s: no base address\n, __func__);
+		return 0;
+	}
+#endif
+
+	cfi.cfi_bst = ma-ma_memt;
+	int error = bus_space_map(cfi.cfi_bst, addr, tmpsize, 0, cfi.cfi_bsh);
+	if (error != 0) {
+		aprint_error(%s: cannot map %# PRIxBUSSIZE  at offset %#
+		PRIxBUSADDR , error %d\n,	__func__, tmpsize, addr, error);
+		return false;
+	}
+
+	if (! cfi_probe(cfi)) {
+		aprint_debug(%s: probe addr %# PRIxBUSADDR
+		, CFI not found\n, __func__, addr);
+		rv = 0;
+	} else {
+		rv = 1;
+	}
+
+	bus_space_unmap(cfi.cfi_bst, cfi.cfi_bsh, tmpsize);
+
+	return rv;
+}
+
+static void
+ra_cfi_attach(device_t parent, device_t self, void *aux)
+{
+	struct ra_cfi_softc *sc = device_private(self);
+	struct mainbus_attach_args * const ma = aux;
+	struct cfi_query_data * const qryp = sc-sc_cfi.cfi_qry_data;
+	const bus_size_t tmpsize = CFI_QRY_MIN_MAP_SIZE;
+	bool found;
+	int error;
+
+	aprint_normal(\n);
+
+	sc-sc_dev = self;
+	sc-sc_cfi.cfi_bst = ma-ma_memt;
+	sc-sc_addr = ra_cfi_addr(ma);
+
+	/* map enough to identify, remap later when size is known */
+	error = bus_space_map(sc-sc_cfi.cfi_bst, sc-sc_addr, tmpsize,
+		0, sc-sc_cfi.cfi_bsh);
+	if (error != 0) {
+		aprint_error_dev(self, could not map error %d\n, error);
+		return;
+	}
+
+	found = cfi_identify(sc-sc_cfi);
+
+	bus_space_unmap(sc-sc_cfi.cfi_bst, 

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

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 03:40:01 UTC 2011

Modified Files:
src/sys/arch/mips/conf: files.ralink

Log Message:
CFI NOR support for mips/ralink


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/conf/files.ralink

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/conf/files.ralink
diff -u src/sys/arch/mips/conf/files.ralink:1.2 src/sys/arch/mips/conf/files.ralink:1.3
--- src/sys/arch/mips/conf/files.ralink:1.2	Thu Jul 28 15:38:48 2011
+++ src/sys/arch/mips/conf/files.ralink	Tue Aug  2 03:40:00 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.ralink,v 1.2 2011/07/28 15:38:48 matt Exp $
+#	$NetBSD: files.ralink,v 1.3 2011/08/02 03:40:00 cliff Exp $
 
 file	arch/mips/ralink/ralink_intr.c
 file	arch/mips/ralink/ralink_bus.c
@@ -37,3 +37,9 @@
 device	reth: ether, ifnet, arp, mii
 attach	reth at mainbus
 file	arch/mips/ralink/ralink_eth.c		reth
+
+# Ralink CFI NOR
+device  cfi: norbus
+attach	cfi at mainbus with ralink_cfi
+file	arch/mips/ralink/ralink_cfi.c		ralink_cfi
+

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

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 03:41:16 UTC 2011

Modified Files:
src/sys/arch/evbmips/conf: CPMBR1400

Log Message:
configure CFI NOR flash


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/CPMBR1400

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/CPMBR1400
diff -u src/sys/arch/evbmips/conf/CPMBR1400:1.2 src/sys/arch/evbmips/conf/CPMBR1400:1.3
--- src/sys/arch/evbmips/conf/CPMBR1400:1.2	Thu Jul 28 15:50:13 2011
+++ src/sys/arch/evbmips/conf/CPMBR1400	Tue Aug  2 03:41:16 2011
@@ -198,6 +198,12 @@
 ri2c0		at mainbus?
 iic*		at ri2c?
 
+# NOR Flash
+#options 	NOR_VERBOSE
+cfi0 		at mainbus0
+nor*		at cfi?
+flash*		at nor? offset 0 size 0x200
+
 # USB Hubs
 uhub*		at usb?
 uhub*		at uhub? port ?

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

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Tue Aug  2 04:45:10 UTC 2011

Modified Files:
src/sys/arch/alpha/include: sysarch.h

Log Message:
Define struct alpha_pci_conf_readwrite_args only once; fix build.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/alpha/include/sysarch.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/alpha/include/sysarch.h
diff -u src/sys/arch/alpha/include/sysarch.h:1.17 src/sys/arch/alpha/include/sysarch.h:1.18
--- src/sys/arch/alpha/include/sysarch.h:1.17	Thu Jul 28 20:30:06 2011
+++ src/sys/arch/alpha/include/sysarch.h	Tue Aug  2 04:45:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.17 2011/07/28 20:30:06 dyoung Exp $ */
+/* $NetBSD: sysarch.h,v 1.18 2011/08/02 04:45:10 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -81,15 +81,6 @@
 	u_int32_t val;
 };
 
-struct alpha_pci_conf_readwrite_args {
-	int write;
-	u_int bus;
-	u_int device;
-	u_int function;
-	u_int reg;
-	u_int32_t val;
-};
-
 #ifdef _KERNEL
 extern	u_int alpha_bus_window_count[];
 extern	int (*alpha_bus_get_window)(int, int,

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

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 05:08:31 UTC 2011

Modified Files:
src/sys/arch/evbmips/conf: CPMBR1400

Log Message:
configure NOR flash partitions


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

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/CPMBR1400
diff -u src/sys/arch/evbmips/conf/CPMBR1400:1.3 src/sys/arch/evbmips/conf/CPMBR1400:1.4
--- src/sys/arch/evbmips/conf/CPMBR1400:1.3	Tue Aug  2 03:41:16 2011
+++ src/sys/arch/evbmips/conf/CPMBR1400	Tue Aug  2 05:08:31 2011
@@ -201,8 +201,14 @@
 # NOR Flash
 #options 	NOR_VERBOSE
 cfi0 		at mainbus0
-nor*		at cfi?
-flash*		at nor? offset 0 size 0x200
+nor0		at cfi0
+flash0		at nor0 offset 0x size 0x0004
+flash1		at nor0 offset 0x0004 size 0x0002
+flash2		at nor0 offset 0x0006 size 0x0002
+flash3		at nor0 offset 0x0008 size 0x0012	# kernel
+flash4		at nor0 offset 0x001a size 0x006e	# filesystem
+flash5		at nor0 offset 0x0088 size 0x0176	# upgrade
+flash6		at nor0 offset 0x01fe size 0x0002
 
 # USB Hubs
 uhub*		at usb?

CVS commit: src/sys/arch/mac68k/obio

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Tue Aug  2 05:10:31 UTC 2011

Modified Files:
src/sys/arch/mac68k/obio: esp.c

Log Message:
Include sys/simplelock.h to use simple_lock(); fix build.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/mac68k/obio/esp.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/mac68k/obio/esp.c
diff -u src/sys/arch/mac68k/obio/esp.c:1.52 src/sys/arch/mac68k/obio/esp.c:1.53
--- src/sys/arch/mac68k/obio/esp.c:1.52	Mon Nov 23 00:11:44 2009
+++ src/sys/arch/mac68k/obio/esp.c	Tue Aug  2 05:10:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp.c,v 1.52 2009/11/23 00:11:44 rmind Exp $	*/
+/*	$NetBSD: esp.c,v 1.53 2011/08/02 05:10:31 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: esp.c,v 1.52 2009/11/23 00:11:44 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: esp.c,v 1.53 2011/08/02 05:10:31 uebayasi Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -89,6 +89,7 @@
 #include sys/buf.h
 #include sys/proc.h
 #include sys/queue.h
+#include sys/simplelock.h
 
 #include dev/scsipi/scsi_all.h
 #include dev/scsipi/scsipi_all.h

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 05:12:32 UTC 2011

Modified Files:
src/sys/arch/mips/include: cpuregs.h

Log Message:
Add Loongson2 DIAG register definitions (partial)


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/mips/include/cpuregs.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/mips/include/cpuregs.h
diff -u src/sys/arch/mips/include/cpuregs.h:1.84 src/sys/arch/mips/include/cpuregs.h:1.85
--- src/sys/arch/mips/include/cpuregs.h:1.84	Sun Jul 31 15:35:04 2011
+++ src/sys/arch/mips/include/cpuregs.h	Tue Aug  2 05:12:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuregs.h,v 1.84 2011/07/31 15:35:04 matt Exp $	*/
+/*	$NetBSD: cpuregs.h,v 1.85 2011/08/02 05:12:32 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -571,6 +571,10 @@
 #define	MIPS_COP_0_DATA_HI	_(29)
 #define	MIPS_COP_0_DESAVE	_(31)
 
+#define	MIPS_DIAG_RAS_DISABLE	0x0001	/* Loongson2 */
+#define	MIPS_DIAG_BTB_CLEAR	0x0002	/* Loongson2 */
+#define	MIPS_DIAG_ITLB_CLEAR	0x0004	/* Loongson2 */
+
 /*
  * Values for the code field in a break instruction.
  */

CVS commit: src/sys/arch/mips/mips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 05:13:21 UTC 2011

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Clear the BTB on user-kernel entry on Loongson2


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 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.51 src/sys/arch/mips/mips/mipsX_subr.S:1.52
--- src/sys/arch/mips/mips/mipsX_subr.S:1.51	Sun Jul 31 15:39:29 2011
+++ src/sys/arch/mips/mips/mipsX_subr.S	Tue Aug  2 05:13:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mipsX_subr.S,v 1.51 2011/07/31 15:39:29 matt Exp $	*/
+/*	$NetBSD: mipsX_subr.S,v 1.52 2011/08/02 05:13:21 matt Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -1052,6 +1052,10 @@
 	/*
 	 * Save all the registers except the kernel temporaries onto the stack.
 	 */
+#ifdef MIPS3_LOONGSON2
+	li	k0, MIPS_DIAG_BTB_CLEAR
+	mtc0	k0, MIPS_COP_0_DIAG
+#endif
 	/* K1 already has CURLWP */
 	PTR_L	k0, L_PCB(k1)			# XXXuvm_lwp_getuarea
 	PTR_ADDU k0, USPACE - TF_SIZ - CALLFRAME_SIZ
@@ -1163,6 +1167,10 @@
  * Save the relevant user registers onto the kernel stack.
  * We don't need to save s0 - s8 because the compiler does it for us.
  */
+#ifdef MIPS3_LOONGSON2
+	li	k0, MIPS_DIAG_BTB_CLEAR
+	mtc0	k0, MIPS_COP_0_DIAG
+#endif
 	/* k1 contains curlwp */
 	PTR_L	k0, L_PCB(k1)			# XXXuvm_lwp_getuarea
 	PTR_ADDU k0, USPACE - TF_SIZ - CALLFRAME_SIZ
@@ -1333,6 +1341,10 @@
 	/*
 	 * Save all the registers but kernel temporaries onto the stack.
 	 */
+#ifdef MIPS3_LOONGSON2
+	li	k0, MIPS_DIAG_BTB_CLEAR
+	mtc0	k0, MIPS_COP_0_DIAG
+#endif
 	/* k1 already contains cpulwp */
 	PTR_L	k0, L_PCB(k1)			# XXXuvm_lwp_getuarea
 	PTR_ADDU k0, USPACE - TF_SIZ - CALLFRAME_SIZ
@@ -1642,7 +1654,7 @@
 	tlbwi	# write TLB
 	COP0_SYNC
 #ifdef MIPS3_LOONGSON2
-	li	k0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	k0, MIPS_COP_0_DIAG		# invalidate ITLB
 #elif defined(MIPS3)
 	nop
@@ -1677,7 +1689,7 @@
 	tlbwi	# update TLB
 	COP0_SYNC
 #ifdef MIPS3_LOONGSON2
-	li	k0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	k0, MIPS_COP_0_DIAG		# invalidate ITLB
 #elif defined(MIPS3)
 	nop
@@ -1762,7 +1774,7 @@
 	tlbwi	# update slot found
 	COP0_SYNC
 #ifdef MIPS3_LOONGSON2
-	li	v0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	v0, MIPS_COP_0_DIAG		# invalidate ITLB
 #elif defined(MIPS3)
 	nop	# required for QED5230
@@ -1784,7 +1796,7 @@
 	tlbwi	# update slot found
 	COP0_SYNC
 #ifdef MIPS3_LOONGSON2
-	li	v0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	v0, MIPS_COP_0_DIAG		# invalidate ITLB
 #elif defined(MIPS3)
 	nop	# required for QED5230
@@ -1905,7 +1917,7 @@
 	tlbwi
 	COP0_SYNC
 #ifdef MIPS3_LOONGSON2
-	li	v0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	v0, MIPS_COP_0_DIAG		# invalidate ITLB
 #elif defined(MIPS3)
 	nop
@@ -1975,7 +1987,7 @@
 	COP0_SYNC
 
 #ifdef MIPS3_LOONGSON2
-	li	v0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	v0, MIPS_COP_0_DIAG		# invalidate ITLB
 #endif
 
@@ -2030,7 +2042,7 @@
 	COP0_SYNC
 
 #ifdef MIPS3_LOONGSON2
-	li	v0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	v0, MIPS_COP_0_DIAG		# invalidate ITLB
 #endif
 
@@ -2078,7 +2090,7 @@
 	COP0_SYNC
 
 #ifdef MIPS3_LOONGSON2
-	li	v0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	v0, MIPS_COP_0_DIAG		# invalidate ITLB
 #endif
 
@@ -2241,7 +2253,7 @@
 	_MTC0	ta1, MIPS_COP_0_TLB_HI		# restore EntryHi
 
 #ifdef MIPS3_LOONGSON2
-	li	v0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	v0, MIPS_COP_0_DIAG		# invalidate ITLB
 #endif
 
@@ -2475,7 +2487,7 @@
 	COP0_SYNC
 
 #ifdef MIPS3_LOONGSON2
-	li	v0, 4# ugly
+	li	k0, MIPS_DIAG_ITLB_CLEAR
 	mtc0	v0, MIPS_COP_0_DIAG		# invalidate ITLB
 #endif
 

CVS commit: src/sys/arch/mac68k/obio

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Tue Aug  2 05:17:18 UTC 2011

Modified Files:
src/sys/arch/mac68k/obio: esp.c

Log Message:
ncr53c9x was converted to use mutex(9), follow that.  Fix DEBUG build too.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/mac68k/obio/esp.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/mac68k/obio/esp.c
diff -u src/sys/arch/mac68k/obio/esp.c:1.53 src/sys/arch/mac68k/obio/esp.c:1.54
--- src/sys/arch/mac68k/obio/esp.c:1.53	Tue Aug  2 05:10:31 2011
+++ src/sys/arch/mac68k/obio/esp.c	Tue Aug  2 05:17:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp.c,v 1.53 2011/08/02 05:10:31 uebayasi Exp $	*/
+/*	$NetBSD: esp.c,v 1.54 2011/08/02 05:17:18 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: esp.c,v 1.53 2011/08/02 05:10:31 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: esp.c,v 1.54 2011/08/02 05:17:18 uebayasi Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -89,7 +89,7 @@
 #include sys/buf.h
 #include sys/proc.h
 #include sys/queue.h
-#include sys/simplelock.h
+#include sys/mutex.h
 
 #include dev/scsipi/scsi_all.h
 #include dev/scsipi/scsipi_all.h
@@ -871,9 +871,9 @@
 	 * which protects itself against multiple invocation with a
 	 * simple_lock. Follow the example of ncr53c9x_poll().
 	 */
-	simple_unlock(sc-sc_lock);
+	mutex_exit(sc-sc_lock);
 	ncr53c9x_intr(sc);
-	simple_lock(sc-sc_lock);
+	mutex_enter(sc-sc_lock);
 	if (espspl != -1)
 		splx(espspl);
 	espspl = -1;

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Tue Aug  2 05:36:45 UTC 2011

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
when matching pubkeys, also return the first (pgp) uid for the key in the
resultant key listing

when using json to format keys returned from libnetpgp, also prepare for
machine-readable format (mr) as well as human (human), even though
it's not yet used.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.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/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.92 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.93
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.92	Tue Jun 28 03:35:28 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Tue Aug  2 05:36:45 2011
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: netpgp.c,v 1.92 2011/06/28 03:35:28 agc Exp $);
+__RCSID($NetBSD: netpgp.c,v 1.93 2011/08/02 05:36:45 agc Exp $);
 #endif
 
 #include sys/types.h
@@ -1028,9 +1028,10 @@
 netpgp_match_keys_json(netpgp_t *netpgp, char **json, char *name, const char *fmt, const int psigs)
 {
 	const pgp_key_t	*key;
-	unsigned		 k;
-	mj_t			 id_array;
-	int			 ret;
+	unsigned	 k;
+	mj_t		 id_array;
+	char		*newkey;
+	int		 ret;
 
 	if (name[0] == '0'  name[1] == 'x') {
 		name += 2;
@@ -1044,11 +1045,13 @@
 		name, k);
 		if (key != NULL) {
 			if (strcmp(fmt, mr) == 0) {
-#if 0
 pgp_hkp_sprint_keydata(netpgp-io, netpgp-pubring,
-		key, pubs.v[pubs.c],
-		key-key.pubkey, psigs);
-#endif
+		key, newkey,
+		key-key.pubkey, 0);
+if (newkey) {
+	printf(%s\n, newkey);
+	free(newkey);
+}
 			} else {
 ALLOC(mj_t, id_array.value.v, id_array.size,
 	id_array.c, 10, 10, netpgp_match_keys_json, return 0);
@@ -1070,9 +1073,10 @@
 netpgp_match_pubkeys(netpgp_t *netpgp, char *name, void *vp)
 {
 	const pgp_key_t	*key;
-	unsigned		 k;
-	strings_t		 pubs;
-	FILE			*fp = (FILE *)vp;
+	unsigned	 k;
+	strings_t	 pubs;
+	ssize_t		 cc;
+	FILE		*fp = (FILE *)vp;
 
 	(void) memset(pubs, 0x0, sizeof(pubs));
 	do {
@@ -1083,7 +1087,9 @@
 
 			ALLOC(char *, pubs.v, pubs.size, pubs.c, 10, 10,
 	netpgp_match_pubkeys, return 0);
-			(void) pgp_sprint_pubkey(key, out, sizeof(out));
+			cc = pgp_sprint_pubkey(key, out, sizeof(out));
+			(void) snprintf(out[cc], sizeof(out) - cc, name=%s\n,
+key-uids[0]);
 			pubs.v[pubs.c++] = netpgp_strdup(out);
 			k += 1;
 		}
@@ -1116,7 +1122,7 @@
 netpgp_get_key(netpgp_t *netpgp, const char *name, const char *fmt)
 {
 	const pgp_key_t	*key;
-	char			*newkey;
+	char		*newkey;
 
 	if ((key = resolve_userid(netpgp, netpgp-pubring, name)) == NULL) {
 		return NULL;

CVS commit: src/usr.bin/mkubootimage

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Mon Aug  1 06:16:36 UTC 2011

Modified Files:
src/usr.bin/mkubootimage: mkubootimage.c

Log Message:
Add an -m flag to mkubootimage, for specifying an alternate magic
value.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/mkubootimage/mkubootimage.c

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug  1 08:36:39 UTC 2011

Modified Files:
src/sys/arch/sparc64/dev: central.c fhc_central.c fhc_mainbus.c

Log Message:
use device_private().  thanks to jmcneill for pointing this out.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/central.c \
src/sys/arch/sparc64/dev/fhc_central.c \
src/sys/arch/sparc64/dev/fhc_mainbus.c

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

CVS commit: src/etc/namedb

[Takahiro Kambe]

Module Name:src
Committed By:   taca
Date:   Mon Aug  1 10:04:27 UTC 2011

Modified Files:
src/etc/namedb: root.cache

Log Message:
Update to 2011060800.

- IPv6 address was added to D.ROOT-SERVERS.NET.


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

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

CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Aug  1 10:21:32 UTC 2011

Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416reg.h

Log Message:
Fix AR_SREV_MERLIN_20 and AR_SREV_MERLIN_20_OR_LATER macros to match
rev 2.1 as well as 2.0, from FreeBSD. Fixes 5GHz mode on my 9280.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h

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

CVS commit: src/sys/kern

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Mon Aug  1 10:33:26 UTC 2011

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

Log Message:
modify parsing of device names so that it can deal with names which
have numbers is it, eg i915drm*


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

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

CVS commit: src/sys/arch/x86

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Mon Aug  1 10:42:24 UTC 2011

Modified Files:
src/sys/arch/x86/include: intr.h
src/sys/arch/x86/x86: intr.c

Log Message:
if checking whether an interrupt is shared, don't compare pin numbers
if it is -1 -- this is a hack to allow MSIs which don't have a concept
of pin numbers, and are generally not shared
(This doesn't give us sensible event names for statistics display. The
whole abstraction has more exceptions than regular cases, it should
be redesigned imho.)


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/x86/include/intr.h
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x86/x86/intr.c

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

CVS commit: src/sys/dev

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Mon Aug  1 11:20:28 UTC 2011

Modified Files:
src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c cardbus.c cardbusreg.h
cardbusvar.h com_cardbus.c ehci_cardbus.c fwohci_cardbus.c
if_ath_cardbus.c if_atw_cardbus.c if_ex_cardbus.c if_fxp_cardbus.c
if_ral_cardbus.c if_re_cardbus.c if_rtk_cardbus.c if_rtw_cardbus.c
if_tlp_cardbus.c njata_cardbus.c njs_cardbus.c ohci_cardbus.c
rbus_ppb.c sdhc_cardbus.c siisata_cardbus.c uhci_cardbus.c
src/sys/dev/pci: pccbb.c

Log Message:
remove some bloat:
-cardbus doesn't use multiple interrupt lines like PCI, and it doesn't
 use machanisms like interrupt line register and swizzling -- no need
 to carry around dummy information, this is all dealt with by the
 bridge
 (I'm asking myself how rbus_ppb can work -- a bridge attached to
 cardbus just can't work like a normal PCI bridge as far as interrupts
 are concerned. I thing that should be a hardware specific driver
 because behavior is not covered by a standard.)
-cardbus always uses 3.3V -- no need for a variable to keep track
 of the voltage


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/cardbus/ahc_cardbus.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/cardbus/cardbusreg.h
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/cardbus/cardbusvar.h \
src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/fwohci_cardbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/cardbus/if_atw_cardbus.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/cardbus/if_ral_cardbus.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/cardbus/if_re_cardbus.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/cardbus/if_rtw_cardbus.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/cardbus/if_tlp_cardbus.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cardbus/njata_cardbus.c \
src/sys/dev/cardbus/siisata_cardbus.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/cardbus/njs_cardbus.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/cardbus/ohci_cardbus.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/cardbus/sdhc_cardbus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.202 -r1.203 src/sys/dev/pci/pccbb.c

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

CVS commit: src/sys/dev/acpi

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Aug  1 11:26:00 UTC 2011

Modified Files:
src/sys/dev/acpi: acpi.c acpireg.h acpivar.h

Log Message:
add support for reset registers in PCI config space


To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/acpireg.h
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/acpi/acpivar.h

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

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Aug  1 11:26:31 UTC 2011

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

Log Message:
x86_reset: use acpi_reset instead of AcpiReset


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/x86/x86/x86_machdep.c

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

CVS commit: xsrc/external/mit/xorg-cf-files/dist

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Mon Aug  1 14:14:16 UTC 2011

Modified Files:
xsrc/external/mit/xorg-cf-files/dist: NetBSD.cf

Log Message:
Always include xorg.cf for GccAliasingArgs regardless of server support
on the target plattform.
Fixes GccAliasingArgs leftovers in Makefiles generated by imake(1)
on m68k and sh3 etc.

This problem had been once fixed in rev 1.2 per PR xsrc/40970, but
it looks accidentally reverted on xorg-cf-files 1.0.3 merge in rev 1.3.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf

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

CVS commit: src/sys/kern

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Mon Aug  1 15:26:31 UTC 2011

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

Log Message:
Need to include sys/evcnt.h explicitly to build this on at least amiga.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/subr_pserialize.c

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

CVS commit: src/distrib/arc/ramdisk

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Mon Aug  1 15:41:34 UTC 2011

Modified Files:
src/distrib/arc/ramdisk: list

Log Message:
Use distrib/utils/more to shrink ramdiskbin.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/arc/ramdisk/list

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

CVS commit: src/crypto/external/bsd/openssh/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Aug  1 15:55:00 UTC 2011

Modified Files:
src/crypto/external/bsd/openssh/dist: atomicio.c

Log Message:
PR/45200: : J. Hannken-Illjes: Scp hangs after sending:
- check for vwrite() instead of read() to avoid read() being renamed by SSP


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/atomicio.c

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

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

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Aug  1 22:21:01 UTC 2011

Modified Files:
src/sys/arch/amd64/amd64: linux32_sigcode.S

Log Message:
Remove redundant , after .balign.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/amd64/linux32_sigcode.S

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

CVS commit: src/sys/arch/macppc/dev

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Mon Aug  1 22:40:22 UTC 2011

Modified Files:
src/sys/arch/macppc/dev: obio.c

Log Message:
sanitize sysctl interface in order to appease gcc 4.5


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/macppc/dev/obio.c

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

CVS commit: src/sys/dev/i2c

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Mon Aug  1 22:42:57 UTC 2011

Modified Files:
src/sys/dev/i2c: dbcool.c

Log Message:
appease gcc 4.5


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/i2c/dbcool.c

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

CVS commit: src/sys/arch/mips/ralink

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Aug  1 23:01:40 UTC 2011

Modified Files:
src/sys/arch/mips/ralink: ralink_eth.c ralink_var.h

Log Message:
Use sys/ for bus.h and intr.h


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/ralink/ralink_eth.c \
src/sys/arch/mips/ralink/ralink_var.h

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

CVS commit: src/etc/etc.evbmips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Aug  1 23:18:10 UTC 2011

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

Log Message:
Add CPMBR1400 and GDIUM as kernels to be built


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/etc/etc.evbmips/Makefile.inc

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

CVS commit: src/usr.sbin

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Aug  1 23:19:52 UTC 2011

Modified Files:
src/usr.sbin: Makefile

Log Message:
Break up list of directories by first letter.


To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/usr.sbin/Makefile

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

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:22:02 UTC 2011

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

Log Message:
MPC8544 don't any onchip irqs of 20/21


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:23:34 UTC 2011

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

Log Message:
Add some more DDR register definitions


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:25:39 UTC 2011

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

Log Message:
Fix tpyo.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.

CVS commit: src/sys/arch

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:27:42 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf: MPC8536DS P2020DS P2020RDB
src/sys/arch/powerpc/conf: files.booke

Log Message:
Change device name of pq3cfi to cfi.
Add cfi to P2020DS
Add ddrc


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/MPC8536DS
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/conf/P2020DS
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/conf/P2020RDB
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/conf/files.booke

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

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:35:06 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf [matt-nb5-pq3]: MPC8536DS
src/sys/arch/powerpc/conf [matt-nb5-pq3]: files.booke

Log Message:
Change pq3cfi to cfi


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/evbppc/conf/MPC8536DS
cvs rdiff -u -r1.1.8.3 -r1.1.8.4 src/sys/arch/powerpc/conf/files.booke

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

CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 00:45:37 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: sysv4.h

Log Message:
Don't define LINK_EH_SPEC if it's already defined.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/rs6000/sysv4.h

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

CVS commit: [matt-nb5-pq3] src/sys/dev/nor

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 01:01:35 UTC 2011

Modified Files:
src/sys/dev/nor [matt-nb5-pq3]: cfi.h

Log Message:
- CFI_0002_STATS no longer defined here
- add missing arg for do-nothing variant of CFI_0002_STATS_INIT()


To generate a diff of this commit:
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/sys/dev/nor/cfi.h

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

CVS commit: [matt-nb5-pq3] src/sys/dev/usb

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 01:09:44 UTC 2011

Modified Files:
src/sys/dev/usb [matt-nb5-pq3]: usb_mem.c

Log Message:
silence the usb_block_allocmem: in interrupt context print


To generate a diff of this commit:
cvs rdiff -u -r1.37.18.1 -r1.37.18.2 src/sys/dev/usb/usb_mem.c

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

CVS commit: [matt-nb5-pq3] src/sys/dev/usb

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 01:26:01 UTC 2011

Modified Files:
src/sys/dev/usb [matt-nb5-pq3]: ehci.c

Log Message:
Pull in ETTF EHCI changes from -current.


To generate a diff of this commit:
cvs rdiff -u -r1.154.4.2.4.1 -r1.154.4.2.4.2 src/sys/dev/usb/ehci.c

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

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 01:34:36 UTC 2011

Modified Files:
src/sys/arch/evbppc/mpc85xx [matt-nb5-pq3]: autoconf.c machdep.c
src/sys/arch/powerpc/booke/dev [matt-nb5-pq3]: pq3ehci.c
src/sys/arch/powerpc/include/booke [matt-nb5-pq3]: cpuvar.h e500reg.h

Log Message:
Pull in changes from -current to get ehci at cpunode working.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/evbppc/mpc85xx/autoconf.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/evbppc/mpc85xx/machdep.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/powerpc/booke/dev/pq3ehci.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/powerpc/include/booke/cpuvar.h
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 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.

CVS commit: [matt-nb5-pq3] src/sys/arch/powerpc/booke/dev

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 01:43:03 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke/dev [matt-nb5-pq3]: cpunode.c

Log Message:
need to set cna_le_memt too.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 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.

CVS commit: src/sys/dev/nor

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 03:37:25 UTC 2011

Modified Files:
src/sys/dev/nor: cfi.c

Log Message:
when unpacking CFI QRY data, byte order within a word is host order,
but order across words appears to be invariant across -el and -eb systems.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/nor/cfi.c

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

CVS commit: src/sys/arch/mips/ralink

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 03:38:48 UTC 2011

Added Files:
src/sys/arch/mips/ralink: ralink_cfi.c

Log Message:
CFI NOR support for mips/ralink


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/ralink/ralink_cfi.c

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

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

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 03:40:01 UTC 2011

Modified Files:
src/sys/arch/mips/conf: files.ralink

Log Message:
CFI NOR support for mips/ralink


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/conf/files.ralink

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

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

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 03:41:16 UTC 2011

Modified Files:
src/sys/arch/evbmips/conf: CPMBR1400

Log Message:
configure CFI NOR flash


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/CPMBR1400

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

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

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Tue Aug  2 04:45:10 UTC 2011

Modified Files:
src/sys/arch/alpha/include: sysarch.h

Log Message:
Define struct alpha_pci_conf_readwrite_args only once; fix build.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/alpha/include/sysarch.h

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

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

[Cliff Neighbors]

Module Name:src
Committed By:   cliff
Date:   Tue Aug  2 05:08:31 UTC 2011

Modified Files:
src/sys/arch/evbmips/conf: CPMBR1400

Log Message:
configure NOR flash partitions


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

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

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 05:12:32 UTC 2011

Modified Files:
src/sys/arch/mips/include: cpuregs.h

Log Message:
Add Loongson2 DIAG register definitions (partial)


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/mips/include/cpuregs.h

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

CVS commit: src/sys/arch/mips/mips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Aug  2 05:13:21 UTC 2011

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Clear the BTB on user-kernel entry on Loongson2


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 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.