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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Tue Aug  1 00:01:56 UTC 2017

Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c

Log Message:
Enable GPCLK2 to Bluetooth.


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

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Tue Aug  1 00:01:56 UTC 2017

Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c

Log Message:
Enable GPCLK2 to Bluetooth.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 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/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.77 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.78
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.77	Mon Jul 31 10:45:04 2017
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c	Tue Aug  1 00:01:56 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpi_machdep.c,v 1.77 2017/07/31 10:45:04 jmcneill Exp $	*/
+/*	$NetBSD: rpi_machdep.c,v 1.78 2017/08/01 00:01:56 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.77 2017/07/31 10:45:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.78 2017/08/01 00:01:56 jmcneill Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bcm283x.h"
@@ -506,6 +506,8 @@ rpi_pinctrl(void)
 		bcm2835gpio_function_select(33, BCM2835_GPIO_ALT5);
 		bcm2835gpio_function_setpull(32, BCM2835_GPIO_GPPUD_PULLOFF);
 		bcm2835gpio_function_setpull(33, BCM2835_GPIO_GPPUD_PULLUP);
+		bcm2835gpio_function_select(43, BCM2835_GPIO_ALT0);
+		bcm2835gpio_function_setpull(43, BCM2835_GPIO_GPPUD_PULLOFF);
 	}
 }
 

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 23:54:19 UTC 2017

Modified Files:
src/sys/arch/arm/broadcom: bcm2835_com.c

Log Message:
mark ISR as mpsafe, detect when this is the console


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_com.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_com.c
diff -u src/sys/arch/arm/broadcom/bcm2835_com.c:1.2 src/sys/arch/arm/broadcom/bcm2835_com.c:1.3
--- src/sys/arch/arm/broadcom/bcm2835_com.c:1.2	Mon Jul 31 00:51:20 2017
+++ src/sys/arch/arm/broadcom/bcm2835_com.c	Mon Jul 31 23:54:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_com.c,v 1.2 2017/07/31 00:51:20 jmcneill Exp $ */
+/* $NetBSD: bcm2835_com.c,v 1.3 2017/07/31 23:54:19 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_com.c,v 1.2 2017/07/31 00:51:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_com.c,v 1.3 2017/07/31 23:54:19 jmcneill Exp $");
 
 #include 
 #include 
@@ -77,7 +77,8 @@ bcm_com_attach(device_t parent, device_t
 	}
 	sc->sc_frequency *= 2;
 
-	if (bus_space_map(bst, aaa->aaa_addr, aaa->aaa_size, 0, ) != 0) {
+	if (com_is_console(bst, aaa->aaa_addr, ) == 0 &&
+	bus_space_map(bst, aaa->aaa_addr, aaa->aaa_size, 0, ) != 0) {
 		aprint_error(": can't map device\n");
 		return;
 	}
@@ -87,7 +88,8 @@ bcm_com_attach(device_t parent, device_t
 	com_attach_subr(sc);
 	aprint_naive("\n");
 
-	ih = intr_establish(aaa->aaa_intr, IPL_SERIAL, IST_LEVEL, comintr, sc);
+	ih = intr_establish(aaa->aaa_intr, IPL_SERIAL, IST_LEVEL | IST_MPSAFE,
+	comintr, sc);
 	if (ih == NULL) {
 		aprint_error_dev(self, "failed to establish interrupt %d\n",
 		aaa->aaa_intr);

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 23:54:19 UTC 2017

Modified Files:
src/sys/arch/arm/broadcom: bcm2835_com.c

Log Message:
mark ISR as mpsafe, detect when this is the console


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_com.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/ic

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 23:53:25 UTC 2017

Modified Files:
src/sys/dev/ic: com.c

Log Message:
Broadcom AUX UART doesn't seem to set LSR RXRDY bit when data is available
in the RX FIFO.


To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 src/sys/dev/ic/com.c

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

Modified files:

Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.340 src/sys/dev/ic/com.c:1.341
--- src/sys/dev/ic/com.c:1.340	Mon Jul 31 09:25:14 2017
+++ src/sys/dev/ic/com.c	Mon Jul 31 23:53:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.340 2017/07/31 09:25:14 jmcneill Exp $ */
+/* $NetBSD: com.c,v 1.341 2017/07/31 23:53:25 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.340 2017/07/31 09:25:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.341 2017/07/31 23:53:25 jmcneill Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -2116,6 +2116,9 @@ again:	do {
 #endif
 		}
 
+		if (sc->sc_type == COM_TYPE_BCMAUXUART && ISSET(iir, IIR_RXRDY))
+			lsr |= LSR_RXRDY;
+
 		if (ISSET(lsr, LSR_RCV_MASK) &&
 		!ISSET(sc->sc_rx_flags, RX_IBUF_OVERFLOWED)) {
 			while (cc > 0) {

CVS commit: src/sys/dev/ic

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 23:53:25 UTC 2017

Modified Files:
src/sys/dev/ic: com.c

Log Message:
Broadcom AUX UART doesn't seem to set LSR RXRDY bit when data is available
in the RX FIFO.


To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 src/sys/dev/ic/com.c

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

CVS commit: [jdolecek-ncq] src/sys/dev/ata

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Jul 31 20:11:17 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq

Log Message:
some more notes


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.30 -r1.1.2.31 src/sys/dev/ata/TODO.ncq

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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.30 src/sys/dev/ata/TODO.ncq:1.1.2.31
--- src/sys/dev/ata/TODO.ncq:1.1.2.30	Wed Jul 19 20:26:52 2017
+++ src/sys/dev/ata/TODO.ncq	Mon Jul 31 20:11:17 2017
@@ -11,8 +11,18 @@ do proper NCQ error recovery
   ch_status/ch_error/ATACH_IRQ_WAIT
 - retest ATAPI
 
-ahcisata - use dynamic xfer in ahci_do_reset_drive() instead of hardcoding
-0, which can clash on drive reset after command failure
+do biodone() in wddone() starting the dump to not leak bufs when dumping from
+active system? make sure to not trigger atastart()
+- call ata_kill_active() + ata_kill_pending() when dumping
+
+kill active transfers after software drive reset - race timeout vs.
+error recovery
+
+multi-pmp disk open+i/o on siisata fails - track down and fix
+#!/bin/sh
+for disk in $disks; do
+(echo $disk; for i in `seq 0 3`; do dd if=/dev/r${disk}d bs=16m of=/dev/null count=1; done)&
+done;
 
 Other random notes (do outside the NCQ branch):
 -

CVS commit: [jdolecek-ncq] src/sys/dev/ata

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Jul 31 20:11:17 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq

Log Message:
some more notes


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.30 -r1.1.2.31 src/sys/dev/ata/TODO.ncq

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

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Jul 31 19:29:19 UTC 2017

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

Log Message:
modify code handling mismatch of nsegs in _bus_dmamem_alloc_range() to
a KASSERT() - plain return leaks memory, and this condition should
never trigger unless there is bug in uvm_pglistalloc(), so it seems
to be waste to check this

other ports usually simply do not check this, with exception of arm,
which does even full cleanup (checks it and calls uvm_pglistfree())


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/x86/x86/bus_dma.c

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

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

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Jul 31 19:29:19 UTC 2017

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

Log Message:
modify code handling mismatch of nsegs in _bus_dmamem_alloc_range() to
a KASSERT() - plain return leaks memory, and this condition should
never trigger unless there is bug in uvm_pglistalloc(), so it seems
to be waste to check this

other ports usually simply do not check this, with exception of arm,
which does even full cleanup (checks it and calls uvm_pglistfree())


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/x86/x86/bus_dma.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/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.76 src/sys/arch/x86/x86/bus_dma.c:1.77
--- src/sys/arch/x86/x86/bus_dma.c:1.76	Thu Jun  1 02:45:08 2017
+++ src/sys/arch/x86/x86/bus_dma.c	Mon Jul 31 19:29:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.76 2017/06/01 02:45:08 chs Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.77 2017/07/31 19:29:19 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.76 2017/06/01 02:45:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.77 2017/07/31 19:29:19 jdolecek Exp $");
 
 /*
  * The following is included because _bus_dma_uiomove is derived from
@@ -249,8 +249,7 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t,
 			segs[curseg].ds_len += PAGE_SIZE;
 		} else {
 			curseg++;
-			if (curseg >= nsegs)
-return EFBIG;
+			KASSERT(curseg < nsegs);
 			segs[curseg].ds_addr = curaddr;
 			segs[curseg].ds_len = PAGE_SIZE;
 		}

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Jul 31 18:54:40 UTC 2017

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

Log Message:
Use idt_vec_set instead.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 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/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Jul 31 18:54:40 UTC 2017

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

Log Message:
Use idt_vec_set instead.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 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/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.101 src/sys/arch/x86/x86/intr.c:1.102
--- src/sys/arch/x86/x86/intr.c:1.101	Thu Jun  1 02:45:08 2017
+++ src/sys/arch/x86/x86/intr.c	Mon Jul 31 18:54:40 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.101 2017/06/01 02:45:08 chs Exp $	*/
+/*	$NetBSD: intr.c,v 1.102 2017/07/31 18:54:40 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.101 2017/06/01 02:45:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.102 2017/07/31 18:54:40 maxv Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -267,9 +267,7 @@ intr_default_setup(void)
 	/* icu vectors */
 	for (i = 0; i < NUM_LEGACY_IRQS; i++) {
 		idt_vec_reserve(ICU_OFFSET + i);
-		setgate([ICU_OFFSET + i],
-		i8259_stubs[i].ist_entry, 0, SDT_SYS386IGT,
-		SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
+		idt_vec_set(ICU_OFFSET + i, i8259_stubs[i].ist_entry);
 	}
 
 	/*
@@ -894,8 +892,7 @@ intr_establish_xcall(void *arg1, void *a
 		}
 		source->is_resume = stubp->ist_resume;
 		source->is_recurse = stubp->ist_recurse;
-		setgate([idt_vec], stubp->ist_entry, 0, SDT_SYS386IGT,
-		SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
+		idt_vec_set(idt_vec, stubp->ist_entry);
 	}
 
 	/* Re-enable interrupts locally. */
@@ -1777,8 +1774,7 @@ intr_activate_xcall(void *arg1, void *ar
 	}
 	source->is_resume = stubp->ist_resume;
 	source->is_recurse = stubp->ist_recurse;
-	setgate([idt_vec], stubp->ist_entry, 0, SDT_SYS386IGT,
-	SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
+	idt_vec_set(idt_vec, stubp->ist_entry);
 
 	x86_write_psl(psl);
 

CVS commit: src/share/man/man4/man4.vax

[Ryo ONODERA]

Module Name:src
Committed By:   ryoon
Date:   Mon Jul 31 18:45:43 UTC 2017

Modified Files:
src/share/man/man4/man4.vax: autoconf.4 dmc.4 dmf.4 hk.4 hp.4 intro.4
ix.4 lp.4 mtc.4 pcl.4 rf.4 rl.4 uda.4 up.4 ut.4 uu.4 va.4 vp.4

Log Message:
Fix vax/* cross references


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/man4.vax/autoconf.4 \
src/share/man/man4/man4.vax/dmf.4 src/share/man/man4/man4.vax/uu.4
cvs rdiff -u -r1.15 -r1.16 src/share/man/man4/man4.vax/dmc.4 \
src/share/man/man4/man4.vax/intro.4
cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/man4.vax/hk.4 \
src/share/man/man4/man4.vax/hp.4 src/share/man/man4/man4.vax/uda.4
cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/man4.vax/ix.4 \
src/share/man/man4/man4.vax/up.4
cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/man4.vax/lp.4
cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/man4.vax/mtc.4
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.vax/pcl.4 \
src/share/man/man4/man4.vax/va.4 src/share/man/man4/man4.vax/vp.4
cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.vax/rf.4
cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/man4.vax/rl.4
cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.vax/ut.4

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

Modified files:

Index: src/share/man/man4/man4.vax/autoconf.4
diff -u src/share/man/man4/man4.vax/autoconf.4:1.12 src/share/man/man4/man4.vax/autoconf.4:1.13
--- src/share/man/man4/man4.vax/autoconf.4:1.12	Fri Feb 17 22:24:47 2017
+++ src/share/man/man4/man4.vax/autoconf.4	Mon Jul 31 18:45:43 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: autoconf.4,v 1.12 2017/02/17 22:24:47 christos Exp $
+.\"	$NetBSD: autoconf.4,v 1.13 2017/07/31 18:45:43 ryoon Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -261,7 +261,7 @@ case.
 .El
 .Sh SEE ALSO
 .Xr config 1 ,
-.Xr vax/vax/intro 4 ,
+.Xr vax/intro 4 ,
 .Xr boot 8
 .Sh HISTORY
 The
Index: src/share/man/man4/man4.vax/dmf.4
diff -u src/share/man/man4/man4.vax/dmf.4:1.12 src/share/man/man4/man4.vax/dmf.4:1.13
--- src/share/man/man4/man4.vax/dmf.4:1.12	Fri Feb 17 22:24:47 2017
+++ src/share/man/man4/man4.vax/dmf.4	Mon Jul 31 18:45:43 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: dmf.4,v 1.12 2017/02/17 22:24:47 christos Exp $
+.\"	$NetBSD: dmf.4,v 1.13 2017/07/31 18:45:43 ryoon Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -112,7 +112,7 @@ Column and lines per page may be changed
 in bits 8-15 of flags and the number of lines in bits 16-23.
 This device does not provide the fancy output canonicalization
 features of the
-.Xr vax/vax/lp 4
+.Xr vax/lp 4
 driver.
 .Sh FILES
 .Bl -tag -width "/dev/tty[A-CE-I][0-7]" -compact
Index: src/share/man/man4/man4.vax/uu.4
diff -u src/share/man/man4/man4.vax/uu.4:1.12 src/share/man/man4/man4.vax/uu.4:1.13
--- src/share/man/man4/man4.vax/uu.4:1.12	Fri Feb 17 22:24:47 2017
+++ src/share/man/man4/man4.vax/uu.4	Mon Jul 31 18:45:43 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: uu.4,v 1.12 2017/02/17 22:24:47 christos Exp $
+.\"	$NetBSD: uu.4,v 1.13 2017/07/31 18:45:43 ryoon Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -149,7 +149,7 @@ Open failed, the device could not be res
 Drive in use.
 .El
 .Sh SEE ALSO
-.Xr vax/vax/tu 4 ,
+.Xr vax/tu 4 ,
 .Xr arff 8
 .Sh HISTORY
 The

Index: src/share/man/man4/man4.vax/dmc.4
diff -u src/share/man/man4/man4.vax/dmc.4:1.15 src/share/man/man4/man4.vax/dmc.4:1.16
--- src/share/man/man4/man4.vax/dmc.4:1.15	Fri Feb 17 22:24:47 2017
+++ src/share/man/man4/man4.vax/dmc.4	Mon Jul 31 18:45:43 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: dmc.4,v 1.15 2017/02/17 22:24:47 christos Exp $
+.\"	$NetBSD: dmc.4,v 1.16 2017/07/31 18:45:43 ryoon Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -134,7 +134,7 @@ addresses formatted in an unsuitable add
 .El
 .Sh SEE ALSO
 .Xr inet 4 ,
-.Xr vax/vax/intro 4
+.Xr vax/intro 4
 .Sh HISTORY
 The
 .Nm
Index: src/share/man/man4/man4.vax/intro.4
diff -u src/share/man/man4/man4.vax/intro.4:1.15 src/share/man/man4/man4.vax/intro.4:1.16
--- src/share/man/man4/man4.vax/intro.4:1.15	Sat Feb 18 22:39:01 2017
+++ src/share/man/man4/man4.vax/intro.4	Mon Jul 31 18:45:43 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: intro.4,v 1.15 2017/02/18 22:39:01 wiz Exp $
+.\"	$NetBSD: intro.4,v 1.16 2017/07/31 18:45:43 ryoon Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -99,7 +99,7 @@ after the autoconfiguration sequence
 it will be dynamically autoconfigured into the running system.
 .Pp
 The autoconfiguration system is described in
-.Xr vax/vax/autoconf 4 .
+.Xr vax/autoconf 4 .
 A list of the supported devices is given below.
 .Sh SEE ALSO
 .Xr config 1 ,

CVS commit: src/share/man/man4/man4.vax

[Ryo ONODERA]

Module Name:src
Committed By:   ryoon
Date:   Mon Jul 31 18:45:43 UTC 2017

Modified Files:
src/share/man/man4/man4.vax: autoconf.4 dmc.4 dmf.4 hk.4 hp.4 intro.4
ix.4 lp.4 mtc.4 pcl.4 rf.4 rl.4 uda.4 up.4 ut.4 uu.4 va.4 vp.4

Log Message:
Fix vax/* cross references


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/man4.vax/autoconf.4 \
src/share/man/man4/man4.vax/dmf.4 src/share/man/man4/man4.vax/uu.4
cvs rdiff -u -r1.15 -r1.16 src/share/man/man4/man4.vax/dmc.4 \
src/share/man/man4/man4.vax/intro.4
cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/man4.vax/hk.4 \
src/share/man/man4/man4.vax/hp.4 src/share/man/man4/man4.vax/uda.4
cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/man4.vax/ix.4 \
src/share/man/man4/man4.vax/up.4
cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/man4.vax/lp.4
cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/man4.vax/mtc.4
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.vax/pcl.4 \
src/share/man/man4/man4.vax/va.4 src/share/man/man4/man4.vax/vp.4
cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.vax/rf.4
cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/man4.vax/rl.4
cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.vax/ut.4

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

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 16:34:23 UTC 2017

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

Log Message:
Create a config.txt for RPI and set 'enable_uart=1' and 'force_turbo=0'.
This config gives us a stable core_freq clock that is used to drive the
SD HOST and AUX UART devices.

More information on config.txt settings for the UART can be found here:

https://www.raspberrypi.org/documentation/configuration/uart.md


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.29 -r1.30 src/distrib/utils/embedded/conf/rpi.conf
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/embedded/conf/rpi_inst.conf

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

Modified files:

Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.15 src/distrib/utils/embedded/conf/armv7.conf:1.16
--- src/distrib/utils/embedded/conf/armv7.conf:1.15	Sun Jul  9 10:41:40 2017
+++ src/distrib/utils/embedded/conf/armv7.conf	Mon Jul 31 16:34:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.15 2017/07/09 10:41:40 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.16 2017/07/31 16:34:22 jmcneill Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -65,6 +65,12 @@ root=ld0a console=${console}
 #fb=disable		# to disable fb completely
 EOF
 
+		cat > ${mnt}/boot/config.txt << EOF
+# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
+enable_uart=1
+force_turbo=0
+EOF
+
 	echo "${bar} installing firmware files ${bar}"
 		(cd "${mnt}/boot" &&
 			for f in ${firmwarefiles}; do

Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.29 src/distrib/utils/embedded/conf/rpi.conf:1.30
--- src/distrib/utils/embedded/conf/rpi.conf:1.29	Sun Apr 19 18:28:31 2015
+++ src/distrib/utils/embedded/conf/rpi.conf	Mon Jul 31 16:34:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.29 2015/04/19 18:28:31 hubertf Exp $
+# $NetBSD: rpi.conf,v 1.30 2017/07/31 16:34:22 jmcneill Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -52,6 +52,13 @@ root=ld0a console=fb
 #fb=1280x1024		# to select a mode, otherwise try EDID 
 #fb=disable		# to disable fb completely
 EOF
+
+	cat > ${mnt}/boot/config.txt << EOF
+# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
+enable_uart=1
+force_turbo=0
+EOF
+
 	if [ ! -f ${kernel} ]; then
 		echo ${PROG}: Missing ${kernel} 1>&2
 		exit 1

Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.8 src/distrib/utils/embedded/conf/rpi_inst.conf:1.9
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.8	Sun Apr 19 18:53:33 2015
+++ src/distrib/utils/embedded/conf/rpi_inst.conf	Mon Jul 31 16:34:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.8 2015/04/19 18:53:33 hubertf Exp $
+# $NetBSD: rpi_inst.conf,v 1.9 2017/07/31 16:34:22 jmcneill Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -82,6 +82,13 @@ root=ld0a console=fb
 #fb=1280x1024		# to select a mode, otherwise try EDID 
 #fb=disable		# to disable fb completely
 EOF
+
+	cat > ${mnt}/boot/config.txt << EOF
+# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
+enable_uart=1
+force_turbo=0
+EOF
+
 	if [ ! -f ${kernel} ]; then
 		echo ${PROG}: Missing ${kernel} 1>&2
 		exit 1

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 16:34:23 UTC 2017

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

Log Message:
Create a config.txt for RPI and set 'enable_uart=1' and 'force_turbo=0'.
This config gives us a stable core_freq clock that is used to drive the
SD HOST and AUX UART devices.

More information on config.txt settings for the UART can be found here:

https://www.raspberrypi.org/documentation/configuration/uart.md


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.29 -r1.30 src/distrib/utils/embedded/conf/rpi.conf
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/embedded/conf/rpi_inst.conf

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

CVS commit: src/sys/netinet

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Jul 31 15:51:28 UTC 2017

Modified Files:
src/sys/netinet: tcp_var.h

Log Message:
Fix TCPCTL_NAMES, and remove TCPCTL_VARIABLES.


To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/netinet/tcp_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/netinet/tcp_var.h
diff -u src/sys/netinet/tcp_var.h:1.179 src/sys/netinet/tcp_var.h:1.180
--- src/sys/netinet/tcp_var.h:1.179	Fri Jul 28 19:16:41 2017
+++ src/sys/netinet/tcp_var.h	Mon Jul 31 15:51:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_var.h,v 1.179 2017/07/28 19:16:41 maxv Exp $	*/
+/*	$NetBSD: tcp_var.h,v 1.180 2017/07/31 15:51:27 maxv Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -730,7 +730,9 @@ struct syn_cache_head {
 #define	TCPCTL_SACK		10	/* RFC2018 selective acknowledgement */
 #define	TCPCTL_WSCALE		11	/* RFC1323 window scaling */
 #define	TCPCTL_TSTAMP		12	/* RFC1323 timestamps */
+#if 0	/*obsoleted*/
 #define	TCPCTL_COMPAT_42	13	/* 4.2BSD TCP bug work-arounds */
+#endif
 #define	TCPCTL_CWM		14	/* Congestion Window Monitoring */
 #define	TCPCTL_CWM_BURSTSIZE	15	/* burst size allowed by CWM */
 #define	TCPCTL_ACK_ON_PUSH	16	/* ACK immediately on PUSH */
@@ -770,7 +772,7 @@ struct syn_cache_head {
 	{ "sack", CTLTYPE_INT }, \
 	{ "win_scale", CTLTYPE_INT }, \
 	{ "timestamps", CTLTYPE_INT }, \
-	{ "compat_42", CTLTYPE_INT }, \
+	{ 0, 0 }, \
 	{ "cwm", CTLTYPE_INT }, \
 	{ "cwm_burstsize", CTLTYPE_INT }, \
 	{ "ack_on_push", CTLTYPE_INT }, \
@@ -861,37 +863,6 @@ extern int tcp_do_autosndbuf;
 extern int tcp_autosndbuf_inc;
 extern int tcp_autosndbuf_max;
 
-
-#define	TCPCTL_VARIABLES { \
-	{ 0 },	\
-	{ 1, 0, _do_rfc1323 },		\
-	{ 1, 0, _sendspace },		\
-	{ 1, 0, _recvspace },		\
-	{ 1, 0, _mssdflt },			\
-	{ 1, 0, _syn_cache_limit },		\
-	{ 1, 0, _syn_bucket_limit },	\
-	{ 0 },	\
-	{ 1, 0, _init_win },		\
-	{ 1, 0, _mss_ifmtu },		\
-	{ 1, 0, _do_sack },			\
-	{ 1, 0, _do_win_scale },		\
-	{ 1, 0, _do_timestamps },		\
-	{ 1, 0, _cwm },			\
-	{ 1, 0, _cwm_burstsize },		\
-	{ 1, 0, _ack_on_push },		\
-	{ 1, 0, _keepidle },		\
-	{ 1, 0, _keepintvl },		\
-	{ 1, 0, _keepcnt },			\
-	{ 1, 1, 0, PR_SLOWHZ },			\
-	{ 0 },	\
-	{ 1, 0, _log_refused },		\
-	{ 0 },	\
-	{ 1, 0, _rst_ppslim },		\
-	{ 1, 0, _delack_ticks },		\
-	{ 1, 0, _init_win_local },		\
-	{ 1, 0, _ackdrop_ppslim },		\
-}
-
 struct secasvar;
 
 void	 tcp_canceltimers(struct tcpcb *);

CVS commit: src/sys/netinet

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Jul 31 15:51:28 UTC 2017

Modified Files:
src/sys/netinet: tcp_var.h

Log Message:
Fix TCPCTL_NAMES, and remove TCPCTL_VARIABLES.


To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/netinet/tcp_var.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/i386/conf

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Jul 31 15:43:33 UTC 2017

Modified Files:
src/sys/arch/i386/conf: GENERIC GENERIC_TINY NET4501 XEN3_DOM0
XEN3_DOMU

Log Message:
Disable all the compat options until COMPAT_10. NetBSD 1.0 was released on
October 26 1994; 23 years of compatibility is enough. Discussed with
christos quickly.


To generate a diff of this commit:
cvs rdiff -u -r1.1161 -r1.1162 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/i386/conf/NET4501
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/i386/conf/XEN3_DOMU

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

Modified files:

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1161 src/sys/arch/i386/conf/GENERIC:1.1162
--- src/sys/arch/i386/conf/GENERIC:1.1161	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/i386/conf/GENERIC	Mon Jul 31 15:43:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1161 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC,v 1.1162 2017/07/31 15:43:33 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1161 $"
+#ident		"GENERIC-$Revision: 1.1162 $"
 
 maxusers	64		# estimated number of users
 
@@ -124,8 +124,8 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 options 	KDTRACE_HOOKS	# kernel DTrace hooks
 
 # Compatibility options
-options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
-options 	COMPAT_09	# NetBSD 0.9,
+#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
+#options 	COMPAT_09	# NetBSD 0.9,
 options 	COMPAT_10	# NetBSD 1.0,
 options 	COMPAT_11	# NetBSD 1.1,
 options 	COMPAT_12	# NetBSD 1.2 (and 386BSD and BSDI),
@@ -139,7 +139,7 @@ options 	COMPAT_40	# NetBSD 4.0,
 options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
-options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
+#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
 options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility

Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.151 src/sys/arch/i386/conf/GENERIC_TINY:1.152
--- src/sys/arch/i386/conf/GENERIC_TINY:1.151	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/i386/conf/GENERIC_TINY	Mon Jul 31 15:43:33 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_TINY,v 1.151 2017/07/29 18:08:58 maxv Exp $
+#	$NetBSD: GENERIC_TINY,v 1.152 2017/07/31 15:43:33 maxv Exp $
 #
 #	GENERIC_TINY -- suitable default for 4M machines
 #			No EISA, PCI, or SCSI.
@@ -72,7 +72,7 @@ options 	COMPAT_40	# NetBSD 4.0,
 options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
-options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
+#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
 #options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC

Index: src/sys/arch/i386/conf/NET4501
diff -u src/sys/arch/i386/conf/NET4501:1.94 src/sys/arch/i386/conf/NET4501:1.95
--- src/sys/arch/i386/conf/NET4501:1.94	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/i386/conf/NET4501	Mon Jul 31 15:43:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.94 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: NET4501,v 1.95 2017/07/31 15:43:33 maxv Exp $
 #
 # NET4501 -- kernel configuration for a Soekris Engineering net4501
 # single-board computer.
@@ -10,7 +10,7 @@ include 	"arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"NET4501-$Revision: 1.94 $"
+#ident 		"NET4501-$Revision: 1.95 $"
 
 maxusers	32		# estimated number of users
 
@@ -77,8 +77,8 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #makeoptions	DEBUG="-g"	# compile full symbol table
 
 # Compatibility options
-options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
-options 	COMPAT_09	# NetBSD 0.9,
+#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
+#options 	COMPAT_09	# NetBSD 0.9,
 options 	COMPAT_10	# NetBSD 1.0,
 options 	COMPAT_11	# NetBSD 1.1,
 options 	COMPAT_12	# NetBSD 1.2 (and 386BSD and BSDI),
@@ -92,7 +92,7 @@ options 	COMPAT_40	# NetBSD 4.0,
 options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
-options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI compatibility.
+#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI compatibility.
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
 #options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC

Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.117 src/sys/arch/i386/conf/XEN3_DOM0:1.118
--- 

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Jul 31 15:43:33 UTC 2017

Modified Files:
src/sys/arch/i386/conf: GENERIC GENERIC_TINY NET4501 XEN3_DOM0
XEN3_DOMU

Log Message:
Disable all the compat options until COMPAT_10. NetBSD 1.0 was released on
October 26 1994; 23 years of compatibility is enough. Discussed with
christos quickly.


To generate a diff of this commit:
cvs rdiff -u -r1.1161 -r1.1162 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/i386/conf/NET4501
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/i386/conf/XEN3_DOMU

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

CVS commit: src/sys/compat/netbsd32

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Jul 31 15:38:01 UTC 2017

Modified Files:
src/sys/compat/netbsd32: netbsd32_conv.h netbsd32_netbsd.c

Log Message:
Remove references to COMPAT_OLDSOCK (itself removed years ago).


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.206 -r1.207 src/sys/compat/netbsd32/netbsd32_netbsd.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/compat/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.31 src/sys/compat/netbsd32/netbsd32_conv.h:1.32
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.31	Sun Nov 13 13:59:45 2016
+++ src/sys/compat/netbsd32/netbsd32_conv.h	Mon Jul 31 15:38:01 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_conv.h,v 1.31 2016/11/13 13:59:45 rin Exp $	*/
+/*	$NetBSD: netbsd32_conv.h,v 1.32 2017/07/31 15:38:01 maxv Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,13 +29,6 @@
 #ifndef _COMPAT_NETBSD32_NETBSD32_CONV_H_
 #define _COMPAT_NETBSD32_NETBSD32_CONV_H_
 
-/*
- * Though COMPAT_OLDSOCK is needed only for COMPAT_43, SunOS, Linux,
- * HP-UX, FreeBSD, Ultrix, OSF1, we define it unconditionally so that
- * this would be module-safe.
- */
-#define COMPAT_OLDSOCK /* used by  */
-
 #include 
 #include 
 #include 

Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.206 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.207
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.206	Sat Apr 29 01:15:40 2017
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c	Mon Jul 31 15:38:01 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.206 2017/04/29 01:15:40 christos Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.207 2017/07/31 15:38:01 maxv Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.206 2017/04/29 01:15:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.207 2017/07/31 15:38:01 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
@@ -39,13 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net
 #include "opt_syscall_debug.h"
 #endif
 
-/*
- * Though COMPAT_OLDSOCK is needed only for COMPAT_43, SunOS, Linux,
- * HP-UX, FreeBSD, Ultrix, OSF1, we define it unconditionally so that
- * this would be module-safe.
- */
-#define COMPAT_OLDSOCK /* used by  */
-
 #include 
 #include 
 #include 

CVS commit: src/sys/compat/netbsd32

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Jul 31 15:38:01 UTC 2017

Modified Files:
src/sys/compat/netbsd32: netbsd32_conv.h netbsd32_netbsd.c

Log Message:
Remove references to COMPAT_OLDSOCK (itself removed years ago).


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.206 -r1.207 src/sys/compat/netbsd32/netbsd32_netbsd.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/x68k/dev

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Mon Jul 31 14:53:08 UTC 2017

Modified Files:
src/sys/arch/x68k/dev: vs.c

Log Message:
Update confused vs_set_params().
play and rec are identical but pfil and rfil are independent.
XXX I introduce VS_USE_PREC8 option for debugging purposes
temporarily.  I'll remove it if the problem is solved.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x68k/dev/vs.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/x68k/dev/vs.c
diff -u src/sys/arch/x68k/dev/vs.c:1.40 src/sys/arch/x68k/dev/vs.c:1.41
--- src/sys/arch/x68k/dev/vs.c:1.40	Sat Jul 29 07:30:39 2017
+++ src/sys/arch/x68k/dev/vs.c	Mon Jul 31 14:53:08 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vs.c,v 1.40 2017/07/29 07:30:39 nat Exp $	*/
+/*	$NetBSD: vs.c,v 1.41 2017/07/31 14:53:08 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.40 2017/07/29 07:30:39 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.41 2017/07/31 14:53:08 isaki Exp $");
 
 #include "audio.h"
 #include "vs.h"
@@ -56,6 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.40 
 
 #include 
 
+//#define VS_USE_PREC8 /* for debugging */
 #ifdef VS_DEBUG
 #define DPRINTF(y,x)	if (vs_debug >= (y)) printf x
 static int vs_debug;
@@ -329,9 +330,15 @@ vs_query_encoding(void *hdl, struct audi
 	DPRINTF(1, ("vs_query_encoding\n"));
 
 	if (fp->index == 0) {
+#if defined(VS_USE_PREC8)
+		strcpy(fp->name, AudioEslinear);
+		fp->encoding = AUDIO_ENCODING_SLINEAR;
+		fp->precision = 8;
+#else
 		strcpy(fp->name, AudioEslinear_be);
 		fp->encoding = AUDIO_ENCODING_SLINEAR_BE;
 		fp->precision = 16;
+#endif
 		fp->flags = 0;
 		return 0;
 	}
@@ -380,6 +387,8 @@ vs_set_params(void *hdl, int setmode, in
 		setmode, play->encoding, play->sample_rate,
 		play->precision, play->channels));
 
+	/* *play and *rec are identical because !AUDIO_PROP_INDEPENDENT */
+
 	if (play->channels != 1) {
 		DPRINTF(1, ("channels not matched\n"));
 		return EINVAL;
@@ -391,33 +400,42 @@ vs_set_params(void *hdl, int setmode, in
 		return EINVAL;
 	}
 
-	if (play->encoding != AUDIO_ENCODING_SLINEAR_BE) {
-		DPRINTF(1, ("encoding not matched\n"));
-		return EINVAL;
-	}
-	if (play->precision != 16) {
-		DPRINTF(1, ("precision not matched\n"));
+#if defined(VS_USE_PREC8)
+	if (play->precision != 8 || play->encoding != AUDIO_ENCODING_SLINEAR) {
+#else
+	if (play->precision != 16 || play->encoding != AUDIO_ENCODING_SLINEAR_BE) {
+#endif
+		DPRINTF(1, ("prec/enc not matched\n"));
 		return EINVAL;
 	}
 
-	play->encoding = AUDIO_ENCODING_ADPCM;
-	play->validbits = 4;
-	play->precision = 4;
-
-	pfil->prepend(pfil, msm6258_slinear16_to_adpcm, play);
-	rfil->prepend(rfil, msm6258_adpcm_to_slinear16, play);
-
-	play->validbits = 16;
-	play->precision = 16;
-
-	pfil->prepend(pfil, null_filter, play);
-	rfil->prepend(rfil, null_filter, play);
-
 	sc->sc_current.prate = rate;
 	sc->sc_current.rrate = rate;
 
-	/* copy to rec because it's !AUDIO_PROP_INDEPENDENT */
-	*rec = *play;
+	/* pfil and rfil are independent even if !AUDIO_PROP_INDEPENDENT */
+
+	if ((setmode & AUMODE_PLAY) != 0) {
+		pfil->append(pfil, null_filter, play);
+		play->encoding = AUDIO_ENCODING_ADPCM;
+		play->validbits = 4;
+		play->precision = 4;
+#if defined(VS_USE_PREC8)
+		pfil->append(pfil, msm6258_linear8_to_adpcm, play);
+#else
+		pfil->append(pfil, msm6258_slinear16_to_adpcm, play);
+#endif
+	}
+	if ((setmode & AUMODE_RECORD) != 0) {
+		rfil->append(rfil, null_filter, rec);
+		rec->encoding = AUDIO_ENCODING_ADPCM;
+		rec->validbits = 4;
+		rec->precision = 4;
+#if defined(VS_USE_PREC8)
+		rfil->append(rfil, msm6258_adpcm_to_linear8, rec);
+#else
+		rfil->append(rfil, msm6258_adpcm_to_slinear16, rec);
+#endif
+	}
 
 	DPRINTF(1, ("accepted\n"));
 	return 0;

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

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Mon Jul 31 14:53:08 UTC 2017

Modified Files:
src/sys/arch/x68k/dev: vs.c

Log Message:
Update confused vs_set_params().
play and rec are identical but pfil and rfil are independent.
XXX I introduce VS_USE_PREC8 option for debugging purposes
temporarily.  I'll remove it if the problem is solved.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x68k/dev/vs.c

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

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 10:45:04 UTC 2017

Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c

Log Message:
Only remap sdhost/sdhci on boards with wifi.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 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/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.76 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.77
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.76	Mon Jul 31 10:41:39 2017
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c	Mon Jul 31 10:45:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpi_machdep.c,v 1.76 2017/07/31 10:41:39 jmcneill Exp $	*/
+/*	$NetBSD: rpi_machdep.c,v 1.77 2017/07/31 10:45:04 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.76 2017/07/31 10:41:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.77 2017/07/31 10:45:04 jmcneill Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bcm283x.h"
@@ -481,20 +481,22 @@ static void
 rpi_pinctrl(void)
 {
 #if NBCMSDHOST > 0
-	/*
-	 * If the sdhost driver is present, map the SD card slot to the
-	 * SD host controller and the sdhci driver to the SDIO pins.
-	 */
-	for (int pin = 48; pin <= 53; pin++) {
-		/* Enable SDHOST on SD card slot */
-		bcm2835gpio_function_select(pin, BCM2835_GPIO_ALT0);
-	}
-	for (int pin = 34; pin <= 39; pin++) {
-		/* Enable SDHCI on SDIO */
-		bcm2835gpio_function_select(pin, BCM2835_GPIO_ALT3);
-		bcm2835gpio_function_setpull(pin,
-		pin == 34 ? BCM2835_GPIO_GPPUD_PULLOFF :
-		BCM2835_GPIO_GPPUD_PULLUP);
+	if (rpi_rev_has_btwifi(vb.vbt_boardrev.rev)) {
+		/*
+		 * If the sdhost driver is present, map the SD card slot to the
+		 * SD host controller and the sdhci driver to the SDIO pins.
+		 */
+		for (int pin = 48; pin <= 53; pin++) {
+			/* Enable SDHOST on SD card slot */
+			bcm2835gpio_function_select(pin, BCM2835_GPIO_ALT0);
+		}
+		for (int pin = 34; pin <= 39; pin++) {
+			/* Enable SDHCI on SDIO */
+			bcm2835gpio_function_select(pin, BCM2835_GPIO_ALT3);
+			bcm2835gpio_function_setpull(pin,
+			pin == 34 ? BCM2835_GPIO_GPPUD_PULLOFF :
+			BCM2835_GPIO_GPPUD_PULLUP);
+		}
 	}
 #endif
 

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 10:45:04 UTC 2017

Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c

Log Message:
Only remap sdhost/sdhci on boards with wifi.


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

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 10:41:39 UTC 2017

Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c

Log Message:
Enable AUX UART for BT on btwifi boards


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 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/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.75 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.76
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.75	Sun Jul 30 23:48:32 2017
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c	Mon Jul 31 10:41:39 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpi_machdep.c,v 1.75 2017/07/30 23:48:32 jmcneill Exp $	*/
+/*	$NetBSD: rpi_machdep.c,v 1.76 2017/07/31 10:41:39 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.75 2017/07/30 23:48:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.76 2017/07/31 10:41:39 jmcneill Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bcm283x.h"
@@ -497,6 +497,14 @@ rpi_pinctrl(void)
 		BCM2835_GPIO_GPPUD_PULLUP);
 	}
 #endif
+
+	if (rpi_rev_has_btwifi(vb.vbt_boardrev.rev)) {
+		/* Enable AUX UART on BT */
+		bcm2835gpio_function_select(32, BCM2835_GPIO_ALT5);
+		bcm2835gpio_function_select(33, BCM2835_GPIO_ALT5);
+		bcm2835gpio_function_setpull(32, BCM2835_GPIO_GPPUD_PULLOFF);
+		bcm2835gpio_function_setpull(33, BCM2835_GPIO_GPPUD_PULLUP);
+	}
 }
 
 

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 10:41:39 UTC 2017

Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c

Log Message:
Enable AUX UART for BT on btwifi boards


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

CVS commit: src/sys/dev/ic

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 09:25:14 UTC 2017

Modified Files:
src/sys/dev/ic: com.c comvar.h

Log Message:
Add COM_TYPE_BCMAUXUART type for BCM2835 AUX UART.


To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 src/sys/dev/ic/com.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/ic/comvar.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/ic/com.c
diff -u src/sys/dev/ic/com.c:1.339 src/sys/dev/ic/com.c:1.340
--- src/sys/dev/ic/com.c:1.339	Fri May 27 20:01:49 2016
+++ src/sys/dev/ic/com.c	Mon Jul 31 09:25:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.339 2016/05/27 20:01:49 bouyer Exp $ */
+/* $NetBSD: com.c,v 1.340 2017/07/31 09:25:14 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.339 2016/05/27 20:01:49 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.340 2017/07/31 09:25:14 jmcneill Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -475,6 +475,14 @@ com_attach_subr(struct com_softc *sc)
 		CSR_WRITE_1(regsp, COM_REG_FIFO,
 		FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_1);
 		goto fifodelay;
+
+	case COM_TYPE_BCMAUXUART:
+		sc->sc_fifolen = 8;
+		fifo_msg = "BCM AUX UART, working fifo";
+		SET(sc->sc_hwflags, COM_HW_FIFO);
+		CSR_WRITE_1(regsp, COM_REG_FIFO,
+		FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_1);
+		goto fifodelay;
 	}
 
 	sc->sc_fifolen = 1;

Index: src/sys/dev/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.82 src/sys/dev/ic/comvar.h:1.83
--- src/sys/dev/ic/comvar.h:1.82	Fri May 27 20:01:49 2016
+++ src/sys/dev/ic/comvar.h	Mon Jul 31 09:25:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: comvar.h,v 1.82 2016/05/27 20:01:49 bouyer Exp $	*/
+/*	$NetBSD: comvar.h,v 1.83 2017/07/31 09:25:14 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -247,6 +247,7 @@ struct com_softc {
 #define	COM_TYPE_16550_NOERS	5	/* like a 16550, no ERS */
 #define	COM_TYPE_INGENIC	6	/* JZ4780 built-in */
 #define	COM_TYPE_TEGRA		7	/* NVIDIA Tegra built-in */
+#define	COM_TYPE_BCMAUXUART	8	/* BCM2835 AUX UART */
 
 	/* power management hooks */
 	int (*enable)(struct com_softc *);

CVS commit: src/sys/dev/ic

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jul 31 09:25:14 UTC 2017

Modified Files:
src/sys/dev/ic: com.c comvar.h

Log Message:
Add COM_TYPE_BCMAUXUART type for BCM2835 AUX UART.


To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 src/sys/dev/ic/com.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/ic/comvar.h

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

CVS commit: src/sys/dev/pci

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Mon Jul 31 06:41:01 UTC 2017

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

Log Message:
rename unclear functions. pointed out by msaitoh@n.o.


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

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Mon Jul 31 06:41:01 UTC 2017

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

Log Message:
rename unclear functions. pointed out by msaitoh@n.o.


To generate a diff of this commit:
cvs rdiff -u -r1.536 -r1.537 src/sys/dev/pci/if_wm.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.536 src/sys/dev/pci/if_wm.c:1.537
--- src/sys/dev/pci/if_wm.c:1.536	Fri Jul 28 10:34:58 2017
+++ src/sys/dev/pci/if_wm.c	Mon Jul 31 06:41:01 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.536 2017/07/28 10:34:58 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.537 2017/07/31 06:41:01 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.536 2017/07/28 10:34:58 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.537 2017/07/31 06:41:01 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -706,8 +706,8 @@ static int	wm_setup_legacy(struct wm_sof
 static int	wm_setup_msix(struct wm_softc *);
 static int	wm_init(struct ifnet *);
 static int	wm_init_locked(struct ifnet *);
-static void	wm_turnon(struct wm_softc *);
-static void	wm_turnoff(struct wm_softc *);
+static void	wm_unset_stopping_flags(struct wm_softc *);
+static void	wm_set_stopping_flags(struct wm_softc *);
 static void	wm_stop(struct ifnet *, int);
 static void	wm_stop_locked(struct ifnet *, int);
 static void	wm_dump_mbuf_chain(struct wm_softc *, struct mbuf *);
@@ -5121,7 +5121,7 @@ wm_setup_msix(struct wm_softc *sc)
 }
 
 static void
-wm_turnon(struct wm_softc *sc)
+wm_unset_stopping_flags(struct wm_softc *sc)
 {
 	int i;
 
@@ -5147,7 +5147,7 @@ wm_turnon(struct wm_softc *sc)
 }
 
 static void
-wm_turnoff(struct wm_softc *sc)
+wm_set_stopping_flags(struct wm_softc *sc)
 {
 	int i;
 
@@ -5812,7 +5812,7 @@ wm_init_locked(struct ifnet *ifp)
 	/* Set the receive filter. */
 	wm_set_filter(sc);
 
-	wm_turnon(sc);
+	wm_unset_stopping_flags(sc);
 
 	/* Start the one second link check clock. */
 	callout_reset(>sc_tick_ch, hz, wm_tick, sc);
@@ -5855,7 +5855,7 @@ wm_stop_locked(struct ifnet *ifp, int di
 		device_xname(sc->sc_dev), __func__));
 	KASSERT(WM_CORE_LOCKED(sc));
 
-	wm_turnoff(sc);
+	wm_set_stopping_flags(sc);
 
 	/* Stop the one second clock. */
 	callout_stop(>sc_tick_ch);