CVS commit: src/lib/libm/man

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Sep 28 05:51:26 UTC 2017

Modified Files:
src/lib/libm/man: hypot.3

Log Message:
Remove Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libm/man/hypot.3

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

Modified files:

Index: src/lib/libm/man/hypot.3
diff -u src/lib/libm/man/hypot.3:1.18 src/lib/libm/man/hypot.3:1.19
--- src/lib/libm/man/hypot.3:1.18	Tue Sep 26 15:42:54 2017
+++ src/lib/libm/man/hypot.3	Thu Sep 28 05:51:26 2017
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" from: @(#)hypot.3	6.7 (Berkeley) 5/6/91
-.\"	$NetBSD: hypot.3,v 1.18 2017/09/26 15:42:54 maya Exp $
+.\"	$NetBSD: hypot.3,v 1.19 2017/09/28 05:51:26 wiz Exp $
 .\"
 .Dd September 26, 2017
 .Dt HYPOT 3
@@ -87,10 +87,8 @@ are \*(Na for all
 .Em finite
 .Ar v ;
 with "reserved operand" in place of "\*(Na", the
-same is true on a
-.Tn VAX .
-But programmers on machines other than a
-.Tn VAX
+same is true on a VAX.
+But programmers on machines other than a VAX
 (it has no \*(If)
 might be surprised at first to discover that
 .Fn hypot "\(+-\*(If" "\*(Na"
@@ -106,10 +104,7 @@ Hence
 .Fn hypot "\*(If" "v"
 is independent of
 .Ar v .
-Unlike the reserved operand fault on a
-.Tn VAX ,
-the
-.Tn IEEE
+Unlike the reserved operand fault on a VAX, the IEEE
 \*(Na is designed to
 disappear when it turns out to be irrelevant, as it does in
 .Fn hypot "\*(If" "\*(Na" .

CVS commit: src/lib/libm/man

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Sep 28 05:51:26 UTC 2017

Modified Files:
src/lib/libm/man: hypot.3

Log Message:
Remove Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libm/man/hypot.3

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

CVS commit: src/external/bsd/cron/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Sep 28 02:32:51 UTC 2017

Modified Files:
src/external/bsd/cron/dist: do_command.c

Log Message:
Remove debugging log statement


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/cron/dist/do_command.c

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

Modified files:

Index: src/external/bsd/cron/dist/do_command.c
diff -u src/external/bsd/cron/dist/do_command.c:1.10 src/external/bsd/cron/dist/do_command.c:1.11
--- src/external/bsd/cron/dist/do_command.c:1.10	Mon Sep 25 04:30:46 2017
+++ src/external/bsd/cron/dist/do_command.c	Wed Sep 27 22:32:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: do_command.c,v 1.10 2017/09/25 08:30:46 christos Exp $	*/
+/*	$NetBSD: do_command.c,v 1.11 2017/09/28 02:32:51 christos Exp $	*/
 
 /* Copyright 1988,1990,1993,1994 by Paul Vixie
  * All rights reserved
@@ -25,7 +25,7 @@
 #if 0
 static char rcsid[] = "Id: do_command.c,v 1.9 2004/01/23 18:56:42 vixie Exp";
 #else
-__RCSID("$NetBSD: do_command.c,v 1.10 2017/09/25 08:30:46 christos Exp $");
+__RCSID("$NetBSD: do_command.c,v 1.11 2017/09/28 02:32:51 christos Exp $");
 #endif
 #endif
 
@@ -208,7 +208,6 @@ read_data(entry *e, const char *mailto, 
 			retval = ERROR_EXIT;
 			goto out;
 		}
-		log_itx(usernm, getpid(), "MAIL", "opened pipe `%s'", mailcmd);
 		(void)fprintf(mail, "From: root (Cron Daemon)\n");
 		(void)fprintf(mail, "To: %s\n", mailto);
 		(void)fprintf(mail, "Subject: Cron <%s@%s> %s\n",

CVS commit: src/external/bsd/cron/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Sep 28 02:32:51 UTC 2017

Modified Files:
src/external/bsd/cron/dist: do_command.c

Log Message:
Remove debugging log statement


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/cron/dist/do_command.c

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

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Sep 28 01:19:22 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
293


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.59 -r1.1.2.60 src/doc/CHANGES-8.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-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.59 src/doc/CHANGES-8.0:1.1.2.60
--- src/doc/CHANGES-8.0:1.1.2.59	Sat Sep 23 18:27:21 2017
+++ src/doc/CHANGES-8.0	Thu Sep 28 01:19:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.59 2017/09/23 18:27:21 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.60 2017/09/28 01:19:22 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -6050,3 +6050,12 @@ sys/arch/x68k/dev/vsvar.h			1.12-1.15 vi
 	Make vs(4) work again.
 	[isaki, ticket #172]
 
+sys/dev/usb/if_athn_usb.c			1.23
+
+	PR/52553 Panic on "ifconfig athn0 up"
+
+	Don't race for a transfer in athn_usb_init on the free list
+	for beacons.  Instead pre-assign a transfer to beacons in
+	athn_usb_alloc_tx_list
+	[skrll, ticket #293]
+

CVS commit: [netbsd-8] src/sys/dev/usb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Sep 28 01:18:55 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-8]: if_athn_usb.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #293):
sys/dev/usb/if_athn_usb.c: revision 1.23
PR/52553 Panic on "ifconfig athn0 up"
Don't race for a transfer in athn_usb_init on the free list for beacons.
Instead pre-assign a transfer to beacons in athn_usb_alloc_tx_list


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/dev/usb/if_athn_usb.c

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

CVS commit: [netbsd-8] src/sys/dev/usb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Sep 28 01:18:55 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-8]: if_athn_usb.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #293):
sys/dev/usb/if_athn_usb.c: revision 1.23
PR/52553 Panic on "ifconfig athn0 up"
Don't race for a transfer in athn_usb_init on the free list for beacons.
Instead pre-assign a transfer to beacons in athn_usb_alloc_tx_list


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/dev/usb/if_athn_usb.c

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

Modified files:

Index: src/sys/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.22 src/sys/dev/usb/if_athn_usb.c:1.22.2.1
--- src/sys/dev/usb/if_athn_usb.c:1.22	Thu Jun  1 02:45:11 2017
+++ src/sys/dev/usb/if_athn_usb.c	Thu Sep 28 01:18:55 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_athn_usb.c,v 1.22 2017/06/01 02:45:11 chs Exp $	*/
+/*	$NetBSD: if_athn_usb.c,v 1.22.2.1 2017/09/28 01:18:55 snj Exp $	*/
 /*	$OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.22 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.22.2.1 2017/09/28 01:18:55 snj Exp $");
 
 #ifdef	_KERNEL_OPT
 #include "opt_inet.h"
@@ -728,9 +728,15 @@ athn_usb_alloc_tx_list(struct athn_usb_s
 		/* Append this Tx buffer to our free list. */
 		TAILQ_INSERT_TAIL(>usc_tx_free_list, data, next);
 	}
-	if (error != 0)
+	if (error == 0) {
+		/* Steal one buffer for beacons. */
+		usc->usc_tx_bcn = TAILQ_FIRST(>usc_tx_free_list);
+		TAILQ_REMOVE(>usc_tx_free_list, usc->usc_tx_bcn, next);
+	} else {
 		athn_usb_free_tx_list(usc);
+	}
 	mutex_exit(>usc_tx_mtx);
+
 	return error;
 }
 
@@ -749,6 +755,10 @@ athn_usb_free_tx_list(struct athn_usb_so
 		if (xfer != NULL)
 			usbd_destroy_xfer(xfer);
 	}
+	if (usc->usc_tx_bcn) {
+		usbd_destroy_xfer(usc->usc_tx_bcn->xfer);
+		usc->usc_tx_bcn = NULL;
+	}
 }
 
 Static int
@@ -2756,12 +2766,6 @@ athn_usb_init_locked(struct ifnet *ifp)
 	usc->usc_cmdq.cur = usc->usc_cmdq.next = usc->usc_cmdq.queued = 0;
 	mutex_spin_exit(>usc_task_mtx);
 
-	/* Steal one buffer for beacons. */
-	mutex_enter(>usc_tx_mtx);
-	usc->usc_tx_bcn = TAILQ_FIRST(>usc_tx_free_list);
-	TAILQ_REMOVE(>usc_tx_free_list, usc->usc_tx_bcn, next);
-	mutex_exit(>usc_tx_mtx);
-
 	curchan = ic->ic_curchan;
 	extchan = NULL;
 

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Sep 28 01:19:22 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
293


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.59 -r1.1.2.60 src/doc/CHANGES-8.0

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

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Sep 27 22:31:54 UTC 2017

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

Log Message:
if there is no 'compatible' property try to guess the codec from the i2c
address


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/macppc/dev/deq.c

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

Modified files:

Index: src/sys/arch/macppc/dev/deq.c
diff -u src/sys/arch/macppc/dev/deq.c:1.11 src/sys/arch/macppc/dev/deq.c:1.12
--- src/sys/arch/macppc/dev/deq.c:1.11	Wed Sep 27 22:11:31 2017
+++ src/sys/arch/macppc/dev/deq.c	Wed Sep 27 22:31:53 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: deq.c,v 1.11 2017/09/27 22:11:31 macallan Exp $	*/
+/*	$NetBSD: deq.c,v 1.12 2017/09/27 22:31:53 macallan Exp $	*/
 
 /*-
  * Copyright (C) 2005 Michael Lorenz
@@ -32,7 +32,7 @@
  */
  
 #include 
-__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.11 2017/09/27 22:11:31 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.12 2017/09/27 22:31:53 macallan Exp $");
 
 #include 
 #include 
@@ -90,7 +90,14 @@ deq_attach(device_t parent, device_t sel
 	sc->sc_address = (ia->ia_addr & 0x7f);
 	sc->sc_i2c = ia->ia_tag;
 	if (OF_getprop(sc->sc_node, "compatible", name, 256) <= 0) {
-		strcpy(name, "unknown");
+		/* deq has no 'compatible' on my iBook G4 */
+		switch (sc->sc_address) {
+			case 0x35:
+strcpy(name, "tas3004");
+break;
+			default:
+strcpy(name, "unknown");
+		}
 	}
 	aprint_normal(" Audio Codec (%s)\n", name);
 }

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Sep 27 22:18:15 UTC 2017

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5_11_2

Log Message:
add obio and some child devices


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

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

Modified files:

Index: src/sys/arch/macppc/conf/POWERMAC_G5_11_2
diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.4 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.5
--- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.4	Fri Sep 22 18:09:48 2017
+++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2	Wed Sep 27 22:18:15 2017
@@ -115,8 +115,6 @@ spdmem* at memory? addr ?
 
 uni_n*	at mainbus?
 ki2c*	at uni_n?			# Keywest I2C
-iic*	at ki2c?
-admtemp* 	at iic?
 
 smu* 		at mainbus?
 #options 	SMU_DEBUG
@@ -131,6 +129,22 @@ pci*	at ppb? bus ?
 pchb*	at pci? dev ? function ?	# PCI-Host bridges
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 
+obio0		at pci? dev ? function ?
+zsc*		at obio?
+zstty*		at zsc? channel ?
+#snapper* 	at obio?
+ki2c*		at obio?	# Keywest I2C
+iic*		at ki2c?
+
+admtemp* 	at iic?
+deq* 		at iic?
+
+# Audio support
+#audio*	at audiobus?
+
+#spkr*	at audio?		# PC speaker (synthesized)
+#wsbell* at spkr?
+
 bge*	at pci? dev ? function ?	# gmac ethernet
 brgphy*	at mii? phy ?			# Broadcom BCM5400 PHYs
 ukphy*	at mii? phy ?			# generic unknown PHYs

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Sep 27 22:18:15 UTC 2017

Modified Files:
src/sys/arch/macppc/conf: POWERMAC_G5_11_2

Log Message:
add obio and some child devices


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

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

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Sep 27 22:11:31 UTC 2017

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

Log Message:
identify as 'Audio Codec' and print out which codec we found


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/dev/deq.c

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

Modified files:

Index: src/sys/arch/macppc/dev/deq.c
diff -u src/sys/arch/macppc/dev/deq.c:1.10 src/sys/arch/macppc/dev/deq.c:1.11
--- src/sys/arch/macppc/dev/deq.c:1.10	Fri Sep 22 03:10:46 2017
+++ src/sys/arch/macppc/dev/deq.c	Wed Sep 27 22:11:31 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: deq.c,v 1.10 2017/09/22 03:10:46 macallan Exp $	*/
+/*	$NetBSD: deq.c,v 1.11 2017/09/27 22:11:31 macallan Exp $	*/
 
 /*-
  * Copyright (C) 2005 Michael Lorenz
@@ -32,7 +32,7 @@
  */
  
 #include 
-__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.10 2017/09/22 03:10:46 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.11 2017/09/27 22:11:31 macallan Exp $");
 
 #include 
 #include 
@@ -82,11 +82,15 @@ deq_attach(device_t parent, device_t sel
 {
 	struct deq_softc *sc = device_private(self);
 	struct i2c_attach_args *ia = aux;
+	char name[256];
 
 	sc->sc_dev = self;
 	sc->sc_node = ia->ia_cookie;
 	sc->sc_parent = parent;
 	sc->sc_address = (ia->ia_addr & 0x7f);
 	sc->sc_i2c = ia->ia_tag;
-	aprint_normal(" Apple Digital Equalizer\n");
+	if (OF_getprop(sc->sc_node, "compatible", name, 256) <= 0) {
+		strcpy(name, "unknown");
+	}
+	aprint_normal(" Audio Codec (%s)\n", name);
 }

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Sep 27 22:11:31 UTC 2017

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

Log Message:
identify as 'Audio Codec' and print out which codec we found


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/dev/deq.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/macppc/dev

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Sep 27 22:10:19 UTC 2017

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

Log Message:
pass the right OF node to i2c devices


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/dev/ki2c.c

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

Modified files:

Index: src/sys/arch/macppc/dev/ki2c.c
diff -u src/sys/arch/macppc/dev/ki2c.c:1.22 src/sys/arch/macppc/dev/ki2c.c:1.23
--- src/sys/arch/macppc/dev/ki2c.c:1.22	Fri Sep 22 03:09:51 2017
+++ src/sys/arch/macppc/dev/ki2c.c	Wed Sep 27 22:10:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ki2c.c,v 1.22 2017/09/22 03:09:51 macallan Exp $	*/
+/*	$NetBSD: ki2c.c,v 1.23 2017/09/27 22:10:19 macallan Exp $	*/
 /*	Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp	*/
 
 /*-
@@ -169,7 +169,7 @@ ki2c_attach(device_t parent, device_t se
 		prop_dictionary_set(dev, "compatible", data);
 		prop_object_release(data);
 		prop_dictionary_set_uint32(dev, "addr", addr);
-		prop_dictionary_set_uint64(dev, "cookie", node);
+		prop_dictionary_set_uint64(dev, "cookie", devs);
 		prop_array_add(cfg, dev);
 		prop_object_release(dev);
 	skip:

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Sep 27 22:10:19 UTC 2017

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

Log Message:
pass the right OF node to i2c devices


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/dev/ki2c.c

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

CVS commit: src/external/bsd/file/dist/magic/magdir

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Wed Sep 27 21:04:05 UTC 2017

Modified Files:
src/external/bsd/file/dist/magic/magdir: netbsd

Log Message:
fix offset of segment count in NetBSD crashdump header.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/magdir/netbsd

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

Modified files:

Index: src/external/bsd/file/dist/magic/magdir/netbsd
diff -u src/external/bsd/file/dist/magic/magdir/netbsd:1.4 src/external/bsd/file/dist/magic/magdir/netbsd:1.5
--- src/external/bsd/file/dist/magic/magdir/netbsd:1.4	Thu May 25 00:11:26 2017
+++ src/external/bsd/file/dist/magic/magdir/netbsd	Wed Sep 27 21:04:05 2017
@@ -285,7 +285,7 @@
 >0	belong&0xfc00 0x1000	\b, STACK
 >4	leshort	x			\b, (headersize = %d
 >6	leshort	x			\b, segmentsize = %d
->6	lelong	x			\b, segments = %d)
+>8	lelong	x			\b, segments = %d)
 
 # little endian only for now.
 0	name		ktrace

CVS commit: src/external/bsd/file/dist/magic/magdir

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Wed Sep 27 21:04:05 UTC 2017

Modified Files:
src/external/bsd/file/dist/magic/magdir: netbsd

Log Message:
fix offset of segment count in NetBSD crashdump header.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/magdir/netbsd

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/arch/atari

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Sep 27 19:11:35 UTC 2017

Modified Files:
src/sys/arch/atari/dev [jdolecek-ncq]: atari5380.c dma.c fd.c wdc_mb.c
src/sys/arch/atari/include [jdolecek-ncq]: dma.h

Log Message:
pass ata channel interlock to st_dmagrab() so that it can release
and reacquire it if it sleeps


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/arch/atari/dev/atari5380.c
cvs rdiff -u -r1.27 -r1.27.48.1 src/sys/arch/atari/dev/dma.c
cvs rdiff -u -r1.84 -r1.84.6.1 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.38.28.3 -r1.38.28.4 src/sys/arch/atari/dev/wdc_mb.c
cvs rdiff -u -r1.11 -r1.11.52.1 src/sys/arch/atari/include/dma.h

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

Modified files:

Index: src/sys/arch/atari/dev/atari5380.c
diff -u src/sys/arch/atari/dev/atari5380.c:1.62 src/sys/arch/atari/dev/atari5380.c:1.62.8.1
--- src/sys/arch/atari/dev/atari5380.c:1.62	Sat Oct 18 08:33:25 2014
+++ src/sys/arch/atari/dev/atari5380.c	Wed Sep 27 19:11:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: atari5380.c,v 1.62 2014/10/18 08:33:25 snj Exp $	*/
+/*	$NetBSD: atari5380.c,v 1.62.8.1 2017/09/27 19:11:35 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.62 2014/10/18 08:33:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.62.8.1 2017/09/27 19:11:35 jdolecek Exp $");
 
 #include "opt_atariscsi.h"
 
@@ -794,7 +794,7 @@ falcon_claimed_dma(void)
 			return 0;
 		}
 		if (st_dmagrab((dma_farg)ncr_ctrl_intr, (dma_farg)run_main,
-		cur_softc, _lock, 1) == 0)
+		cur_softc, _lock, 1, NULL) == 0)
 			return 0;
 	}
 	return 1;
@@ -819,7 +819,7 @@ falcon_reconsider_dma(void)
 		 * waiting in the issue queue.
 		 */
 		st_dmagrab((dma_farg)ncr_ctrl_intr, (dma_farg)run_main,
-		cur_softc, _lock, 0);
+		cur_softc, _lock, 0, NULL);
 	}
 }
 

Index: src/sys/arch/atari/dev/dma.c
diff -u src/sys/arch/atari/dev/dma.c:1.27 src/sys/arch/atari/dev/dma.c:1.27.48.1
--- src/sys/arch/atari/dev/dma.c:1.27	Mon Apr 12 12:43:39 2010
+++ src/sys/arch/atari/dev/dma.c	Wed Sep 27 19:11:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: dma.c,v 1.27 2010/04/12 12:43:39 tsutsui Exp $	*/
+/*	$NetBSD: dma.c,v 1.27.48.1 2017/09/27 19:11:35 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -47,7 +47,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.27 2010/04/12 12:43:39 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.27.48.1 2017/09/27 19:11:35 jdolecek Exp $");
 
 #include 
 #include 
@@ -103,7 +103,7 @@ st_dma_init(void)
 
 int
 st_dmagrab(dma_farg int_func, dma_farg call_func, void *softc, int *lock_stat,
-int rcaller)
+int rcaller, kmutex_t *interlock)
 {
 	int s;
 	DMA_ENTRY *req;
@@ -131,7 +131,8 @@ st_dmagrab(dma_farg int_func, dma_farg c
 	if (TAILQ_FIRST(_active) != req) {
 		if (call_func == NULL) {
 			do {
-tsleep(_active, PRIBIO, "dmalck", 0);
+mtsleep(_active, PRIBIO, "dmalck", 0,
+interlock);
 			} while (*req->lock_stat != DMA_LOCK_GRANT);
 			splx(s);
 			return 1;

Index: src/sys/arch/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.84 src/sys/arch/atari/dev/fd.c:1.84.6.1
--- src/sys/arch/atari/dev/fd.c:1.84	Sun Apr 26 15:15:19 2015
+++ src/sys/arch/atari/dev/fd.c	Wed Sep 27 19:11:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.84 2015/04/26 15:15:19 mlelstv Exp $	*/
+/*	$NetBSD: fd.c,v 1.84.6.1 2017/09/27 19:11:35 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.84 2015/04/26 15:15:19 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.84.6.1 2017/09/27 19:11:35 jdolecek Exp $");
 
 #include 
 #include 
@@ -334,7 +334,7 @@ fdcattach(device_t parent, device_t self
 		fdsoftc.unit  = i;
 		fdsoftc.flags = 0;
 		st_dmagrab((dma_farg)fdcint, (dma_farg)fdtestdrv, ,
-		_stat, 0);
+		_stat, 0, NULL);
 		st_dmafree(, _stat);
 
 		if ((fdsoftc.flags & FLPF_NOTRESP) == 0) {
@@ -532,7 +532,7 @@ fdopen(dev_t dev, int flags, int devtype
 		sc->flags |= FLPF_INOPEN|FLPF_GETSTAT;
 		s = splbio();
 		st_dmagrab((dma_farg)fdcint, (dma_farg)fdstatus, sc,
-		_stat, 0);
+		_stat, 0, NULL);
 		while ((sc->flags & FLPF_GETSTAT) != 0)
 			tsleep((void *)sc, PRIBIO, "fdopen", 0);
 		splx(s);
@@ -638,7 +638,7 @@ fdstrategy(struct buf *bp)
 			callout_stop(>sc_motor_ch);
 		fd_state = FLP_IDLE;
 		st_dmagrab((dma_farg)fdcint, (dma_farg)fdstart, sc,
-		_stat, 0);
+		_stat, 0, NULL);
 	}
 	splx(s);
 
@@ -769,7 +769,8 @@ fddone(register struct fd_softc *sc)
 #ifdef FLP_DEBUG
 	printf("fddone: Staring job on unit %d\n", sc1->unit);
 #endif
-	st_dmagrab((dma_farg)fdcint, (dma_farg)fdstart, sc1, _stat, 0);
+	st_dmagrab((dma_farg)fdcint, (dma_farg)fdstart, sc1, _stat, 0,
+	NULL);
 }
 
 static int
@@ -1187,7 +1188,7 @@ fdmotoroff(struct fd_softc *sc)
 			int 

CVS commit: [jdolecek-ncq] src/sys/arch/atari

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Sep 27 19:11:35 UTC 2017

Modified Files:
src/sys/arch/atari/dev [jdolecek-ncq]: atari5380.c dma.c fd.c wdc_mb.c
src/sys/arch/atari/include [jdolecek-ncq]: dma.h

Log Message:
pass ata channel interlock to st_dmagrab() so that it can release
and reacquire it if it sleeps


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/arch/atari/dev/atari5380.c
cvs rdiff -u -r1.27 -r1.27.48.1 src/sys/arch/atari/dev/dma.c
cvs rdiff -u -r1.84 -r1.84.6.1 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.38.28.3 -r1.38.28.4 src/sys/arch/atari/dev/wdc_mb.c
cvs rdiff -u -r1.11 -r1.11.52.1 src/sys/arch/atari/include/dma.h

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:   Wed Sep 27 19:05:57 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: ata.c atavar.h

Log Message:
restore the atac_claim_hw and atac_free_hw hooks, they are used on atari


To generate a diff of this commit:
cvs rdiff -u -r1.132.8.37 -r1.132.8.38 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.92.8.27 -r1.92.8.28 src/sys/dev/ata/atavar.h

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:   Wed Sep 27 19:05:57 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: ata.c atavar.h

Log Message:
restore the atac_claim_hw and atac_free_hw hooks, they are used on atari


To generate a diff of this commit:
cvs rdiff -u -r1.132.8.37 -r1.132.8.38 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.92.8.27 -r1.92.8.28 src/sys/dev/ata/atavar.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.132.8.37 src/sys/dev/ata/ata.c:1.132.8.38
--- src/sys/dev/ata/ata.c:1.132.8.37	Mon Sep 25 22:43:46 2017
+++ src/sys/dev/ata/ata.c	Wed Sep 27 19:05:57 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata.c,v 1.132.8.37 2017/09/25 22:43:46 jdolecek Exp $	*/
+/*	$NetBSD: ata.c,v 1.132.8.38 2017/09/27 19:05:57 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.37 2017/09/25 22:43:46 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.38 2017/09/27 19:05:57 jdolecek Exp $");
 
 #include "opt_ata.h"
 
@@ -1355,6 +1355,10 @@ again:
 		goto out;
 	}
 
+	if (atac->atac_claim_hw)
+		if (!atac->atac_claim_hw(chp, 0))
+			goto out;
+
 	ATADEBUG_PRINT(("atastart: xfer %p channel %d drive %d\n", xfer,
 	chp->ch_channel, xfer->c_drive), DEBUG_XFERS);
 	if (drvp->drive_flags & ATA_DRIVE_RESET) {
@@ -1529,6 +1533,9 @@ ata_free_xfer(struct ata_channel *chp, s
 	}
 #endif
 
+	if (chp->ch_atac->atac_free_hw)
+		chp->ch_atac->atac_free_hw(chp);
+ 
 	KASSERT((chq->active_xfers_used & __BIT(xfer->c_slot)) == 0);
 	KASSERT((chq->queue_xfers_avail & __BIT(xfer->c_slot)) == 0);
 	chq->queue_xfers_avail |= __BIT(xfer->c_slot);

Index: src/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.92.8.27 src/sys/dev/ata/atavar.h:1.92.8.28
--- src/sys/dev/ata/atavar.h:1.92.8.27	Tue Sep 26 20:15:36 2017
+++ src/sys/dev/ata/atavar.h	Wed Sep 27 19:05:57 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: atavar.h,v 1.92.8.27 2017/09/26 20:15:36 jdolecek Exp $	*/
+/*	$NetBSD: atavar.h,v 1.92.8.28 2017/09/27 19:05:57 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -483,6 +483,13 @@ struct atac_softc {
 	void (*atac_probe)(struct ata_channel *);
 
 	/*
+	 * Optional callbacks to lock/unlock hardware.
+	 * Called with channel mutex held.
+	 */
+	int  (*atac_claim_hw)(struct ata_channel *, int);
+	void (*atac_free_hw)(struct ata_channel *);
+
+	/*
 	 * Optional callbacks to set drive mode.  Required for anything
 	 * but basic PIO operation.
 	 */

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

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Sep 27 19:04:05 UTC 2017

Modified Files:
src/sys/arch/atari/dev [jdolecek-ncq]: wdc_mb.c

Log Message:
g/c mistakely left over code


To generate a diff of this commit:
cvs rdiff -u -r1.38.28.2 -r1.38.28.3 src/sys/arch/atari/dev/wdc_mb.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/dev/wdc_mb.c
diff -u src/sys/arch/atari/dev/wdc_mb.c:1.38.28.2 src/sys/arch/atari/dev/wdc_mb.c:1.38.28.3
--- src/sys/arch/atari/dev/wdc_mb.c:1.38.28.2	Wed Sep 27 07:19:33 2017
+++ src/sys/arch/atari/dev/wdc_mb.c	Wed Sep 27 19:04:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_mb.c,v 1.38.28.2 2017/09/27 07:19:33 jdolecek Exp $	*/
+/*	$NetBSD: wdc_mb.c,v 1.38.28.3 2017/09/27 19:04:05 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.38.28.2 2017/09/27 07:19:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.38.28.3 2017/09/27 19:04:05 jdolecek Exp $");
 
 #include 
 #include 
@@ -95,11 +95,6 @@ wdc_mb_probe(device_t parent, cfdata_t c
 	if (!atari_realconfig)
 		return 0;
 
-	memset(, 0, sizeof(wdc));
-	memset(, 0, sizeof(ch));
-	ch.ch_atac = _atac;
-	wdc.regs = 
-
 	wdr.cmd_iot = wdr.ctl_iot = mb_alloc_bus_space_tag();
 	if (wdr.cmd_iot == NULL)
 		return 0;

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

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Sep 27 19:04:05 UTC 2017

Modified Files:
src/sys/arch/atari/dev [jdolecek-ncq]: wdc_mb.c

Log Message:
g/c mistakely left over code


To generate a diff of this commit:
cvs rdiff -u -r1.38.28.2 -r1.38.28.3 src/sys/arch/atari/dev/wdc_mb.c

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

CVS commit: src/lib/libc/gen

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 18:55:50 UTC 2017

Modified Files:
src/lib/libc/gen: isnan.3

Log Message:
move VAX notes to CAVEATS, clarify.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/isnan.3

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

Modified files:

Index: src/lib/libc/gen/isnan.3
diff -u src/lib/libc/gen/isnan.3:1.2 src/lib/libc/gen/isnan.3:1.3
--- src/lib/libc/gen/isnan.3:1.2	Thu Mar  4 23:49:31 2004
+++ src/lib/libc/gen/isnan.3	Wed Sep 27 18:55:50 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: isnan.3,v 1.2 2004/03/04 23:49:31 wiz Exp $
+.\"	$NetBSD: isnan.3,v 1.3 2017/09/27 18:55:50 maya Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" From: @(#)isinf.3	8.2 (Berkeley) 1/29/94
 .\"	from: NetBSD: isinf.3,v 1.10 2003/08/07 16:42:52 agc Exp
 .\"
-.Dd March 5, 2004
+.Dd September 27, 2017
 .Dt ISNAN 3
 .Os
 .Sh NAME
@@ -52,12 +52,6 @@ is not-a-number
 An argument represented in a format wider than its semantic type is
 converted to its semantic type first.
 The determination is then based on the type of the argument.
-.Ss IEEE 754
-It is determined whether the value of
-.Fa x
-is a NaN.
-.Ss VAX
-NaNs are not supported.
 .Sh RETURN VALUES
 The
 .Fn isnan
@@ -84,3 +78,8 @@ The
 .Fn isnan
 macro conforms to
 .St -isoC-99 .
+.Sh CAVEATS
+On VAX the
+.Fn isnan
+function always returns 0,
+as the architecture doesn't support NaN.

CVS commit: src/lib/libc/gen

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 18:55:50 UTC 2017

Modified Files:
src/lib/libc/gen: isnan.3

Log Message:
move VAX notes to CAVEATS, clarify.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/isnan.3

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

Re: CVS commit: src/lib/libc/gen (vax mentions moved to CAVEATs)

[Kamil Rytarowski]

On 27.09.2017 11:23, m...@netbsd.org wrote:
> On Wed, Sep 27, 2017 at 09:04:30AM +, Maya Rashish wrote:
>> Module Name: src
>> Committed By:maya
>> Date:Wed Sep 27 09:04:30 UTC 2017
>>
>> Modified Files:
>>  src/lib/libc/gen: isinf.3
>>
>> Log Message:
>> Move VAX notes to CAVEATS, clarify that it just returns zero
>>
>> The VAX isinf implementation is in sys/arch/vax/include/math.h.
> 
> If there is no objection to this I'll do isnan too
> (and whatever else I can find)
> 

On VAX infinites, NaN and signbit(3) are special.



signature.asc
Description: OpenPGP digital signature

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Sep 27 10:50:06 UTC 2017

Modified Files:
src/sys/arch/arm/nvidia: tegra210_car.c tegra_hdaudio.c

Log Message:
Tegra210 HDA support.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/nvidia/tegra210_car.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_hdaudio.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/arm/nvidia

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Sep 27 10:50:06 UTC 2017

Modified Files:
src/sys/arch/arm/nvidia: tegra210_car.c tegra_hdaudio.c

Log Message:
Tegra210 HDA support.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/nvidia/tegra210_car.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_hdaudio.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/nvidia/tegra210_car.c
diff -u src/sys/arch/arm/nvidia/tegra210_car.c:1.15 src/sys/arch/arm/nvidia/tegra210_car.c:1.16
--- src/sys/arch/arm/nvidia/tegra210_car.c:1.15	Wed Sep 27 10:19:48 2017
+++ src/sys/arch/arm/nvidia/tegra210_car.c	Wed Sep 27 10:50:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra210_car.c,v 1.15 2017/09/27 10:19:48 jmcneill Exp $ */
+/* $NetBSD: tegra210_car.c,v 1.16 2017/09/27 10:50:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra210_car.c,v 1.15 2017/09/27 10:19:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra210_car.c,v 1.16 2017/09/27 10:50:06 jmcneill Exp $");
 
 #include 
 #include 
@@ -448,6 +448,14 @@ static const char *mux_soc_therm_p[] =
 	{ "CLK_M", "PLL_C", "PLL_P", "PLL_A",
 	  "PLL_C2", "PLL_C4_OUT0", "PLL_C4_OUT1", "PLL_C4_OUT2" };
 
+static const char *mux_hda2codec_2x_p[] =
+	{ "PLL_P", "PLL_C2", "PLL_C4_OUT0", "PLL_A",
+	  "PLL_A", "PLL_C4_OUT1", "CLK_M", "PLL_C4_OUT2" };
+
+static const char *mux_hda_p[] =
+	{ "PLL_P", "PLL_C2", "PLL_C", "PLL_C4_OUT0",
+	  NULL, "PLL_C4_OUT1", "CLK_M", "PLL_C4_OUT2" };
+
 static struct tegra_clk tegra210_car_clocks[] = {
 	CLK_FIXED("CLK_M", TEGRA210_REF_FREQ),
 
@@ -520,6 +528,13 @@ static struct tegra_clk tegra210_car_clo
 		CAR_CLKSRC_SOC_THERM_REG, CAR_CLKSRC_SOC_THERM_SRC,
 		mux_soc_therm_p),
 
+	CLK_MUX("MUX_HDA2CODEC_2X",
+		CAR_CLKSRC_HDA2CODEC_2X_REG, CAR_CLKSRC_HDA2CODEC_2X_SRC,
+		mux_hda2codec_2x_p),
+	CLK_MUX("MUX_HDA",
+		CAR_CLKSRC_HDA_REG, CAR_CLKSRC_HDA_SRC,
+		mux_hda_p),
+
 	CLK_DIV("DIV_UARTA", "MUX_UARTA",
 		CAR_CLKSRC_UARTA_REG, CAR_CLKSRC_UART_DIV),
 	CLK_DIV("DIV_UARTB", "MUX_UARTB",
@@ -574,6 +589,11 @@ static struct tegra_clk tegra210_car_clo
 	CLK_DIV("DIV_SOC_THERM", "MUX_SOC_THERM",
 		CAR_CLKSRC_SOC_THERM_REG, CAR_CLKSRC_SOC_THERM_DIV),
 
+	CLK_DIV("DIV_HDA2CODEC_2X", "MUX_HDA2CODEC_2X",
+		CAR_CLKSRC_HDA2CODEC_2X_REG, CAR_CLKSRC_HDA2CODEC_2X_DIV),
+	CLK_DIV("DIV_HDA", "MUX_HDA",
+		CAR_CLKSRC_HDA_REG, CAR_CLKSRC_HDA_DIV),
+
 	CLK_GATE("PLL_U_OUT1", "DIV_PLL_U_OUT1",
 		 CAR_PLLU_OUTA_REG, CAR_PLLU_OUTA_REG, CAR_PLLU_OUTA_OUT1_CLKEN),
 	CLK_GATE("PLL_U_OUT2", "DIV_PLL_U_OUT2",
@@ -612,6 +632,9 @@ static struct tegra_clk tegra210_car_clo
 	CLK_GATE_U("AFI", "MSELECT", CAR_DEV_U_AFI),
 	CLK_GATE_V("TSENSOR", "DIV_TSENSOR", CAR_DEV_V_TSENSOR),
 	CLK_GATE_U("SOC_THERM", "DIV_SOC_THERM", CAR_DEV_U_SOC_THERM),
+	CLK_GATE_W("HDA2HDMI", "CLK_M", CAR_DEV_W_HDA2HDMICODEC),
+	CLK_GATE_V("HDA2CODEC_2X", "DIV_HDA2CODEC_2X", CAR_DEV_V_HDA2CODEC_2X),
+	CLK_GATE_V("HDA", "DIV_HDA", CAR_DEV_V_HDA),
 };
 
 struct tegra210_init_parent {

Index: src/sys/arch/arm/nvidia/tegra_hdaudio.c
diff -u src/sys/arch/arm/nvidia/tegra_hdaudio.c:1.8 src/sys/arch/arm/nvidia/tegra_hdaudio.c:1.9
--- src/sys/arch/arm/nvidia/tegra_hdaudio.c:1.8	Sun Apr 16 12:28:21 2017
+++ src/sys/arch/arm/nvidia/tegra_hdaudio.c	Wed Sep 27 10:50:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_hdaudio.c,v 1.8 2017/04/16 12:28:21 jmcneill Exp $ */
+/* $NetBSD: tegra_hdaudio.c,v 1.9 2017/09/27 10:50:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra_hdaudio.c,v 1.8 2017/04/16 12:28:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_hdaudio.c,v 1.9 2017/09/27 10:50:06 jmcneill Exp $");
 
 #include 
 #include 
@@ -85,7 +85,11 @@ CFATTACH_DECL2_NEW(tegra_hdaudio, sizeof
 static int
 tegra_hdaudio_match(device_t parent, cfdata_t cf, void *aux)
 {
-	const char * const compatible[] = { "nvidia,tegra124-hda", NULL };
+	const char * const compatible[] = {
+		"nvidia,tegra210-hda",
+		"nvidia,tegra124-hda",
+		NULL
+	};
 	struct fdt_attach_args * const faa = aux;
 
 	return of_match_compatible(faa->faa_phandle, compatible);

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Sep 27 10:31:29 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c

Log Message:
 Print device name in ixv_attach().


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.100 src/sys/dev/pci/ixgbe/ixgbe.c:1.101
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.100	Thu Aug 31 02:48:55 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Wed Sep 27 10:31:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.100 2017/08/31 02:48:55 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.101 2017/09/27 10:31:29 msaitoh Exp $ */
 
 /**
 
@@ -823,15 +823,9 @@ ixgbe_attach(device_t parent, device_t d
 	case ixgbe_mac_82599EB:
 		str = "82599EB";
 		break;
-	case ixgbe_mac_82599_vf:
-		str = "82599 VF";
-		break;
 	case ixgbe_mac_X540:
 		str = "X540";
 		break;
-	case ixgbe_mac_X540_vf:
-		str = "X540 VF";
-		break;
 	case ixgbe_mac_X550:
 		str = "X550";
 		break;
@@ -841,15 +835,6 @@ ixgbe_attach(device_t parent, device_t d
 	case ixgbe_mac_X550EM_a:
 		str = "X550EM A";
 		break;
-	case ixgbe_mac_X550_vf:
-		str = "X550 VF";
-		break;
-	case ixgbe_mac_X550EM_x_vf:
-		str = "X550EM X VF";
-		break;
-	case ixgbe_mac_X550EM_a_vf:
-		str = "X550EM A VF";
-		break;
 	default:
 		str = "Unknown";
 		break;

Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.65 src/sys/dev/pci/ixgbe/ixv.c:1.66
--- src/sys/dev/pci/ixgbe/ixv.c:1.65	Fri Sep 15 08:31:32 2017
+++ src/sys/dev/pci/ixgbe/ixv.c	Wed Sep 27 10:31:29 2017
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.65 2017/09/15 08:31:32 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.66 2017/09/27 10:31:29 msaitoh Exp $*/
 
 /**
 
@@ -284,6 +284,7 @@ ixv_attach(device_t parent, device_t dev
 	ixgbe_vendor_info_t *ent;
 	const struct pci_attach_args *pa = aux;
 	const char *apivstr;
+	const char *str;
 	char buf[256];
 
 	INIT_DEBUGOUT("ixv_attach: begin");
@@ -348,18 +349,23 @@ ixv_attach(device_t parent, device_t dev
 	switch (hw->device_id) {
 	case IXGBE_DEV_ID_82599_VF:
 		hw->mac.type = ixgbe_mac_82599_vf;
+		str = "82599 VF";
 		break;
 	case IXGBE_DEV_ID_X540_VF:
 		hw->mac.type = ixgbe_mac_X540_vf;
+		str = "X540 VF";
 		break;
 	case IXGBE_DEV_ID_X550_VF:
 		hw->mac.type = ixgbe_mac_X550_vf;
+		str = "X550 VF";
 		break;
 	case IXGBE_DEV_ID_X550EM_X_VF:
 		hw->mac.type = ixgbe_mac_X550EM_x_vf;
+		str = "X550EM X VF";
 		break;
 	case IXGBE_DEV_ID_X550EM_A_VF:
 		hw->mac.type = ixgbe_mac_X550EM_a_vf;
+		str = "X550EM A VF";
 		break;
 	default:
 		/* Shouldn't get here since probe succeeded */
@@ -368,6 +374,7 @@ ixv_attach(device_t parent, device_t dev
 		goto err_out;
 		break;
 	}
+	aprint_normal_dev(dev, "device %s\n", str);
 
 	ixv_init_device_features(adapter);
 

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Sep 27 10:31:29 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c

Log Message:
 Print device name in ixv_attach().


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/ixgbe/ixv.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/arm/nvidia

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Sep 27 10:19:48 UTC 2017

Modified Files:
src/sys/arch/arm/nvidia: tegra210_car.c

Log Message:
add SOC_THERM and TSENSOR clocks


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/nvidia/tegra210_car.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/nvidia/tegra210_car.c
diff -u src/sys/arch/arm/nvidia/tegra210_car.c:1.14 src/sys/arch/arm/nvidia/tegra210_car.c:1.15
--- src/sys/arch/arm/nvidia/tegra210_car.c:1.14	Tue Sep 26 16:12:45 2017
+++ src/sys/arch/arm/nvidia/tegra210_car.c	Wed Sep 27 10:19:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra210_car.c,v 1.14 2017/09/26 16:12:45 jmcneill Exp $ */
+/* $NetBSD: tegra210_car.c,v 1.15 2017/09/27 10:19:48 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra210_car.c,v 1.14 2017/09/26 16:12:45 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra210_car.c,v 1.15 2017/09/27 10:19:48 jmcneill Exp $");
 
 #include 
 #include 
@@ -440,6 +440,14 @@ static const char *mux_mselect_p[] =
 	{ "PLL_P", "PLL_C2", "PLL_C", "PLL_C4_OUT2",
 	  "PLL_C4_OUT1", "CLK_S", "CLK_M", "PLL_C4_OUT0" };
 
+static const char *mux_tsensor_p[] =
+	{ "PLL_P", "PLL_C2", "PLL_C", "PLL_C4_OUT0",
+	  "CLK_M", "PLL_C4_OUT1", "CLK_S", "PLL_C4_OUT2" };
+
+static const char *mux_soc_therm_p[] =
+	{ "CLK_M", "PLL_C", "PLL_P", "PLL_A",
+	  "PLL_C2", "PLL_C4_OUT0", "PLL_C4_OUT1", "PLL_C4_OUT2" };
+
 static struct tegra_clk tegra210_car_clocks[] = {
 	CLK_FIXED("CLK_M", TEGRA210_REF_FREQ),
 
@@ -505,6 +513,13 @@ static struct tegra_clk tegra210_car_clo
 		CAR_CLKSRC_MSELECT_REG, CAR_CLKSRC_MSELECT_SRC,
 		mux_mselect_p),
 
+	CLK_MUX("MUX_TSENSOR",
+		CAR_CLKSRC_TSENSOR_REG, CAR_CLKSRC_TSENSOR_SRC,
+		mux_tsensor_p),
+	CLK_MUX("MUX_SOC_THERM",
+		CAR_CLKSRC_SOC_THERM_REG, CAR_CLKSRC_SOC_THERM_SRC,
+		mux_soc_therm_p),
+
 	CLK_DIV("DIV_UARTA", "MUX_UARTA",
 		CAR_CLKSRC_UARTA_REG, CAR_CLKSRC_UART_DIV),
 	CLK_DIV("DIV_UARTB", "MUX_UARTB",
@@ -554,6 +569,11 @@ static struct tegra_clk tegra210_car_clo
 	CLK_DIV("DIV_MSELECT", "MUX_MSELECT",
 		CAR_CLKSRC_MSELECT_REG, CAR_CLKSRC_MSELECT_DIV),
 
+CLK_DIV("DIV_TSENSOR", "MUX_TSENSOR",
+CAR_CLKSRC_TSENSOR_REG, CAR_CLKSRC_TSENSOR_DIV),
+	CLK_DIV("DIV_SOC_THERM", "MUX_SOC_THERM",
+		CAR_CLKSRC_SOC_THERM_REG, CAR_CLKSRC_SOC_THERM_DIV),
+
 	CLK_GATE("PLL_U_OUT1", "DIV_PLL_U_OUT1",
 		 CAR_PLLU_OUTA_REG, CAR_PLLU_OUTA_REG, CAR_PLLU_OUTA_OUT1_CLKEN),
 	CLK_GATE("PLL_U_OUT2", "DIV_PLL_U_OUT2",
@@ -590,6 +610,8 @@ static struct tegra_clk tegra210_car_clo
 	CLK_GATE_V("MSELECT", "DIV_MSELECT", CAR_DEV_V_MSELECT),
 	CLK_GATE_U("PCIE", "CLK_M", CAR_DEV_U_PCIE),
 	CLK_GATE_U("AFI", "MSELECT", CAR_DEV_U_AFI),
+	CLK_GATE_V("TSENSOR", "DIV_TSENSOR", CAR_DEV_V_TSENSOR),
+	CLK_GATE_U("SOC_THERM", "DIV_SOC_THERM", CAR_DEV_U_SOC_THERM),
 };
 
 struct tegra210_init_parent {
@@ -602,6 +624,8 @@ struct tegra210_init_parent {
 	{ "SDMMC2",		"PLL_P", 0, 0 },
 	{ "SDMMC3",		"PLL_P", 0, 0 },
 	{ "SDMMC4",		"PLL_P", 0, 0 },
+	{ "SOC_THERM",		"PLL_P", 0, 0 },
+	{ "TSENSOR",		"CLK_M", 0, 0 },
 	{ "XUSB_GATE",		NULL, 0, 1 },
 	{ "XUSB_HOST_SRC",	"PLL_P", 10200, 0 },
 	{ "XUSB_FALCON_SRC",	"PLL_P", 20400, 0 },

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

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Sep 27 10:19:48 UTC 2017

Modified Files:
src/sys/arch/arm/nvidia: tegra210_car.c

Log Message:
add SOC_THERM and TSENSOR clocks


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/nvidia/tegra210_car.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/arm/nvidia

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Sep 27 10:19:14 UTC 2017

Modified Files:
src/sys/arch/arm/nvidia: tegra_pcie.c

Log Message:
enable PHYs


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_pcie.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/arm/nvidia

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Sep 27 10:19:14 UTC 2017

Modified Files:
src/sys/arch/arm/nvidia: tegra_pcie.c

Log Message:
enable PHYs


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_pcie.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/nvidia/tegra_pcie.c
diff -u src/sys/arch/arm/nvidia/tegra_pcie.c:1.21 src/sys/arch/arm/nvidia/tegra_pcie.c:1.22
--- src/sys/arch/arm/nvidia/tegra_pcie.c:1.21	Tue Sep 26 16:12:45 2017
+++ src/sys/arch/arm/nvidia/tegra_pcie.c	Wed Sep 27 10:19:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.21 2017/09/26 16:12:45 jmcneill Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.22 2017/09/27 10:19:13 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.21 2017/09/26 16:12:45 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.22 2017/09/27 10:19:13 jmcneill Exp $");
 
 #include 
 #include 
@@ -374,13 +374,21 @@ tegra_pcie_reset_port(struct tegra_pcie_
 static void
 tegra_pcie_enable_ports(struct tegra_pcie_softc * const sc)
 {
+	struct fdtbus_phy *phy;
 	const u_int *data;
-	int child, len;
+	int child, len, n;
 	uint32_t val;
 
 	for (child = OF_child(sc->sc_phandle); child; child = OF_peer(child)) {
 		if (!fdtbus_status_okay(child))
 			continue;
+
+		/* Enable PHYs */
+		for (n = 0; (phy = fdtbus_phy_get_index(child, n)) != NULL; n++)
+			if (fdtbus_phy_enable(phy, true) != 0)
+aprint_error_dev(sc->sc_dev, "couldn't enable %s phy #%d\n",
+fdtbus_get_string(child, "name"), n);
+
 		data = fdtbus_get_prop(child, "reg", );
 		if (data == NULL || len < 4)
 			continue;
@@ -393,6 +401,7 @@ tegra_pcie_enable_ports(struct tegra_pci
 		bus_space_write_4(sc->sc_bst, sc->sc_bsh_afi, AFI_PEXn_CTRL_REG(index), val);
 
 		tegra_pcie_reset_port(sc, index);
+
 	}
 }
 

CVS commit: src/lib/libm/man

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 10:12:47 UTC 2017

Modified Files:
src/lib/libm/man: fma.3

Log Message:
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/man/fma.3

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

Modified files:

Index: src/lib/libm/man/fma.3
diff -u src/lib/libm/man/fma.3:1.2 src/lib/libm/man/fma.3:1.3
--- src/lib/libm/man/fma.3:1.2	Sat Dec 12 23:55:42 2015
+++ src/lib/libm/man/fma.3	Wed Sep 27 10:12:47 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: fma.3,v 1.2 2015/12/12 23:55:42 wiz Exp $
+.\" $NetBSD: fma.3,v 1.3 2017/09/27 10:12:47 maya Exp $
 .\" Copyright (c) 2005 David Schultz 
 .\" All rights reserved.
 .\"
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD: head/lib/msun/man/fma.3 152755 2005-11-24 09:25:10Z joel $
 .\"
-.Dd November 23, 2015
+.Dd September 27, 2017
 .Dt FMA 3
 .Os
 .Sh NAME
@@ -120,7 +120,7 @@ The
 .Fn fmaf
 and
 .Fn fmal
-routines where imported into
+routines were imported into
 .Nx
 in
 .Nx 7.0 .

CVS commit: src/lib/libm/man

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 10:12:47 UTC 2017

Modified Files:
src/lib/libm/man: fma.3

Log Message:
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/man/fma.3

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

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Sep 27 10:05:05 UTC 2017

Modified Files:
src/sys/netinet: in_proto.c ip_input.c
src/sys/netinet6: in6_proto.c ip6_input.c ip6protosw.h
src/sys/sys: protosw.h

Log Message:
Take softnet_lock on pr_input properly if NET_MPSAFE

Currently softnet_lock is taken unnecessarily in some cases, e.g.,
icmp_input and encap4_input from ip_input, or not taken even if needed,
e.g., udp_input and tcp_input from ipsec4_common_input_cb. Fix them.

NFC if NET_MPSAFE is disabled (default).


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.360 -r1.361 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.118 -r1.119 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.181 -r1.182 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.25 -r1.26 src/sys/netinet6/ip6protosw.h
cvs rdiff -u -r1.66 -r1.67 src/sys/sys/protosw.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/in_proto.c
diff -u src/sys/netinet/in_proto.c:1.124 src/sys/netinet/in_proto.c:1.125
--- src/sys/netinet/in_proto.c:1.124	Thu Sep 21 07:15:34 2017
+++ src/sys/netinet/in_proto.c	Wed Sep 27 10:05:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_proto.c,v 1.124 2017/09/21 07:15:34 ozaki-r Exp $	*/
+/*	$NetBSD: in_proto.c,v 1.125 2017/09/27 10:05:04 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.124 2017/09/21 07:15:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.125 2017/09/27 10:05:04 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
@@ -72,6 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: in_proto.c,v
 #include "opt_dccp.h"
 #include "opt_sctp.h"
 #include "opt_compat_netbsd.h"
+#include "opt_net_mpsafe.h"
 #endif
 
 #include 
@@ -185,6 +186,38 @@ PR_WRAP_CTLOUTPUT(sctp_ctloutput)
 #define sctp_ctloutput	sctp_ctloutput_wrapper
 #endif
 
+#ifdef NET_MPSAFE
+PR_WRAP_INPUT(udp_input)
+PR_WRAP_INPUT(tcp_input)
+#ifdef DCCP
+PR_WRAP_INPUT(dccp_input)
+#endif
+#ifdef SCTP
+PR_WRAP_INPUT(sctp_input)
+#endif
+PR_WRAP_INPUT(rip_input)
+#if NETHERIP > 0
+PR_WRAP_INPUT(ip_etherip_input)
+#endif
+#if NPFSYNC > 0
+PR_WRAP_INPUT(pfsync_input)
+#endif
+PR_WRAP_INPUT(igmp_input)
+#ifdef PIM
+PR_WRAP_INPUT(pim_input)
+#endif
+
+#define	udp_input		udp_input_wrapper
+#define	tcp_input		tcp_input_wrapper
+#define	dccp_input		dccp_input_wrapper
+#define	sctp_input		sctp_input_wrapper
+#define	rip_input		rip_input_wrapper
+#define	ip_etherip_input	ip_etherip_input_wrapper
+#define	pfsync_input		pfsync_input_wrapper
+#define	igmp_input		igmp_input_wrapper
+#define	pim_input		pim_input_wrapper
+#endif
+
 #if defined(IPSEC)
 
 #ifdef IPSEC_RUMPKERNEL

Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.360 src/sys/netinet/ip_input.c:1.361
--- src/sys/netinet/ip_input.c:1.360	Thu Jul 27 06:59:28 2017
+++ src/sys/netinet/ip_input.c	Wed Sep 27 10:05:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.360 2017/07/27 06:59:28 ozaki-r Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.361 2017/09/27 10:05:04 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.360 2017/07/27 06:59:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.361 2017/09/27 10:05:04 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -826,9 +826,7 @@ ours:
 
 	const int off = hlen, nh = ip->ip_p;
 
-	SOFTNET_LOCK();
 	(*inetsw[ip_protox[nh]].pr_input)(m, off, nh);
-	SOFTNET_UNLOCK();
 	return;
 
 out:

Index: src/sys/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.118 src/sys/netinet6/in6_proto.c:1.119
--- src/sys/netinet6/in6_proto.c:1.118	Thu Sep 21 07:15:35 2017
+++ src/sys/netinet6/in6_proto.c	Wed Sep 27 10:05:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_proto.c,v 1.118 2017/09/21 07:15:35 ozaki-r Exp $	*/
+/*	$NetBSD: in6_proto.c,v 1.119 2017/09/27 10:05:05 ozaki-r Exp $	*/
 /*	$KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.118 2017/09/21 07:15:35 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.119 2017/09/27 10:05:05 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -70,6 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: in6_proto.c,
 #include "opt_ipsec.h"
 #include "opt_dccp.h"
 #include "opt_sctp.h"
+#include "opt_net_mpsafe.h"
 #endif
 
 #include 
@@ -184,6 +185,39 @@ PR_WRAP_CTLOUTPUT(sctp_ctloutput)
 #define sctp_ctloutput	sctp_ctloutput_wrapper
 #endif
 
+#ifdef NET_MPSAFE
+PR_WRAP_INPUT6(udp6_input)
+PR_WRAP_INPUT6(tcp6_input)
+#ifdef DCCP
+PR_WRAP_INPUT6(dccp6_input)
+#endif
+#ifdef SCTP
+PR_WRAP_INPUT6(sctp6_input)
+#endif
+PR_WRAP_INPUT6(rip6_input)
+PR_WRAP_INPUT6(dest6_input)

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Sep 27 10:05:05 UTC 2017

Modified Files:
src/sys/netinet: in_proto.c ip_input.c
src/sys/netinet6: in6_proto.c ip6_input.c ip6protosw.h
src/sys/sys: protosw.h

Log Message:
Take softnet_lock on pr_input properly if NET_MPSAFE

Currently softnet_lock is taken unnecessarily in some cases, e.g.,
icmp_input and encap4_input from ip_input, or not taken even if needed,
e.g., udp_input and tcp_input from ipsec4_common_input_cb. Fix them.

NFC if NET_MPSAFE is disabled (default).


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.360 -r1.361 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.118 -r1.119 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.181 -r1.182 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.25 -r1.26 src/sys/netinet6/ip6protosw.h
cvs rdiff -u -r1.66 -r1.67 src/sys/sys/protosw.h

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

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Sep 27 09:55:53 UTC 2017

Modified Files:
src/sys/netipsec: key.c

Log Message:
Add missing ifdef NET_MPSAFE


To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/netipsec/key.c

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

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Sep 27 09:55:53 UTC 2017

Modified Files:
src/sys/netipsec: key.c

Log Message:
Add missing ifdef NET_MPSAFE


To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.226 src/sys/netipsec/key.c:1.227
--- src/sys/netipsec/key.c:1.226	Wed Sep 27 07:27:29 2017
+++ src/sys/netipsec/key.c	Wed Sep 27 09:55:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.226 2017/09/27 07:27:29 ozaki-r Exp $	*/
+/*	$NetBSD: key.c,v 1.227 2017/09/27 09:55:52 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.226 2017/09/27 07:27:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.227 2017/09/27 09:55:52 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -804,6 +804,7 @@ key_sp_refcnt(const struct secpolicy *sp
 	return 0;
 }
 
+#ifdef NET_MPSAFE
 static void
 key_spd_pserialize_perform(void)
 {
@@ -821,6 +822,7 @@ key_spd_pserialize_perform(void)
 	key_spd.psz_performing = false;
 	cv_broadcast(_spd.cv_psz);
 }
+#endif
 
 /*
  * Remove the sp from the key_spd.splist and wait for references to the sp
@@ -1497,6 +1499,7 @@ key_freesp_so(struct secpolicy **sp)
 }
 #endif
 
+#ifdef NET_MPSAFE
 static void
 key_sad_pserialize_perform(void)
 {
@@ -1514,6 +1517,7 @@ key_sad_pserialize_perform(void)
 	key_sad.psz_performing = false;
 	cv_broadcast(_sad.cv_psz);
 }
+#endif
 
 /*
  * Remove the sav from the savlist of its sah and wait for references to the sav

Re: CVS commit: src/lib/libc/gen (vax mentions moved to CAVEATs)

[maya]

On Wed, Sep 27, 2017 at 09:04:30AM +, Maya Rashish wrote:
> Module Name:  src
> Committed By: maya
> Date: Wed Sep 27 09:04:30 UTC 2017
> 
> Modified Files:
>   src/lib/libc/gen: isinf.3
> 
> Log Message:
> Move VAX notes to CAVEATS, clarify that it just returns zero
> 
> The VAX isinf implementation is in sys/arch/vax/include/math.h.

If there is no objection to this I'll do isnan too
(and whatever else I can find)

CVS commit: src/lib/libm/complex

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 09:20:27 UTC 2017

Modified Files:
src/lib/libm/complex: cabs.3 cproj.3 creal.3

Log Message:
Mention tgmath cproj, creal, cabs

following copysign example use of "real-floating" with "complex-floating"


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/complex/cabs.3
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/complex/cproj.3 \
src/lib/libm/complex/creal.3

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

CVS commit: src/lib/libm/complex

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 09:20:27 UTC 2017

Modified Files:
src/lib/libm/complex: cabs.3 cproj.3 creal.3

Log Message:
Mention tgmath cproj, creal, cabs

following copysign example use of "real-floating" with "complex-floating"


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/complex/cabs.3
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/complex/cproj.3 \
src/lib/libm/complex/creal.3

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

Modified files:

Index: src/lib/libm/complex/cabs.3
diff -u src/lib/libm/complex/cabs.3:1.3 src/lib/libm/complex/cabs.3:1.4
--- src/lib/libm/complex/cabs.3:1.3	Tue Jan 29 02:05:08 2013
+++ src/lib/libm/complex/cabs.3	Wed Sep 27 09:20:27 2017
@@ -1,6 +1,6 @@
-.\" $NetBSD: cabs.3,v 1.3 2013/01/29 02:05:08 matt Exp $
+.\" $NetBSD: cabs.3,v 1.4 2017/09/27 09:20:27 maya Exp $
 .\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
+.Dd September 27, 2017
 .Dt CABS 3
 .Os
 .Sh NAME
@@ -16,6 +16,9 @@
 .Fn cabsf "float complex z"
 .Ft long double
 .Fn cabsl "long double complex z"
+.In tgmath.h
+.Ft complex-floating
+.Fn cabs "complex-floating z"
 .Sh DESCRIPTION
 These functions compute the complex absolute value (also called
 norm, modulus, or magnitude) of

Index: src/lib/libm/complex/cproj.3
diff -u src/lib/libm/complex/cproj.3:1.4 src/lib/libm/complex/cproj.3:1.5
--- src/lib/libm/complex/cproj.3:1.4	Thu Dec 27 21:34:10 2012
+++ src/lib/libm/complex/cproj.3	Wed Sep 27 09:20:27 2017
@@ -1,6 +1,6 @@
-.\" $NetBSD: cproj.3,v 1.4 2012/12/27 21:34:10 wiz Exp $
+.\" $NetBSD: cproj.3,v 1.5 2017/09/27 09:20:27 maya Exp $
 .\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd December 27, 2012
+.Dd September 27, 2017
 .Dt CPROJ 3
 .Os
 .Sh NAME
@@ -16,6 +16,9 @@
 .Fn cprojf "float complex z"
 .Ft long double
 .Fn cprojl "long double complex z"
+.In tgmath.h
+.Ft complex-floating
+.Fn cproj "complex-floating z"
 .Sh DESCRIPTION
 These functions compute a projection of
 .Ar z
Index: src/lib/libm/complex/creal.3
diff -u src/lib/libm/complex/creal.3:1.4 src/lib/libm/complex/creal.3:1.5
--- src/lib/libm/complex/creal.3:1.4	Thu Dec 27 21:34:10 2012
+++ src/lib/libm/complex/creal.3	Wed Sep 27 09:20:27 2017
@@ -1,6 +1,6 @@
-.\" $NetBSD: creal.3,v 1.4 2012/12/27 21:34:10 wiz Exp $
+.\" $NetBSD: creal.3,v 1.5 2017/09/27 09:20:27 maya Exp $
 .\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd December 27, 2012
+.Dd September 27, 2017
 .Dt CREAL 3
 .Os
 .Sh NAME
@@ -16,6 +16,9 @@
 .Fn crealf "float complex z"
 .Ft long double
 .Fn creall "long double complex z"
+.In tgmath.h
+.Ft complex-float
+.Fn creal "complex-float z"
 .Sh DESCRIPTION
 These functions compute the real part of
 .Ar z .

CVS commit: src/lib/libc/gen

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 09:04:30 UTC 2017

Modified Files:
src/lib/libc/gen: isinf.3

Log Message:
Move VAX notes to CAVEATS, clarify that it just returns zero

The VAX isinf implementation is in sys/arch/vax/include/math.h.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/gen/isinf.3

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

Modified files:

Index: src/lib/libc/gen/isinf.3
diff -u src/lib/libc/gen/isinf.3:1.12 src/lib/libc/gen/isinf.3:1.13
--- src/lib/libc/gen/isinf.3:1.12	Thu Mar  4 23:47:56 2004
+++ src/lib/libc/gen/isinf.3	Wed Sep 27 09:04:30 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: isinf.3,v 1.12 2004/03/04 23:47:56 wiz Exp $
+.\"	$NetBSD: isinf.3,v 1.13 2017/09/27 09:04:30 maya Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)isinf.3	8.2 (Berkeley) 1/29/94
 .\"
-.Dd March 5, 2004
+.Dd September 27, 2017
 .Dt ISINF 3
 .Os
 .Sh NAME
@@ -50,12 +50,6 @@ is an infinity (positive or negative).
 An argument represented in a format wider than its semantic type is
 converted to its semantic type first.
 The determination is then based on the type of the argument.
-.Ss IEEE 754
-It is determined whether the value of
-.Fa x
-is an infinity.
-.Ss VAX
-Infinities are not supported.
 .Sh RETURN VALUES
 The
 .Fn isinf
@@ -82,3 +76,8 @@ The
 .Fn isinf
 macro conforms to
 .St -isoC-99 .
+.Sh CAVEATS
+On VAX the
+.Fn isinf
+function always returns 0,
+as the architecture doesn't have a representation for infinity.

CVS commit: src/lib/libc/gen

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 09:04:30 UTC 2017

Modified Files:
src/lib/libc/gen: isinf.3

Log Message:
Move VAX notes to CAVEATS, clarify that it just returns zero

The VAX isinf implementation is in sys/arch/vax/include/math.h.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/gen/isinf.3

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

CVS commit: src/share/misc

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 08:43:19 UTC 2017

Modified Files:
src/share/misc: acronyms-o.real

Log Message:
Add an offensive acronym, 'ayfkm'


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/misc/acronyms-o.real

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

Modified files:

Index: src/share/misc/acronyms-o.real
diff -u src/share/misc/acronyms-o.real:1.4 src/share/misc/acronyms-o.real:1.5
--- src/share/misc/acronyms-o.real:1.4	Mon May 29 06:54:01 2017
+++ src/share/misc/acronyms-o.real	Wed Sep 27 08:43:19 2017
@@ -1,5 +1,6 @@
-# $NetBSD: acronyms-o.real,v 1.4 2017/05/29 06:54:01 pgoyette Exp $
+# $NetBSD: acronyms-o.real,v 1.5 2017/09/27 08:43:19 maya Exp $
 AFU	all fucked up
+AYFKM	are you fucking kidding me
 B/S	bullshit
 BAMF	bad-ass motherfucker
 BFD	big fucking deal

CVS commit: src/share/misc

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Sep 27 08:43:19 UTC 2017

Modified Files:
src/share/misc: acronyms-o.real

Log Message:
Add an offensive acronym, 'ayfkm'


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/misc/acronyms-o.real

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

CVS commit: src/usr.sbin/acpitools/acpidump

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Sep 27 08:14:18 UTC 2017

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
 Cosmetic change (tab and newline).


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/acpitools/acpidump/acpi.c

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

CVS commit: src/usr.sbin/acpitools/acpidump

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Sep 27 08:14:18 UTC 2017

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
 Cosmetic change (tab and newline).


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/acpitools/acpidump/acpi.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.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.27 src/usr.sbin/acpitools/acpidump/acpi.c:1.28
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.27	Wed Sep 27 05:43:55 2017
+++ src/usr.sbin/acpitools/acpidump/acpi.c	Wed Sep 27 08:14:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.27 2017/09/27 05:43:55 msaitoh Exp $ */
+/* $NetBSD: acpi.c,v 1.28 2017/09/27 08:14:18 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: acpi.c,v 1.27 2017/09/27 05:43:55 msaitoh Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.28 2017/09/27 08:14:18 msaitoh Exp $");
 
 #include 
 #include 
@@ -1253,8 +1253,9 @@ acpi_handle_dbgp(ACPI_TABLE_HEADER *sdp)
 		break;
 	}
 	printf("}\n");
-	printf("DebugPort=");
+	printf("\tDebugPort=");
 	acpi_print_gas(>DebugPort);
+	printf("\n");
 	printf(END_COMMENT);
 }
 

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Sep 27 07:27:29 UTC 2017

Modified Files:
src/sys/netipsec: key.c

Log Message:
Fix deadlock between pserialize_perform and localcount_drain

A typical ussage of localcount_drain looks like this:

  mutex_enter();
  item = remove_from_list();
  pserialize_perform(psz);
  localcount_drain(>localcount, , );
  mutex_exit();

This sequence can cause a deadlock which happens for example on the following
situation:

- Thread A calls localcount_drain which calls xc_broadcast after releasing
  a specified mutex
- Thread B enters the sequence and calls pserialize_perform with holding
  the mutex while pserialize_perform also calls xc_broadcast
- Thread C (xc_thread) that calls an xcall callback of localcount_drain tries
  to hold the mutex

xc_broadcast of thread B doesn't start until xc_broadcast of thread A
finishes, which is a feature of xcall(9). This means that pserialize_perform
never complete until xc_broadcast of thread A finishes. On the other hand,
thread C that is a callee of xc_broadcast of thread A sticks on the mutex.
Finally the threads block each other (A blocks B, B blocks C and C blocks A).

A possible fix is to serialize executions of the above sequence by another
mutex, but adding another mutex makes the code complex, so fix the deadlock
by another way; the fix is to release the mutex before pserialize_perform
and instead use a condvar to prevent pserialize_perform from being called
simultaneously.

Note that the deadlock has happened only if NET_MPSAFE is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/sys/netipsec/key.c

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

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Sep 27 07:27:29 UTC 2017

Modified Files:
src/sys/netipsec: key.c

Log Message:
Fix deadlock between pserialize_perform and localcount_drain

A typical ussage of localcount_drain looks like this:

  mutex_enter();
  item = remove_from_list();
  pserialize_perform(psz);
  localcount_drain(>localcount, , );
  mutex_exit();

This sequence can cause a deadlock which happens for example on the following
situation:

- Thread A calls localcount_drain which calls xc_broadcast after releasing
  a specified mutex
- Thread B enters the sequence and calls pserialize_perform with holding
  the mutex while pserialize_perform also calls xc_broadcast
- Thread C (xc_thread) that calls an xcall callback of localcount_drain tries
  to hold the mutex

xc_broadcast of thread B doesn't start until xc_broadcast of thread A
finishes, which is a feature of xcall(9). This means that pserialize_perform
never complete until xc_broadcast of thread A finishes. On the other hand,
thread C that is a callee of xc_broadcast of thread A sticks on the mutex.
Finally the threads block each other (A blocks B, B blocks C and C blocks A).

A possible fix is to serialize executions of the above sequence by another
mutex, but adding another mutex makes the code complex, so fix the deadlock
by another way; the fix is to release the mutex before pserialize_perform
and instead use a condvar to prevent pserialize_perform from being called
simultaneously.

Note that the deadlock has happened only if NET_MPSAFE is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.225 src/sys/netipsec/key.c:1.226
--- src/sys/netipsec/key.c:1.225	Mon Aug 21 07:38:42 2017
+++ src/sys/netipsec/key.c	Wed Sep 27 07:27:29 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.225 2017/08/21 07:38:42 knakahara Exp $	*/
+/*	$NetBSD: key.c,v 1.226 2017/09/27 07:27:29 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.225 2017/08/21 07:38:42 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.226 2017/09/27 07:27:29 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -237,26 +237,31 @@ static u_int32_t acq_seq = 0;
  *   - key_misc.lock must be held even for read accesses
  */
 
-static pserialize_t key_spd_psz __read_mostly;
-static pserialize_t key_sad_psz __read_mostly;
-
 /* SPD */
 static struct {
 	kmutex_t lock;
-	kcondvar_t cv;
+	kcondvar_t cv_lc;
 	struct pslist_head splist[IPSEC_DIR_MAX];
 	/*
 	 * The list has SPs that are set to a socket via
 	 * setsockopt(IP_IPSEC_POLICY) from userland. See ipsec_set_policy.
 	 */
 	struct pslist_head socksplist;
+
+	pserialize_t psz;
+	kcondvar_t cv_psz;
+	bool psz_performing;
 } key_spd __cacheline_aligned;
 
 /* SAD */
 static struct {
 	kmutex_t lock;
-	kcondvar_t cv;
+	kcondvar_t cv_lc;
 	struct pslist_head sahlist;
+
+	pserialize_t psz;
+	kcondvar_t cv_psz;
+	bool psz_performing;
 } key_sad __cacheline_aligned;
 
 /* Misc data */
@@ -799,6 +804,24 @@ key_sp_refcnt(const struct secpolicy *sp
 	return 0;
 }
 
+static void
+key_spd_pserialize_perform(void)
+{
+
+	KASSERT(mutex_owned(_spd.lock));
+
+	while (key_spd.psz_performing)
+		cv_wait(_spd.cv_psz, _spd.lock);
+	key_spd.psz_performing = true;
+	mutex_exit(_spd.lock);
+
+	pserialize_perform(key_spd.psz);
+
+	mutex_enter(_spd.lock);
+	key_spd.psz_performing = false;
+	cv_broadcast(_spd.cv_psz);
+}
+
 /*
  * Remove the sp from the key_spd.splist and wait for references to the sp
  * to be released. key_spd.lock must be held.
@@ -817,10 +840,10 @@ key_unlink_sp(struct secpolicy *sp)
 
 #ifdef NET_MPSAFE
 	KASSERT(mutex_ownable(softnet_lock));
-	pserialize_perform(key_spd_psz);
+	key_spd_pserialize_perform();
 #endif
 
-	localcount_drain(>localcount, _spd.cv, _spd.lock);
+	localcount_drain(>localcount, _spd.cv_lc, _spd.lock);
 }
 
 /*
@@ -1354,7 +1377,7 @@ key_sp_unref(struct secpolicy *sp, const
 	"DP SP:%p (ID=%u) from %s:%u; refcnt-- now %u\n",
 	sp, sp->id, where, tag, key_sp_refcnt(sp));
 
-	localcount_release(>localcount, _spd.cv, _spd.lock);
+	localcount_release(>localcount, _spd.cv_lc, _spd.lock);
 }
 
 static void
@@ -1396,7 +1419,7 @@ key_sa_unref(struct secasvar *sav, const
 	"DP cause refcnt--: SA:%p from %s:%u\n",
 	sav, where, tag);
 
-	localcount_release(>localcount, _sad.cv, _sad.lock);
+	localcount_release(>localcount, _sad.cv_lc, _sad.lock);
 }
 
 #if 0
@@ -1474,6 +1497,24 @@ key_freesp_so(struct secpolicy **sp)
 }
 #endif
 
+static void
+key_sad_pserialize_perform(void)
+{
+
+	KASSERT(mutex_owned(_sad.lock));
+
+	while (key_sad.psz_performing)
+		

CVS commit: [jdolecek-ncq] src/sys

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Sep 27 07:19:34 UTC 2017

Modified Files:
src/sys/arch/acorn32/eb7500atx [jdolecek-ncq]: rside.c
src/sys/arch/acorn32/mainbus [jdolecek-ncq]: wdc_pioc.c
src/sys/arch/acorn32/podulebus [jdolecek-ncq]: icside.c rapide.c
simide.c
src/sys/arch/amiga/dev [jdolecek-ncq]: efa.c wdc_acafh.c wdc_amiga.c
wdc_buddha.c wdc_xsurf.c
src/sys/arch/atari/dev [jdolecek-ncq]: wdc_mb.c
src/sys/arch/i386/pnpbios [jdolecek-ncq]: pciide_pnpbios.c
src/sys/arch/landisk/dev [jdolecek-ncq]: wdc_obio.c
src/sys/arch/mac68k/obio [jdolecek-ncq]: wdc_obio.c
src/sys/arch/macppc/dev [jdolecek-ncq]: kauai.c wdc_obio.c
src/sys/arch/playstation2/dev [jdolecek-ncq]: wdc_spd.c
src/sys/arch/prep/pnpbus [jdolecek-ncq]: wdc_pnpbus.c
src/sys/dev/ic [jdolecek-ncq]: mvsata.c ninjaata32.c wdc.c wdcvar.h
src/sys/dev/isa [jdolecek-ncq]: wdc_isa.c
src/sys/dev/pci [jdolecek-ncq]: pciide_common.c pdcsata.c satalink.c
svwsata.c viaide.c
src/sys/dev/pcmcia [jdolecek-ncq]: wdc_pcmcia.c

Log Message:
change wdc_init_shadow_regs() to accept only struct wdc_regs, it doesn't
touch anything else

factor out the probe-only struct ata_channel initialization to wdcprobe(), to
reduce duplication of logic in individual drivers, and to actually work now
that more init is needed beyond the memset()


To generate a diff of this commit:
cvs rdiff -u -r1.14.28.1 -r1.14.28.2 src/sys/arch/acorn32/eb7500atx/rside.c
cvs rdiff -u -r1.28.28.1 -r1.28.28.2 src/sys/arch/acorn32/mainbus/wdc_pioc.c
cvs rdiff -u -r1.32.28.1 -r1.32.28.2 src/sys/arch/acorn32/podulebus/icside.c
cvs rdiff -u -r1.30.28.1 -r1.30.28.2 src/sys/arch/acorn32/podulebus/rapide.c
cvs rdiff -u -r1.29.28.1 -r1.29.28.2 src/sys/arch/acorn32/podulebus/simide.c
cvs rdiff -u -r1.12.18.1 -r1.12.18.2 src/sys/arch/amiga/dev/efa.c
cvs rdiff -u -r1.3.24.1 -r1.3.24.2 src/sys/arch/amiga/dev/wdc_acafh.c
cvs rdiff -u -r1.38.6.1 -r1.38.6.2 src/sys/arch/amiga/dev/wdc_amiga.c
cvs rdiff -u -r1.8.28.1 -r1.8.28.2 src/sys/arch/amiga/dev/wdc_buddha.c
cvs rdiff -u -r1.2.30.2 -r1.2.30.3 src/sys/arch/amiga/dev/wdc_xsurf.c
cvs rdiff -u -r1.38.28.1 -r1.38.28.2 src/sys/arch/atari/dev/wdc_mb.c
cvs rdiff -u -r1.31.22.1 -r1.31.22.2 \
src/sys/arch/i386/pnpbios/pciide_pnpbios.c
cvs rdiff -u -r1.8.28.1 -r1.8.28.2 src/sys/arch/landisk/dev/wdc_obio.c
cvs rdiff -u -r1.27.18.1 -r1.27.18.2 src/sys/arch/mac68k/obio/wdc_obio.c
cvs rdiff -u -r1.36.4.1 -r1.36.4.2 src/sys/arch/macppc/dev/kauai.c
cvs rdiff -u -r1.59.4.1 -r1.59.4.2 src/sys/arch/macppc/dev/wdc_obio.c
cvs rdiff -u -r1.27.20.1 -r1.27.20.2 src/sys/arch/playstation2/dev/wdc_spd.c
cvs rdiff -u -r1.13.28.1 -r1.13.28.2 src/sys/arch/prep/pnpbus/wdc_pnpbus.c
cvs rdiff -u -r1.35.6.30 -r1.35.6.31 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.18.28.1 -r1.18.28.2 src/sys/dev/ic/ninjaata32.c
cvs rdiff -u -r1.283.2.16 -r1.283.2.17 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.97.26.2 -r1.97.26.3 src/sys/dev/ic/wdcvar.h
cvs rdiff -u -r1.59.28.3 -r1.59.28.4 src/sys/dev/isa/wdc_isa.c
cvs rdiff -u -r1.62.4.2 -r1.62.4.3 src/sys/dev/pci/pciide_common.c
cvs rdiff -u -r1.27.18.1 -r1.27.18.2 src/sys/dev/pci/pdcsata.c
cvs rdiff -u -r1.53.4.1 -r1.53.4.2 src/sys/dev/pci/satalink.c
cvs rdiff -u -r1.19 -r1.19.18.1 src/sys/dev/pci/svwsata.c
cvs rdiff -u -r1.84.18.1 -r1.84.18.2 src/sys/dev/pci/viaide.c
cvs rdiff -u -r1.124.18.1 -r1.124.18.2 src/sys/dev/pcmcia/wdc_pcmcia.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/acorn32/eb7500atx/rside.c
diff -u src/sys/arch/acorn32/eb7500atx/rside.c:1.14.28.1 src/sys/arch/acorn32/eb7500atx/rside.c:1.14.28.2
--- src/sys/arch/acorn32/eb7500atx/rside.c:1.14.28.1	Mon Apr 24 08:48:45 2017
+++ src/sys/arch/acorn32/eb7500atx/rside.c	Wed Sep 27 07:19:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rside.c,v 1.14.28.1 2017/04/24 08:48:45 jdolecek Exp $	*/
+/*	$NetBSD: rside.c,v 1.14.28.2 2017/09/27 07:19:33 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 2004 Christopher Gilbert
@@ -56,7 +56,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rside.c,v 1.14.28.1 2017/04/24 08:48:45 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rside.c,v 1.14.28.2 2017/09/27 07:19:33 jdolecek Exp $");
 
 #include 
 #include 
@@ -217,7 +217,7 @@ rside_attach(device_t parent, device_t s
 continue;
 			}
 		}
-		wdc_init_shadow_regs(cp);
+		wdc_init_shadow_regs(wdr);
 
 		if (bus_space_map(wdr->ctl_iot,
 		rside_info[channel].aux_register, 0x4, 0, >ctl_ioh))

Index: src/sys/arch/acorn32/mainbus/wdc_pioc.c
diff -u src/sys/arch/acorn32/mainbus/wdc_pioc.c:1.28.28.1 src/sys/arch/acorn32/mainbus/wdc_pioc.c:1.28.28.2
--- src/sys/arch/acorn32/mainbus/wdc_pioc.c:1.28.28.1	Tue Sep 26 22:13:08 2017
+++ src/sys/arch/acorn32/mainbus/wdc_pioc.c	Wed Sep 27 07:19:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_pioc.c,v 1.28.28.1 

CVS commit: [jdolecek-ncq] src/sys

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Wed Sep 27 07:19:34 UTC 2017

Modified Files:
src/sys/arch/acorn32/eb7500atx [jdolecek-ncq]: rside.c
src/sys/arch/acorn32/mainbus [jdolecek-ncq]: wdc_pioc.c
src/sys/arch/acorn32/podulebus [jdolecek-ncq]: icside.c rapide.c
simide.c
src/sys/arch/amiga/dev [jdolecek-ncq]: efa.c wdc_acafh.c wdc_amiga.c
wdc_buddha.c wdc_xsurf.c
src/sys/arch/atari/dev [jdolecek-ncq]: wdc_mb.c
src/sys/arch/i386/pnpbios [jdolecek-ncq]: pciide_pnpbios.c
src/sys/arch/landisk/dev [jdolecek-ncq]: wdc_obio.c
src/sys/arch/mac68k/obio [jdolecek-ncq]: wdc_obio.c
src/sys/arch/macppc/dev [jdolecek-ncq]: kauai.c wdc_obio.c
src/sys/arch/playstation2/dev [jdolecek-ncq]: wdc_spd.c
src/sys/arch/prep/pnpbus [jdolecek-ncq]: wdc_pnpbus.c
src/sys/dev/ic [jdolecek-ncq]: mvsata.c ninjaata32.c wdc.c wdcvar.h
src/sys/dev/isa [jdolecek-ncq]: wdc_isa.c
src/sys/dev/pci [jdolecek-ncq]: pciide_common.c pdcsata.c satalink.c
svwsata.c viaide.c
src/sys/dev/pcmcia [jdolecek-ncq]: wdc_pcmcia.c

Log Message:
change wdc_init_shadow_regs() to accept only struct wdc_regs, it doesn't
touch anything else

factor out the probe-only struct ata_channel initialization to wdcprobe(), to
reduce duplication of logic in individual drivers, and to actually work now
that more init is needed beyond the memset()


To generate a diff of this commit:
cvs rdiff -u -r1.14.28.1 -r1.14.28.2 src/sys/arch/acorn32/eb7500atx/rside.c
cvs rdiff -u -r1.28.28.1 -r1.28.28.2 src/sys/arch/acorn32/mainbus/wdc_pioc.c
cvs rdiff -u -r1.32.28.1 -r1.32.28.2 src/sys/arch/acorn32/podulebus/icside.c
cvs rdiff -u -r1.30.28.1 -r1.30.28.2 src/sys/arch/acorn32/podulebus/rapide.c
cvs rdiff -u -r1.29.28.1 -r1.29.28.2 src/sys/arch/acorn32/podulebus/simide.c
cvs rdiff -u -r1.12.18.1 -r1.12.18.2 src/sys/arch/amiga/dev/efa.c
cvs rdiff -u -r1.3.24.1 -r1.3.24.2 src/sys/arch/amiga/dev/wdc_acafh.c
cvs rdiff -u -r1.38.6.1 -r1.38.6.2 src/sys/arch/amiga/dev/wdc_amiga.c
cvs rdiff -u -r1.8.28.1 -r1.8.28.2 src/sys/arch/amiga/dev/wdc_buddha.c
cvs rdiff -u -r1.2.30.2 -r1.2.30.3 src/sys/arch/amiga/dev/wdc_xsurf.c
cvs rdiff -u -r1.38.28.1 -r1.38.28.2 src/sys/arch/atari/dev/wdc_mb.c
cvs rdiff -u -r1.31.22.1 -r1.31.22.2 \
src/sys/arch/i386/pnpbios/pciide_pnpbios.c
cvs rdiff -u -r1.8.28.1 -r1.8.28.2 src/sys/arch/landisk/dev/wdc_obio.c
cvs rdiff -u -r1.27.18.1 -r1.27.18.2 src/sys/arch/mac68k/obio/wdc_obio.c
cvs rdiff -u -r1.36.4.1 -r1.36.4.2 src/sys/arch/macppc/dev/kauai.c
cvs rdiff -u -r1.59.4.1 -r1.59.4.2 src/sys/arch/macppc/dev/wdc_obio.c
cvs rdiff -u -r1.27.20.1 -r1.27.20.2 src/sys/arch/playstation2/dev/wdc_spd.c
cvs rdiff -u -r1.13.28.1 -r1.13.28.2 src/sys/arch/prep/pnpbus/wdc_pnpbus.c
cvs rdiff -u -r1.35.6.30 -r1.35.6.31 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.18.28.1 -r1.18.28.2 src/sys/dev/ic/ninjaata32.c
cvs rdiff -u -r1.283.2.16 -r1.283.2.17 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.97.26.2 -r1.97.26.3 src/sys/dev/ic/wdcvar.h
cvs rdiff -u -r1.59.28.3 -r1.59.28.4 src/sys/dev/isa/wdc_isa.c
cvs rdiff -u -r1.62.4.2 -r1.62.4.3 src/sys/dev/pci/pciide_common.c
cvs rdiff -u -r1.27.18.1 -r1.27.18.2 src/sys/dev/pci/pdcsata.c
cvs rdiff -u -r1.53.4.1 -r1.53.4.2 src/sys/dev/pci/satalink.c
cvs rdiff -u -r1.19 -r1.19.18.1 src/sys/dev/pci/svwsata.c
cvs rdiff -u -r1.84.18.1 -r1.84.18.2 src/sys/dev/pci/viaide.c
cvs rdiff -u -r1.124.18.1 -r1.124.18.2 src/sys/dev/pcmcia/wdc_pcmcia.c

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