CVS commit: src/share/examples/fstab

2015-03-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Mar  4 16:18:04 UTC 2015

Modified Files:
src/share/examples/fstab: fstab.ramdisk

Log Message:
add a shm example


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/examples/fstab/fstab.ramdisk

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

Modified files:

Index: src/share/examples/fstab/fstab.ramdisk
diff -u src/share/examples/fstab/fstab.ramdisk:1.4 src/share/examples/fstab/fstab.ramdisk:1.5
--- src/share/examples/fstab/fstab.ramdisk:1.4	Sat Dec 24 07:59:21 2005
+++ src/share/examples/fstab/fstab.ramdisk	Wed Mar  4 11:18:04 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: fstab.ramdisk,v 1.4 2005/12/24 12:59:21 jmmv Exp $
+#	$NetBSD: fstab.ramdisk,v 1.5 2015/03/04 16:18:04 christos Exp $
 #
 # Sample fstab for multiple ramdisks (mfs and tmpfs).
 #
@@ -30,3 +30,6 @@ tmpfs	/tmp		tmpfs	rw
 
 # Mounts a tmpfs instance to be used by a specific user.
 #tmpfs	/home/foo/tmp	tmpfs	rw,-ufoo,-gusers,-s50M
+
+# Shared memory tempfs template allocating 25% of available memory
+tmpfs	/var/shm	tmpfs	rw,-m1777,-sram%25

CVS commit: src/usr.bin/pwait

2015-03-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Mar  4 16:36:12 UTC 2015

Modified Files:
src/usr.bin/pwait: pwait.1 pwait.c

Log Message:
add flag that let's you not wait for all the processes specified.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/pwait/pwait.1
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/pwait/pwait.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/pwait/pwait.1
diff -u src/usr.bin/pwait/pwait.1:1.3 src/usr.bin/pwait/pwait.1:1.4
--- src/usr.bin/pwait/pwait.1:1.3	Tue Mar  3 14:59:48 2015
+++ src/usr.bin/pwait/pwait.1	Wed Mar  4 11:36:12 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: pwait.1,v 1.3 2015/03/03 19:59:48 christos Exp $
+.\	$NetBSD: pwait.1,v 1.4 2015/03/04 16:36:12 christos Exp $
 .\
 .\ Copyright (c) 2004-2009, Jilles Tjoelker
 .\ All rights reserved.
@@ -33,7 +33,7 @@
 .\
 .\ $FreeBSD: head/bin/pwait/pwait.1 233648 2012-03-29 05:02:12Z eadler $
 .\
-.Dd March 3, 2015
+.Dd March 4, 2015
 .Dt PWAIT 1
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nd wait for processes to terminate
 .Sh SYNOPSIS
 .Nm
-.Op Fl sv
+.Op Fl isv
 .Op Fl t Ar timeout
 .Ar pid
 \...
@@ -52,6 +52,9 @@ utility will wait until each of the give
 .Pp
 The following option is available:
 .Bl -tag -width indent
+.It Fl i
+Don't wait for all the processes, exit after the first process or group
+of processes exit.
 .It Fl s
 Exit with the status code of the first non-zero exit status pid, or
 if timed out exit with

Index: src/usr.bin/pwait/pwait.c
diff -u src/usr.bin/pwait/pwait.c:1.4 src/usr.bin/pwait/pwait.c:1.5
--- src/usr.bin/pwait/pwait.c:1.4	Wed Mar  4 08:31:53 2015
+++ src/usr.bin/pwait/pwait.c	Wed Mar  4 11:36:12 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwait.c,v 1.4 2015/03/04 13:31:53 christos Exp $	*/
+/*	$NetBSD: pwait.c,v 1.5 2015/03/04 16:36:12 christos Exp $	*/
 
 /*-
  * Copyright (c) 2004-2009, Jilles Tjoelker
@@ -37,7 +37,7 @@
 #ifdef __FBSDID
 __FBSDID($FreeBSD: head/bin/pwait/pwait.c 245506 2013-01-16 18:15:25Z delphij $);
 #endif
-__RCSID($NetBSD: pwait.c,v 1.4 2015/03/04 13:31:53 christos Exp $);
+__RCSID($NetBSD: pwait.c,v 1.5 2015/03/04 16:36:12 christos Exp $);
 
 #include sys/types.h
 #include sys/event.h
@@ -58,7 +58,7 @@ static __dead void
 usage(void)
 {
 
-	fprintf(stderr, Usage: %s [-sv] [-t timeout] pid ...\n,
+	fprintf(stderr, Usage: %s [-isv] [-t timeout] pid ...\n,
 	getprogname());
 	exit(EX_USAGE);
 }
@@ -72,7 +72,7 @@ main(int argc, char *argv[])
 	int kq;
 	struct kevent *e;
 	int verbose = 0, childstatus = 0;
-	int opt, duplicate, status;
+	int opt, duplicate, status, immediately = 0;
 	size_t nleft, n, i;
 	pid_t pid;
 	char *s, *end;
@@ -80,8 +80,11 @@ main(int argc, char *argv[])
 	struct timespec ts, *tsp;
 
 	setprogname(argv[0]);
-	while ((opt = getopt(argc, argv, st:v)) != -1) {
+	while ((opt = getopt(argc, argv, ist:v)) != -1) {
 		switch (opt) {
+		case 'i':
+			immediately = 1;
+			break;
 		case 's':
 			childstatus = 1;
 			break;
@@ -187,6 +190,9 @@ main(int argc, char *argv[])
 return status;
 		}
 		nleft -= n;
+		// n != 0 here, belt-n-suspenders...
+		if (immediately  n)
+			break;
 	}
 
 	return EX_OK;

CVS commit: src/sys/arch

2015-03-04 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Wed Mar  4 17:02:17 UTC 2015

Modified Files:
src/sys/arch/arm/broadcom: bcm2835_intr.c bcm2835_obio.c
src/sys/arch/arm/cortex: a9_mpsubr.S
src/sys/arch/evbarm/conf: RPI2
src/sys/arch/evbarm/rpi: rpi_machdep.c

Log Message:
Spin up the non-boot CPUs, but don't allow cpu_boot_secondary_processors
to see them for now.

RPI2 nows works well with only the boot cpu.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/broadcom/bcm2835_intr.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/broadcom/bcm2835_obio.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/cortex/a9_mpsubr.S
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/RPI2
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/rpi/rpi_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/arm/broadcom/bcm2835_intr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_intr.c:1.5 src/sys/arch/arm/broadcom/bcm2835_intr.c:1.6
--- src/sys/arch/arm/broadcom/bcm2835_intr.c:1.5	Sat Feb 28 09:34:34 2015
+++ src/sys/arch/arm/broadcom/bcm2835_intr.c	Wed Mar  4 17:02:17 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcm2835_intr.c,v 1.5 2015/02/28 09:34:34 skrll Exp $	*/
+/*	$NetBSD: bcm2835_intr.c,v 1.6 2015/03/04 17:02:17 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_intr.c,v 1.5 2015/02/28 09:34:34 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_intr.c,v 1.6 2015/03/04 17:02:17 skrll Exp $);
 
 #define _INTR_PRIVATE
 
@@ -67,12 +67,14 @@ static int bcm2836mp_pic_find_pending_ir
 static void bcm2836mp_pic_establish_irq(struct pic_softc *, struct intrsource *);
 static void bcm2836mp_pic_source_name(struct pic_softc *, int, char *,
 size_t);
+#if 0
 #ifdef MULTIPROCESSOR
 int bcm2836mp_ipi_handler(void *);
 static void bcm2836mp_cpu_init(struct pic_softc *, struct cpu_info *);
 static void bcm2836mp_send_ipi(struct pic_softc *, const kcpuset_t *, u_long);
 #endif
 #endif
+#endif
 
 
 static int  bcm2835_icu_match(device_t, cfdata_t, void *);
@@ -99,7 +101,7 @@ static struct pic_ops bcm2836mp_picops =
 	.pic_find_pending_irqs = bcm2836mp_pic_find_pending_irqs,
 	.pic_establish_irq = bcm2836mp_pic_establish_irq,
 	.pic_source_name = bcm2836mp_pic_source_name,
-#ifdef MULTIPROCESSOR
+#if 0  defined(MULTIPROCESSOR)
 	.pic_cpu_init = bcm2836mp_cpu_init,
 	.pic_ipi_send = bcm2836mp_send_ipi,
 #endif
@@ -203,7 +205,7 @@ bcm2835_icu_attach(device_t parent, devi
 	pic_add(sc-sc_pic, 0);
 
 #if defined(BCM2836)
-#ifdef MULTIPROCESSOR
+#if 0  defined(MULTIPROCESSOR)
 	aprint_normal(: Multiprocessor);
 #endif
 	pic_add(bcm2836mp_pic, BCM2836_INT_LOCALBASE);

Index: src/sys/arch/arm/broadcom/bcm2835_obio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_obio.c:1.23 src/sys/arch/arm/broadcom/bcm2835_obio.c:1.24
--- src/sys/arch/arm/broadcom/bcm2835_obio.c:1.23	Sat Feb 28 09:34:34 2015
+++ src/sys/arch/arm/broadcom/bcm2835_obio.c	Wed Mar  4 17:02:17 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcm2835_obio.c,v 1.23 2015/02/28 09:34:34 skrll Exp $	*/
+/*	$NetBSD: bcm2835_obio.c,v 1.24 2015/03/04 17:02:17 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2012, 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_obio.c,v 1.23 2015/02/28 09:34:34 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_obio.c,v 1.24 2015/03/04 17:02:17 skrll Exp $);
 
 #include locators.h
 #include obio.h
@@ -309,3 +309,10 @@ obio_print(void *aux, const char *name)
 
 	return UNCONF;
 }
+
+#ifdef MULTIPROCESSOR
+void
+bcm2836_cpu_hatch(struct cpu_info *ci)
+{
+}
+#endif

Index: src/sys/arch/arm/cortex/a9_mpsubr.S
diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.29 src/sys/arch/arm/cortex/a9_mpsubr.S:1.30
--- src/sys/arch/arm/cortex/a9_mpsubr.S:1.29	Fri Feb 27 18:52:20 2015
+++ src/sys/arch/arm/cortex/a9_mpsubr.S	Wed Mar  4 17:02:17 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: a9_mpsubr.S,v 1.29 2015/02/27 18:52:20 jmcneill Exp $	*/
+/*	$NetBSD: a9_mpsubr.S,v 1.30 2015/03/04 17:02:17 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -518,6 +518,10 @@ cortex_mpfault:
 // Secondary processors come here after exiting the SKU ROM.
 // Switches to kernel's endian almost immediately.
 //
+
+	.global	cortex_mpstart
+	.type	cortex_mpstart,%object
+
 cortex_mpstart:
 #ifndef MULTIPROCESSOR
 	//

Index: src/sys/arch/evbarm/conf/RPI2
diff -u src/sys/arch/evbarm/conf/RPI2:1.1 src/sys/arch/evbarm/conf/RPI2:1.2
--- src/sys/arch/evbarm/conf/RPI2:1.1	Sat Feb 28 09:34:34 2015
+++ src/sys/arch/evbarm/conf/RPI2	Wed Mar  4 17:02:17 2015
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: RPI2,v 1.1 2015/02/28 09:34:34 skrll Exp $
+#	$NetBSD: RPI2,v 1.2 2015/03/04 17:02:17 skrll Exp $
 #
 #	RPi2 -- Raspberry Pi 2
 #
@@ -13,7 +13,7 @@ no makeoptions	CPUFLAGS
 
 options 	BCM2836

CVS commit: src/sys/dev/pci

2015-03-04 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Wed Mar  4 16:53:32 UTC 2015

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

Log Message:
Set/clear the IWM_MAC_FILTER_IN_BEACON flag under conditions that match what
Linux does.

From OpenBSD rev.1.34.


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

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

Modified files:

Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.24 src/sys/dev/pci/if_iwm.c:1.25
--- src/sys/dev/pci/if_iwm.c:1.24	Tue Mar  3 09:54:55 2015
+++ src/sys/dev/pci/if_iwm.c	Wed Mar  4 16:53:32 2015
@@ -1,5 +1,5 @@
-/*	$NetBSD: if_iwm.c,v 1.24 2015/03/03 09:54:55 nonaka Exp $	*/
-/*	OpenBSD: if_iwm.c,v 1.33 2015/03/03 06:56:12 kettenis Exp	*/
+/*	$NetBSD: if_iwm.c,v 1.25 2015/03/04 16:53:32 nonaka Exp $	*/
+/*	OpenBSD: if_iwm.c,v 1.34 2015/03/03 20:14:34 kettenis Exp	*/
 
 /*
  * Copyright (c) 2014 genua mbh i...@genua.de
@@ -105,7 +105,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.24 2015/03/03 09:54:55 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.25 2015/03/04 16:53:32 nonaka Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -4971,7 +4971,9 @@ iwm_mvm_mac_ctxt_cmd_station(struct iwm_
 	/* Fill the common data for all mac context types */
 	iwm_mvm_mac_ctxt_cmd_common(sc, in, cmd, action);
 
-	if (in-in_assoc)
+	/* Allow beacons to pass through as long as we are not associated,or we
+	 * do not have dtim period information */
+	if (!in-in_assoc || !sc-sc_ic.ic_dtim_period)
 		cmd.filter_flags |= htole32(IWM_MAC_FILTER_IN_BEACON);
 	else
 		cmd.filter_flags = ~htole32(IWM_MAC_FILTER_IN_BEACON);

CVS commit: src/sys/dev/pci

2015-03-04 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Wed Mar  4 16:55:11 UTC 2015

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

Log Message:
stop the calibration timeout when stopping the interface.

From OpenBSD rev.1.35.


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

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

Modified files:

Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.25 src/sys/dev/pci/if_iwm.c:1.26
--- src/sys/dev/pci/if_iwm.c:1.25	Wed Mar  4 16:53:32 2015
+++ src/sys/dev/pci/if_iwm.c	Wed Mar  4 16:55:11 2015
@@ -1,5 +1,5 @@
-/*	$NetBSD: if_iwm.c,v 1.25 2015/03/04 16:53:32 nonaka Exp $	*/
-/*	OpenBSD: if_iwm.c,v 1.34 2015/03/03 20:14:34 kettenis Exp	*/
+/*	$NetBSD: if_iwm.c,v 1.26 2015/03/04 16:55:11 nonaka Exp $	*/
+/*	OpenBSD: if_iwm.c,v 1.35 2015/03/04 15:18:12 jsg Exp	*/
 
 /*
  * Copyright (c) 2014 genua mbh i...@genua.de
@@ -105,7 +105,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.25 2015/03/04 16:53:32 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.26 2015/03/04 16:55:11 nonaka Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -5849,6 +5849,7 @@ iwm_stop(struct ifnet *ifp, int disable)
 	if (ic-ic_state != IEEE80211_S_INIT)
 		ieee80211_new_state(ic, IEEE80211_S_INIT, -1);
 
+	callout_stop(sc-sc_calib_to);
 	ifp-if_timer = sc-sc_tx_timer = 0;
 	iwm_stop_device(sc);
 }

CVS commit: src/sys/external/bsd/drm2/drm

2015-03-04 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Wed Mar  4 18:19:27 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/drm: drm_cache.c

Log Message:
CLFLUSH needs to be surrounded by membars.

While here, round everything to a multiple of the cache line size.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_cache.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/external/bsd/drm2/drm/drm_cache.c
diff -u src/sys/external/bsd/drm2/drm/drm_cache.c:1.3 src/sys/external/bsd/drm2/drm/drm_cache.c:1.4
--- src/sys/external/bsd/drm2/drm/drm_cache.c:1.3	Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/drm/drm_cache.c	Wed Mar  4 18:19:27 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_cache.c,v 1.3 2014/07/16 20:56:25 riastradh Exp $	*/
+/*	$NetBSD: drm_cache.c,v 1.4 2015/03/04 18:19:27 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: drm_cache.c,v 1.3 2014/07/16 20:56:25 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: drm_cache.c,v 1.4 2015/03/04 18:19:27 riastradh Exp $);
 
 #include sys/types.h
 #include sys/xcall.h
@@ -146,15 +146,19 @@ drm_md_clflush_page(struct page *page)
 
 static void
 drm_md_clflush_virt_range(const void *vaddr, size_t nbytes)
-
 {
-	const char *const start = vaddr, *const end = (start + nbytes);
+	const unsigned clflush_size = drm_x86_clflush_size();
+	const vaddr_t va = (vaddr_t)vaddr;
+	const char *const start = (const void *)rounddown(va, clflush_size);
+	const char *const end = (const void *)roundup(va + nbytes,
+	clflush_size);
 	const char *p;
-	const unsigned int clflush_size = drm_x86_clflush_size();
 
 	KASSERT(drm_md_clflush_finegrained_p());
+	membar_sync();
 	for (p = start; p  end; p += clflush_size)
 		drm_x86_clflush(p);
+	membar_sync();
 }
 
 #endif	/* defined(__i386__) || defined(__x86_64__) */

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

2015-03-04 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Mar  4 18:40:06 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_gmac.c

Log Message:
IST_EDGE for eth


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

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

Modified files:

Index: src/sys/arch/arm/amlogic/amlogic_gmac.c
diff -u src/sys/arch/arm/amlogic/amlogic_gmac.c:1.1 src/sys/arch/arm/amlogic/amlogic_gmac.c:1.2
--- src/sys/arch/arm/amlogic/amlogic_gmac.c:1.1	Wed Mar  4 12:37:16 2015
+++ src/sys/arch/arm/amlogic/amlogic_gmac.c	Wed Mar  4 18:40:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_gmac.c,v 1.1 2015/03/04 12:37:16 jmcneill Exp $ */
+/* $NetBSD: amlogic_gmac.c,v 1.2 2015/03/04 18:40:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2013, 2014, 2015 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: amlogic_gmac.c,v 1.1 2015/03/04 12:37:16 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: amlogic_gmac.c,v 1.2 2015/03/04 18:40:06 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -92,7 +92,7 @@ amlogic_gmac_attach(device_t parent, dev
 	/*
 	 * Interrupt handler
 	 */
-	sc-sc_ih = intr_establish(loc-loc_intr, IPL_NET, IST_LEVEL,
+	sc-sc_ih = intr_establish(loc-loc_intr, IPL_NET, IST_EDGE,
 	amlogic_gmac_intr, sc);
 	if (sc-sc_ih == NULL) {
 		aprint_error_dev(self, failed to establish interrupt %d\n,

CVS commit: src/sys/dev/mii

2015-03-04 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Mar  4 18:21:00 UTC 2015

Modified Files:
src/sys/dev/mii: rgephy.c rgephyreg.h

Log Message:
add RTL8211F support


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/mii/rgephyreg.h

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

Modified files:

Index: src/sys/dev/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.37 src/sys/dev/mii/rgephy.c:1.38
--- src/sys/dev/mii/rgephy.c:1.37	Sun Nov  9 19:35:43 2014
+++ src/sys/dev/mii/rgephy.c	Wed Mar  4 18:21:00 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rgephy.c,v 1.37 2014/11/09 19:35:43 nonaka Exp $	*/
+/*	$NetBSD: rgephy.c,v 1.38 2015/03/04 18:21:00 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 2003
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.37 2014/11/09 19:35:43 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.38 2015/03/04 18:21:00 jmcneill Exp $);
 
 
 /*
@@ -303,7 +303,14 @@ rgephy_service(struct mii_softc *sc, str
 		 * need to restart the autonegotiation process.  Read
 		 * the BMSR twice in case it's latched.
 		 */
-		if (sc-mii_mpd_rev = 2) {
+		if (sc-mii_mpd_rev = 6) {
+			/* RTL8211F */
+			reg = PHY_READ(sc, RGEPHY_MII_PHYSR);
+			if (reg  RGEPHY_PHYSR_LINK) {
+sc-mii_ticks = 0;
+break;
+			}
+		} else if (sc-mii_mpd_rev = 2) {
 			/* RTL8211B(L) */
 			reg = PHY_READ(sc, RGEPHY_MII_SSR);
 			if (reg  RGEPHY_SSR_LINK) {
@@ -351,13 +358,17 @@ static void
 rgephy_status(struct mii_softc *sc)
 {
 	struct mii_data *mii = sc-mii_pdata;
-	int gstat, bmsr, bmcr;
+	int gstat, bmsr, bmcr, physr;
 	uint16_t ssr;
 
 	mii-mii_media_status = IFM_AVALID;
 	mii-mii_media_active = IFM_ETHER;
 
-	if (sc-mii_mpd_rev = 2) {
+	if (sc-mii_mpd_rev = 6) {
+		physr = PHY_READ(sc, RGEPHY_MII_PHYSR);
+		if (physr  RGEPHY_PHYSR_LINK)
+			mii-mii_media_status |= IFM_ACTIVE;
+	} else if (sc-mii_mpd_rev = 2) {
 		ssr = PHY_READ(sc, RGEPHY_MII_SSR);
 		if (ssr  RGEPHY_SSR_LINK)
 			mii-mii_media_status |= IFM_ACTIVE;
@@ -387,7 +398,28 @@ rgephy_status(struct mii_softc *sc)
 		}
 	}
 
-	if (sc-mii_mpd_rev = 2) {
+	if (sc-mii_mpd_rev = 6) {
+		physr = PHY_READ(sc, RGEPHY_MII_PHYSR);
+		switch (__SHIFTOUT(physr, RGEPHY_PHYSR_SPEED)) {
+		case RGEPHY_PHYSR_SPEED_1000:
+			mii-mii_media_active |= IFM_1000_T;
+			break;
+		case RGEPHY_PHYSR_SPEED_100:
+			mii-mii_media_active |= IFM_100_TX;
+			break;
+		case RGEPHY_PHYSR_SPEED_10:
+			mii-mii_media_active |= IFM_10_T;
+			break;
+		default:
+			mii-mii_media_active |= IFM_NONE;
+			break;
+		}
+		if (physr  RGEPHY_PHYSR_DUPLEX)
+			mii-mii_media_active |= mii_phy_flowstatus(sc) |
+			IFM_FDX;
+		else
+			mii-mii_media_active |= IFM_HDX;
+	} else if (sc-mii_mpd_rev = 2) {
 		ssr = PHY_READ(sc, RGEPHY_MII_SSR);
 		switch (ssr  RGEPHY_SSR_SPD_MASK) {
 		case RGEPHY_SSR_S1000:

Index: src/sys/dev/mii/rgephyreg.h
diff -u src/sys/dev/mii/rgephyreg.h:1.6 src/sys/dev/mii/rgephyreg.h:1.7
--- src/sys/dev/mii/rgephyreg.h:1.6	Sun Jul 18 03:00:39 2010
+++ src/sys/dev/mii/rgephyreg.h	Wed Mar  4 18:21:00 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rgephyreg.h,v 1.6 2010/07/18 03:00:39 jakllsch Exp $	*/
+/*	$NetBSD: rgephyreg.h,v 1.7 2015/03/04 18:21:00 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 2003
@@ -55,4 +55,22 @@
 #define RGEPHY_SSR_ALDPS	0x0008	/* RTL8211C(L) only */
 #define	RGEPHY_SSR_JABBER	0x0001	/* Jabber */
 
+/* RTL8211F */
+#define RGEPHY_MII_PHYSR	0x1a	/* PHY Specific status register */
+#define RGEPHY_PHYSR_ALDPS	__BIT(14)
+#define RGEPHY_PHYSR_MDI_PLUG	__BIT(13)
+#define RGEPHY_PHYSR_NWAY_EN	__BIT(12)
+#define RGEPHY_PHYSR_MASTER	__BIT(11)
+#define RGEPHY_PHYSR_EEE	__BIT(8)
+#define RGEPHY_PHYSR_RXFLOW_EN	__BIT(7)
+#define RGEPHY_PHYSR_TXFLOW_EN	__BIT(6)
+#define RGEPHY_PHYSR_SPEED	__BITS(5,4)
+#define RGEPHY_PHYSR_SPEED_10	0
+#define RGEPHY_PHYSR_SPEED_100	1
+#define RGEPHY_PHYSR_SPEED_1000	2
+#define RGEPHY_PHYSR_DUPLEX	__BIT(3)
+#define RGEPHY_PHYSR_LINK	__BIT(2)
+#define RGEPHY_PHYSR_MDI_XOVER	__BIT(1)
+#define RGEPHY_PHYSR_JABBER	__BIT(0)
+
 #endif /* _DEV_MII_RGEPHYREG_H_ */

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

2015-03-04 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Wed Mar  4 19:10:20 UTC 2015

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

Log Message:
amidisplaycc requires vcons


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/amiga/conf/files.amiga

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

Modified files:

Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.176 src/sys/arch/amiga/conf/files.amiga:1.177
--- src/sys/arch/amiga/conf/files.amiga:1.176	Sat Jul  5 09:39:35 2014
+++ src/sys/arch/amiga/conf/files.amiga	Wed Mar  4 19:10:20 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amiga,v 1.176 2014/07/05 09:39:35 tsutsui Exp $
+#	$NetBSD: files.amiga,v 1.177 2015/03/04 19:10:20 mlelstv Exp $
 
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 16			# NOTE THAT AMIGA IS SPECIAL!
@@ -165,7 +165,7 @@ file	arch/amiga/dev/grf_cc.c		grfcc need
 file	arch/amiga/dev/ite_cc.c		grfcc  ite
 
 # wscons interface to custom chips
-device	amidisplaycc: wsemuldisplaydev
+device	amidisplaycc: wsemuldisplaydev, vcons
 attach	amidisplaycc at mainbus
 file	arch/amiga/dev/amidisplaycc.c	amidisplaycc needs-flag

CVS commit: src/sys/arch/amiga/amiga

2015-03-04 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Wed Mar  4 19:56:24 UTC 2015

Modified Files:
src/sys/arch/amiga/amiga: trap.c

Log Message:
Handle EINVAL in the fault path and send SIGBUS on mmap'd access past EOF.
From martin@


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/amiga/amiga/trap.c

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

Modified files:

Index: src/sys/arch/amiga/amiga/trap.c
diff -u src/sys/arch/amiga/amiga/trap.c:1.134 src/sys/arch/amiga/amiga/trap.c:1.135
--- src/sys/arch/amiga/amiga/trap.c:1.134	Sun Feb 19 21:06:03 2012
+++ src/sys/arch/amiga/amiga/trap.c	Wed Mar  4 19:56:24 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.134 2012/02/19 21:06:03 rmind Exp $	*/
+/*	$NetBSD: trap.c,v 1.135 2015/03/04 19:56:24 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
 #include opt_m68k_arch.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.134 2012/02/19 21:06:03 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.135 2015/03/04 19:56:24 mlelstv Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -461,11 +461,6 @@ trapmmufault(int type, u_int code, u_int
 		return;
 	}
 nogo:
-	if (rv == EACCES) {
-		ksi.ksi_code = SEGV_ACCERR;
-		rv = EFAULT;
-	} else
-		ksi.ksi_code = SEGV_MAPERR;
 	if (type == T_MMUFLT) {
 		if (onfault) {
 			trapcpfault(l, fp, rv);
@@ -478,13 +473,25 @@ nogo:
 		panictrap(type, code, v, fp);
 	}
 	ksi.ksi_addr = (void *)v;
-	if (rv == ENOMEM) {
+	switch (rv) {
+	case ENOMEM:
 		printf(UVM: pid %d (%s), uid %d killed: out of swap\n,
-		   p-p_pid, p-p_comm,
-		   l-l_cred ? kauth_cred_geteuid(l-l_cred) : -1);
+		p-p_pid, p-p_comm,
+		l-l_cred ? kauth_cred_geteuid(l-l_cred) : -1);
 		ksi.ksi_signo = SIGKILL;
-	} else {
+		break;
+	case EINVAL:
+		ksi.ksi_signo = SIGBUS;
+		ksi.ksi_code = BUS_ADRERR;
+		break;
+	case EACCES:
 		ksi.ksi_signo = SIGSEGV;
+		ksi.ksi_code = SEGV_ACCERR;
+		break;
+	default:
+		ksi.ksi_signo = SIGSEGV;
+		ksi.ksi_code = SEGV_MAPERR;
+		break;
 	}
 	trapsignal(l, ksi);
 	if ((type  T_USER) == 0)

CVS commit: src/sys/arch

2015-03-04 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Wed Mar  4 20:30:00 UTC 2015

Modified Files:
src/sys/arch/atari/atari: trap.c
src/sys/arch/cesfic/cesfic: trap.c
src/sys/arch/hp300/hp300: trap.c
src/sys/arch/luna68k/luna68k: trap.c
src/sys/arch/mvme68k/mvme68k: trap.c
src/sys/arch/news68k/news68k: trap.c
src/sys/arch/next68k/next68k: trap.c
src/sys/arch/sun2/sun2: trap.c
src/sys/arch/sun3/sun3: trap.c
src/sys/arch/x68k/x68k: trap.c

Log Message:
Handle EINVAL in the fault path and send SIGBUS on mmap'd access past EOF


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/atari/atari/trap.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/cesfic/cesfic/trap.c
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/hp300/hp300/trap.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/luna68k/luna68k/trap.c
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/mvme68k/mvme68k/trap.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/news68k/news68k/trap.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/next68k/next68k/trap.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sun2/sun2/trap.c
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/sun3/sun3/trap.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/x68k/x68k/trap.c

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

Modified files:

Index: src/sys/arch/atari/atari/trap.c
diff -u src/sys/arch/atari/atari/trap.c:1.112 src/sys/arch/atari/atari/trap.c:1.113
--- src/sys/arch/atari/atari/trap.c:1.112	Sun Feb 19 21:06:05 2012
+++ src/sys/arch/atari/atari/trap.c	Wed Mar  4 20:29:59 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.112 2012/02/19 21:06:05 rmind Exp $	*/
+/*	$NetBSD: trap.c,v 1.113 2015/03/04 20:29:59 martin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.112 2012/02/19 21:06:05 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.113 2015/03/04 20:29:59 martin Exp $);
 
 #include opt_ddb.h
 #include opt_execfmt.h
@@ -656,14 +656,26 @@ trap(struct frame *fp, int type, u_int c
 			panictrap(type, code, v, fp);
 		}
 		ksi.ksi_addr = (void *)v;
-		if (rv == ENOMEM) {
+		switch (rv) {
+		case ENOMEM:
 			printf(UVM: pid %d (%s), uid %d killed: out of swap\n,
 			   p-p_pid, p-p_comm,
 			   l-l_cred ?
 			   kauth_cred_geteuid(l-l_cred) : -1);
 			ksi.ksi_signo = SIGKILL;
-		} else {
+			break;
+		case EINVAL:
+			ksi.ksi_signo = SIGBUS;
+			ksi.ksi_code = BUS_ADRERR;
+			break;
+		case EACCES:
 			ksi.ksi_signo = SIGSEGV;
+			ksi.ksi_code = SEGV_ACCERR;
+			break;
+		default:
+			ksi.ksi_signo = SIGSEGV;
+			ksi.ksi_code = SEGV_MAPERR;
+			break;
 		}
 		break;
 	}

Index: src/sys/arch/cesfic/cesfic/trap.c
diff -u src/sys/arch/cesfic/cesfic/trap.c:1.56 src/sys/arch/cesfic/cesfic/trap.c:1.57
--- src/sys/arch/cesfic/cesfic/trap.c:1.56	Sun Feb 19 21:06:06 2012
+++ src/sys/arch/cesfic/cesfic/trap.c	Wed Mar  4 20:29:59 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.56 2012/02/19 21:06:06 rmind Exp $	*/
+/*	$NetBSD: trap.c,v 1.57 2015/03/04 20:29:59 martin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.56 2012/02/19 21:06:06 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.57 2015/03/04 20:29:59 martin Exp $);
 
 #include opt_ddb.h
 #include opt_execfmt.h
@@ -610,14 +610,26 @@ trap(struct frame *fp, int type, unsigne
 			goto dopanic;
 		}
 		ksi.ksi_addr = (void *)v;
-		if (rv == ENOMEM) {
+		switch (rv) {
+		case ENOMEM:
 			printf(UVM: pid %d (%s), uid %d killed: out of swap\n,
 			   p-p_pid, p-p_comm,
 			   l-l_cred ?
 			   kauth_cred_geteuid(l-l_cred) : -1);
 			ksi.ksi_signo = SIGKILL;
-		} else {
+			break;
+		case EINVAL:
+			ksi.ksi_signo = SIGBUS;
+			ksi.ksi_code = BUS_ADRERR;
+			break;
+		case EACCES:
 			ksi.ksi_signo = SIGSEGV;
+			ksi.ksi_code = SEGV_ACCERR;
+			break;
+		default:
+			ksi.ksi_signo = SIGSEGV;
+			ksi.ksi_code = SEGV_MAPERR;
+			break;
 		}
 		break;
 	}

Index: src/sys/arch/hp300/hp300/trap.c
diff -u src/sys/arch/hp300/hp300/trap.c:1.150 src/sys/arch/hp300/hp300/trap.c:1.151
--- src/sys/arch/hp300/hp300/trap.c:1.150	Fri Aug 16 13:39:47 2013
+++ src/sys/arch/hp300/hp300/trap.c	Wed Mar  4 20:29:59 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.150 2013/08/16 13:39:47 tsutsui Exp $	*/
+/*	$NetBSD: trap.c,v 1.151 2015/03/04 20:29:59 martin Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.150 2013/08/16 13:39:47 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.151 2015/03/04 20:29:59 martin Exp $);
 
 #include opt_ddb.h
 #include opt_execfmt.h
@@ -632,14 +632,26 @@ trap(struct frame *fp, int type, u_int c
 			goto dopanic;
 		}
 		ksi.ksi_addr = (void *)v;
-		if (rv == ENOMEM) {
+		switch (rv) {
+		case ENOMEM:

CVS commit: src/lib/librumphijack

2015-03-04 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Wed Mar  4 23:31:49 UTC 2015

Modified Files:
src/lib/librumphijack: hijack.c

Log Message:
Define a generic ATCALL() and use it to implement utimensat()


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/lib/librumphijack/hijack.c

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

Modified files:

Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.113 src/lib/librumphijack/hijack.c:1.114
--- src/lib/librumphijack/hijack.c:1.113	Tue Mar  3 01:24:39 2015
+++ src/lib/librumphijack/hijack.c	Wed Mar  4 23:31:49 2015
@@ -1,4 +1,4 @@
-/*  $NetBSD: hijack.c,v 1.113 2015/03/03 01:24:39 enami Exp $	*/
+/*  $NetBSD: hijack.c,v 1.114 2015/03/04 23:31:49 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -34,7 +34,7 @@
 #include rump/rumpuser_port.h
 
 #if !defined(lint)
-__RCSID($NetBSD: hijack.c,v 1.113 2015/03/03 01:24:39 enami Exp $);
+__RCSID($NetBSD: hijack.c,v 1.114 2015/03/04 23:31:49 pooka Exp $);
 #endif
 
 #include sys/param.h
@@ -525,6 +525,33 @@ whichpath(const char *path)
 #define DPRINTF(x)
 #endif
 
+#define ATCALL(type, name, rcname, args, proto, vars)			\
+type name args\
+{	\
+	type (*fun) proto;		\
+	int isrump = -1;		\
+	\
+	if (fd == AT_FDCWD) {		\
+		isrump = path_isrump(path);\
+	} else {			\
+		isrump = fd_isrump(fd);	\
+	}\
+	\
+	DPRINTF((%s - %d:%s (%s)\n, __STRING(name),			\
+	fd, path, isrump ? rump : host));			\
+	\
+	assert(isrump != -1);		\
+	if (isrump) {			\
+		fun = syscalls[rcname].bs_rump;\
+		if (fd != AT_FDCWD)	\
+			fd = fd_host2rump(fd);\
+		path = path_host2rump(path);\
+	} else {			\
+		fun = syscalls[rcname].bs_host;\
+	}\
+	return fun vars;		\
+}
+
 #define FDCALL(type, name, rcname, args, proto, vars)			\
 type name args\
 {	\
@@ -2238,6 +2265,11 @@ __sysctl(const int *name, unsigned int n
  * Rest are std type calls.
  */
 
+ATCALL(int, utimensat, DUALCALL_UTIMENSAT,\
+	(int fd, const char *path, const struct timespec t[2], int f),	\
+	(int, const char *, const struct timespec [2], int),
+	(fd, path, t, f))
+
 FDCALL(int, bind, DUALCALL_BIND,	\
 	(int fd, const struct sockaddr *name, socklen_t namelen),	\
 	(int, const struct sockaddr *, socklen_t),			\
@@ -2504,11 +2536,6 @@ PATHCALL(int, lutimes, DUALCALL_LUTIMES,
 	(const char *, const struct timeval *),\
 	(path, tv))
 
-PATHCALL(int, utimensat, DUALCALL_UTIMENSAT,\
-	(int fd, const char *path, const struct timespec *ts, int flags), \
-	(int, const char *, const struct timespec *, int),		\
-	(fd, path, ts, flags))
-
 #ifdef HAVE_CHFLAGS
 PATHCALL(int, chflags, DUALCALL_CHFLAGS,\
 	(const char *path, u_long flags),\

CVS commit: src/lib/librumphijack

2015-03-04 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Wed Mar  4 23:42:26 UTC 2015

Modified Files:
src/lib/librumphijack: hijack.c

Log Message:
Make ATCALL() behave for absolute paths too.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/lib/librumphijack/hijack.c

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

Modified files:

Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.114 src/lib/librumphijack/hijack.c:1.115
--- src/lib/librumphijack/hijack.c:1.114	Wed Mar  4 23:31:49 2015
+++ src/lib/librumphijack/hijack.c	Wed Mar  4 23:42:26 2015
@@ -1,4 +1,4 @@
-/*  $NetBSD: hijack.c,v 1.114 2015/03/04 23:31:49 pooka Exp $	*/
+/*  $NetBSD: hijack.c,v 1.115 2015/03/04 23:42:26 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -34,7 +34,7 @@
 #include rump/rumpuser_port.h
 
 #if !defined(lint)
-__RCSID($NetBSD: hijack.c,v 1.114 2015/03/04 23:31:49 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.115 2015/03/04 23:42:26 pooka Exp $);
 #endif
 
 #include sys/param.h
@@ -531,7 +531,7 @@ type name args\
 	type (*fun) proto;		\
 	int isrump = -1;		\
 	\
-	if (fd == AT_FDCWD) {		\
+	if (fd == AT_FDCWD || *path == '/') {\
 		isrump = path_isrump(path);\
 	} else {			\
 		isrump = fd_isrump(fd);	\

CVS commit: src/lib/librumpuser

2015-03-04 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Thu Mar  5 00:25:39 UTC 2015

Modified Files:
src/lib/librumpuser: configure configure.ac rumpuser_config.h.in
rumpuser_port.h

Log Message:
check for utimensat


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/librumpuser/configure \
src/lib/librumpuser/configure.ac
cvs rdiff -u -r1.3 -r1.4 src/lib/librumpuser/rumpuser_config.h.in
cvs rdiff -u -r1.43 -r1.44 src/lib/librumpuser/rumpuser_port.h

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

Modified files:

Index: src/lib/librumpuser/configure
diff -u src/lib/librumpuser/configure:1.4 src/lib/librumpuser/configure:1.5
--- src/lib/librumpuser/configure:1.4	Sat Jan  3 13:16:41 2015
+++ src/lib/librumpuser/configure	Thu Mar  5 00:25:39 2015
@@ -3794,7 +3794,7 @@ fi
 
 for ac_func in kqueue chflags strsuftoll setprogname getprogname	\
 	getenv_r posix_memalign memalign aligned_alloc	\
-	arc4random_buf getsubopt fsync_range __quotactl
+	arc4random_buf getsubopt fsync_range __quotactl utimensat
 do :
   as_ac_var=`$as_echo ac_cv_func_$ac_func | $as_tr_sh`
 ac_fn_c_check_func $LINENO $ac_func $as_ac_var
Index: src/lib/librumpuser/configure.ac
diff -u src/lib/librumpuser/configure.ac:1.4 src/lib/librumpuser/configure.ac:1.5
--- src/lib/librumpuser/configure.ac:1.4	Sat Jan  3 13:16:41 2015
+++ src/lib/librumpuser/configure.ac	Thu Mar  5 00:25:39 2015
@@ -28,7 +28,7 @@ AC_CHECK_TYPES([clockid_t, register_t])
 
 AC_CHECK_FUNCS([kqueue chflags strsuftoll setprogname getprogname	\
 	getenv_r posix_memalign memalign aligned_alloc	\
-	arc4random_buf getsubopt fsync_range __quotactl])
+	arc4random_buf getsubopt fsync_range __quotactl utimensat])
 
 AC_TRY_LINK_FUNC([clock_nanosleep],,
 AC_CHECK_LIB([rt], [clock_nanosleep])

Index: src/lib/librumpuser/rumpuser_config.h.in
diff -u src/lib/librumpuser/rumpuser_config.h.in:1.3 src/lib/librumpuser/rumpuser_config.h.in:1.4
--- src/lib/librumpuser/rumpuser_config.h.in:1.3	Wed Nov  5 01:40:30 2014
+++ src/lib/librumpuser/rumpuser_config.h.in	Thu Mar  5 00:25:39 2015
@@ -117,6 +117,9 @@
 /* Define to 1 if you have the unistd.h header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `utimensat' function. */
+#undef HAVE_UTIMENSAT
+
 /* Define to 1 if you have the `__quotactl' function. */
 #undef HAVE___QUOTACTL
 

Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.43 src/lib/librumpuser/rumpuser_port.h:1.44
--- src/lib/librumpuser/rumpuser_port.h:1.43	Sat Jan 17 23:49:40 2015
+++ src/lib/librumpuser/rumpuser_port.h	Thu Mar  5 00:25:39 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_port.h,v 1.43 2015/01/17 23:49:40 justin Exp $	*/
+/*	$NetBSD: rumpuser_port.h,v 1.44 2015/03/05 00:25:39 pooka Exp $	*/
 
 #ifndef _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
 #define _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
@@ -47,6 +47,7 @@
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_UNISTD_H 1
 #define HAVE___QUOTACTL 1
+#define HAVE_UTIMENSAT 1
 #define PACKAGE_BUGREPORT http://rumpkernel.org/;
 #define PACKAGE_NAME rumpuser-posix
 #define PACKAGE_STRING rumpuser-posix 999

CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/main

2015-03-04 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Thu Mar  5 01:57:11 UTC 2015

Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/main: imports.h

Log Message:
lint and pcc don't have xmmintrin.h


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/imports.h

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/MesaLib/dist/src/mesa/main/imports.h
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/imports.h:1.2 xsrc/external/mit/MesaLib/dist/src/mesa/main/imports.h:1.3
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/imports.h:1.2	Tue Mar  3 16:32:27 2015
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/imports.h	Wed Mar  4 20:57:11 2015
@@ -259,7 +259,7 @@ static inline int IROUND_POS(float f)
return (int) (f + 0.5F);
 }
 
-#ifdef __GNUC__
+#if !defined(__lint__)  !defined(__PCC__)
 #ifdef __x86_64__
 #  include xmmintrin.h
 #endif

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

2015-03-04 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Mar  4 23:52:54 UTC 2015

Modified Files:
src/sys/arch/evbarm/amlogic: amlogic_machdep.c

Log Message:
Support for passing mac address from u-boot to the kernel with the
awge0.mac-address cmdline option.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/amlogic/amlogic_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/evbarm/amlogic/amlogic_machdep.c
diff -u src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.12 src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.13
--- src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.12	Tue Mar  3 23:20:04 2015
+++ src/sys/arch/evbarm/amlogic/amlogic_machdep.c	Wed Mar  4 23:52:54 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: amlogic_machdep.c,v 1.12 2015/03/03 23:20:04 jmcneill Exp $ */
+/*	$NetBSD: amlogic_machdep.c,v 1.13 2015/03/04 23:52:54 jmcneill Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_machdep.c,v 1.12 2015/03/03 23:20:04 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_machdep.c,v 1.13 2015/03/04 23:52:54 jmcneill Exp $);
 
 #include opt_machdep.h
 #include opt_ddb.h
@@ -524,6 +524,17 @@ amlogic_device_register(device_t self, v
 		 */
 		prop_dictionary_set_uint32(dict, offset, 0xfff0);
 	}
+
+	if (device_is_a(self, awge)  device_unit(self) == 0) {
+		uint8_t enaddr[ETHER_ADDR_LEN];
+		if (get_bootconf_option(boot_args, awge0.mac-address,
+		BOOTOPT_TYPE_MACADDR, enaddr)) {
+			prop_data_t pd = prop_data_create_data(enaddr,
+			sizeof(enaddr));
+			prop_dictionary_set(dict, mac-address, pd);
+			prop_object_release(pd);
+		}
+	}
 }
 
 #if defined(MULTIPROCESSOR)

CVS commit: src/external/broadcom/rpi-firmware/dist

2015-03-04 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Wed Mar  4 23:01:55 UTC 2015

Modified Files:
src/external/broadcom/rpi-firmware/dist: bootcode.bin fixup.dat
fixup_cd.dat start.elf start_cd.elf

Log Message:
New RPI and RPI2 firmware from

commit b0079452ebce0158ce31d259d251f83a833f23c5
Author: popcornmix popcorn...@gmail.com
Date:   Tue Mar 3 15:49:57 2015 +


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/broadcom/rpi-firmware/dist/bootcode.bin \
src/external/broadcom/rpi-firmware/dist/fixup.dat \
src/external/broadcom/rpi-firmware/dist/fixup_cd.dat \
src/external/broadcom/rpi-firmware/dist/start.elf \
src/external/broadcom/rpi-firmware/dist/start_cd.elf

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

Modified files:

Index: src/external/broadcom/rpi-firmware/dist/bootcode.bin
Binary files are different
Index: src/external/broadcom/rpi-firmware/dist/fixup.dat
Binary files are different
Index: src/external/broadcom/rpi-firmware/dist/fixup_cd.dat
Binary files are different
Index: src/external/broadcom/rpi-firmware/dist/start.elf
Binary files are different
Index: src/external/broadcom/rpi-firmware/dist/start_cd.elf
Binary files are different

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

2015-03-04 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Mar  4 23:18:21 UTC 2015

Modified Files:
src/sys/arch/arm/cortex: a9tmr.c a9wdt.c

Log Message:
print A5 instead of A9 at attach time if running on a Cortex-A5


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/cortex/a9tmr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/cortex/a9wdt.c

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

Modified files:

Index: src/sys/arch/arm/cortex/a9tmr.c
diff -u src/sys/arch/arm/cortex/a9tmr.c:1.11 src/sys/arch/arm/cortex/a9tmr.c:1.12
--- src/sys/arch/arm/cortex/a9tmr.c:1.11	Fri Feb 27 18:26:49 2015
+++ src/sys/arch/arm/cortex/a9tmr.c	Wed Mar  4 23:18:21 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: a9tmr.c,v 1.11 2015/02/27 18:26:49 jmcneill Exp $	*/
+/*	$NetBSD: a9tmr.c,v 1.12 2015/03/04 23:18:21 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: a9tmr.c,v 1.11 2015/02/27 18:26:49 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: a9tmr.c,v 1.12 2015/03/04 23:18:21 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -120,6 +120,7 @@ a9tmr_attach(device_t parent, device_t s
 	struct mpcore_attach_args * const mpcaa = aux;
 	prop_dictionary_t dict = device_properties(self);
 	char freqbuf[sizeof(XXX SHz)];
+	const char *cpu_type;
 
 	/*
 	 * This runs at the ARM PERIPHCLOCK which should be 1/2 of the CPU clock.
@@ -130,7 +131,12 @@ a9tmr_attach(device_t parent, device_t s
 	humanize_number(freqbuf, sizeof(freqbuf), sc-sc_freq, Hz, 1000);
 
 	aprint_naive(\n);
-	aprint_normal(: A9 Global 64-bit Timer (%s)\n, freqbuf);
+	if (CPU_ID_CORTEX_A5_P(curcpu()-ci_arm_cpuid)) {
+		cpu_type = A5;
+	} else {
+		cpu_type = A9;
+	}
+	aprint_normal(: %s Global 64-bit Timer (%s)\n, cpu_type, freqbuf);
 
 	self-dv_private = sc;
 	sc-sc_dev = self;

Index: src/sys/arch/arm/cortex/a9wdt.c
diff -u src/sys/arch/arm/cortex/a9wdt.c:1.3 src/sys/arch/arm/cortex/a9wdt.c:1.4
--- src/sys/arch/arm/cortex/a9wdt.c:1.3	Fri Feb 27 18:43:28 2015
+++ src/sys/arch/arm/cortex/a9wdt.c	Wed Mar  4 23:18:21 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: a9wdt.c,v 1.3 2015/02/27 18:43:28 jmcneill Exp $	*/
+/*	$NetBSD: a9wdt.c,v 1.4 2015/03/04 23:18:21 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: a9wdt.c,v 1.3 2015/02/27 18:43:28 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: a9wdt.c,v 1.4 2015/03/04 23:18:21 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -186,6 +186,7 @@ a9wdt_attach(device_t parent, device_t s
 struct a9wdt_softc * const sc = device_private(self);
 	struct mpcore_attach_args * const mpcaa = aux;
 	prop_dictionary_t dict = device_properties(self);
+	const char *cpu_type;
 
 	sc-sc_dev = self;
 	sc-sc_memt = mpcaa-mpcaa_memt;
@@ -230,8 +231,13 @@ a9wdt_attach(device_t parent, device_t s
 		sc-sc_wdog_armed = true;
 
 	aprint_naive(\n);
-	aprint_normal(: A9 Watchdog Timer, default period is %u seconds%s\n,
-	sc-sc_wdog_period,
+	if (CPU_ID_CORTEX_A5_P(curcpu()-ci_arm_cpuid)) {
+		cpu_type = A5;
+	} else {
+		cpu_type = A9;
+	}
+	aprint_normal(: %s Watchdog Timer, default period is %u seconds%s\n,
+	cpu_type, sc-sc_wdog_period,
 	sc-sc_wdog_armed ?  (armed) : );
 
 	sc-sc_smw.smw_name = device_xname(self);

CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

2015-03-04 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Thu Mar  5 01:04:51 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c

Log Message:
Mark pages dirty after use for write in the aperture (`GTT').


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c

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

Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.26 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.27
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.26	Thu Mar  5 00:55:34 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c	Thu Mar  5 01:04:51 2015
@@ -380,6 +380,7 @@ i915_gem_object_attach_phys(struct drm_i
 		kunmap_atomic(src);
 
 #ifdef __NetBSD__
+		/* XXX mark page accessed */
 		uvm_obj_unwirepages(obj-base.gemo_shm_uao, i*PAGE_SIZE,
 		(i + 1)*PAGE_SIZE);
 #else
@@ -2421,6 +2422,7 @@ static void
 i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)
 {
 	struct drm_device *const dev = obj-base.dev;
+	struct vm_page *page;
 	int ret;
 
 	/* XXX Cargo-culted from the Linux code.  */
@@ -2437,7 +2439,15 @@ i915_gem_object_put_pages_gtt(struct drm
 	if (i915_gem_object_needs_bit17_swizzle(obj))
 		i915_gem_object_save_bit_17_swizzle(obj);
 
-	/* XXX Maintain dirty flag?  */
+	if (obj-madv == I915_MADV_DONTNEED)
+		obj-dirty = 0;
+
+	if (obj-dirty) {
+		TAILQ_FOREACH(page, obj-igo_pageq, pageq.queue) {
+			page-flags = ~PG_CLEAN;
+			/* XXX mark page accessed */
+		}
+	}
 
 	bus_dmamap_destroy(dev-dmat, obj-igo_dmamap);
 	bus_dmamem_unwire_uvm_object(dev-dmat, obj-base.gemo_shm_uao, 0,

CVS commit: src/include

2015-03-04 Thread David A. Holland 
Module Name:src
Committed By:   dholland
Date:   Thu Mar  5 03:29:02 UTC 2015

Modified Files:
src/include: stdio.h

Log Message:
One vscanf_l is ample.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/include/stdio.h

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

Modified files:

Index: src/include/stdio.h
diff -u src/include/stdio.h:1.94 src/include/stdio.h:1.95
--- src/include/stdio.h:1.94	Wed Mar  4 13:33:19 2015
+++ src/include/stdio.h	Thu Mar  5 03:29:02 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.94 2015/03/04 13:33:19 christos Exp $	*/
+/*	$NetBSD: stdio.h,v 1.95 2015/03/05 03:29:02 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -580,8 +580,6 @@ int	 sscanf_l(const char * __restrict, l
 const char * __restrict, ...) __scanflike(3, 4);
 int	 vscanf_l(locale_t, const char * __restrict, __va_list)
 __scanflike(2, 0);
-int	 vscanf_l(locale_t, const char * __restrict, __va_list)
-__scanflike(2, 0);
 int	 vfscanf_l(FILE * __restrict, locale_t, const char * __restrict,
 __va_list) __scanflike(3, 0);
 int	 vsscanf_l(const char * __restrict, locale_t, const char * __restrict,

CVS commit: src/sys/dev/pckbport

2015-03-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Mar  4 22:58:36 UTC 2015

Modified Files:
src/sys/dev/pckbport: synaptics.c

Log Message:
Fix clickpad button detection (From Rhialto)


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.32 src/sys/dev/pckbport/synaptics.c:1.33
--- src/sys/dev/pckbport/synaptics.c:1.32	Thu May 22 21:11:29 2014
+++ src/sys/dev/pckbport/synaptics.c	Wed Mar  4 17:58:35 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: synaptics.c,v 1.32 2014/05/23 01:11:29 christos Exp $	*/
+/*	$NetBSD: synaptics.c,v 1.33 2015/03/04 22:58:35 christos Exp $	*/
 
 /*
  * Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
 #include opt_pms.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.32 2014/05/23 01:11:29 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.33 2015/03/04 22:58:35 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -197,18 +197,46 @@ pms_synaptics_probe_extended(struct pms_
 		cmd[0] = PMS_SEND_DEV_STATUS;
 		res |= pckbport_poll_cmd(psc-sc_kbctag,
 		psc-sc_kbcslot, cmd, 1, 3, resp, 0);
+/*
+ * The following describes response for the
+ * SYNAPTICS_CONTINUED_CAPABILITIES query.
+ *
+ * byte	mask	name			meaning
+ * 		---			
+ * 0	0x01	adjustable threshold	capacitive button sensitivity
+ *	can be adjusted
+ * 0	0x02	report max		query 0x0d gives max coord reported
+ * 0	0x04	clearpad		sensor is ClearPad product
+ * 0	0x08	advanced gesture	not particularly meaningful
+ * 0	0x10	clickpad bit 0		1-button ClickPad
+ * 0	0x60	multifinger mode	identifies firmware finger counting
+ *	(not reporting!) algorithm.
+ *	Not particularly meaningful
+ * 0	0x80	covered pad		W clipped to 14, 15 == pad mostly covered
+ * 1	0x01	clickpad bit 1		2-button ClickPad
+ * 1	0x02	deluxe LED controls	touchpad support LED commands
+ *	ala multimedia control bar
+ * 1	0x04	reduced filtering	firmware does less filtering on
+ *	position data, driver should watch
+ *	for noise.
+ * 1	0x08	image sensor		image sensor tracks 5 fingers, but only
+ *	reports 2.
+ * 1	0x01	uniform clickpad	whole clickpad moves instead of being
+ *	hinged at the top.
+ * 1	0x20	report min		query 0x0f gives min coord reported
+ */
 		if (res == 0) {
-			u_char clickpad_type = (resp[1]  0x1);
-			clickpad_type |= ((resp[0]  4)  0x1);
+			u_char clickpad_type = (resp[0]  0x10);
+			clickpad_type |=   (resp[1]  0x01);
 
 			aprint_debug_dev(psc-sc_dev, %s: Continued 
 			Capabilities 0x%02x 0x%02x 0x%02x.\n, __func__,
 			resp[0], resp[1], resp[2]);
 			switch (clickpad_type) {
-			case 1:
+			case 0x10:
 sc-flags |= SYN_FLAG_HAS_ONE_BUTTON_CLICKPAD;
 break;
-			case 2:
+			case 0x01:
 sc-flags |= SYN_FLAG_HAS_TWO_BUTTON_CLICKPAD;
 break;
 			default:

CVS commit: src/lib/librumphijack

2015-03-04 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Thu Mar  5 00:26:17 UTC 2015

Modified Files:
src/lib/librumphijack: hijack.c

Log Message:
Wrap utimensat() only if present on host

fixes buildrump.sh on NetBSD 6.1.5


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/lib/librumphijack/hijack.c

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

Modified files:

Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.115 src/lib/librumphijack/hijack.c:1.116
--- src/lib/librumphijack/hijack.c:1.115	Wed Mar  4 23:42:26 2015
+++ src/lib/librumphijack/hijack.c	Thu Mar  5 00:26:17 2015
@@ -1,4 +1,4 @@
-/*  $NetBSD: hijack.c,v 1.115 2015/03/04 23:42:26 pooka Exp $	*/
+/*  $NetBSD: hijack.c,v 1.116 2015/03/05 00:26:17 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -34,7 +34,7 @@
 #include rump/rumpuser_port.h
 
 #if !defined(lint)
-__RCSID($NetBSD: hijack.c,v 1.115 2015/03/04 23:42:26 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.116 2015/03/05 00:26:17 pooka Exp $);
 #endif
 
 #include sys/param.h
@@ -2265,10 +2265,12 @@ __sysctl(const int *name, unsigned int n
  * Rest are std type calls.
  */
 
+#ifdef HAVE_UTIMENSAT
 ATCALL(int, utimensat, DUALCALL_UTIMENSAT,\
 	(int fd, const char *path, const struct timespec t[2], int f),	\
 	(int, const char *, const struct timespec [2], int),
 	(fd, path, t, f))
+#endif
 
 FDCALL(int, bind, DUALCALL_BIND,	\
 	(int fd, const struct sockaddr *name, socklen_t namelen),	\

CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

2015-03-04 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Thu Mar  5 00:55:34 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c

Log Message:
Unwire pages when we're done in i915_gem_object_attach_phys.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c

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

Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.25 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.26
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.25	Tue Mar  3 14:31:48 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c	Thu Mar  5 00:55:34 2015
@@ -379,7 +379,10 @@ i915_gem_object_attach_phys(struct drm_i
 		memcpy(vaddr, src, PAGE_SIZE);
 		kunmap_atomic(src);
 
-#ifndef __NetBSD__
+#ifdef __NetBSD__
+		uvm_obj_unwirepages(obj-base.gemo_shm_uao, i*PAGE_SIZE,
+		(i + 1)*PAGE_SIZE);
+#else
 		mark_page_accessed(page);
 		page_cache_release(page);
 #endif

CVS commit: src/sys/arch/sh3/sh3

2015-03-04 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Wed Mar  4 09:39:26 UTC 2015

Modified Files:
src/sys/arch/sh3/sh3: exception.c

Log Message:
Handle EINVAL in the fault path and send SIGBUS on mmap'd access past EOF.

From martin@


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sh3/sh3/exception.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/sh3/sh3/exception.c
diff -u src/sys/arch/sh3/sh3/exception.c:1.63 src/sys/arch/sh3/sh3/exception.c:1.64
--- src/sys/arch/sh3/sh3/exception.c:1.63	Sun Jul  8 20:14:12 2012
+++ src/sys/arch/sh3/sh3/exception.c	Wed Mar  4 09:39:26 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exception.c,v 1.63 2012/07/08 20:14:12 dsl Exp $	*/
+/*	$NetBSD: exception.c,v 1.64 2015/03/04 09:39:26 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: exception.c,v 1.63 2012/07/08 20:14:12 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: exception.c,v 1.64 2015/03/04 09:39:26 skrll Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -417,11 +417,22 @@ tlb_exception(struct lwp *l, struct trap
 	/* Page not found. */
 	if (usermode) {
 		KSI_INIT_TRAP(ksi);
-		if (err == ENOMEM)
+		switch (err) {
+		case ENOMEM:
 			ksi.ksi_signo = SIGKILL;
-		else {
+			break;
+		case EINVAL:
+			ksi.ksi_signo = SIGBUS;
+			ksi.ksi_code = BUS_ADRERR;
+			break;
+		case EACCES:
+			ksi.ksi_signo = SIGSEGV;
+			ksi.ksi_code = SEGV_ACCERR;
+			break;
+		default:
 			ksi.ksi_signo = SIGSEGV;
 			ksi.ksi_code = SEGV_MAPERR;
+			break;
 		}
 		goto user_fault;
 	} else {

CVS commit: [netbsd-7] src/doc

2015-03-04 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Wed Mar  4 09:49:16 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by martin in ticket #556):
sys/arch/shark/conf/Makefile.shark.inc: revision 1.24
Put -fno-unwind-tables into CFLAGS instead of COPTS - the old version caused
DEFCOPTS not to be propagated into COPTS, which means no optimization
for the kernel - ooops!


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

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

Modified files:

Index: src/doc/CHANGES-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.217 src/doc/CHANGES-7.0:1.1.2.218
--- src/doc/CHANGES-7.0:1.1.2.217	Tue Mar  3 08:35:00 2015
+++ src/doc/CHANGES-7.0	Wed Mar  4 09:49:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.217 2015/03/03 08:35:00 snj Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.218 2015/03/04 09:49:16 snj Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -17503,3 +17503,10 @@ share/mk/bsd.own.mk1.841
 	machine_cpu=xxx tags.
 	[mrg, ticket #559]
 
+sys/arch/shark/conf/Makefile.shark.inc		1.24
+
+	Put -fno-unwind-tables into CFLAGS instead of COPTS - the old
+	version caused DEFCOPTS to not be propagated into COPTS, which
+	meant there was no optimization for the kernel.
+	[martin, ticket #556]
+

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

2015-03-04 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Wed Mar  4 09:45:27 UTC 2015

Modified Files:
src/sys/arch/shark/conf [netbsd-7]: Makefile.shark.inc

Log Message:
Pull up following revision(s) (requested by martin in ticket #556):
sys/arch/shark/conf/Makefile.shark.inc: revision 1.24
Put -fno-unwind-tables into CFLAGS instead of COPTS - the old version caused
DEFCOPTS not to be propagated into COPTS, which means no optimization
for the kernel - ooops!


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/arch/shark/conf/Makefile.shark.inc

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

Modified files:

Index: src/sys/arch/shark/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.19 src/sys/arch/shark/conf/Makefile.shark.inc:1.19.4.1
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.19	Thu Aug 22 20:03:15 2013
+++ src/sys/arch/shark/conf/Makefile.shark.inc	Wed Mar  4 09:45:27 2015
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile.shark.inc,v 1.19 2013/08/22 20:03:15 martin Exp $
+#	$NetBSD: Makefile.shark.inc,v 1.19.4.1 2015/03/04 09:45:27 snj Exp $
 
 CPPFLAGS+=		-D${MACHINE}
-COPTS+=			-fno-unwind-tables
+CFLAGS+=		-fno-unwind-tables
 GENASSYM_EXTRAS+=	${THISARM}/shark/genassym.cf
 
 # Need to convert the kernel from ELF to a.out so that OpenFirmware

CVS commit: src/sys/dev/pci

2015-03-04 Thread Kengo NAKAHARA 
Module Name:src
Committed By:   knakahara
Date:   Wed Mar  4 11:31:58 UTC 2015

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

Log Message:
add nForce Host Bridges.


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

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1215 src/sys/dev/pci/pcidevs:1.1216
--- src/sys/dev/pci/pcidevs:1.1215	Sun Feb 15 21:27:57 2015
+++ src/sys/dev/pci/pcidevs	Wed Mar  4 11:31:58 2015
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1215 2015/02/15 21:27:57 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1216 2015/03/04 11:31:58 knakahara Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -4545,8 +4545,17 @@ product NVIDIA	QUADRO4_280NVS	0x018a	Qua
 product NVIDIA	QUADRO4_380XGL	0x018b	Quadro4 380 XGL
 product NVIDIA	QUADROFX4600	0x019e	Quadro FX 4600
 product NVIDIA	GEFORCE2_IGP	0x01a0	GeForce2 Integrated GPU
+product NVIDIA	NFORCE_PCHB	0x01a4	nForce PCI Host
+product NVIDIA	NFORCE_DDR2	0x01aa	nForce 220 DDR
+product NVIDIA	NFORCE_DDR	0x01ab	nForce 420 DDR
+product NVIDIA	NFORCE_MEM	0x01ac	nForce 220/420
+product NVIDIA	NFORCE_MEM1	0x01ad	nForce 220/420
+product NVIDIA	NFORCE_APU	0x01b0	nForce Audio Processing Unit
 product NVIDIA	NFORCE_MCP_AC	0x01b1	nForce MCP AC-97
+product NVIDIA	NFORCE_ISA	0x01b2	nForce ISA
 product NVIDIA	XBOX_SMBUS	0x01b4	Xbox nForce SMBus Controller
+product NVIDIA	NFORCE_AGP	0x01b7	nForce AGP
+product NVIDIA	NFORCE_PPB	0x01b8	nForce PCI-PCI Bridge
 product NVIDIA	NFORCE_ATA100	0x01bc	nForce ATA100 IDE
 product NVIDIA	NFORCE_USB	0x01c2	nForce USB
 product NVIDIA	NFORCE_LAN	0x01c3	nForce Ethernet

CVS commit: src/sys/external/bsd/drm2/dist/drm

2015-03-04 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Wed Mar  4 11:00:15 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_ioctl.c

Log Message:
Return current pid and current euid from drm_getclient to fool libva.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.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/external/bsd/drm2/dist/drm/drm_ioctl.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.3 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.3	Wed Jul 16 20:03:56 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c	Wed Mar  4 11:00:15 2015
@@ -232,8 +232,8 @@ int drm_getclient(struct drm_device *dev
 	if (client-idx == 0) {
 		client-auth = file_priv-authenticated;
 #ifdef __NetBSD__		/* XXX Too scary to contemplate.  */
-		client-pid = -1;
-		client-uid = -1;
+		client-pid = curproc-p_pid;
+		client-uid = kauth_cred_geteuid(curproc-p_cred);
 #else
 		client-pid = pid_vnr(file_priv-pid);
 		client-uid = from_kuid_munged(current_user_ns(),

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

2015-03-04 Thread Palle Lyckegaard 
Module Name:src
Committed By:   palle
Date:   Wed Mar  4 11:32:31 UTC 2015

Modified Files:
src/sys/arch/sparc64/sparc64: locore.s

Log Message:
sun4v: revert some of the logic introduced in revision 1.378 - flushw is not 
necessary on sun4v (OpenBSD patches the flushw instruction to a nop 
instruction) - with these changes the kernel reaches 
cpu_boot_secondary_processors() when running in the Legion simulator (crashes 
due to missing handling of cpu_mondo_trap)


To generate a diff of this commit:
cvs rdiff -u -r1.381 -r1.382 src/sys/arch/sparc64/sparc64/locore.s

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.381 src/sys/arch/sparc64/sparc64/locore.s:1.382
--- src/sys/arch/sparc64/sparc64/locore.s:1.381	Mon Mar  2 14:17:06 2015
+++ src/sys/arch/sparc64/sparc64/locore.s	Wed Mar  4 11:32:31 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.381 2015/03/02 14:17:06 nakayama Exp $	*/
+/*	$NetBSD: locore.s,v 1.382 2015/03/04 11:32:31 palle Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -3683,7 +3683,7 @@ ENTRY_NOPROFILE(sparc_interrupt)
 	stx	%g5, [%sp + CC64FSZ + STKB + TF_G + ( 5*8)]
 	stx	%g6, [%sp + CC64FSZ + STKB + TF_G + ( 6*8)]
 	stx	%g7, [%sp + CC64FSZ + STKB + TF_G + ( 7*8)]
-	ALTERNATE_GLOBALS_SUN4V
+
 	/*
 	 * In the EMBEDANY memory model %g4 points to the start of the
 	 * data segment.  In our case we need to clear it before calling
@@ -3691,8 +3691,6 @@ ENTRY_NOPROFILE(sparc_interrupt)
 	 */
 	clr	%g4
 
-	flushw			! Do not remove this insn -- causes interrupt loss
-	NORMAL_GLOBALS_SUN4V
 	ba	2f
 	 nop
 1:		
@@ -3706,7 +3704,7 @@ ENTRY_NOPROFILE(sparc_interrupt)
 	stx	%g5, [%sp + CC64FSZ + STKB + TF_G + ( 5*8)]
 	stx	%g6, [%sp + CC64FSZ + STKB + TF_G + ( 6*8)]
 	stx	%g7, [%sp + CC64FSZ + STKB + TF_G + ( 7*8)]
-	ALTERNATE_GLOBALS_SUN4U
+
 	/*
 	 * In the EMBEDANY memory model %g4 points to the start of the
 	 * data segment.  In our case we need to clear it before calling
@@ -3715,7 +3713,7 @@ ENTRY_NOPROFILE(sparc_interrupt)
 	clr	%g4
 
 	flushw			! Do not remove this insn -- causes interrupt loss
-	NORMAL_GLOBALS_SUN4U
+
 2:
 	rd	%y, %l6
 	INCR64(CPUINFO_VA+CI_NINTR)	! cnt.v_ints++ (clobbers %o0,%o1)

CVS commit: src/etc

2015-03-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Mar  4 14:54:38 UTC 2015

Modified Files:
src/etc: weekly
src/etc/defaults: weekly.conf

Log Message:
there is no more makewhatis


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/etc/weekly
cvs rdiff -u -r1.4 -r1.5 src/etc/defaults/weekly.conf

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

Modified files:

Index: src/etc/weekly
diff -u src/etc/weekly:1.29 src/etc/weekly:1.30
--- src/etc/weekly:1.29	Wed Aug 29 16:34:19 2012
+++ src/etc/weekly	Wed Mar  4 09:54:38 2015
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: weekly,v 1.29 2012/08/29 20:34:19 wiz Exp $
+#	$NetBSD: weekly,v 1.30 2015/03/04 14:54:38 christos Exp $
 #	from: @(#)weekly	8.2 (Berkeley) 1/2/94
 #
 
@@ -79,17 +79,6 @@ if checkyesno rebuild_locatedb; then
 	fi
 fi
 
-if checkyesno rebuild_whatisdb; then
-	echo 
-	if [ -x /usr/libexec/makewhatis -a \( -f /etc/man.conf \
-	 -o -d /usr/share/man \) ]; then
-		echo Rebuilding whatis databases:
-		nice -n 5 /usr/libexec/makewhatis -f
-	else
-		echo Not rebuilding whatis databases
-	fi
-fi
-
 if checkyesno rebuild_mandb; then
 	echo 
 	if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then

Index: src/etc/defaults/weekly.conf
diff -u src/etc/defaults/weekly.conf:1.4 src/etc/defaults/weekly.conf:1.5
--- src/etc/defaults/weekly.conf:1.4	Tue Feb  7 14:13:30 2012
+++ src/etc/defaults/weekly.conf	Wed Mar  4 09:54:38 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: weekly.conf,v 1.4 2012/02/07 19:13:30 joerg Exp $
+#	$NetBSD: weekly.conf,v 1.5 2015/03/04 14:54:38 christos Exp $
 #
 # /etc/defaults/weekly.conf --
 #	default configuration of /etc/weekly.conf
@@ -10,5 +10,4 @@
 #
 
 rebuild_locatedb=YES
-rebuild_whatisdb=NO
 rebuild_mandb=YES

CVS commit: src/sys/arch

2015-03-04 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Mar  4 12:36:12 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_board.c amlogic_crureg.h
amlogic_intr.h amlogic_io.c amlogic_reg.h amlogic_var.h
files.amlogic
src/sys/arch/evbarm/conf: ODROID-C1

Log Message:
ODROID-C1 onboard ethernet support.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/amlogic/amlogic_board.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/amlogic/amlogic_crureg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/amlogic_intr.h \
src/sys/arch/arm/amlogic/amlogic_io.c \
src/sys/arch/arm/amlogic/files.amlogic
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/amlogic/amlogic_reg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/amlogic_var.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/ODROID-C1

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

Modified files:

Index: src/sys/arch/arm/amlogic/amlogic_board.c
diff -u src/sys/arch/arm/amlogic/amlogic_board.c:1.6 src/sys/arch/arm/amlogic/amlogic_board.c:1.7
--- src/sys/arch/arm/amlogic/amlogic_board.c:1.6	Sun Mar  1 15:06:09 2015
+++ src/sys/arch/arm/amlogic/amlogic_board.c	Wed Mar  4 12:36:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_board.c,v 1.6 2015/03/01 15:06:09 jmcneill Exp $ */
+/* $NetBSD: amlogic_board.c,v 1.7 2015/03/04 12:36:12 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
 #include opt_amlogic.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_board.c,v 1.6 2015/03/01 15:06:09 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_board.c,v 1.7 2015/03/04 12:36:12 jmcneill Exp $);
 
 #define	_ARM32_BUS_DMA_PRIVATE
 #include sys/param.h
@@ -157,6 +157,13 @@ amlogic_get_rate_a9periph(void)
 	return amlogic_get_rate_a9() / div;
 }
 
+void
+amlogic_eth_init(void)
+{
+	CBUS_WRITE(EE_CLK_GATING1_REG,
+	CBUS_READ(EE_CLK_GATING1_REG) | EE_CLK_GATING1_ETHERNET);
+}
+
 static void
 amlogic_usbphy_clkgate_enable(int port)
 {

Index: src/sys/arch/arm/amlogic/amlogic_crureg.h
diff -u src/sys/arch/arm/amlogic/amlogic_crureg.h:1.4 src/sys/arch/arm/amlogic/amlogic_crureg.h:1.5
--- src/sys/arch/arm/amlogic/amlogic_crureg.h:1.4	Sat Feb 28 18:50:57 2015
+++ src/sys/arch/arm/amlogic/amlogic_crureg.h	Wed Mar  4 12:36:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_crureg.h,v 1.4 2015/02/28 18:50:57 jmcneill Exp $ */
+/* $NetBSD: amlogic_crureg.h,v 1.5 2015/03/04 12:36:12 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -39,9 +39,12 @@
 #define EE_CLK_GATING1_USB_GENERAL	__BIT(26)
 #define EE_CLK_GATING1_USB1		__BIT(22)
 #define EE_CLK_GATING1_USB0		__BIT(21)
+#define EE_CLK_GATING1_ETHERNET		__BIT(3)
+
 #define EE_CLK_GATING2_USB0_TO_DDR	__BIT(9)
 #define EE_CLK_GATING2_USB1_TO_DDR	__BIT(8)
 
+
 #define HHI_SYS_CPU_CLK_CNTL1_REG	CBUS_REG(0x1057)
 #define HHI_SYS_CPU_CLK_CNTL1_SDIV	__BITS(29,20)
 #define HHI_SYS_CPU_CLK_CNTL1_PERIPH_CLK_MUX __BITS(8,6)

Index: src/sys/arch/arm/amlogic/amlogic_intr.h
diff -u src/sys/arch/arm/amlogic/amlogic_intr.h:1.3 src/sys/arch/arm/amlogic/amlogic_intr.h:1.4
--- src/sys/arch/arm/amlogic/amlogic_intr.h:1.3	Sat Feb 28 15:20:43 2015
+++ src/sys/arch/arm/amlogic/amlogic_intr.h	Wed Mar  4 12:36:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_intr.h,v 1.3 2015/02/28 15:20:43 jmcneill Exp $ */
+/* $NetBSD: amlogic_intr.h,v 1.4 2015/03/04 12:36:12 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -35,6 +35,8 @@
 #include arm/cortex/gic_intr.h
 #include arm/cortex/a9tmr_intr.h
 
+#define AMLOGIC_INTR_GMAC	40
+#define AMLOGIC_INTR_MMC	60
 #define AMLOGIC_INTR_USB0	62
 #define AMLOGIC_INTR_USB1	63
 #define AMLOGIC_INTR_UART2AO	70
Index: src/sys/arch/arm/amlogic/amlogic_io.c
diff -u src/sys/arch/arm/amlogic/amlogic_io.c:1.3 src/sys/arch/arm/amlogic/amlogic_io.c:1.4
--- src/sys/arch/arm/amlogic/amlogic_io.c:1.3	Sat Feb 28 15:20:43 2015
+++ src/sys/arch/arm/amlogic/amlogic_io.c	Wed Mar  4 12:36:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_io.c,v 1.3 2015/02/28 15:20:43 jmcneill Exp $ */
+/* $NetBSD: amlogic_io.c,v 1.4 2015/03/04 12:36:12 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
 #include opt_amlogic.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_io.c,v 1.3 2015/02/28 15:20:43 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_io.c,v 1.4 2015/03/04 12:36:12 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -55,6 +55,8 @@ static int	amlogicio_find(device_t, cfda
 
 static bool amlogicio_found = false;
 
+#define NOPORT	AMLOGICIOCF_PORT_DEFAULT
+
 static const struct amlogic_locators amlogic_locators[] = {
   { amlogiccom,
 AMLOGIC_UART0AO_OFFSET, AMLOGIC_UART_SIZE, 0, AMLOGIC_INTR_UART0AO },
@@ -64,6 +66,8 @@ static const struct amlogic_locators aml
 AMLOGIC_USB0_OFFSET,

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

2015-03-04 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Mar  4 12:37:16 UTC 2015

Added Files:
src/sys/arch/arm/amlogic: amlogic_gmac.c

Log Message:
ODROID-C1 onboard ethernet support.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/amlogic/amlogic_gmac.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/arm/amlogic/amlogic_gmac.c
diff -u /dev/null src/sys/arch/arm/amlogic/amlogic_gmac.c:1.1
--- /dev/null	Wed Mar  4 12:37:16 2015
+++ src/sys/arch/arm/amlogic/amlogic_gmac.c	Wed Mar  4 12:37:16 2015
@@ -0,0 +1,114 @@
+/* $NetBSD: amlogic_gmac.c,v 1.1 2015/03/04 12:37:16 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2013, 2014, 2015 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry and Martin Husemann.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include locators.h
+
+#include sys/cdefs.h
+
+__KERNEL_RCSID(1, $NetBSD: amlogic_gmac.c,v 1.1 2015/03/04 12:37:16 jmcneill Exp $);
+
+#include sys/param.h
+#include sys/bus.h
+#include sys/device.h
+#include sys/intr.h
+#include sys/systm.h
+
+#include arm/amlogic/amlogic_reg.h
+#include arm/amlogic/amlogic_var.h
+
+#include net/if.h
+#include net/if_ether.h
+#include net/if_media.h
+
+#include dev/mii/miivar.h
+
+#include dev/ic/dwc_gmac_var.h
+#include dev/ic/dwc_gmac_reg.h
+
+static int amlogic_gmac_match(device_t, cfdata_t, void *);
+static void amlogic_gmac_attach(device_t, device_t, void *);
+static int amlogic_gmac_intr(void*);
+
+struct amlogic_gmac_softc {
+	struct dwc_gmac_softc sc_core;
+	void *sc_ih;
+};
+
+CFATTACH_DECL_NEW(amlogic_gmac, sizeof(struct amlogic_gmac_softc),
+	amlogic_gmac_match, amlogic_gmac_attach, NULL, NULL);
+
+static int
+amlogic_gmac_match(device_t parent, cfdata_t cf, void *aux)
+{
+	return 1;
+}
+
+static void
+amlogic_gmac_attach(device_t parent, device_t self, void *aux)
+{
+	struct amlogic_gmac_softc * const sc = device_private(self);
+	struct amlogicio_attach_args * const aio = aux;
+	const struct amlogic_locators * const loc = aio-aio_loc;
+
+	sc-sc_core.sc_dev = self;
+	sc-sc_core.sc_bst = aio-aio_core_bst;
+	sc-sc_core.sc_dmat = aio-aio_dmat;
+	bus_space_subregion(aio-aio_core_bst, aio-aio_bsh,
+	loc-loc_offset, loc-loc_size, sc-sc_core.sc_bsh);
+
+	aprint_naive(\n);
+	aprint_normal(: Gigabit Ethernet Controller\n);
+
+	amlogic_eth_init();
+
+	/*
+	 * Interrupt handler
+	 */
+	sc-sc_ih = intr_establish(loc-loc_intr, IPL_NET, IST_LEVEL,
+	amlogic_gmac_intr, sc);
+	if (sc-sc_ih == NULL) {
+		aprint_error_dev(self, failed to establish interrupt %d\n,
+		 loc-loc_intr);
+		return;
+	}
+	aprint_normal_dev(self, interrupting on irq %d\n,
+	 loc-loc_intr);
+
+	dwc_gmac_attach(sc-sc_core, GMAC_MII_CLK_100_150M_DIV62);
+}
+
+static int
+amlogic_gmac_intr(void *arg)
+{
+	struct amlogic_gmac_softc *sc = arg;
+
+	return dwc_gmac_intr(sc-sc_core);
+}

CVS commit: src/include

2015-03-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Mar  4 13:33:19 UTC 2015

Modified Files:
src/include: stdio.h

Log Message:
PR/49715: Henning Petersen: Missing _*_DECLS in stdio.h around popenve.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/include/stdio.h

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

Modified files:

Index: src/include/stdio.h
diff -u src/include/stdio.h:1.93 src/include/stdio.h:1.94
--- src/include/stdio.h:1.93	Tue Jan 20 12:29:00 2015
+++ src/include/stdio.h	Wed Mar  4 08:33:19 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.93 2015/01/20 17:29:00 christos Exp $	*/
+/*	$NetBSD: stdio.h,v 1.94 2015/03/04 13:33:19 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -331,7 +331,9 @@ FILE	*popen(const char *, const char *);
 __END_DECLS
 #endif
 #ifdef _NETBSD_SOURCE
+__BEGIN_DECLS
 FILE	*popenve(const char *, char *const *, char *const *, const char *);
+__END_DECLS
 #endif
 
 /*

CVS commit: src/usr.bin/midirecord

2015-03-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Mar  4 13:34:49 UTC 2015

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

Log Message:
PR/49716: Henning Petersen: Use false and true on bool, fix sign in printf
formats.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/midirecord/midirecord.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/midirecord/midirecord.c
diff -u src/usr.bin/midirecord/midirecord.c:1.7 src/usr.bin/midirecord/midirecord.c:1.8
--- src/usr.bin/midirecord/midirecord.c:1.7	Sun Mar  1 04:56:54 2015
+++ src/usr.bin/midirecord/midirecord.c	Wed Mar  4 08:34:49 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: midirecord.c,v 1.7 2015/03/01 09:56:54 mrg Exp $	*/
+/*	$NetBSD: midirecord.c,v 1.8 2015/03/04 13:34:49 christos Exp $	*/
 
 /*
  * Copyright (c) 2014 Matthew R. Green
@@ -33,7 +33,7 @@
 #include sys/cdefs.h
 
 #ifndef lint
-__RCSID($NetBSD: midirecord.c,v 1.7 2015/03/01 09:56:54 mrg Exp $);
+__RCSID($NetBSD: midirecord.c,v 1.8 2015/03/04 13:34:49 christos Exp $);
 #endif
 
 #include sys/param.h
@@ -122,7 +122,7 @@ main(int argc, char *argv[])
 			channels);
 			break;
 		case 'D':
-			debug++;
+			debug = true;
 			break;
 		case 'd':
 			parse_ints(optarg, filt_devnos, num_filt_devnos,
@@ -237,7 +237,7 @@ main(int argc, char *argv[])
 	data_size = 0;
 
 	if (verbose)
-		fprintf(stderr, tempo=%d notes_per_beat=%d\n,
+		fprintf(stderr, tempo=%d notes_per_beat=%u\n,
 		   tempo, notes_per_beat);
 
 	if (!no_time_limit  verbose)
@@ -282,7 +282,7 @@ debug_log(const char *file, size_t line,
 
 	if (!debug)
 		return;
-	fprintf(stderr, %s:%zd: , file, line);
+	fprintf(stderr, %s:%zu: , file, line);
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);