CVS commit: [pgoyette-compat] src/sys/modules/arch/x86
Module Name:src Committed By: pgoyette Date: Tue Mar 27 03:57:37 UTC 2018 Modified Files: src/sys/modules/arch/x86/amd64-xen [pgoyette-compat]: bsd.amd64-xen.mk src/sys/modules/arch/x86/i386-xen [pgoyette-compat]: bsd.i386-xen.mk src/sys/modules/arch/x86/i386pae-xen [pgoyette-compat]: bsd.i386pae-xen.mk Log Message: Disable previous change - it breaks some stuff To generate a diff of this commit: cvs rdiff -u -r1.1.28.1 -r1.1.28.2 \ src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk cvs rdiff -u -r1.1.28.1 -r1.1.28.2 \ src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk cvs rdiff -u -r1.1.28.1 -r1.1.28.2 \ src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk diff -u src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk:1.1.28.1 src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk:1.1.28.2 --- src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk:1.1.28.1 Mon Mar 26 10:49:45 2018 +++ src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk Tue Mar 27 03:57:37 2018 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.amd64-xen.mk,v 1.1.28.1 2018/03/26 10:49:45 pgoyette Exp $ +# $NetBSD: bsd.amd64-xen.mk,v 1.1.28.2 2018/03/27 03:57:37 pgoyette Exp $ .ifndef _BSD_AMD64_XEN_MK_ _BSD_AMD64_XEN_MK_=1 @@ -7,6 +7,6 @@ KMODULEARCHDIR:= amd64-xen XEN= 1 -CPPFLAGS+= -DXEN +#CPPFLAGS+= -DXEN .endif # _BSD_AMD64_XEN_MK_ Index: src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk diff -u src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk:1.1.28.1 src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk:1.1.28.2 --- src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk:1.1.28.1 Mon Mar 26 10:49:45 2018 +++ src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk Tue Mar 27 03:57:37 2018 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.i386-xen.mk,v 1.1.28.1 2018/03/26 10:49:45 pgoyette Exp $ +# $NetBSD: bsd.i386-xen.mk,v 1.1.28.2 2018/03/27 03:57:37 pgoyette Exp $ .ifndef _BSD_I386_XEN_MK_ _BSD_I386_XEN_MK_=1 @@ -7,6 +7,6 @@ KMODULEARCHDIR:= i386-xen XEN= 1 -CPPFLAGS+= -DXEN +#CPPFLAGS+= -DXEN .endif # _BSD_I386_XEN_MK_ Index: src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk diff -u src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk:1.1.28.1 src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk:1.1.28.2 --- src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk:1.1.28.1 Mon Mar 26 10:49:45 2018 +++ src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk Tue Mar 27 03:57:37 2018 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.i386pae-xen.mk,v 1.1.28.1 2018/03/26 10:49:45 pgoyette Exp $ +# $NetBSD: bsd.i386pae-xen.mk,v 1.1.28.2 2018/03/27 03:57:37 pgoyette Exp $ .ifndef _BSD_I386PAE_XEN_MK_ _BSD_I386PAE_XEN_MK_=1 @@ -8,6 +8,6 @@ KMODULEARCHDIR:= i386pae-xen XEN= 1 PAE= 1 -CPPFLAGS+= -DPAE -DXEN +#CPPFLAGS+= -DPAE -DXEN .endif # _BSD_I386PAE_XEN_MK_
CVS commit: [pgoyette-compat] src/sys/modules/compat
Module Name:src
Committed By: pgoyette
Date: Tue Mar 27 03:41:51 UTC 2018
Modified Files:
src/sys/modules/compat [pgoyette-compat]: Makefile
Log Message:
Finish disable of compat_60_cpu_ucode.c
To generate a diff of this commit:
cvs rdiff -u -r1.14.14.6 -r1.14.14.7 src/sys/modules/compat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat/Makefile
diff -u src/sys/modules/compat/Makefile:1.14.14.6 src/sys/modules/compat/Makefile:1.14.14.7
--- src/sys/modules/compat/Makefile:1.14.14.6 Mon Mar 26 00:00:39 2018
+++ src/sys/modules/compat/Makefile Tue Mar 27 03:41:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14.14.6 2018/03/26 00:00:39 pgoyette Exp $
+# $NetBSD: Makefile,v 1.14.14.7 2018/03/27 03:41:51 pgoyette Exp $
.include "../Makefile.inc"
@@ -42,7 +42,7 @@ SRCS+= compat_mod.c compat_exec.c compat
.PATH: ${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}
.PATH: ${S} ${S}/arch/${MACHINE_EXTRA}/${MACHINE_EXTRA}
-.for i in compat_13_machdep.c compat_16_machdep.c compat_60_cpu_ucode.c
+.for i in compat_13_machdep.c compat_16_machdep.c # compat_60_cpu_ucode.c
. if exists(${S}/arch/${MACHINE}/${MACHINE}/${i}) || \
exists(${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}/${i}) || \
exists(${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}/${i}) || \
CVS commit: src/sys/uvm
Module Name:src
Committed By: jdolecek
Date: Mon Mar 26 21:43:30 UTC 2018
Modified Files:
src/sys/uvm: uvm_bio.c
Log Message:
mark ubc_winshift and ubc_winsize as __read_mostly, they are used often
so might benefit from cache placement
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/uvm/uvm_bio.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/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.92 src/sys/uvm/uvm_bio.c:1.93
--- src/sys/uvm/uvm_bio.c:1.92 Fri Feb 9 09:07:13 2018
+++ src/sys/uvm/uvm_bio.c Mon Mar 26 21:43:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.92 2018/02/09 09:07:13 maxv Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.93 2018/03/26 21:43:30 jdolecek Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.92 2018/02/09 09:07:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.93 2018/03/26 21:43:30 jdolecek Exp $");
#include "opt_uvmhist.h"
#include "opt_ubc.h"
@@ -112,8 +112,8 @@ const struct uvm_pagerops ubc_pager = {
};
int ubc_nwins = UBC_NWINS;
-int ubc_winshift = UBC_WINSHIFT;
-int ubc_winsize;
+int ubc_winshift __read_mostly = UBC_WINSHIFT;
+int ubc_winsize __read_mostly;
#if defined(PMAP_PREFER)
int ubc_nqueues;
#define UBC_NQUEUES ubc_nqueues
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: martin Date: Mon Mar 26 12:21:50 UTC 2018 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: Ammend tickt #1539 To generate a diff of this commit: cvs rdiff -u -r1.1.2.135 -r1.1.2.136 src/doc/CHANGES-6.0.7 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-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.135 src/doc/CHANGES-6.0.7:1.1.2.136 --- src/doc/CHANGES-6.0.7:1.1.2.135 Sun Mar 25 18:40:02 2018 +++ src/doc/CHANGES-6.0.7 Mon Mar 26 12:21:50 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.135 2018/03/25 18:40:02 martin Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.136 2018/03/26 12:21:50 martin Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -15392,7 +15392,6 @@ sys/netipsec/ipsec_input.c 1.57-1.58 [maxv, ticket #1536] external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.5 -external/public-domain/tz/dist/Makefile up to 1.1.1.20 external/public-domain/tz/dist/NEWS up to 1.1.1.21 external/public-domain/tz/dist/README up to 1.1.1.6 external/public-domain/tz/dist/TZDATA_VERSION up to 1.11
CVS commit: [netbsd-6-0] src/share/zoneinfo
Module Name:src
Committed By: martin
Date: Mon Mar 26 12:21:14 UTC 2018
Modified Files:
src/share/zoneinfo [netbsd-6-0]: Makefile
Log Message:
Back out all changes to this file accidently included in the pullup of
tickt #1539.
To generate a diff of this commit:
cvs rdiff -u -r1.43.14.3 -r1.43.14.4 src/share/zoneinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/zoneinfo/Makefile
diff -u src/share/zoneinfo/Makefile:1.43.14.3 src/share/zoneinfo/Makefile:1.43.14.4
--- src/share/zoneinfo/Makefile:1.43.14.3 Sun Mar 25 18:38:52 2018
+++ src/share/zoneinfo/Makefile Mon Mar 26 12:21:13 2018
@@ -1,43 +1,19 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
+# $NetBSD: Makefile,v 1.43.14.4 2018/03/26 12:21:13 martin Exp $
-# Package name for the code distribution.
-PACKAGE= tzcode
+.include
-# Version number for the distribution, overridden in the 'tarballs' rule below.
-VERSION= unknown
+TZDISTDIR=${.CURDIR}
-# Email address for bug reports.
-BUGEMAIL= t...@iana.org
-
-# Choose source data features. To get new features right away, use:
-# DATAFORM= vanguard
-# To wait a while before using new features, to give downstream users
-# time to upgrade zic (the default), use:
-# DATAFORM= main
-# To wait even longer for new features, use:
-# DATAFORM= rearguard
-DATAFORM= main
-
-# Change the line below for your time zone (after finding the zone you want in
-# the time zone files, or adding it to a time zone file).
-# Alternately, if you discover you've got the wrong time zone, you can just
-# zic -l rightzone
-# to correct things.
-# Use the command
-# make zonenames
-# to get a list of the values you can use for LOCALTIME.
-
-LOCALTIME= GMT
+.PATH: ${TZDISTDIR}
# If you want something other than Eastern United States time as a template
# for handling POSIX-style time zone environment variables,
# change the line below (after finding the zone you want in the
# time zone files, or adding it to a time zone file).
-# When a POSIX-style environment variable is handled, the rules in the
+# (When a POSIX-style environment variable is handled, the rules in the
# template file are used to determine "spring forward" and "fall back" days and
# times; the environment variable itself specifies UT offsets of standard and
-# daylight saving time.
+# summer time.)
# Alternately, if you discover you've got the wrong time zone, you can just
# zic -p rightzone
# to correct things.
@@ -48,72 +24,18 @@ LOCALTIME= GMT
POSIXRULES= America/New_York
-# Also see TZDEFRULESTRING below, which takes effect only
-# if the time zone files cannot be accessed.
-
-
-# Installation locations.
-#
-# The defaults are suitable for Debian, except that if REDO is
-# posix_right or right_posix then files that Debian puts under
-# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead
-# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps,
-# respectively. Problems with the Debian approach are discussed in
-# the commentary for the right_posix rule (below).
-
-# Destination directory, which can be used for staging.
-# 'make DESTDIR=/stage install' installs under /stage (e.g., to
-# /stage/etc/localtime instead of to /etc/localtime). Files under
-# /stage are not intended to work as-is, but can be copied by hand to
-# the root directory later. If DESTDIR is empty, 'make install' does
-# not stage, but installs directly into production locations.
-DESTDIR =
-
-# Everything is installed into subdirectories of TOPDIR, and used there.
-# TOPDIR should be empty (meaning the root directory),
-# or a directory name that does not end in "/".
-# TOPDIR should be empty or an absolute name unless you're just testing.
-TOPDIR =
-
-# The default local time zone is taken from the file TZDEFAULT.
-TZDEFAULT = $(TOPDIR)/etc/localtime
-
-# The subdirectory containing installed program and data files, and
-# likewise for installed files that can be shared among architectures.
-# These should be relative file names.
-USRDIR = usr
-USRSHAREDIR = $(USRDIR)/share
-
# "Compiled" time zone information is placed in the "TZDIR" directory
# (and subdirectories).
-# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty.
-TZDIR_BASENAME= zoneinfo
-TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME)
-
-# The "tzselect" and (if you do "make INSTALL") "date" commands go in:
-BINDIR = $(TOPDIR)/$(USRDIR)/bin
-
-# The "zdump" command goes in:
-ZDUMPDIR = $(BINDIR)
-
-# The "zic" command goes in:
-ZICDIR = $(TOPDIR)/$(USRDIR)/sbin
+# Use an absolute path name for TZDIR unless you're just testing the software.
+# Note: ${DESTDIR} is prepended to this for the actual copy.
-# Manual pages go in subdirectories of. . .
-MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
+TZDIR= /usr/share/zoneinfo
-# Library functions are put in an archive in LIBDIR.
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: martin Date: Mon Mar 26 12:20:00 UTC 2018 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: Ammend tickt #1539 To generate a diff of this commit: cvs rdiff -u -r1.1.2.132 -r1.1.2.133 src/doc/CHANGES-6.1.6 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-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.132 src/doc/CHANGES-6.1.6:1.1.2.133 --- src/doc/CHANGES-6.1.6:1.1.2.132 Sun Mar 25 18:36:12 2018 +++ src/doc/CHANGES-6.1.6 Mon Mar 26 12:20:00 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.132 2018/03/25 18:36:12 martin Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.133 2018/03/26 12:20:00 martin Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -15061,7 +15061,6 @@ sys/netipsec/ipsec_input.c 1.57-1.58 [maxv, ticket #1536] external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.5 -external/public-domain/tz/dist/Makefile up to 1.1.1.20 external/public-domain/tz/dist/NEWS up to 1.1.1.21 external/public-domain/tz/dist/README up to 1.1.1.6 external/public-domain/tz/dist/TZDATA_VERSION up to 1.11
CVS commit: [netbsd-6-1] src/share/zoneinfo
Module Name:src
Committed By: martin
Date: Mon Mar 26 12:19:22 UTC 2018
Modified Files:
src/share/zoneinfo [netbsd-6-1]: Makefile
Log Message:
Back out all changes to this file accidently included in the pullup of
tickt #1539.
To generate a diff of this commit:
cvs rdiff -u -r1.43.18.3 -r1.43.18.4 src/share/zoneinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/zoneinfo/Makefile
diff -u src/share/zoneinfo/Makefile:1.43.18.3 src/share/zoneinfo/Makefile:1.43.18.4
--- src/share/zoneinfo/Makefile:1.43.18.3 Sun Mar 25 18:35:29 2018
+++ src/share/zoneinfo/Makefile Mon Mar 26 12:19:22 2018
@@ -1,43 +1,19 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
+# $NetBSD: Makefile,v 1.43.18.4 2018/03/26 12:19:22 martin Exp $
-# Package name for the code distribution.
-PACKAGE= tzcode
+.include
-# Version number for the distribution, overridden in the 'tarballs' rule below.
-VERSION= unknown
+TZDISTDIR=${.CURDIR}
-# Email address for bug reports.
-BUGEMAIL= t...@iana.org
-
-# Choose source data features. To get new features right away, use:
-# DATAFORM= vanguard
-# To wait a while before using new features, to give downstream users
-# time to upgrade zic (the default), use:
-# DATAFORM= main
-# To wait even longer for new features, use:
-# DATAFORM= rearguard
-DATAFORM= main
-
-# Change the line below for your time zone (after finding the zone you want in
-# the time zone files, or adding it to a time zone file).
-# Alternately, if you discover you've got the wrong time zone, you can just
-# zic -l rightzone
-# to correct things.
-# Use the command
-# make zonenames
-# to get a list of the values you can use for LOCALTIME.
-
-LOCALTIME= GMT
+.PATH: ${TZDISTDIR}
# If you want something other than Eastern United States time as a template
# for handling POSIX-style time zone environment variables,
# change the line below (after finding the zone you want in the
# time zone files, or adding it to a time zone file).
-# When a POSIX-style environment variable is handled, the rules in the
+# (When a POSIX-style environment variable is handled, the rules in the
# template file are used to determine "spring forward" and "fall back" days and
# times; the environment variable itself specifies UT offsets of standard and
-# daylight saving time.
+# summer time.)
# Alternately, if you discover you've got the wrong time zone, you can just
# zic -p rightzone
# to correct things.
@@ -48,72 +24,18 @@ LOCALTIME= GMT
POSIXRULES= America/New_York
-# Also see TZDEFRULESTRING below, which takes effect only
-# if the time zone files cannot be accessed.
-
-
-# Installation locations.
-#
-# The defaults are suitable for Debian, except that if REDO is
-# posix_right or right_posix then files that Debian puts under
-# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead
-# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps,
-# respectively. Problems with the Debian approach are discussed in
-# the commentary for the right_posix rule (below).
-
-# Destination directory, which can be used for staging.
-# 'make DESTDIR=/stage install' installs under /stage (e.g., to
-# /stage/etc/localtime instead of to /etc/localtime). Files under
-# /stage are not intended to work as-is, but can be copied by hand to
-# the root directory later. If DESTDIR is empty, 'make install' does
-# not stage, but installs directly into production locations.
-DESTDIR =
-
-# Everything is installed into subdirectories of TOPDIR, and used there.
-# TOPDIR should be empty (meaning the root directory),
-# or a directory name that does not end in "/".
-# TOPDIR should be empty or an absolute name unless you're just testing.
-TOPDIR =
-
-# The default local time zone is taken from the file TZDEFAULT.
-TZDEFAULT = $(TOPDIR)/etc/localtime
-
-# The subdirectory containing installed program and data files, and
-# likewise for installed files that can be shared among architectures.
-# These should be relative file names.
-USRDIR = usr
-USRSHAREDIR = $(USRDIR)/share
-
# "Compiled" time zone information is placed in the "TZDIR" directory
# (and subdirectories).
-# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty.
-TZDIR_BASENAME= zoneinfo
-TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME)
-
-# The "tzselect" and (if you do "make INSTALL") "date" commands go in:
-BINDIR = $(TOPDIR)/$(USRDIR)/bin
-
-# The "zdump" command goes in:
-ZDUMPDIR = $(BINDIR)
-
-# The "zic" command goes in:
-ZICDIR = $(TOPDIR)/$(USRDIR)/sbin
+# Use an absolute path name for TZDIR unless you're just testing the software.
+# Note: ${DESTDIR} is prepended to this for the actual copy.
-# Manual pages go in subdirectories of. . .
-MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
+TZDIR= /usr/share/zoneinfo
-# Library functions are put in an archive in LIBDIR.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Mon Mar 26 12:18:23 UTC 2018 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ammend tickt #1539 To generate a diff of this commit: cvs rdiff -u -r1.1.2.328 -r1.1.2.329 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.328 src/doc/CHANGES-6.2:1.1.2.329 --- src/doc/CHANGES-6.2:1.1.2.328 Sun Mar 25 18:32:04 2018 +++ src/doc/CHANGES-6.2 Mon Mar 26 12:18:23 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.328 2018/03/25 18:32:04 martin Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.329 2018/03/26 12:18:23 martin Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -21166,7 +21166,6 @@ share/man/man4/altq.41.3 [sevan, ticket #1538] external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.5 -external/public-domain/tz/dist/Makefile up to 1.1.1.20 external/public-domain/tz/dist/NEWS up to 1.1.1.21 external/public-domain/tz/dist/README up to 1.1.1.6 external/public-domain/tz/dist/TZDATA_VERSION up to 1.11
CVS commit: [netbsd-6] src/share/zoneinfo
Module Name:src
Committed By: martin
Date: Mon Mar 26 12:17:20 UTC 2018
Modified Files:
src/share/zoneinfo [netbsd-6]: Makefile
Log Message:
Back out all changes to this file accidently included in the pullup of
tickt #1539.
To generate a diff of this commit:
cvs rdiff -u -r1.43.8.4 -r1.43.8.5 src/share/zoneinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/zoneinfo/Makefile
diff -u src/share/zoneinfo/Makefile:1.43.8.4 src/share/zoneinfo/Makefile:1.43.8.5
--- src/share/zoneinfo/Makefile:1.43.8.4 Sun Mar 25 18:31:03 2018
+++ src/share/zoneinfo/Makefile Mon Mar 26 12:17:20 2018
@@ -1,43 +1,19 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
+# $NetBSD: Makefile,v 1.43.8.5 2018/03/26 12:17:20 martin Exp $
-# Package name for the code distribution.
-PACKAGE= tzcode
+.include
-# Version number for the distribution, overridden in the 'tarballs' rule below.
-VERSION= unknown
+TZDISTDIR=${.CURDIR}
-# Email address for bug reports.
-BUGEMAIL= t...@iana.org
-
-# Choose source data features. To get new features right away, use:
-# DATAFORM= vanguard
-# To wait a while before using new features, to give downstream users
-# time to upgrade zic (the default), use:
-# DATAFORM= main
-# To wait even longer for new features, use:
-# DATAFORM= rearguard
-DATAFORM= main
-
-# Change the line below for your time zone (after finding the zone you want in
-# the time zone files, or adding it to a time zone file).
-# Alternately, if you discover you've got the wrong time zone, you can just
-# zic -l rightzone
-# to correct things.
-# Use the command
-# make zonenames
-# to get a list of the values you can use for LOCALTIME.
-
-LOCALTIME= GMT
+.PATH: ${TZDISTDIR}
# If you want something other than Eastern United States time as a template
# for handling POSIX-style time zone environment variables,
# change the line below (after finding the zone you want in the
# time zone files, or adding it to a time zone file).
-# When a POSIX-style environment variable is handled, the rules in the
+# (When a POSIX-style environment variable is handled, the rules in the
# template file are used to determine "spring forward" and "fall back" days and
# times; the environment variable itself specifies UT offsets of standard and
-# daylight saving time.
+# summer time.)
# Alternately, if you discover you've got the wrong time zone, you can just
# zic -p rightzone
# to correct things.
@@ -48,72 +24,18 @@ LOCALTIME= GMT
POSIXRULES= America/New_York
-# Also see TZDEFRULESTRING below, which takes effect only
-# if the time zone files cannot be accessed.
-
-
-# Installation locations.
-#
-# The defaults are suitable for Debian, except that if REDO is
-# posix_right or right_posix then files that Debian puts under
-# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead
-# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps,
-# respectively. Problems with the Debian approach are discussed in
-# the commentary for the right_posix rule (below).
-
-# Destination directory, which can be used for staging.
-# 'make DESTDIR=/stage install' installs under /stage (e.g., to
-# /stage/etc/localtime instead of to /etc/localtime). Files under
-# /stage are not intended to work as-is, but can be copied by hand to
-# the root directory later. If DESTDIR is empty, 'make install' does
-# not stage, but installs directly into production locations.
-DESTDIR =
-
-# Everything is installed into subdirectories of TOPDIR, and used there.
-# TOPDIR should be empty (meaning the root directory),
-# or a directory name that does not end in "/".
-# TOPDIR should be empty or an absolute name unless you're just testing.
-TOPDIR =
-
-# The default local time zone is taken from the file TZDEFAULT.
-TZDEFAULT = $(TOPDIR)/etc/localtime
-
-# The subdirectory containing installed program and data files, and
-# likewise for installed files that can be shared among architectures.
-# These should be relative file names.
-USRDIR = usr
-USRSHAREDIR = $(USRDIR)/share
-
# "Compiled" time zone information is placed in the "TZDIR" directory
# (and subdirectories).
-# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty.
-TZDIR_BASENAME= zoneinfo
-TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME)
-
-# The "tzselect" and (if you do "make INSTALL") "date" commands go in:
-BINDIR = $(TOPDIR)/$(USRDIR)/bin
-
-# The "zdump" command goes in:
-ZDUMPDIR = $(BINDIR)
-
-# The "zic" command goes in:
-ZICDIR = $(TOPDIR)/$(USRDIR)/sbin
+# Use an absolute path name for TZDIR unless you're just testing the software.
+# Note: ${DESTDIR} is prepended to this for the actual copy.
-# Manual pages go in subdirectories of. . .
-MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
+TZDIR= /usr/share/zoneinfo
-# Library functions are put in an archive in LIBDIR.
-LIBDIR =
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Mar 26 11:20:48 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.0 Log Message: Ticket #658 To generate a diff of this commit: cvs rdiff -u -r1.1.2.153 -r1.1.2.154 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.153 src/doc/CHANGES-8.0:1.1.2.154 --- src/doc/CHANGES-8.0:1.1.2.153 Sat Mar 24 18:13:25 2018 +++ src/doc/CHANGES-8.0 Mon Mar 26 11:20:48 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.0,v 1.1.2.153 2018/03/24 18:13:25 snj Exp $ +# $NetBSD: CHANGES-8.0,v 1.1.2.154 2018/03/26 11:20:48 martin Exp $ A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04 until the 8.0 release: @@ -10601,3 +10601,8 @@ sys/arch/vax/boot/Makefile.inc 1.18 with booting a kernel larger than below 4MB. [ragge, ticket #657] +sys/arch/x86/x86/intr.c1.124 + + Avoid a panic from "intrctl list" during attach of MSI/MSI-X devices. + [knakahara, ticket #658] +
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Mon Mar 26 11:19:39 UTC 2018
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: intr.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #658):
sys/arch/x86/x86/intr.c: revision 1.124
Fix "intrctl list" causes panic while attaching MSI/MSI-X devices.
When there are devices which is already pci_intr_alloc'ed, however is not
established yet, "intrctl list" causes panic. E.g.
# while true; do intrctl list > /dev/null ; done&
# drvctl -d ixg0 && drvctl -r pci0
And add some KASSERTMSG to similar but not the same code.
Pointed out by msaitoh@n.o.
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.101.2.3 -r1.101.2.4 src/sys/arch/x86/x86/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.101.2.3 src/sys/arch/x86/x86/intr.c:1.101.2.4
--- src/sys/arch/x86/x86/intr.c:1.101.2.3 Fri Mar 16 13:17:56 2018
+++ src/sys/arch/x86/x86/intr.c Mon Mar 26 11:19:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.101.2.3 2018/03/16 13:17:56 martin Exp $ */
+/* $NetBSD: intr.c,v 1.101.2.4 2018/03/26 11:19:39 martin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.101.2.3 2018/03/16 13:17:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.101.2.4 2018/03/26 11:19:39 martin Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -1839,6 +1839,9 @@ intr_get_affinity(struct intrsource *isp
return;
}
+ KASSERTMSG(isp->is_handlers != NULL,
+ "Don't get affinity for the device which is not established.");
+
ci = isp->is_handlers->ih_cpu;
if (ci == NULL) {
kcpuset_zero(cpuset);
@@ -1891,6 +1894,9 @@ intr_set_affinity(struct intrsource *isp
}
ih = isp->is_handlers;
+ KASSERTMSG(ih != NULL,
+ "Don't set affinity for the device which is not established.");
+
oldci = ih->ih_cpu;
if (newci == oldci) /* nothing to do */
return 0;
@@ -1957,6 +1963,13 @@ intr_is_affinity_intrsource(struct intrs
KASSERT(mutex_owned(_lock));
+ /*
+ * The device is already pci_intr_alloc'ed, however it is not
+ * established yet.
+ */
+ if (isp->is_handlers == NULL)
+ return false;
+
ci = isp->is_handlers->ih_cpu;
KASSERT(ci != NULL);
CVS commit: src/share/man/man4/man4.sparc64
Module Name:src Committed By: jdc Date: Mon Mar 26 10:54:31 UTC 2018 Modified Files: src/share/man/man4/man4.sparc64: ffb.4 Log Message: Note that EDID is only read on series 2 and 3 cards. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.sparc64/ffb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.sparc64/ffb.4 diff -u src/share/man/man4/man4.sparc64/ffb.4:1.2 src/share/man/man4/man4.sparc64/ffb.4:1.3 --- src/share/man/man4/man4.sparc64/ffb.4:1.2 Sat Apr 9 21:53:58 2011 +++ src/share/man/man4/man4.sparc64/ffb.4 Mon Mar 26 10:54:31 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: ffb.4,v 1.2 2011/04/09 21:53:58 wiz Exp $ +.\" $NetBSD: ffb.4,v 1.3 2018/03/26 10:54:31 jdc Exp $ .\" .\" Copyright (c) 2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -156,8 +156,12 @@ The .Nm driver supports reading .Dv EDID -data from connected monitors, and will automatically set a resolution that is -supported by both the card and the monitor if the +data from connected monitors on +.Sq Series 2 +and +.Sq Series 3 +cards, and will automatically set a resolution that is supported by both the +card and the monitor if the .Dv EDID data can be read. This can be overridden for the console frame buffer, by setting the
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Mon Mar 26 10:49:45 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: Makefile compat_60_mod.c
src/sys/modules/arch/x86/amd64-xen [pgoyette-compat]: bsd.amd64-xen.mk
src/sys/modules/arch/x86/i386-xen [pgoyette-compat]: bsd.i386-xen.mk
src/sys/modules/arch/x86/i386pae-xen [pgoyette-compat]:
bsd.i386pae-xen.mk
src/sys/modules/compat_60 [pgoyette-compat]: Makefile
Log Message:
For now, disable CPU_UCODE stuff since we can't build it properly
with XEN. Re-enable it after we get fix for PR kern/53130
To generate a diff of this commit:
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sys/compat/common/Makefile
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/compat/common/compat_60_mod.c
cvs rdiff -u -r1.1 -r1.1.28.1 \
src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
cvs rdiff -u -r1.1 -r1.1.28.1 \
src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk
cvs rdiff -u -r1.1 -r1.1.28.1 \
src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/modules/compat_60/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/Makefile
diff -u src/sys/compat/common/Makefile:1.63.2.1 src/sys/compat/common/Makefile:1.63.2.2
--- src/sys/compat/common/Makefile:1.63.2.1 Sun Mar 18 02:05:21 2018
+++ src/sys/compat/common/Makefile Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63.2.1 2018/03/18 02:05:21 pgoyette Exp $
+# $NetBSD: Makefile,v 1.63.2.2 2018/03/26 10:49:45 pgoyette Exp $
LIB= compat
NOPIC= # defined
@@ -33,9 +33,11 @@ lib${LIB}.po:: ${POBJS:O}
@rm -f lib${LIB}.po
@${LD} -r -o lib${LIB}.po ${LDFLAGS} `NM=${NM} ${LORDER} ${POBJS} | ${TSORT}`
+.if NOTYET
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DCPU_UCODE
.endif
+.endif
showsources: ${SRCS}
@echo ${.ALLSRC}
Index: src/sys/compat/common/compat_60_mod.c
diff -u src/sys/compat/common/compat_60_mod.c:1.1.2.13 src/sys/compat/common/compat_60_mod.c:1.1.2.14
--- src/sys/compat/common/compat_60_mod.c:1.1.2.13 Sat Mar 24 08:11:12 2018
+++ src/sys/compat/common/compat_60_mod.c Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_60_mod.c,v 1.1.2.13 2018/03/24 08:11:12 pgoyette Exp $ */
+/* $NetBSD: compat_60_mod.c,v 1.1.2.14 2018/03/26 10:49:45 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.13 2018/03/24 08:11:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.14 2018/03/26 10:49:45 pgoyette Exp $");
#include
#include
@@ -78,9 +78,11 @@ compat_60_fini(void)
{
int error = 0;
+#ifdef NOTYET
#ifdef CPU_UCODE
kern_cpu_60_fini();
#endif
+#endif
ccd_60_fini();
kern_tty_60_fini();
@@ -89,9 +91,11 @@ compat_60_fini(void)
if (error != 0) {
kern_tty_60_init();
ccd_60_init();
+#ifdef NOTYET
#ifdef CPU_UCODE
kern_cpu_60_init();
#endif
+#endif
return error;
}
@@ -100,9 +104,11 @@ compat_60_fini(void)
kern_sa_60_init();
kern_tty_60_init();
ccd_60_init();
+#ifdef NOTYET
#ifdef CPU_UCODE
kern_cpu_60_init();
#endif
+#endif
return error;
}
Index: src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
diff -u src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk:1.1 src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk:1.1.28.1
--- src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk:1.1 Mon Aug 11 03:43:25 2014
+++ src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.amd64-xen.mk,v 1.1 2014/08/11 03:43:25 jnemeth Exp $
+# $NetBSD: bsd.amd64-xen.mk,v 1.1.28.1 2018/03/26 10:49:45 pgoyette Exp $
.ifndef _BSD_AMD64_XEN_MK_
_BSD_AMD64_XEN_MK_=1
@@ -7,4 +7,6 @@ KMODULEARCHDIR:= amd64-xen
XEN= 1
+CPPFLAGS+= -DXEN
+
.endif # _BSD_AMD64_XEN_MK_
Index: src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk
diff -u src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk:1.1 src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk:1.1.28.1
--- src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk:1.1 Mon Aug 11 03:43:26 2014
+++ src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386-xen.mk,v 1.1 2014/08/11 03:43:26 jnemeth Exp $
+# $NetBSD: bsd.i386-xen.mk,v 1.1.28.1 2018/03/26 10:49:45 pgoyette Exp $
.ifndef _BSD_I386_XEN_MK_
_BSD_I386_XEN_MK_=1
@@ -7,4 +7,6 @@ KMODULEARCHDIR:= i386-xen
XEN= 1
+CPPFLAGS+= -DXEN
+
.endif # _BSD_I386_XEN_MK_
Index: src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
diff -u src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk:1.1 src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk:1.1.28.1
--- src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk:1.1 Mon Aug 11 03:43:26 2014
+++
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: jdc
Date: Mon Mar 26 10:31:10 UTC 2018
Modified Files:
src/sys/arch/sparc64/dev: ffb.c
Log Message:
Correct a typo in the openprom variable name.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/sparc64/dev/ffb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.61 src/sys/arch/sparc64/dev/ffb.c:1.62
--- src/sys/arch/sparc64/dev/ffb.c:1.61 Fri May 19 19:25:53 2017
+++ src/sys/arch/sparc64/dev/ffb.c Mon Mar 26 10:31:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.61 2017/05/19 19:25:53 macallan Exp $ */
+/* $NetBSD: ffb.c,v 1.62 2018/03/26 10:31:10 jdc Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.61 2017/05/19 19:25:53 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.62 2018/03/26 10:31:10 jdc Exp $");
#include
#include
@@ -260,7 +260,7 @@ ffb_attach(device_t self)
/* Check if a console resolution ":r" is set. */
if (sc->sc_console) {
- out_dev = prom_getpropstring(sc->sc_node, "output_device");
+ out_dev = prom_getpropstring(sc->sc_node, "output-device");
if (out_dev != NULL && strlen(out_dev) != 0 &&
strstr(out_dev, ":r") != NULL)
try_edid = 0;
CVS commit: src/tests/net/icmp
Module Name:src
Committed By: roy
Date: Mon Mar 26 09:11:15 UTC 2018
Modified Files:
src/tests/net/icmp: t_ping.c
Log Message:
Handle errors better.
Fix test for checking we sent all the data we asked to.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tests/net/icmp/t_ping.c
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/icmp/t_ping.c
diff -u src/tests/net/icmp/t_ping.c:1.22 src/tests/net/icmp/t_ping.c:1.23
--- src/tests/net/icmp/t_ping.c:1.22 Sat Mar 24 15:51:57 2018
+++ src/tests/net/icmp/t_ping.c Mon Mar 26 09:11:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ping.c,v 1.22 2018/03/24 15:51:57 roy Exp $ */
+/* $NetBSD: t_ping.c,v 1.23 2018/03/26 09:11:15 roy Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: t_ping.c,v 1.22 2018/03/24 15:51:57 roy Exp $");
+__RCSID("$NetBSD: t_ping.c,v 1.23 2018/03/26 09:11:15 roy Exp $");
#endif /* not lint */
#include
@@ -334,7 +334,8 @@ ATF_TC_BODY(ping_of_death, tc)
char ifname[IFNAMSIZ];
pid_t cpid;
size_t tot, frag;
- int s, x, loop, error;
+ int s, x, loop;
+ ssize_t error;
cpid = fork();
rump_init();
@@ -420,11 +421,13 @@ ATF_TC_BODY(ping_of_death, tc)
error = rump_sys_sendto(s, data, frag, 0,
(struct sockaddr *), sizeof(dst));
- if (error == sizeof(dst))
-continue;
- if (error == -1 && errno == ENOBUFS)
-continue;
- atf_tc_fail_errno("sendto failed");
+ if (error == -1) {
+if (errno == ENOBUFS)
+ continue;
+atf_tc_fail_errno("sendto failed");
+ }
+ if ((size_t)error != frag)
+atf_tc_fail("sendto did not write all data");
}
if (waitpid(-1, , WNOHANG) > 0) {
if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Mon Mar 26 06:40:28 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h
Log Message:
- Add link related softint's counter.
- Fix indent.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.136 src/sys/dev/pci/ixgbe/ixgbe.c:1.137
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.136 Tue Mar 20 09:46:25 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Mon Mar 26 06:40:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.136 2018/03/20 09:46:25 knakahara Exp $ */
+/* $NetBSD: ixgbe.c,v 1.137 2018/03/26 06:40:28 msaitoh Exp $ */
/**
@@ -173,7 +173,7 @@ static void ixgbe_media_status(struc
static int ixgbe_media_change(struct ifnet *);
static int ixgbe_allocate_pci_resources(struct adapter *,
const struct pci_attach_args *);
-static void ixgbe_free_softint(struct adapter *);
+static void ixgbe_free_softint(struct adapter *);
static void ixgbe_get_slot_info(struct adapter *);
static int ixgbe_allocate_msix(struct adapter *,
const struct pci_attach_args *);
@@ -1707,6 +1707,14 @@ ixgbe_add_hw_stats(struct adapter *adapt
NULL, xname, "TSO errors");
evcnt_attach_dynamic(>link_irq, EVCNT_TYPE_INTR,
NULL, xname, "Link MSI-X IRQ Handled");
+ evcnt_attach_dynamic(>link_sicount, EVCNT_TYPE_INTR,
+ NULL, xname, "Link softint");
+ evcnt_attach_dynamic(>mod_sicount, EVCNT_TYPE_INTR,
+ NULL, xname, "module softint");
+ evcnt_attach_dynamic(>msf_sicount, EVCNT_TYPE_INTR,
+ NULL, xname, "multimode softint");
+ evcnt_attach_dynamic(>phy_sicount, EVCNT_TYPE_INTR,
+ NULL, xname, "external PHY softint");
for (int i = 0; i < adapter->num_queues; i++, rxr++, txr++) {
#ifdef LRO
@@ -1984,6 +1992,10 @@ ixgbe_clear_evcnt(struct adapter *adapte
adapter->tso_err.ev_count = 0;
adapter->watchdog_events.ev_count = 0;
adapter->link_irq.ev_count = 0;
+ adapter->link_sicount.ev_count = 0;
+ adapter->mod_sicount.ev_count = 0;
+ adapter->msf_sicount.ev_count = 0;
+ adapter->phy_sicount.ev_count = 0;
txr = adapter->tx_rings;
for (int i = 0; i < adapter->num_queues; i++, rxr++, txr++) {
@@ -3396,6 +3408,10 @@ ixgbe_detach(device_t dev, int flags)
evcnt_detach(>watchdog_events);
evcnt_detach(>tso_err);
evcnt_detach(>link_irq);
+ evcnt_detach(>link_sicount);
+ evcnt_detach(>mod_sicount);
+ evcnt_detach(>msf_sicount);
+ evcnt_detach(>phy_sicount);
txr = adapter->tx_rings;
for (int i = 0; i < adapter->num_queues; i++, rxr++, txr++) {
@@ -4336,6 +4352,7 @@ ixgbe_handle_mod(void *context)
device_t dev = adapter->dev;
u32 err, cage_full = 0;
+ ++adapter->mod_sicount.ev_count;
if (adapter->hw.need_crosstalk_fix) {
switch (hw->mac.type) {
case ixgbe_mac_82599EB:
@@ -4383,6 +4400,7 @@ ixgbe_handle_msf(void *context)
u32 autoneg;
boolnegotiate;
+ ++adapter->msf_sicount.ev_count;
/* get_supported_phy_layer will call hw->phy.ops.identify_sfp() */
adapter->phy_layer = ixgbe_get_supported_physical_layer(hw);
@@ -4410,6 +4428,7 @@ ixgbe_handle_phy(void *context)
struct ixgbe_hw *hw = >hw;
int error;
+ ++adapter->phy_sicount.ev_count;
error = hw->phy.ops.handle_lasi(hw);
if (error == IXGBE_ERR_OVERTEMP)
device_printf(adapter->dev,
@@ -6341,7 +6360,7 @@ ixgbe_handle_link(void *context)
struct ixgbe_hw *hw = >hw;
IXGBE_CORE_LOCK(adapter);
-
+ ++adapter->link_sicount.ev_count;
ixgbe_check_link(hw, >link_speed, >link_up, 0);
ixgbe_update_link_status(adapter);
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.36 src/sys/dev/pci/ixgbe/ixgbe.h:1.37
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.36 Thu Mar 15 06:48:51 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.h Mon Mar 26 06:40:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.36 2018/03/15 06:48:51 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.37 2018/03/26 06:40:28 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -576,6 +576,10 @@ struct adapter {
struct evcnt tso_err;
struct evcnt watchdog_events;
struct evcnt link_irq;
+ struct evcnt link_sicount;
+ struct evcnt mod_sicount;
+ struct evcnt msf_sicount;
+ struct evcnt phy_sicount;
union {
struct ixgbe_hw_stats pf;
