CVS commit: src/tests/net
Module Name:src Committed By: ozaki-r Date: Thu Jul 18 04:22:22 UTC 2019 Modified Files: src/tests/net: net_common.sh Log Message: tests: extract all kernel logs, not just a panic message, from rump_server.core To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/tests/net/net_common.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net
Module Name:src Committed By: ozaki-r Date: Thu Jul 18 04:22:22 UTC 2019 Modified Files: src/tests/net: net_common.sh Log Message: tests: extract all kernel logs, not just a panic message, from rump_server.core To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/tests/net/net_common.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/net_common.sh diff -u src/tests/net/net_common.sh:1.31 src/tests/net/net_common.sh:1.32 --- src/tests/net/net_common.sh:1.31 Mon May 13 17:55:08 2019 +++ src/tests/net/net_common.sh Thu Jul 18 04:22:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: net_common.sh,v 1.31 2019/05/13 17:55:08 bad Exp $ +# $NetBSD: net_common.sh,v 1.32 2019/07/18 04:22:22 ozaki-r Exp $ # # Copyright (c) 2016 Internet Initiative Japan Inc. # All rights reserved. @@ -389,7 +389,8 @@ extract_rump_server_core() if [ -f rump_server.core ]; then gdb -ex bt /usr/bin/rump_server rump_server.core - strings rump_server.core |grep panic + # Extract kernel logs including a panic message + strings rump_server.core |grep -E '^\[.+\] ' fi }
CVS commit: src/tests/net/ndp
Module Name:src Committed By: ozaki-r Date: Thu Jul 18 04:00:09 UTC 2019 Modified Files: src/tests/net/ndp: t_ndp.sh Log Message: tests: shorten the expire time of neighbor caches to reduce the runtime of the tests To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/tests/net/ndp/t_ndp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/ndp
Module Name:src Committed By: ozaki-r Date: Thu Jul 18 04:00:09 UTC 2019 Modified Files: src/tests/net/ndp: t_ndp.sh Log Message: tests: shorten the expire time of neighbor caches to reduce the runtime of the tests To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/tests/net/ndp/t_ndp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/ndp/t_ndp.sh diff -u src/tests/net/ndp/t_ndp.sh:1.32 src/tests/net/ndp/t_ndp.sh:1.33 --- src/tests/net/ndp/t_ndp.sh:1.32 Fri Jun 28 06:46:04 2019 +++ src/tests/net/ndp/t_ndp.sh Thu Jul 18 04:00:09 2019 @@ -1,4 +1,4 @@ -# $NetBSD: t_ndp.sh,v 1.32 2019/06/28 06:46:04 ozaki-r Exp $ +# $NetBSD: t_ndp.sh,v 1.33 2019/07/18 04:00:09 ozaki-r Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -121,10 +121,15 @@ ndp_cache_expiration_body() setup_dst_server setup_src_server + export RUMP_SERVER=$SOCKSRC + + # Shorten the expire time of cache entries + atf_check -s exit:0 -o match:'basereachable=7s0ms' \ + rump.ndp -i shmif0 basereachable=7000 + # # Check if a cache is expired expectedly # - export RUMP_SERVER=$SOCKSRC atf_check -s exit:0 -o ignore rump.ping6 -n -X $TIMEOUT -c 1 $IP6DST $DEBUG && rump.ndp -n -a @@ -714,6 +719,10 @@ ndp_cache_state_body() export RUMP_SERVER=$SOCKSRC + # Shorten the expire time of cache entries + atf_check -s exit:0 -o match:'basereachable=7s0ms' \ + rump.ndp -i shmif0 basereachable=7000 + # # Reachability confirmation (RFC 4861 7.3.3) #
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Thu Jul 18 03:52:27 UTC 2019 Modified Files: src/share/man/man4: ixv.4 Log Message: The VLAN hardware filiter function was implemeted, so remove the BUGS section. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/ixv.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Thu Jul 18 03:52:27 UTC 2019 Modified Files: src/share/man/man4: ixv.4 Log Message: The VLAN hardware filiter function was implemeted, so remove the BUGS section. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/ixv.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/ixv.4 diff -u src/share/man/man4/ixv.4:1.3 src/share/man/man4/ixv.4:1.4 --- src/share/man/man4/ixv.4:1.3 Wed May 9 08:03:55 2018 +++ src/share/man/man4/ixv.4 Thu Jul 18 03:52:26 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: ixv.4,v 1.3 2018/05/09 08:03:55 wiz Exp $ +.\" $NetBSD: ixv.4,v 1.4 2019/07/18 03:52:26 msaitoh Exp $ .\" .\" Copyright (c) 2018 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 9, 2018 +.Dd July 18, 2019 .Dt IXV 4 .Os .Sh NAME @@ -61,8 +61,3 @@ The .Nm driver was written by .An Intel Corporation Aq Mt freebsd...@mailbox.intel.com . -.Sh BUGS -VLAN over -.Nm -won't work because VLAN hardware filter function is not currently implemented -correctly.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Wed Jul 17 18:35:00 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of openresolv-3.9.1 To generate a diff of this commit: cvs rdiff -u -r1.1634 -r1.1635 src/doc/3RDPARTY cvs rdiff -u -r1.2552 -r1.2553 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1634 src/doc/3RDPARTY:1.1635 --- src/doc/3RDPARTY:1.1634 Wed Jul 3 15:52:35 2019 +++ src/doc/3RDPARTY Wed Jul 17 18:35:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1634 2019/07/03 15:52:35 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1635 2019/07/17 18:35:00 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1031,12 +1031,12 @@ Location: external/bsd/openpam/dist Notes: Package: openresolv -Version: 3.9.0 -Current Vers: 3.9.0 +Version: 3.9.1 +Current Vers: 3.9.1 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/openresolv/ Home Page: http://roy.marples.name/projects/openresolv/ -Date: 2019-01-09 +Date: 2019-07-17 Mailing List: openresolv-disc...@marples.name License: BSD (2-clause) Location: external/bsd/openresolv/dist Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2552 src/doc/CHANGES:1.2553 --- src/doc/CHANGES:1.2552 Wed Jul 17 03:35:43 2019 +++ src/doc/CHANGES Wed Jul 17 18:35:00 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2552 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2553 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -399,3 +399,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: tzcode: Updated to 2019b. [christos 20190703] network: Implement VLAN hardware filter. [msaitoh 20190717] ixg(4),ixv(4): Add VLAN hardware filter support. [msaitoh 20190717] + resolvconf(8): Import openresolv-3.9.1. [roy 20190717]
CVS commit: src/external/bsd/openresolv/dist
Module Name:src
Committed By: roy
Date: Wed Jul 17 18:31:43 UTC 2019
Modified Files:
src/external/bsd/openresolv/dist: Makefile libc.in pdnsd.in
resolvconf.in
Removed Files:
src/external/bsd/openresolv/dist: README
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/openresolv/dist/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openresolv/dist/README
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openresolv/dist/libc.in
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openresolv/dist/pdnsd.in
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openresolv/dist/resolvconf.in
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/openresolv/dist/Makefile
diff -u src/external/bsd/openresolv/dist/Makefile:1.1.1.1 src/external/bsd/openresolv/dist/Makefile:1.2
--- src/external/bsd/openresolv/dist/Makefile:1.1.1.1 Wed Jul 17 18:24:23 2019
+++ src/external/bsd/openresolv/dist/Makefile Wed Jul 17 18:31:43 2019
@@ -79,11 +79,6 @@ maninstall:
install: proginstall maninstall
-import:
- rm -rf /tmp/${DISTPREFIX}
- ${INSTALL} -d /tmp/${DISTPREFIX}
- cp README ${SRCS} /tmp/${DISTPREFIX}
-
dist-git:
git archive --prefix=${DISTPREFIX}/ ${GITREF} | xz >${DISTFILE}
@@ -103,3 +98,8 @@ distinfo: dist
${PGP} --clearsign --output=${DISTINFOSIGN} ${DISTINFO}
chmod 644 ${DISTINFOSIGN}
ls -l ${DISTFILE} ${DISTINFO} ${DISTINFOSIGN}
+
+import: dist
+ rm -rf /tmp/${DISTPREFIX}
+ ${INSTALL} -d /tmp/${DISTPREFIX}
+ tar xvJpf ${DISTFILE} -C /tmp
Index: src/external/bsd/openresolv/dist/libc.in
diff -u src/external/bsd/openresolv/dist/libc.in:1.3 src/external/bsd/openresolv/dist/libc.in:1.4
--- src/external/bsd/openresolv/dist/libc.in:1.3 Tue Oct 9 01:28:35 2018
+++ src/external/bsd/openresolv/dist/libc.in Wed Jul 17 18:31:43 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2007-2016 Roy Marples
+# Copyright (c) 2007-2019 Roy Marples
# All rights reserved
# libc subscriber for resolvconf
@@ -36,9 +36,9 @@ NL="
# sed may not be available, and this is faster on small files
key_get_value()
{
- local key="$1" x= line=
-
+ key="$1"
shift
+
if [ $# -eq 0 ]; then
while read -r line; do
case "$line" in
@@ -58,8 +58,6 @@ key_get_value()
keys_remove()
{
- local key x line found
-
while read -r line; do
found=false
for key do
@@ -79,7 +77,7 @@ local_nameservers="127.* 0.0.0.0 255.255
if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then
. "$SYSCONFDIR"/resolvconf.conf
elif [ -d "$SYSCONFDIR"/resolvconf ]; then
- SYSCONFDIR="$SYSCONFDIR/resolvconf/resolv.conf.d"
+ SYSCONFDIR="$SYSCONFDIR/resolvconf"
base="$SYSCONFDIR/resolv.conf.d/base"
if [ -f "$base" ]; then
prepend_nameservers="$(key_get_value "nameserver " "$base")"
@@ -112,7 +110,7 @@ signature="# Generated by resolvconf"
uniqify()
{
- local result=
+ result=
while [ -n "$1" ]; do
case " $result " in
*" $1 "*);;
Index: src/external/bsd/openresolv/dist/pdnsd.in
diff -u src/external/bsd/openresolv/dist/pdnsd.in:1.2 src/external/bsd/openresolv/dist/pdnsd.in:1.3
--- src/external/bsd/openresolv/dist/pdnsd.in:1.2 Mon Sep 24 21:58:11 2018
+++ src/external/bsd/openresolv/dist/pdnsd.in Wed Jul 17 18:31:43 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2010-2013 Roy Marples
+# Copyright (c) 2010-2018 Roy Marples
# All rights reserved
# pdnsd subscriber for resolvconf
@@ -41,14 +41,16 @@ signature_end="# End of resolvconf"
# but sed may not always be available at the time.
remove_markers()
{
- local m1="$1" m2="$2" x= line= in_marker=0
+ m1="$1"
+ m2="$2"
+ in_marker=0
shift; shift
if type sed >/dev/null 2>&1; then
sed "/^$m1/,/^$m2/d" $@
else
- for x; do
- while read -r line; do
+ for x do
+ while read line; do
case "$line" in
"$m1"*) in_marker=1;;
"$m2"*) in_marker=0;;
Index: src/external/bsd/openresolv/dist/resolvconf.in
diff -u src/external/bsd/openresolv/dist/resolvconf.in:1.4 src/external/bsd/openresolv/dist/resolvconf.in:1.5
--- src/external/bsd/openresolv/dist/resolvconf.in:1.4 Mon Oct 8 14:09:38 2018
+++ src/external/bsd/openresolv/dist/resolvconf.in Wed Jul 17 18:31:43 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2007-2016 Roy Marples
+# Copyright (c) 2007-2019 Roy Marples
# All rights reserved
# Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
RESOLVCONF="$0"
-OPENRESOLV_VERSION="3.9.0"
+OPENRESOLV_VERSION="3.9.1"
SYSCONFDIR=@SYSCONFDIR@
LIBEXECDIR=@LIBEXECDIR@
VARDIR=@VARDIR@
@@ -125,21 +125,22 @@ usage()
# If you think otherwise, capture a DNS trace and you'll see libc
# will strip it regardless.
# This also solves setting up duplicate zones in our subscribers.
-strip_trailing_dots()
+# Also strip any comments denoted by #.
+resolv_strip()
{
- local n= d=
-
- for n; do
- printf "$d%s"
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Wed Jul 17 18:31:43 UTC 2019 Modified Files: src/external/bsd/openresolv/dist: Makefile libc.in pdnsd.in resolvconf.in Removed Files: src/external/bsd/openresolv/dist: README Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/openresolv/dist/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openresolv/dist/README cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openresolv/dist/libc.in cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openresolv/dist/pdnsd.in cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openresolv/dist/resolvconf.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Wed Jul 17 18:24:24 UTC 2019 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15663 Log Message: Import openresolv-3.9.1 with the following changes: * More strict POSIX shell support * Interfaces have an implicit metric of 0 unless specified * Inline comments are stripped from nameserver and domain entries Status: Vendor Tag: roy Release Tags: openresolv-3-9-1 N src/external/bsd/openresolv/dist/config-null.mk N src/external/bsd/openresolv/dist/.gitignore N src/external/bsd/openresolv/dist/GNUmakefile N src/external/bsd/openresolv/dist/LICENSE N src/external/bsd/openresolv/dist/Makefile N src/external/bsd/openresolv/dist/README.md N src/external/bsd/openresolv/dist/pdns_recursor.in N src/external/bsd/openresolv/dist/configure C src/external/bsd/openresolv/dist/dnsmasq.in C src/external/bsd/openresolv/dist/libc.in C src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/pdnsd.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in N src/external/bsd/openresolv/dist/resolvconf.conf C src/external/bsd/openresolv/dist/resolvconf.in C src/external/bsd/openresolv/dist/unbound.in 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS import: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Wed Jul 17 18:24:24 UTC 2019 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15663 Log Message: Import openresolv-3.9.1 with the following changes: * More strict POSIX shell support * Interfaces have an implicit metric of 0 unless specified * Inline comments are stripped from nameserver and domain entries Status: Vendor Tag: roy Release Tags: openresolv-3-9-1 N src/external/bsd/openresolv/dist/config-null.mk N src/external/bsd/openresolv/dist/.gitignore N src/external/bsd/openresolv/dist/GNUmakefile N src/external/bsd/openresolv/dist/LICENSE N src/external/bsd/openresolv/dist/Makefile N src/external/bsd/openresolv/dist/README.md N src/external/bsd/openresolv/dist/pdns_recursor.in N src/external/bsd/openresolv/dist/configure C src/external/bsd/openresolv/dist/dnsmasq.in C src/external/bsd/openresolv/dist/libc.in C src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/pdnsd.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in N src/external/bsd/openresolv/dist/resolvconf.conf C src/external/bsd/openresolv/dist/resolvconf.in C src/external/bsd/openresolv/dist/unbound.in 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS commit: [netbsd-8] src/doc
Module Name:src
Committed By: martin
Date: Wed Jul 17 16:22:40 UTC 2019
Modified Files:
src/doc [netbsd-8]: CHANGES-8.2
Log Message:
Tickets #1291 - #1299
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-8.2
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.2
diff -u src/doc/CHANGES-8.2:1.1.2.8 src/doc/CHANGES-8.2:1.1.2.9
--- src/doc/CHANGES-8.2:1.1.2.8 Mon Jul 15 08:27:39 2019
+++ src/doc/CHANGES-8.2 Wed Jul 17 16:22:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.2,v 1.1.2.8 2019/07/15 08:27:39 martin Exp $
+# $NetBSD: CHANGES-8.2,v 1.1.2.9 2019/07/17 16:22:40 martin Exp $
A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2
release:
@@ -120,3 +120,123 @@ xsrc/external/mit/xf86-video-intel/dist/
list.h into this older version.
[mrg, ticket #1290]
+sys/dev/pci/pcidevs1.1367-1.1380
+sys/dev/pci/pcidevs.hregen
+sys/dev/pci/pcidevs_data.h regen
+
+ - Add other two Intel Core 8G host bridges.
+ - Add Intel Xeon E devices.
+ - Add some new Intel C620 LPC devices.
+ - Add some Intel Xeon Scalable processor's devices.
+ - Add some Intel Whisky Lake devices.
+ - Add Xeon D XFI.
+ - Add "(Hyper-V)" to Intel 0x15a9's description.
+ - Add Intel C3000 QSFP devices.
+ - Add Some Qlogic devices from OpenBSD.
+ - Rename Qlogic 0x3022's name from ISP3022 to ISP4022.
+ - Add IDs for SATA controllers VT8237S and VX855
+ - Modify some descriptions of Virtio devices from OpenBSD to identify
+ the functions.
+ - Add Phison PS5000 and PS5016 NVMe.
+ - Add some ServerWorks HT1100 devices from OpenBSD.
+ - Remove extra white spaces.
+ [msaitoh, ticket #1291]
+
+sys/dev/pci/pci_subr.c1.211,1.214
+
+ Fix a typo. Print extend capability from 0x25 to 0x29 correctly.
+ [msaitoh, ticket #1292]
+
+sys/arch/x86/include/specialreg.h 1.149
+
+ Define some new bits of CPUID Fn8000_0007 %edx AMD
+ Advanced Power Management leaf.
+ [msaitoh, ticket #1293]
+
+sys/dev/ic/nslm7x.c1.72
+sys/dev/ic/nslm7x.c1.73
+sys/dev/isa/wbsio.c1.25
+sys/dev/isa/wbsioreg.h1.9
+
+ Use pmf_device_{register,deregister}().
+ Identify Nuvoton NCT6798D correctly.
+ [msaitoh, ticket #1294]
+
+sys/dev/pci/pci_subr.c1.213
+sys/dev/pci/ppb.c1.69
+
+ Identify 16GT/s.
+ [msaitoh, ticket #1295]
+
+usr.sbin/cpuctl/arch/i386.c 1.91,1.93-1.95,1.100-1.103
+ (via patch)
+
+ - Handle NVMM and HAXM's signature.
+ - Regard "TCGTCGTCGTCG" as QEMU(TCG).
+ - Dump CPUID leaf 0x4000 if available (for -v option).
+ - Add Cascade Lake, Copper Lake.
+ - Add Future Xeon (Cannon Lake)
+ - Add 06_7DH for another Ice Lake.
+ - Add Coffee Lake based Xeon E.
+ - White space fix. No functional change.
+ [msaitoh, ticket #1296]
+
+sys/dev/usb/usbdevs1.737-1.741,1.743-1.752,
+ 1.756-1.759,1.763-1.770
+ (via patch)
+sys/dev/usb/usbdevs.hregen
+sys/dev/usb/usbdevs_data.h regen
+
+ - Add yet another moschip serial adapter chip.
+ - Add some classic Roland products from Shinichi Doyashiki in
+ PR kern/52385.
+ - Add Ralink RT73.
+ - Add Wacom Intuos2 A4 and Intuos Art pen tablets.
+ - Add ELAN keyboard.
+ - Add Sony UWA-BR100 WLAN adapter.
+ - Add the TP-LINK TL-WN823N (version 2).
+ - Add RT Systems RTS-03 USB to Serial Adapter.
+ - Add West Mountain Radio IDs from OpenBSD.
+ - Add LAN78xx family (Raspberry Pi 3B+) entries - PR kern/53105.
+ - Add Linux Foundation vendor ID, and their root hub device IDs.
+ - Apple Bluetooth adapter, as found on the G4 PowerBook FW-800
+ (PowerBook5,2).
+ - Add Yubico Yubikey devices.
+ - Add Huawei E182.
+ - Add the Sierra Wireless MC7304 and EM7455 USB modems.
+ - Add SMSC LAN7505 USB 2.0 gigabit ethernet device.
+ - Add Panasonic N5HBZ055 WiFi device reported by
+ David H. Gutteridge in PR kern/53647.
+ - Add Logitech Gamepad F310 and Logitech Dual Action Gamepad.
+ - Add D-Link LTE products.
+ - Add D-Link DWA-131 rev E "Wireless N300 Nano USB Adapter"
+ - Add Microsoft Natural Wireless Mouse 600 from Julian in
+ PR kern/44634.
+ - Add Gretag Macbeth/X-Rite Huey device ids.
+ - Add HP LP2[24]75w hub.
+ - Prefer longer "canonical" names and add some vendors (mainly from
+ FreeBSD r334649).
+ - Make whitespace much more consistent.
+ - Lowercase hexadecimal number.
+ - Update comment.
+ [msaitoh, ticket #1297]
+
+sys/dev/pci/if_wm.c1.633, 1.637-1.641 (via patch)
+sys/dev/pci/if_wmreg.h1.114 (via patch)
+
+ - Use unsigned to avoid undefined behavior.
+ - Print ICH/PCH's NVM version.
+ - Fix typo in comment. u_int*_t -> uint*_t. Whitespace fix.
+ [msaitoh, ticket #1298]
+
+sys/dev/usb/if_athn_usb.c 1.24,1.31-1.34 (via patch)
+
+ - Match BUFFALO CEWL-1 (Sony UWA-BR100 WLAN).
+ - Add support for Panasonic N5HBZ055, from David H. Gutteridge
+ in PR kern/53647.
+ - Resolves build on macppc by renaming imask to intr_mask as imask is
+ defined globally in
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Jul 17 16:22:40 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1291 - #1299 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-8.2 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/pci
Module Name:src
Committed By: martin
Date: Wed Jul 17 16:12:17 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c if_wmreg.h
Log Message:
Pull up the following revisions (via patch), requested by msaitoh in
ticket #1298:
sys/dev/pci/if_wm.c 1.633, 1.637-1.641
sys/dev/pci/if_wmreg.h 1.114
- Use unsigned to avoid undefined behavior.
- Print ICH/PCH's NVM version.
- Fix typo in comment. u_int*_t -> uint*_t. Whitespace fix.
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.32 -r1.508.4.33 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.98.6.8 -r1.98.6.9 src/sys/dev/pci/if_wmreg.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.32 src/sys/dev/pci/if_wm.c:1.508.4.33
--- src/sys/dev/pci/if_wm.c:1.508.4.32 Tue May 14 11:40:41 2019
+++ src/sys/dev/pci/if_wm.c Wed Jul 17 16:12:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.32 2019/05/14 11:40:41 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.33 2019/07/17 16:12:17 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.32 2019/05/14 11:40:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.33 2019/07/17 16:12:17 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -389,7 +389,7 @@ struct wm_txqueue {
WM_Q_EVCNT_DEFINE(txq, tusum6) /* TCP/UDP v6 cksums comp. */
WM_Q_EVCNT_DEFINE(txq, tso) /* TCP seg offload (IPv4) */
WM_Q_EVCNT_DEFINE(txq, tso6) /* TCP seg offload (IPv6) */
- WM_Q_EVCNT_DEFINE(txq, tsopain) /* Painful header manip. for TSO */
+ WM_Q_EVCNT_DEFINE(txq, tsopain) /* Painful header manip. for TSO */
WM_Q_EVCNT_DEFINE(txq, pcqdrop) /* Pkt dropped in pcq */
WM_Q_EVCNT_DEFINE(txq, descdrop)/* Pkt dropped in MAC desc ring */
/* other than toomanyseg */
@@ -543,10 +543,10 @@ struct wm_softc {
int sc_nqueues;
struct wm_queue *sc_queue;
- u_int sc_tx_process_limit; /* Tx processing repeat limit in softint */
- u_int sc_tx_intr_process_limit; /* Tx processing repeat limit in H/W intr */
- u_int sc_rx_process_limit; /* Rx processing repeat limit in softint */
- u_int sc_rx_intr_process_limit; /* Rx processing repeat limit in H/W intr */
+ u_int sc_tx_process_limit; /* Tx proc. repeat limit in softint */
+ u_int sc_tx_intr_process_limit; /* Tx proc. repeat limit in H/W intr */
+ u_int sc_rx_process_limit; /* Rx proc. repeat limit in softint */
+ u_int sc_rx_intr_process_limit; /* Rx proc. repeat limit in H/W intr */
int sc_affinity_offset;
@@ -600,9 +600,12 @@ struct wm_softc {
struct wm_nvmop nvm;
};
-#define WM_CORE_LOCK(_sc) if ((_sc)->sc_core_lock) mutex_enter((_sc)->sc_core_lock)
-#define WM_CORE_UNLOCK(_sc) if ((_sc)->sc_core_lock) mutex_exit((_sc)->sc_core_lock)
-#define WM_CORE_LOCKED(_sc) (!(_sc)->sc_core_lock || mutex_owned((_sc)->sc_core_lock))
+#define WM_CORE_LOCK(_sc) \
+ if ((_sc)->sc_core_lock) mutex_enter((_sc)->sc_core_lock)
+#define WM_CORE_UNLOCK(_sc) \
+ if ((_sc)->sc_core_lock) mutex_exit((_sc)->sc_core_lock)
+#define WM_CORE_LOCKED(_sc) \
+ (!(_sc)->sc_core_lock || mutex_owned((_sc)->sc_core_lock))
#define WM_RXCHAIN_RESET(rxq) \
do { \
@@ -638,7 +641,7 @@ do { \
#define CSR_WRITE(sc, reg, val) \
bus_space_write_4((sc)->sc_st, (sc)->sc_sh, (reg), (val))
#define CSR_WRITE_FLUSH(sc) \
- (void) CSR_READ((sc), WMREG_STATUS)
+ (void)CSR_READ((sc), WMREG_STATUS)
#define ICH8_FLASH_READ32(sc, reg) \
bus_space_read_4((sc)->sc_flasht, (sc)->sc_flashh, \
@@ -1813,7 +1816,7 @@ wm_attach(device_t parent, device_t self
/*
* Disable MSI for Errata:
* "Message Signaled Interrupt Feature May Corrupt Write Transactions"
- *
+ *
* 82544: Errata 25
* 82540: Errata 6 (easy to reproduce device timeout)
* 82545: Errata 4 (easy to reproduce device timeout)
@@ -1913,7 +1916,7 @@ wm_attach(device_t parent, device_t self
preg &= ~PCI_COMMAND_INVALIDATE_ENABLE;
pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, preg);
- /* power up chip */
+ /* Power up chip */
if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self, NULL))
&& error != EOPNOTSUPP) {
aprint_error_dev(sc->sc_dev, "cannot activate %d\n", error);
@@ -1973,7 +1976,7 @@ alloc_retry:
goto alloc_retry;
}
} else if (pci_intr_type(pc, sc->sc_intrs[0]) == PCI_INTR_TYPE_MSI) {
- wm_adjust_qnum(sc, 0); /* must not use multiqueue */
+ wm_adjust_qnum(sc, 0); /* Must not use multiqueue */
error = wm_setup_legacy(sc);
if (error) {
pci_intr_release(sc->sc_pc, sc->sc_intrs,
@@ -1985,7 +1988,7 @@ alloc_retry:
goto alloc_retry;
}
} else {
- wm_adjust_qnum(sc, 0); /* must not use multiqueue */
+ wm_adjust_qnum(sc,
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Wed Jul 17 16:20:26 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-8]: if_athn_usb.c
Log Message:
Pull up the following revisions (via patch), requested by msaitoh
in ticket #1299:
sys/dev/usb/if_athn_usb.c 1.24,1.31-1.34
- Match BUFFALO CEWL-1 (Sony UWA-BR100 WLAN).
- Add support for Panasonic N5HBZ055, from David H. Gutteridge
in PR kern/53647.
- Resolves build on macppc by renaming imask to intr_mask as imask is
defined globally in sys/arch/powerpc/include/intr.h.
- Use pmf(9).
- Fix the detach path to prevent panic.
To generate a diff of this commit:
cvs rdiff -u -r1.22.2.3 -r1.22.2.4 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.2.3 src/sys/dev/usb/if_athn_usb.c:1.22.2.4
--- src/sys/dev/usb/if_athn_usb.c:1.22.2.3 Wed Aug 8 10:28:35 2018
+++ src/sys/dev/usb/if_athn_usb.c Wed Jul 17 16:20:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.22.2.3 2018/08/08 10:28:35 martin Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.22.2.4 2019/07/17 16:20:26 martin 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.2.3 2018/08/08 10:28:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.22.2.4 2019/07/17 16:20:26 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -223,7 +223,9 @@ athn_usb_lookup(int vendor, int product)
_D( LITEON, LITEON_AR9271, NONE ),
_D( NETGEAR, NETGEAR_WNA1100, NONE ),
_D( NETGEAR, NETGEAR_WNDA3200, AR7010 ),
- _D( VIA, VIA_AR9271, NONE )
+ _D( VIA, VIA_AR9271, NONE ),
+ _D( MELCO, MELCO_CEWL_1, AR7010 ),
+ _D( PANASONIC, PANASONIC_N5HBZ055, AR7010 ),
#undef _D
};
@@ -323,6 +325,9 @@ athn_usb_attach(device_t parent, device_
config_mountroot(self, athn_usb_attachhook);
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, usc->usc_udev, sc->sc_dev);
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, "couldn't establish power handler\n");
+
return;
fail:
@@ -473,6 +478,8 @@ athn_usb_detach(device_t self, int flags
DPRINTFN(DBG_FN, usc, "\n");
+ pmf_device_deregister(self);
+
mutex_enter(>usc_lock);
usc->usc_dying = 1;
mutex_exit(>usc_lock);
@@ -501,6 +508,7 @@ athn_usb_detach(device_t self, int flags
athn_usb_wait_async(usc);
+ athn_usb_stop(>sc_if, 0);
usb_rem_task_wait(usc->usc_udev, >usc_task, USB_TASKQ_DRIVER,
NULL);
@@ -516,6 +524,7 @@ athn_usb_detach(device_t self, int flags
athn_usb_free_rx_list(usc);
athn_usb_free_tx_list(usc);
athn_usb_free_tx_cmd(usc);
+ athn_usb_free_tx_msg(usc);
/* Close Tx/Rx pipes. */
athn_usb_close_pipes(usc);
@@ -757,10 +766,6 @@ 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
@@ -1420,7 +1425,7 @@ athn_usb_newstate_cb(struct athn_usb_sof
struct athn_softc *sc = >usc_sc;
struct ieee80211com *ic = >sc_ic;
enum ieee80211_state ostate, nstate;
- uint32_t reg, imask;
+ uint32_t reg, intr_mask;
int s;
DPRINTFN(DBG_FN, sc, "\n");
@@ -1477,13 +1482,13 @@ athn_usb_newstate_cb(struct athn_usb_sof
if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
athn_set_hostap_timers(sc);
/* Enable software beacon alert interrupts. */
- imask = htobe32(AR_IMR_SWBA);
+ intr_mask = htobe32(AR_IMR_SWBA);
} else
#endif
{
athn_set_sta_timers(sc);
/* Enable beacon miss interrupts. */
- imask = htobe32(AR_IMR_BMISS);
+ intr_mask = htobe32(AR_IMR_BMISS);
/* Stop receiving beacons from other BSS. */
reg = AR_READ(sc, AR_RX_FILTER);
@@ -1493,7 +1498,7 @@ athn_usb_newstate_cb(struct athn_usb_sof
AR_WRITE_BARRIER(sc);
}
athn_usb_wmi_xcmd(usc, AR_WMI_CMD_ENABLE_INTR,
- , sizeof(imask), NULL);
+ _mask, sizeof(intr_mask), NULL);
break;
}
if (!usc->usc_dying)
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 17 16:12:17 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: if_wm.c if_wmreg.h Log Message: Pull up the following revisions (via patch), requested by msaitoh in ticket #1298: sys/dev/pci/if_wm.c 1.633, 1.637-1.641 sys/dev/pci/if_wmreg.h 1.114 - Use unsigned to avoid undefined behavior. - Print ICH/PCH's NVM version. - Fix typo in comment. u_int*_t -> uint*_t. Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.508.4.32 -r1.508.4.33 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.98.6.8 -r1.98.6.9 src/sys/dev/pci/if_wmreg.h 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
Module Name:src Committed By: martin Date: Wed Jul 17 16:20:26 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-8]: if_athn_usb.c Log Message: Pull up the following revisions (via patch), requested by msaitoh in ticket #1299: sys/dev/usb/if_athn_usb.c 1.24,1.31-1.34 - Match BUFFALO CEWL-1 (Sony UWA-BR100 WLAN). - Add support for Panasonic N5HBZ055, from David H. Gutteridge in PR kern/53647. - Resolves build on macppc by renaming imask to intr_mask as imask is defined globally in sys/arch/powerpc/include/intr.h. - Use pmf(9). - Fix the detach path to prevent panic. To generate a diff of this commit: cvs rdiff -u -r1.22.2.3 -r1.22.2.4 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
Module Name:src Committed By: martin Date: Wed Jul 17 16:08:12 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-8]: usbdevs.h usbdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.727.2.3 -r1.727.2.4 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.728.2.3 -r1.728.2.4 src/sys/dev/usb/usbdevs_data.h 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
Module Name:src Committed By: martin Date: Wed Jul 17 16:07:38 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-8]: usbdevs Log Message: Pull up the following revisions (via patch), requested by msaitoh in ticket #1297: sys/dev/usb/usbdevs 1.737-1.741,1.743-1.752, 1.756-1.759,1.763-1.770 - Add yet another moschip serial adapter chip. - Add some classic Roland products from Shinichi Doyashiki in PR kern/52385. - Add Ralink RT73. - Add Wacom Intuos2 A4 and Intuos Art pen tablets. - Add ELAN keyboard. - Add Sony UWA-BR100 WLAN adapter. - Add the TP-LINK TL-WN823N (version 2). - Add RT Systems RTS-03 USB to Serial Adapter. - Add West Mountain Radio IDs from OpenBSD. - Add LAN78xx family (Raspberry Pi 3B+) entries - PR kern/53105. - Add Linux Foundation vendor ID, and their root hub device IDs. - Apple Bluetooth adapter, as found on the G4 PowerBook FW-800 (PowerBook5,2). - Add Yubico Yubikey devices. - Add Huawei E182. - Add the Sierra Wireless MC7304 and EM7455 USB modems. - Add SMSC LAN7505 USB 2.0 gigabit ethernet device. - Add Panasonic N5HBZ055 WiFi device reported by David H. Gutteridge in PR kern/53647. - Add Logitech Gamepad F310 and Logitech Dual Action Gamepad. - Add D-Link LTE products. - Add D-Link DWA-131 rev E "Wireless N300 Nano USB Adapter" - Add Microsoft Natural Wireless Mouse 600 from Julian in PR kern/44634. - Add Gretag Macbeth/X-Rite Huey device ids. - Add HP LP2[24]75w hub. - Prefer longer "canonical" names and add some vendors (mainly from FreeBSD r334649). - Make whitespace much more consistent. - Lowercase hexadecimal number. - Update comment. To generate a diff of this commit: cvs rdiff -u -r1.736.2.3 -r1.736.2.4 src/sys/dev/usb/usbdevs 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.736.2.3 src/sys/dev/usb/usbdevs:1.736.2.4 --- src/sys/dev/usb/usbdevs:1.736.2.3 Thu Feb 7 06:13:26 2019 +++ src/sys/dev/usb/usbdevs Wed Jul 17 16:07:38 2019 @@ -1,6 +1,6 @@ -$NetBSD: usbdevs,v 1.736.2.3 2019/02/07 06:13:26 msaitoh Exp $ +$NetBSD: usbdevs,v 1.736.2.4 2019/07/17 16:07:38 martin Exp $ -/* +/*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. * All rights reserved. * @@ -31,7 +31,7 @@ $NetBSD: usbdevs,v 1.736.2.3 2019/02/07 */ /* - * Use "make -f Makefile.usbdevs" to regenerate usbdevs.h and usbdevs_data.h + * Follow the handling instructions in Makefile.usbdevs */ /* @@ -62,7 +62,8 @@ vendor UNKNOWN1 0x0053 Unknown vendor vendor UNKNOWN2 0x0105 Unknown vendor vendor EGALAX2 0x0123 eGalax, Inc. vendor QUAN 0x01e1 Quan -vendor CHIPSBANK 0x0204 Chipsbank +vendor CHIPSBANK 0x0204 Chipsbank Microelectronics Co. +vendor HUMAX 0x02ad HUMAX vendor AOX 0x03e8 AOX vendor ATMEL 0x03eb Atmel vendor MITSUMI 0x03ee Mitsumi @@ -91,9 +92,10 @@ vendor ALPS 0x044e Alps Electric vendor THRUST 0x044f Thrustmaster vendor TI 0x0451 Texas Instruments vendor ANALOGDEVICES 0x0456 Analog Devices -vendor SIS 0x0457 Silicon Integrated Systems +vendor SIS 0x0457 Silicon Integrated Systems Corp. vendor KYE 0x0458 KYE Systems vendor DIAMOND2 0x045a Diamond (Supra) +vendor RENESAS 0x045b Renesas vendor MICROSOFT 0x045e Microsoft vendor PRIMAX 0x0461 Primax Electronics vendor MGE 0x0463 MGE UPS Systems @@ -103,12 +105,14 @@ vendor MEGATRENDS 0x046b American Megatr vendor LOGITECH 0x046d Logitech vendor BTC 0x046e Behavior Tech. Computer vendor PHILIPS 0x0471 Philips +vendor SUN2 0x0472 Sun Microsystems (official) vendor SANYO 0x0474 Sanyo Electric +vendor SEAGATE 0x0477 Seagate vendor CONNECTIX 0x0478 Connectix vendor KENSINGTON 0x047d Kensington vendor LUCENT 0x047e Lucent vendor PLANTRONICS 0x047f Plantronics -vendor KYOCERA 0x0482 Kyocera +vendor KYOCERA 0x0482 Kyocera Wireless Corp. vendor STMICRO 0x0483 STMicroelectronics vendor FOXCONN 0x0489 Foxconn / Hon Hai vendor MEIZU 0x0492 Meizu Electronics @@ -116,6 +120,7 @@ vendor YAMAHA 0x0499 YAMAHA vendor COMPAQ 0x049f Compaq vendor HITACHI 0x04a4 Hitachi vendor ACERP 0x04a5 Acer Peripherals +vendor DAVIDCOM 0x04a6 Davicom vendor VISIONEER 0x04a7 Visioneer vendor CANON 0x04a9 Canon vendor NIKON 0x04b0 Nikon @@ -145,6 +150,7 @@ vendor ALTEC 0x04d2 Altec Lansing vendor MICROCHIP 0x04d8 Microchip Technology vendor HOLTEK 0x04d9 Holtek Semiconductor vendor PANASONIC 0x04da Panasonic (Matsushita) +vendor HUANHSIN 0x04dc Huan Hsin vendor SHARP 0x04dd Sharp vendor IIYAMA 0x04e1 Iiyama vendor SHUTTLE 0x04e6 Shuttle Technology @@ -152,7 +158,7 @@ vendor SAMSUNG 0x04e8 Samsung Electroni vendor ANNABOOKS 0x04ed Annabooks vendor JVC 0x04f1 JVC vendor CHICONY 0x04f2 Chicony Electronics -vendor ELAN 0x04f3 ELAN Microelectronics +vendor ELAN 0x04f3 ELAN Microelectronics vendor BROTHER 0x04f9
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src Committed By: martin Date: Wed Jul 17 16:07:38 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-8]: usbdevs Log Message: Pull up the following revisions (via patch), requested by msaitoh in ticket #1297: sys/dev/usb/usbdevs 1.737-1.741,1.743-1.752, 1.756-1.759,1.763-1.770 - Add yet another moschip serial adapter chip. - Add some classic Roland products from Shinichi Doyashiki in PR kern/52385. - Add Ralink RT73. - Add Wacom Intuos2 A4 and Intuos Art pen tablets. - Add ELAN keyboard. - Add Sony UWA-BR100 WLAN adapter. - Add the TP-LINK TL-WN823N (version 2). - Add RT Systems RTS-03 USB to Serial Adapter. - Add West Mountain Radio IDs from OpenBSD. - Add LAN78xx family (Raspberry Pi 3B+) entries - PR kern/53105. - Add Linux Foundation vendor ID, and their root hub device IDs. - Apple Bluetooth adapter, as found on the G4 PowerBook FW-800 (PowerBook5,2). - Add Yubico Yubikey devices. - Add Huawei E182. - Add the Sierra Wireless MC7304 and EM7455 USB modems. - Add SMSC LAN7505 USB 2.0 gigabit ethernet device. - Add Panasonic N5HBZ055 WiFi device reported by David H. Gutteridge in PR kern/53647. - Add Logitech Gamepad F310 and Logitech Dual Action Gamepad. - Add D-Link LTE products. - Add D-Link DWA-131 rev E "Wireless N300 Nano USB Adapter" - Add Microsoft Natural Wireless Mouse 600 from Julian in PR kern/44634. - Add Gretag Macbeth/X-Rite Huey device ids. - Add HP LP2[24]75w hub. - Prefer longer "canonical" names and add some vendors (mainly from FreeBSD r334649). - Make whitespace much more consistent. - Lowercase hexadecimal number. - Update comment. To generate a diff of this commit: cvs rdiff -u -r1.736.2.3 -r1.736.2.4 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: martin
Date: Wed Jul 17 16:01:43 UTC 2019
Modified Files:
src/usr.sbin/cpuctl/arch [netbsd-8]: i386.c
Log Message:
Pull up the following revisions (via patch), requested by msaitoh
in ticket #1296:
usr.sbin/cpuctl/arch/i386.c 1.91,1.93-1.95,1.100-1.103
- Handle NVMM and HAXM's signature.
- Regard "TCGTCGTCGTCG" as QEMU(TCG).
- Dump CPUID leaf 0x4000 if available (for -v option).
- Add Cascade Lake, Copper Lake.
- Add Future Xeon (Cannon Lake)
- Add 06_7DH for another Ice Lake.
- Add Coffee Lake based Xeon E.
- White space fix. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.74.6.5 -r1.74.6.6 src/usr.sbin/cpuctl/arch/i386.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/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.74.6.5 src/usr.sbin/cpuctl/arch/i386.c:1.74.6.6
--- src/usr.sbin/cpuctl/arch/i386.c:1.74.6.5 Mon Feb 11 13:23:03 2019
+++ src/usr.sbin/cpuctl/arch/i386.c Wed Jul 17 16:01:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.74.6.5 2019/02/11 13:23:03 martin Exp $ */
+/* $NetBSD: i386.c,v 1.74.6.6 2019/07/17 16:01:43 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.74.6.5 2019/02/11 13:23:03 martin Exp $");
+__RCSID("$NetBSD: i386.c,v 1.74.6.6 2019/07/17 16:01:43 martin Exp $");
#endif /* not lint */
#include
@@ -167,7 +167,7 @@ static const char * const i386_intel_bra
"Pentium III", /* Intel (R) Pentium (R) III processor */
"", /* 0x05: Reserved */
"Mobile Pentium III",/* Mobile Intel (R) Pentium (R) III processor-M */
- "Mobile Celeron", /* Mobile Intel (R) Celeron (R) processor */
+ "Mobile Celeron", /* Mobile Intel (R) Celeron (R) processor */
"Pentium 4", /* Intel (R) Pentium (R) 4 processor */
"Pentium 4", /* Intel (R) Pentium (R) 4 processor */
"Celeron", /* Intel (R) Celeron (TM) processor */
@@ -320,10 +320,10 @@ const struct cpu_cpuid_nameclass i386_cp
[0x06] = "Celeron (Mendocino)",
[0x07] = "Pentium III (Katmai)",
[0x08] = "Pentium III (Coppermine)",
-[0x09] = "Pentium M (Banias)",
+[0x09] = "Pentium M (Banias)",
[0x0a] = "Pentium III Xeon (Cascades)",
[0x0b] = "Pentium III (Tualatin)",
-[0x0d] = "Pentium M (Dothan)",
+[0x0d] = "Pentium M (Dothan)",
[0x0e] = "Pentium Core Duo, Core solo",
[0x0f] = "Xeon 30xx, 32xx, 51xx, 53xx, 73xx, "
"Core 2 Quad 6xxx, "
@@ -372,7 +372,7 @@ const struct cpu_cpuid_nameclass i386_cp
[0x4d] = "Atom C2000",
[0x4e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)",
[0x4f] = "Xeon E[57] v4 (Broadwell), Core i7-69xx Extreme",
-[0x55] = "Xeon Scalable (Skylake)",
+[0x55] = "Xeon Scalable (Skylake, Cascade Lake, Copper Lake)",
[0x56] = "Xeon D-1500 (Broadwell)",
[0x57] = "Xeon Phi [357]200 (Knights Landing)",
[0x5a] = "Atom E3500",
@@ -380,13 +380,16 @@ const struct cpu_cpuid_nameclass i386_cp
[0x5d] = "Atom X3-C3000 (Silvermont)",
[0x5e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)",
[0x5f] = "Atom (Goldmont, Denverton)",
-[0x66] = "Future Core (Cannon Lake)",
+[0x66] = "8th gen Core i3 (Cannon Lake)",
+[0x6a] = "Future Xeon (Ice Lake)",
+[0x6c] = "Future Xeon (Ice Lake)",
[0x7a] = "Atom (Goldmont Plus)",
+[0x7d] = "Future Core (Ice Lake)",
[0x7e] = "Future Core (Ice Lake)",
[0x85] = "Xeon Phi 7215, 7285, 7295 (Knights Mill)",
[0x86] = "Atom (Tremont)",
-[0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake)",
-[0x9e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake)",
+[0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
+[0x9e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
},
"Pentium Pro, II or III", /* Default */
NULL,
@@ -725,7 +728,7 @@ static void
cyrix6x86_cpu_setup(struct cpu_info *ci)
{
- /*
+ /*
* Do not disable the TSC on the Geode GX, it's reported to
* work fine.
*/
@@ -975,7 +978,7 @@ amd_family6_probe(struct cpu_info *ci)
if (*cpu_brand_string == '\0')
return;
-
+
for (i = 1; i < __arraycount(amd_brand); i++)
if ((p = strstr(cpu_brand_string, amd_brand[i])) != NULL) {
ci->ci_brand_id = i;
@@ -1226,10 +1229,10 @@ intel_cpu_cacheinfo(struct cpu_info *ci)
}
}
-static const struct x86_cache_info amd_cpuid_l2cache_assoc_info[] =
+static const struct x86_cache_info amd_cpuid_l2cache_assoc_info[] =
AMD_L2CACHE_INFO;
-static const struct x86_cache_info amd_cpuid_l3cache_assoc_info[] =
+static const struct x86_cache_info amd_cpuid_l3cache_assoc_info[] =
AMD_L3CACHE_INFO;
static void
@@ -1716,19 +1719,28 @@ cpu_probe_hv_features(struct cpu_info *c
/*
* HV vendor ID string
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Jul 17 15:55:31 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-8]: pci_subr.c ppb.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1295):
sys/dev/pci/pci_subr.c: revision 1.213
sys/dev/pci/ppb.c: revision 1.69
Identify 16GT/s.
To generate a diff of this commit:
cvs rdiff -u -r1.183.2.10 -r1.183.2.11 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sys/dev/pci/ppb.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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.183.2.10 src/sys/dev/pci/pci_subr.c:1.183.2.11
--- src/sys/dev/pci/pci_subr.c:1.183.2.10 Wed Jul 17 15:34:31 2019
+++ src/sys/dev/pci/pci_subr.c Wed Jul 17 15:55:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.183.2.10 2019/07/17 15:34:31 martin Exp $ */
+/* $NetBSD: pci_subr.c,v 1.183.2.11 2019/07/17 15:55:31 martin Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.10 2019/07/17 15:34:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.11 2019/07/17 15:55:31 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -1688,7 +1688,7 @@ pci_print_pcie_compl_timeout(uint32_t va
}
}
-static const char * const pcie_linkspeeds[] = {"2.5", "5.0", "8.0"};
+static const char * const pcie_linkspeeds[] = {"2.5", "5.0", "8.0", "16.0"};
/*
* Print link speed. This function is used for the following register bits:
Index: src/sys/dev/pci/ppb.c
diff -u src/sys/dev/pci/ppb.c:1.63.2.1 src/sys/dev/pci/ppb.c:1.63.2.2
--- src/sys/dev/pci/ppb.c:1.63.2.1 Fri Feb 1 11:25:13 2019
+++ src/sys/dev/pci/ppb.c Wed Jul 17 15:55:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ppb.c,v 1.63.2.1 2019/02/01 11:25:13 martin Exp $ */
+/* $NetBSD: ppb.c,v 1.63.2.2 2019/07/17 15:55:31 martin Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.63.2.1 2019/02/01 11:25:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.63.2.2 2019/07/17 15:55:31 martin Exp $");
#include
#include
@@ -54,8 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.63
(PCIE_SLCSR_ABP | PCIE_SLCSR_PFD | PCIE_SLCSR_MSC | \
PCIE_SLCSR_PDC | PCIE_SLCSR_CC | PCIE_SLCSR_LACS)
-static const char pcie_linkspeed_strings[4][5] = {
- "1.25", "2.5", "5.0", "8.0",
+static const char pcie_linkspeed_strings[5][5] = {
+ "1.25", "2.5", "5.0", "8.0", "16.0"
};
int ppb_printevent = 0; /* Print event type if the value is not 0 */
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 17 15:55:31 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pci_subr.c ppb.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1295): sys/dev/pci/pci_subr.c: revision 1.213 sys/dev/pci/ppb.c: revision 1.69 Identify 16GT/s. To generate a diff of this commit: cvs rdiff -u -r1.183.2.10 -r1.183.2.11 src/sys/dev/pci/pci_subr.c cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sys/dev/pci/ppb.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
Module Name:src
Committed By: martin
Date: Wed Jul 17 15:43:18 UTC 2019
Modified Files:
src/sys/dev/ic [netbsd-8]: nslm7x.c
src/sys/dev/isa [netbsd-8]: wbsio.c wbsioreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1294):
sys/dev/isa/wbsio.c: revision 1.25
sys/dev/ic/nslm7x.c: revision 1.72
sys/dev/ic/nslm7x.c: revision 1.73
sys/dev/isa/wbsioreg.h: revision 1.9
Use pmf_device_{register,deregister}().
-
Identify Nuvoton NCT6798D correctly. It seems that the bit width of NCT6796D
and newer devices' device ID is 13bit. The previous series was 12bits.
To generate a diff of this commit:
cvs rdiff -u -r1.64.10.2 -r1.64.10.3 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.10.10.5 -r1.10.10.6 src/sys/dev/isa/wbsio.c
cvs rdiff -u -r1.5.2.4 -r1.5.2.5 src/sys/dev/isa/wbsioreg.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/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.64.10.2 src/sys/dev/ic/nslm7x.c:1.64.10.3
--- src/sys/dev/ic/nslm7x.c:1.64.10.2 Thu Jul 26 20:37:42 2018
+++ src/sys/dev/ic/nslm7x.c Wed Jul 17 15:43:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.64.10.2 2018/07/26 20:37:42 snj Exp $ */
+/* $NetBSD: nslm7x.c,v 1.64.10.3 2019/07/17 15:43:18 martin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.64.10.2 2018/07/26 20:37:42 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.64.10.3 2019/07/17 15:43:18 martin Exp $");
#include
#include
@@ -2156,6 +2156,7 @@ static const struct wb_product wbsio_pro
{ WBSIO_ID_NCT6793D,"NCT6793D", nct6779d_sensors, NULL },
{ WBSIO_ID_NCT6795D,"NCT6795D", nct6779d_sensors, NULL },
{ WBSIO_ID_NCT6796D,"NCT6796D", nct6779d_sensors, NULL },
+{ WBSIO_ID_NCT6798D,"NCT6798D", nct6779d_sensors, NULL },
{ 0, NULL, NULL, NULL }
};
@@ -2270,6 +2271,9 @@ lm_attach(struct lm_softc *lmsc)
"unable to register with sysmon\n");
sysmon_envsys_destroy(lmsc->sc_sme);
}
+ if (!pmf_device_register(lmsc->sc_dev, NULL, NULL))
+ aprint_error_dev(lmsc->sc_dev,
+ "couldn't establish power handler\n");
}
/*
@@ -2282,6 +2286,7 @@ lm_detach(struct lm_softc *lmsc)
callout_halt(>sc_callout, NULL);
callout_destroy(>sc_callout);
sysmon_envsys_unregister(lmsc->sc_sme);
+ pmf_device_deregister(lmsc->sc_dev);
}
static void
Index: src/sys/dev/isa/wbsio.c
diff -u src/sys/dev/isa/wbsio.c:1.10.10.5 src/sys/dev/isa/wbsio.c:1.10.10.6
--- src/sys/dev/isa/wbsio.c:1.10.10.5 Thu Jul 26 20:37:42 2018
+++ src/sys/dev/isa/wbsio.c Wed Jul 17 15:43:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.10.10.5 2018/07/26 20:37:42 snj Exp $ */
+/* $NetBSD: wbsio.c,v 1.10.10.6 2019/07/17 15:43:18 martin Exp $ */
/* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
@@ -73,31 +73,32 @@ struct wbsio_softc {
static const struct wbsio_product {
uint16_t id;
- bool idis12bits;
+ int idbits;
const char *str;
} wbsio_products[] = {
- { WBSIO_ID_W83627HF, false, "W83627HF" },
- { WBSIO_ID_W83697HF, false, "W83697HF" },
- { WBSIO_ID_W83637HF, false, "W83637HF" },
- { WBSIO_ID_W83627THF, false, "W83627THF" },
- { WBSIO_ID_W83687THF, false, "W83687THF" },
- { WBSIO_ID_W83627DHG, true, "W83627DHG" },
- { WBSIO_ID_W83627DHGP, true, "W83627DHG-P" },
- { WBSIO_ID_W83627EHF, true, "W83627EHF" },
- { WBSIO_ID_W83627SF, true, "W83627SF" },
- { WBSIO_ID_W83627UHG, true, "W83627UHG" },
- { WBSIO_ID_W83667HG, true, "W83667HG" },
- { WBSIO_ID_W83667HGB, true, "W83667HGB" },
- { WBSIO_ID_W83697UG, true, "W83697UG" },
- { WBSIO_ID_NCT6775F, true, "NCT6775F" },
- { WBSIO_ID_NCT6776F, true, "NCT6776F" },
- { WBSIO_ID_NCT5104D, true, "NCT5104D or 610[246]D" },
- { WBSIO_ID_NCT6779D, true, "NCT6779D" },
- { WBSIO_ID_NCT6791D, true, "NCT6791D" },
- { WBSIO_ID_NCT6792D, true, "NCT6792D" },
- { WBSIO_ID_NCT6793D, true, "NCT6793D" },
- { WBSIO_ID_NCT6795D, true, "NCT6795D" },
- { WBSIO_ID_NCT6796D, true, "NCT6796D" },
+ { WBSIO_ID_W83627HF, 8, "W83627HF" },
+ { WBSIO_ID_W83697HF, 8, "W83697HF" },
+ { WBSIO_ID_W83637HF, 8, "W83637HF" },
+ { WBSIO_ID_W83627THF, 8, "W83627THF" },
+ { WBSIO_ID_W83687THF, 8, "W83687THF" },
+ { WBSIO_ID_W83627DHG, 12, "W83627DHG" },
+ { WBSIO_ID_W83627DHGP, 12, "W83627DHG-P" },
+ { WBSIO_ID_W83627EHF, 12, "W83627EHF" },
+ { WBSIO_ID_W83627SF, 12, "W83627SF" },
+ { WBSIO_ID_W83627UHG, 12, "W83627UHG" },
+ { WBSIO_ID_W83667HG, 12, "W83667HG" },
+ { WBSIO_ID_W83667HGB, 12, "W83667HGB" },
+ { WBSIO_ID_W83697UG, 12, "W83697UG" },
+ { WBSIO_ID_NCT6775F, 12, "NCT6775F" },
+ { WBSIO_ID_NCT6776F, 12, "NCT6776F" },
+ { WBSIO_ID_NCT5104D, 12, "NCT5104D or 610[246]D" },
+ { WBSIO_ID_NCT6779D, 12, "NCT6779D" },
+ { WBSIO_ID_NCT6791D, 12, "NCT6791D" },
+ { WBSIO_ID_NCT6792D, 12, "NCT6792D" },
+ {
CVS commit: [netbsd-8] src/sys/dev
Module Name:src
Committed By: martin
Date: Wed Jul 17 15:43:18 UTC 2019
Modified Files:
src/sys/dev/ic [netbsd-8]: nslm7x.c
src/sys/dev/isa [netbsd-8]: wbsio.c wbsioreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1294):
sys/dev/isa/wbsio.c: revision 1.25
sys/dev/ic/nslm7x.c: revision 1.72
sys/dev/ic/nslm7x.c: revision 1.73
sys/dev/isa/wbsioreg.h: revision 1.9
Use pmf_device_{register,deregister}().
-
Identify Nuvoton NCT6798D correctly. It seems that the bit width of NCT6796D
and newer devices' device ID is 13bit. The previous series was 12bits.
To generate a diff of this commit:
cvs rdiff -u -r1.64.10.2 -r1.64.10.3 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.10.10.5 -r1.10.10.6 src/sys/dev/isa/wbsio.c
cvs rdiff -u -r1.5.2.4 -r1.5.2.5 src/sys/dev/isa/wbsioreg.h
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/arch/x86/include
Module Name:src Committed By: martin Date: Wed Jul 17 15:37:34 UTC 2019 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1293): sys/arch/x86/include/specialreg.h: revision 1.149 Define some new bits of CPUID Fn8000_0007 %edx AMD Advanced Power Management leaf. To generate a diff of this commit: cvs rdiff -u -r1.98.2.13 -r1.98.2.14 src/sys/arch/x86/include/specialreg.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/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.98.2.13 src/sys/arch/x86/include/specialreg.h:1.98.2.14 --- src/sys/arch/x86/include/specialreg.h:1.98.2.13 Wed May 29 15:43:26 2019 +++ src/sys/arch/x86/include/specialreg.h Wed Jul 17 15:37:33 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.98.2.13 2019/05/29 15:43:26 martin Exp $ */ +/* $NetBSD: specialreg.h,v 1.98.2.14 2019/07/17 15:37:33 martin Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -654,12 +654,16 @@ #define CPUID_APM_TSC 0x0100 /* TSC invariant */ #define CPUID_APM_CPB 0x0200 /* Core performance boost */ #define CPUID_APM_EFF 0x0400 /* Effective Frequency (read-only) */ - -#define CPUID_APM_FLAGS "\20" \ - "\1" "TS" "\2" "FID" "\3" "VID" "\4" "TTP" \ - "\5" "HTC" "\6" "STC" "\7" "100" "\10" "HWP" \ - "\11" "TSC" "\12" "CPB" "\13" "EffFreq" "\14" "B11" \ - "\15" "B12" +#define CPUID_APM_PROCFI 0x0800 /* Proc Feedback Interface */ +#define CPUID_APM_PROCPR 0x1000 /* Proc Power Reporting */ +#define CPUID_APM_CONNSTBY 0x2000 /* Connected Standby */ +#define CPUID_APM_RAPL 0x4000 /* Running Average Power Limit */ + +#define CPUID_APM_FLAGS "\20" \ + "\1" "TS" "\2" "FID" "\3" "VID" "\4" "TTP" \ + "\5" "HTC" "\6" "STC" "\7" "100" "\10" "HWP" \ + "\11" "TSC" "\12" "CPB" "\13" "EffFreq" "\14" "PROCFI" \ + "\15" "PROCPR" "\16" "CONNSTBY" "\17" "RAPL" /* AMD Fn800a %edx features (SVM features) */ #define CPUID_AMD_SVM_NP 0x0001
CVS commit: [netbsd-8] src/sys/arch/x86/include
Module Name:src Committed By: martin Date: Wed Jul 17 15:37:34 UTC 2019 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1293): sys/arch/x86/include/specialreg.h: revision 1.149 Define some new bits of CPUID Fn8000_0007 %edx AMD Advanced Power Management leaf. To generate a diff of this commit: cvs rdiff -u -r1.98.2.13 -r1.98.2.14 src/sys/arch/x86/include/specialreg.h 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/pci
Module Name:src
Committed By: martin
Date: Wed Jul 17 15:34:31 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-8]: pci_subr.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1292):
sys/dev/pci/pci_subr.c: revision 1.211
sys/dev/pci/pci_subr.c: revision 1.214
Typo (s/vaule/value/)
Print extend capability from 0x25 to 0x29 correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.183.2.9 -r1.183.2.10 src/sys/dev/pci/pci_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.183.2.9 src/sys/dev/pci/pci_subr.c:1.183.2.10
--- src/sys/dev/pci/pci_subr.c:1.183.2.9 Tue Dec 4 11:29:41 2018
+++ src/sys/dev/pci/pci_subr.c Wed Jul 17 15:34:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.183.2.9 2018/12/04 11:29:41 martin Exp $ */
+/* $NetBSD: pci_subr.c,v 1.183.2.10 2019/07/17 15:34:31 martin Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.9 2018/12/04 11:29:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.10 2019/07/17 15:34:31 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -3726,7 +3726,7 @@ pci_conf_print_tph_req_cap(const pcireg_
printf("Device Specific Mode\n");
break;
default:
- printf("(reserved vaule)\n");
+ printf("(reserved value)\n");
break;
}
printf(" TPH Requester Enable: ");
@@ -3741,7 +3741,7 @@ pci_conf_print_tph_req_cap(const pcireg_
printf("TPH and Extended TPH");
break;
default:
- printf("(reserved vaule)\n");
+ printf("(reserved value)\n");
break;
}
@@ -4240,6 +4240,9 @@ static struct {
NULL },
{ PCI_EXTCAP_VF_RESIZBAR, "VF Resizable BARs",
NULL },
+ { 0x25, "unknown", NULL },
+ { 0x26, "unknown", NULL },
+ { 0x27, "unknown", NULL },
{ PCI_EXTCAP_HIERARCHYID, "Hierarchy ID",
NULL },
{ PCI_EXTCAP_NPEM, "Native PCIe Enclosure Management",
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 17 15:34:31 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pci_subr.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1292): sys/dev/pci/pci_subr.c: revision 1.211 sys/dev/pci/pci_subr.c: revision 1.214 Typo (s/vaule/value/) Print extend capability from 0x25 to 0x29 correctly. To generate a diff of this commit: cvs rdiff -u -r1.183.2.9 -r1.183.2.10 src/sys/dev/pci/pci_subr.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/pci
Module Name:src Committed By: martin Date: Wed Jul 17 15:30:08 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1281.2.14 -r1.1281.2.15 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1280.2.14 -r1.1280.2.15 src/sys/dev/pci/pcidevs_data.h 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/pci
Module Name:src Committed By: martin Date: Wed Jul 17 15:30:08 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1281.2.14 -r1.1281.2.15 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1280.2.14 -r1.1280.2.15 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 17 15:27:55 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs Log Message: Pull up the foolowing revisions (via patch), requested by msaitoh in ticket #1291: sys/dev/pci/pcidevs 1.1367-1.1380 - Add other two Intel Core 8G host bridges. - Add Intel Xeon E devices. - Add some new Intel C620 LPC devices. - Add some Intel Xeon Scalable processor's devices. - Add some Intel Whisky Lake devices. - Add Xeon D XFI. - Add "(Hyper-V)" to Intel 0x15a9's description. - Add Intel C3000 QSFP devices. - Add Some Qlogic devices from OpenBSD. - Rename Qlogic 0x3022's name from ISP3022 to ISP4022. - Add IDs for SATA controllers VT8237S and VX855 - Modify some descriptions of Virtio devices from OpenBSD to identify the functions. - Add Phison PS5000 and PS5016 NVMe. - Add some ServerWorks HT1100 devices from OpenBSD. - Remove extra white spaces. To generate a diff of this commit: cvs rdiff -u -r1.1289.2.14 -r1.1289.2.15 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1289.2.14 src/sys/dev/pci/pcidevs:1.1289.2.15 --- src/sys/dev/pci/pcidevs:1.1289.2.14 Thu Mar 7 17:03:52 2019 +++ src/sys/dev/pci/pcidevs Wed Jul 17 15:27:55 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1289.2.14 2019/03/07 17:03:52 martin Exp $ +$NetBSD: pcidevs,v 1.1289.2.15 2019/07/17 15:27:55 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -634,6 +634,7 @@ vendor RENESAS 0x1912 Renesas Technolog vendor FREESCALE 0x1957 Freescale Semiconductor vendor ATTANSIC 0x1969 Attansic Technologies vendor JMICRON 0x197b JMicron Technology +vendor PHISON 0x1987 Phison vendor SERVERENGINES 0x19a2 ServerEngines vendor HUAWEI 0x19e5 Huaewi Technology vendor ASPEED 0x1a03 ASPEED Technology @@ -1291,7 +1292,11 @@ product ASMEDIA ASM1061_12 0x0612 ASM106 product ASMEDIA ASM1042 0x1042 ASM1042 USB 3.0 Host Controller product ASMEDIA ASM1083 0x1080 ASM1083/1085 PCIe-PCI Bridge product ASMEDIA ASM1042A 0x1142 ASM1042A USB 3.0 Host Controller +product ASMEDIA ASM1182 0x1182 ASM1182E PCIE Bridge Controller +product ASMEDIA ASM1184 0x1184 ASM1184E PCIE Bridge Controller product ASMEDIA ASM1142 0x1242 ASM1142 USB 3.1 Host Controller +product ASMEDIA ASM1143 0x1343 ASM1143 USB 3.1 Host Controller +product ASMEDIA ASM2142 0x2142 ASM2142 USB 3.1 Host Controller /* Asustek products */ product ASUSTEK HFCPCI 0x0675 ISDN @@ -1725,14 +1730,33 @@ product ATI RADEON_HD6320 0x9806 Radeon product ATI RADEON_HD7340 0x9808 Radeon HD7340 Graphics product ATI RADEON_HDMI_DP_AUDIO 0x9840 HDMI/DP Audio product ATI RADEON_R2_R3_R3E_R4 0x9854 Radeon R2/R3/R4 Graphics -product ATI RADEON_HD2600_HD 0xaa08 Radeon HD2600 HD Audio Controller +product ATI RADEON_HD2900_HDA 0xaa00 Radeon HD 2900 HD Audio Controller +product ATI RADEON_HD3650_HDA 0xaa01 Radeon HD 3650/3730/3750 HD Audio Controller +product ATI RADEON_HD2600_HDA 0xaa08 Radeon HD 2600 HD Audio Controller +product ATI RADEON_HD2350_HDA 0xaa10 Radeon HD 2350PRO/2400PRO/2400XT/3410 HD Audio Controller +product ATI RADEON_HD3690_HDA 0xaa18 Radeon HD 3690/3800 HD Audio Controller +product ATI RADEON_HD36XX_HDA 0xaa20 Radeon HD 3650/3730/3750 HD Audio Controller product ATI RADEON_HD34XX_HDA 0xaa28 Radeon HD 34xx HD Audio Controller -product ATI RADEON_HD4350_HD 0xaa38 Radeon HD4350 HD Audio Controller -product ATI RADEON_HD5600_HDMI 0xaa60 Redwood HDMI Audio -product ATI RADEON_HD54XX_HDA 0xaa68 Radeon HD 54xx Audio -product ATI RADEON_HD7700_HDA 0xaab0 Radeon HD 7700 HD Audio -product ATI RADEON_RX460_HDA 0xaae0 Radeon RX460 HD Audio -product ATI RADEON_RX470_HDA 0xaaf0 Radeon RX470 HD Audio +product ATI RADEON_HD4850_HDA 0xaa30 Radeon HD 4850 HD Audio Controller +product ATI RADEON_HD4350_HDA 0xaa38 Radeon HD 4350 HD Audio Controller +product ATI RADEON_HD5830_HDA 0xaa50 Radeon HD 5830/5850/5870/6850/6870 HD Audio Controller +product ATI RADEON_HD5700_HDA 0xaa58 Radeon HD 5700 HD Audio Controller +product ATI RADEON_HD5000_HDA 0xaa60 Radeon HD 5000 HD Audio Controller +product ATI RADEON_HD68XX_HDA 0xaa68 Radeon HD 5400/6300/7300 HD Audio Controller +product ATI RADEON_HD6930_HDA 0xaa80 Radeon HD 6930/6950/6970/6990 HD Audio Controller +product ATI RADEON_HD6790_HDA 0xaa88 Radeon HD 6790/6850/6870/7720 HD Audio Controller +product ATI RADEON_HD6500_HDA 0xaa90 Radeon HD 6500/6600/6700M HD Audio Controller +product ATI RADEON_HD6450_HDA 0xaa98 Radeon HD 6450/7450/8450/8490, R5 230/235/235X HD Audio Controller +product ATI RADEON_HD7870_HDA 0xaaa0 Radeon HD 7870XT/7950/7970 HD Audio Controller +product ATI RADEON_HD7700_HDA 0xaab0 Radeon HD 7700 HD Audio Controller +product ATI RADEON_R7_360_HDA 0xaac0 Radeon R7 360, R9 360 HD Audio Controller +product ATI RADEON_R9_290_HDA 0xaac8 Radeon R9
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 17 15:27:55 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs Log Message: Pull up the foolowing revisions (via patch), requested by msaitoh in ticket #1291: sys/dev/pci/pcidevs 1.1367-1.1380 - Add other two Intel Core 8G host bridges. - Add Intel Xeon E devices. - Add some new Intel C620 LPC devices. - Add some Intel Xeon Scalable processor's devices. - Add some Intel Whisky Lake devices. - Add Xeon D XFI. - Add "(Hyper-V)" to Intel 0x15a9's description. - Add Intel C3000 QSFP devices. - Add Some Qlogic devices from OpenBSD. - Rename Qlogic 0x3022's name from ISP3022 to ISP4022. - Add IDs for SATA controllers VT8237S and VX855 - Modify some descriptions of Virtio devices from OpenBSD to identify the functions. - Add Phison PS5000 and PS5016 NVMe. - Add some ServerWorks HT1100 devices from OpenBSD. - Remove extra white spaces. To generate a diff of this commit: cvs rdiff -u -r1.1289.2.14 -r1.1289.2.15 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/gdbscripts
Module Name:src Committed By: skrll Date: Wed Jul 17 09:10:28 UTC 2019 Modified Files: src/sys/gdbscripts: Makefile.inc Log Message: Add devs To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/gdbscripts/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/gdbscripts
Module Name:src Committed By: skrll Date: Wed Jul 17 09:10:28 UTC 2019 Modified Files: src/sys/gdbscripts: Makefile.inc Log Message: Add devs To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/gdbscripts/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/gdbscripts/Makefile.inc diff -u src/sys/gdbscripts/Makefile.inc:1.7 src/sys/gdbscripts/Makefile.inc:1.8 --- src/sys/gdbscripts/Makefile.inc:1.7 Wed Jul 17 09:08:57 2019 +++ src/sys/gdbscripts/Makefile.inc Wed Jul 17 09:10:28 2019 @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.inc,v 1.7 2019/07/17 09:08:57 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.8 2019/07/17 09:10:28 skrll Exp $ -SYS_GDBINIT= bdump cpus kernhist lwps module msgbuf pgrpdump procs vchain vdump +SYS_GDBINIT= bdump cpus devs kernhist lwps module msgbuf pgrpdump procs vchain vdump
CVS commit: src/sys/gdbscripts
Module Name:src Committed By: skrll Date: Wed Jul 17 09:14:24 UTC 2019 Modified Files: src/sys/gdbscripts: lwps Log Message: Remove the 'procs' from lwps and use the one from procs. OK mrg@ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/gdbscripts/lwps Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/gdbscripts/lwps diff -u src/sys/gdbscripts/lwps:1.5 src/sys/gdbscripts/lwps:1.6 --- src/sys/gdbscripts/lwps:1.5 Thu May 30 07:17:35 2019 +++ src/sys/gdbscripts/lwps Wed Jul 17 09:14:24 2019 @@ -1,4 +1,4 @@ -# $NetBSD: lwps,v 1.5 2019/05/30 07:17:35 mrg Exp $ +# $NetBSD: lwps,v 1.6 2019/07/17 09:14:24 skrll Exp $ define lwps set $i = 0 @@ -34,22 +34,6 @@ document lwps ps for lwps end -define procs - set $p = allproc.lh_first - - printf " paddr pid flag statn firstlwp command\n" - while ($p) - printf "%16lx %5d %8x %4x %5d %16lx %16s\n", \ - $p, $p->p_pid, $p->p_flag, $p->p_stat, \ - $nlwps, $p->p_lwps.lh_first, \ - (char *) $p->p_comm - set $p = $p->p_list.le_next - end -end -document procs -Show one line summary of all processes (ps) -end - define threadinfo set $l = (struct lwp *)$arg0 set $pid = $arg1
CVS commit: src/sys/gdbscripts
Module Name:src Committed By: skrll Date: Wed Jul 17 09:14:24 UTC 2019 Modified Files: src/sys/gdbscripts: lwps Log Message: Remove the 'procs' from lwps and use the one from procs. OK mrg@ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/gdbscripts/lwps Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/gdbscripts
Module Name:src Committed By: skrll Date: Wed Jul 17 09:08:57 UTC 2019 Modified Files: src/sys/gdbscripts: Makefile.inc Log Message: kdump was remove some time ago To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/gdbscripts/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/gdbscripts/Makefile.inc diff -u src/sys/gdbscripts/Makefile.inc:1.6 src/sys/gdbscripts/Makefile.inc:1.7 --- src/sys/gdbscripts/Makefile.inc:1.6 Wed May 11 10:39:31 2016 +++ src/sys/gdbscripts/Makefile.inc Wed Jul 17 09:08:57 2019 @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.inc,v 1.6 2016/05/11 10:39:31 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.7 2019/07/17 09:08:57 skrll Exp $ -SYS_GDBINIT= bdump cpus kdump kernhist lwps module msgbuf pgrpdump procs vchain vdump +SYS_GDBINIT= bdump cpus kernhist lwps module msgbuf pgrpdump procs vchain vdump
CVS commit: src/sys/gdbscripts
Module Name:src Committed By: skrll Date: Wed Jul 17 09:08:57 UTC 2019 Modified Files: src/sys/gdbscripts: Makefile.inc Log Message: kdump was remove some time ago To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/gdbscripts/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Wed Jul 17 08:39:03 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: locore.S
src/sys/arch/powerpc/include/ibm4xx: pmap.h
Log Message:
Spell endianness correctly in comments
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/aarch64/aarch64/locore.S
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/ibm4xx/pmap.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/aarch64/aarch64/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.38 src/sys/arch/aarch64/aarch64/locore.S:1.39
--- src/sys/arch/aarch64/aarch64/locore.S:1.38 Mon Jul 15 11:46:53 2019
+++ src/sys/arch/aarch64/aarch64/locore.S Wed Jul 17 08:39:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.38 2019/07/15 11:46:53 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.39 2019/07/17 08:39:03 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -38,7 +38,7 @@
#include
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.38 2019/07/15 11:46:53 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.39 2019/07/17 08:39:03 skrll Exp $")
/*#define DEBUG_LOCORE /* debug print */
@@ -976,7 +976,7 @@ tcr_setting:
sctlr_ee:
- .quad (SCTLR_EE | SCTLR_EOE) /* Endiannes of Exception and EL0 */
+ .quad (SCTLR_EE | SCTLR_EOE) /* Endianness of Exception and EL0 */
sctlr_set:
.quad ( \
SCTLR_LSMAOE | /* Load/Store Multiple Atomicity and Ordering */ \
Index: src/sys/arch/powerpc/include/ibm4xx/pmap.h
diff -u src/sys/arch/powerpc/include/ibm4xx/pmap.h:1.18 src/sys/arch/powerpc/include/ibm4xx/pmap.h:1.19
--- src/sys/arch/powerpc/include/ibm4xx/pmap.h:1.18 Thu Apr 19 21:50:07 2018
+++ src/sys/arch/powerpc/include/ibm4xx/pmap.h Wed Jul 17 08:39:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.18 2018/04/19 21:50:07 christos Exp $ */
+/* $NetBSD: pmap.h,v 1.19 2019/07/17 08:39:03 skrll Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
#define KERNEL_PID 1 /* TLB PID to use for kernel translation */
/*
- * A TTE is a 16KB or greater TLB entry w/size and endiannes bits
+ * A TTE is a 16KB or greater TLB entry w/size and endianness bits
* stuffed in the (unused) low bits of the PA.
*/
#define TTE_PA_MASK 0xc000
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Wed Jul 17 08:39:03 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: locore.S src/sys/arch/powerpc/include/ibm4xx: pmap.h Log Message: Spell endianness correctly in comments To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/aarch64/aarch64/locore.S cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/ibm4xx/pmap.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
Module Name:src
Committed By: ozaki-r
Date: Wed Jul 17 07:07:59 UTC 2019
Modified Files:
src/sys/netipsec: key.c
Log Message:
Avoid a race condition between SA (sav) manipulations
An sav can be removed from belonging list(s) twice resulting in an assertion
failure of pslist. It can occur if the following two operations interleave:
(i) a deletion or a update of an SA via the API, and
(ii) a state change (key_sa_chgstate) of the same SA by the timer.
Note that even (ii) removes an sav once from its list(s) on a update.
The cause of the race condition is that the two operations are not serialized
and (i) doesn't get and remove an sav from belonging list(s) atomically. So
(ii) can be inserted between an acquisition and a removal of (i).
Avoid the race condition by making (i) atomic.
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 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.263 src/sys/netipsec/key.c:1.264
--- src/sys/netipsec/key.c:1.263 Wed Jun 12 22:23:06 2019
+++ src/sys/netipsec/key.c Wed Jul 17 07:07:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.263 2019/06/12 22:23:06 christos Exp $ */
+/* $NetBSD: key.c,v 1.264 2019/07/17 07:07:59 ozaki-r Exp $ */
/* $FreeBSD: 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.263 2019/06/12 22:23:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.264 2019/07/17 07:07:59 ozaki-r Exp $");
/*
* This code is referred to RFC 2367
@@ -696,8 +696,8 @@ static bool key_sah_has_sav(struct secas
static void key_sah_ref(struct secashead *);
static void key_sah_unref(struct secashead *);
static void key_init_sav(struct secasvar *);
+static void key_wait_sav(struct secasvar *);
static void key_destroy_sav(struct secasvar *);
-static void key_destroy_sav_with_ref(struct secasvar *);
static struct secasvar *key_newsav(struct mbuf *,
const struct sadb_msghdr *, int *, const char*, int);
#define KEY_NEWSAV(m, sadb, e)\
@@ -1598,30 +1598,20 @@ key_destroy_sav(struct secasvar *sav)
}
/*
- * Destroy sav with holding its reference.
+ * Wait for references of a passed sav to go away.
*/
static void
-key_destroy_sav_with_ref(struct secasvar *sav)
+key_wait_sav(struct secasvar *sav)
{
ASSERT_SLEEPABLE();
mutex_enter(_sad.lock);
- sav->state = SADB_SASTATE_DEAD;
- SAVLIST_WRITER_REMOVE(sav);
- SAVLUT_WRITER_REMOVE(sav);
- mutex_exit(_sad.lock);
-
- /* We cannot unref with holding key_sad.lock */
- KEY_SA_UNREF();
-
- mutex_enter(_sad.lock);
+ KASSERT(sav->state == SADB_SASTATE_DEAD);
KDASSERT(mutex_ownable(softnet_lock));
key_sad_pserialize_perform();
localcount_drain(>localcount, _sad.cv_lc, _sad.lock);
mutex_exit(_sad.lock);
-
- key_destroy_sav(sav);
}
/* %%% SPD management */
@@ -3534,6 +3524,38 @@ out:
}
/*
+ * Search SAD litmited alive SA by an SPI and remove it from a list.
+ * OUT:
+ * NULL : not found
+ * others : found, pointer to a SA.
+ */
+static struct secasvar *
+key_lookup_and_remove_sav(struct secashead *sah, u_int32_t spi)
+{
+ struct secasvar *sav = NULL;
+ u_int state;
+
+ /* search all status */
+ mutex_enter(_sad.lock);
+ SASTATE_ALIVE_FOREACH(state) {
+ SAVLIST_WRITER_FOREACH(sav, sah, state) {
+ KASSERT(sav->state == state);
+
+ if (sav->spi == spi) {
+sav->state = SADB_SASTATE_DEAD;
+SAVLIST_WRITER_REMOVE(sav);
+SAVLUT_WRITER_REMOVE(sav);
+goto out;
+ }
+ }
+ }
+out:
+ mutex_exit(_sad.lock);
+
+ return sav;
+}
+
+/*
* Free allocated data to member variables of sav:
* sav->replay, sav->key_* and sav->lft_*.
*/
@@ -5628,7 +5650,7 @@ key_api_update(struct socket *so, struct
const struct sockaddr *src, *dst;
struct secasindex saidx;
struct secashead *sah;
- struct secasvar *sav, *newsav;
+ struct secasvar *sav, *newsav, *oldsav;
u_int16_t proto;
u_int8_t mode;
u_int16_t reqid;
@@ -5781,12 +5803,25 @@ key_api_update(struct socket *so, struct
mutex_exit(_sad.lock);
key_validate_savlist(sah, SADB_SASTATE_MATURE);
+ /*
+ * We need to lookup and remove the sav atomically, so get it again
+ * here by a special API while we have a reference to it.
+ */
+ oldsav = key_lookup_and_remove_sav(sah, sa0->sadb_sa_spi);
+ /* We can release the reference because of oldsav */
+ KEY_SA_UNREF();
+ if (oldsav == NULL) {
+ /* Someone has already removed the sav. Nothing to do. */
+ } else {
+ key_wait_sav(oldsav);
+ key_destroy_sav(oldsav);
+ oldsav = NULL;
+ }
+ sav = NULL;
+
key_sah_unref(sah);
sah = NULL;
- key_destroy_sav_with_ref(sav);
- sav = NULL;
-
{
struct mbuf *n;
@@ -6187,7 +6222,7 @@ key_api_delete(struct socket *so, struct
sah = key_getsah_ref(, CMP_HEAD);
if (sah != NULL) {
/* get a SA with SPI.
CVS commit: src/sys/netipsec
Module Name:src Committed By: ozaki-r Date: Wed Jul 17 07:07:59 UTC 2019 Modified Files: src/sys/netipsec: key.c Log Message: Avoid a race condition between SA (sav) manipulations An sav can be removed from belonging list(s) twice resulting in an assertion failure of pslist. It can occur if the following two operations interleave: (i) a deletion or a update of an SA via the API, and (ii) a state change (key_sa_chgstate) of the same SA by the timer. Note that even (ii) removes an sav once from its list(s) on a update. The cause of the race condition is that the two operations are not serialized and (i) doesn't get and remove an sav from belonging list(s) atomically. So (ii) can be inserted between an acquisition and a removal of (i). Avoid the race condition by making (i) atomic. To generate a diff of this commit: cvs rdiff -u -r1.263 -r1.264 src/sys/netipsec/key.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
